X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=d877c790ac792263aa4c83c0f48a277bffbd88df;hp=a5ee467c2a31d2149b0b343050ce1b25b99d537a;hb=1cdcbcf5cbb370999326c22f79e4e013914de7b0;hpb=3ab52ff81212ec0704c75d7fc6027b73d48bc59f diff --git a/Makefile.PL b/Makefile.PL index a5ee467..d877c79 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -6,12 +6,13 @@ name 'Catalyst-Runtime'; all_from 'lib/Catalyst/Runtime.pm'; requires 'namespace::clean'; -requires 'Scope::Upper'; -requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00700'; -requires 'Moose' => '0.64'; +requires 'Scope::Upper' => '0.06'; +requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00801'; +requires 'Moose' => '0.73'; +requires 'MooseX::MethodAttributes::Inheritable' => '0.06'; requires 'Carp'; -requires 'Class::C3::Adopt::NEXT' => '0.05'; -requires 'Class::MOP'; +requires 'Class::C3::Adopt::NEXT' => '0.07'; +requires 'Class::MOP' => '0.79'; requires 'CGI::Simple::Cookie'; requires 'Data::Dump'; requires 'File::Modified'; @@ -34,9 +35,29 @@ requires 'URI' => '1.35'; requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness requires 'MRO::Compat'; +recommends 'B::Hooks::OP::Check::StashChange'; + test_requires 'Class::Data::Inheritable'; test_requires 'Test::MockObject'; +# NOTE - This is the version number which the user must upgrade to to be ok, +my %conflicts = ( + 'Catalyst::Plugin::ConfigLoader' => '0.23', # Older versions work but + # throw Data::Visitor warns + 'Catalyst::Devel' => '0.10', + 'Catalyst::Plugin::SmartURI' => '0.030', + 'CatalystX::CRUD' => '0.38', + 'Catalyst::Action::RenderView' => '0.08', + 'Catalyst::Plugin::DebugCookie' => '0.999003', + 'Catalyst::Plugin::Authentication' => '0.100092', + 'CatalystX::Imports' => '0.04', + 'Catalyst::Plugin::HashedCookies' => '1.04', + 'Catalyst::Action::REST' => '0.68', +); +check_conflicts(%conflicts); + +# Run aggregate tests if AGGREGATE_TESTS environment = 1, but not if it = 0 +# Otherwise default to using Test::Aggregate if installed, but not requiring it. if ( ( exists $ENV{AGGREGATE_TESTS} && !$ENV{AGGREGATE_TESTS}) || (!exists $ENV{AGGREGATE_TESTS} && !can_use('Test::Aggregate', '0.34_01'))) { tests join q{ }, @@ -47,31 +68,17 @@ else { test_requires('Test::Aggregate', '0.34_01'); } my @force_build_requires_if_author = qw( - Test::NoTabs - Test::Pod - Test::Pod::Coverage + Test::NoTabs + Test::Pod + Test::Pod::Coverage Pod::Coverage ); if ($Module::Install::AUTHOR) { - - foreach my $module (@force_build_requires_if_author) { - build_requires $module; - } - - - if ($^O eq 'darwin') { - my $osx_ver = `/usr/bin/sw_vers -productVersion`; - chomp $osx_ver; - - # TAR on 10.4 wants COPY_EXTENDED_ATTRIBUTES_DISABLE - # On 10.5 (Leopard) it wants COPYFILE_DISABLE - my $attr = $osx_ver eq '10.5' ? 'COPYFILE_DISABLE' : 'COPY_EXTENDED_ATTRIBUTES_DISABLE'; - - makemaker_args(dist => { PREOP => qq{\@if [ "\$\$$attr" != "true" ]; then}. - qq{ echo "You must set the ENV variable $attr to true,"; }. - ' echo "to avoid getting resource forks in your dist."; exit 255; fi' }); - } + foreach my $module (@force_build_requires_if_author) { + build_requires $module; + } + darwin_check_no_resource_forks(); } install_script glob('script/*.pl'); @@ -82,27 +89,23 @@ if ($Module::Install::AUTHOR) { # Strip out the author only build_requires from META.yml # Need to do this _after_ WriteAll else it looses track of them - Meta->{values}{build_requires} = [ grep { - my $ok = 1; - foreach my $module (@force_build_requires_if_author) { - if ($_->[0] =~ /$module/) { - $ok = 0; - last; - } - } - $ok; - } @{Meta->{values}{build_requires}} ]; - - Meta->{values}{resources} = [ - [ 'MailingList', 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst' ], - [ 'IRC', 'irc://irc.perl.org/#catalyst' ], - [ 'license', 'http://dev.perl.org/licenses/' ], - [ 'homepage', 'http://dev.catalyst.perl.org/'], - [ 'repository', 'http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Runtime/' ], + strip_build_requires(@force_build_requires_if_author); + + # Strip out any conflicts, so that even if the author has a conflicting + # module installed, we don't end up with META.fail + strip_requires(keys %conflicts); + + Meta->{values}{resources} = [ + [ 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst' ], + [ 'IRC' => 'irc://irc.perl.org/#catalyst' ], + [ 'license', => 'http://dev.perl.org/licenses/' ], + [ 'homepage', => 'http://dev.catalyst.perl.org/'], + [ 'repository', => 'http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Runtime/' ], ]; Meta->write; } + print <<"EOF"; Important: @@ -121,48 +124,80 @@ print <<"EOF"; Have fun! EOF -check_conflicts(); +# End of script, helper functions below. + +sub darwin_check_no_resource_forks { + if ($^O eq 'darwin') { + my $osx_ver = `/usr/bin/sw_vers -productVersion`; + chomp $osx_ver; + + # TAR on 10.4 wants COPY_EXTENDED_ATTRIBUTES_DISABLE + # On 10.5 (Leopard) it wants COPYFILE_DISABLE + my $attr = $osx_ver eq '10.5' ? 'COPYFILE_DISABLE' : 'COPY_EXTENDED_ATTRIBUTES_DISABLE'; + + makemaker_args(dist => { PREOP => qq{\@if [ "\$\$$attr" != "true" ]; then}. + qq{ echo "You must set the ENV variable $attr to true,"; }. + ' echo "to avoid getting resource forks in your dist."; exit 255; fi' }); + } +} + +sub strip_build_requires { + _strip_a_requires('build_requires', @_); +} +sub strip_requires { + _strip_a_requires('requires', @_); +} +sub _strip_a_requires { + my ($type, @to_strip) = @_; + Meta->{values}{$type} = [ grep { + my $ok = 1; + foreach my $module (@to_strip) { + if ($_->[0] =~ /$module/) { + $ok = 0; + last; + } + } + $ok; + } @{Meta->{values}{$type}} ]; +} -# Nicked straight from Moose! sub check_conflicts { - my %conflicts = ( - 'CatalystX::CRUD' => '0.37', - 'Catalyst::Action::RenderView' => '0.08', - 'Catalyst::Plugin::DebugCookie' => '0.999002', - 'Catalyst::Plugin::Authentication' => '0.100092', - 'CatalystX::Imports' => '0.03', - 'Catalyst-Plugin-HashedCookies' => '1.03', - ); - - my $found = 0; + my %conflicts = @_; + + my %conflicts_found; for my $mod ( sort keys %conflicts ) { eval "require($mod)"; next if $@; my $installed = $mod->VERSION(); - if ( $installed le $conflicts{$mod} ) { + $conflicts_found{$mod} = $installed + if ( $installed lt $conflicts{$mod} ); + } + + return unless scalar keys %conflicts_found; - print <<"EOF"; + print <<"EOF"; -*** - This version of Catalyst conflicts with the version of - $mod ($installed) you have installed. + WARNING: - You will need to upgrade $mod after installing + This version of Catalyst conflicts with the versions of + some components you have installed. + + You will need to upgrade these modules after installing this version of Catalyst. -*** + + List of the conflicting components and their installed versions: EOF - $found = 1; - } + foreach my $mod (keys %conflicts_found) { + print sprintf(" %s => %s\n", $mod, $conflicts_found{$mod}); } + print "\n\n"; + return unless prompt("Would you like to upgrade these modules as part of this install?", 'N') =~ /Y/i; - return unless $found; - - # More or less copied from Module::Build - return if $ENV{PERL_MM_USE_DEFAULT}; - return unless -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT)); - - sleep 4; + foreach my $mod (keys %conflicts_found) { + requires($mod, $conflicts{$mod}) + if prompt("Install $mod?", 'Y') =~ /Y/i; + } }