X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=5d0180e31ec4fec449376b17710a56af0cc7f45d;hp=cf83e7e9e12695f3cb93f4c91afe019a2c366c94;hb=d877f8685ec6e22ec4b07aad67ccc4a384b8e448;hpb=c49128b19ce9fa7afa95ccf9e95da00f74569ab5 diff --git a/Makefile.PL b/Makefile.PL index cf83e7e..5d0180e 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,29 +1,43 @@ -use inc::Module::Install 0.87; - -perl_version '5.008001'; +use strict; +use warnings; +use inc::Module::Install 0.91; +# Ensure that these get used - yes, M::I loads them for us, but if you're +# in author mode and don't have them installed, then the error is tres +# cryptic. +use Module::Install::AuthorRequires; +use Module::Install::CheckConflicts; +use Module::Install::AuthorTests; + +perl_version '5.008004'; name 'Catalyst-Runtime'; all_from 'lib/Catalyst/Runtime.pm'; -requires 'namespace::clean'; +requires 'List::MoreUtils'; +requires 'namespace::autoclean' => '0.09'; +requires 'namespace::clean' => '0.13'; requires 'B::Hooks::EndOfScope' => '0.08'; -requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00801'; -requires 'Class::MOP' => '0.83'; -requires 'Moose' => '0.78'; -requires 'MooseX::MethodAttributes::Inheritable' => '0.10'; +requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00903'; +requires 'Class::MOP' => '0.95'; +requires 'Data::OptList'; +requires 'Moose' => '1.03'; +requires 'MooseX::MethodAttributes::Inheritable' => '0.24'; +requires 'MooseX::Role::WithOverloading' => '0.05'; +requires 'MooseX::Types::LoadableClass' => '0.003'; requires 'Carp'; requires 'Class::C3::Adopt::NEXT' => '0.07'; -requires 'CGI::Simple::Cookie'; +requires 'CGI::Simple::Cookie' => '1.109'; requires 'Data::Dump'; -requires 'File::Modified'; +requires 'Data::OptList'; requires 'HTML::Entities'; -requires 'HTTP::Body' => '1.04'; # makes uploadtmp work +requires 'HTML::HeadParser'; +requires 'HTTP::Body' => '1.06'; # ->cleanup(1) requires 'HTTP::Headers' => '1.64'; -requires 'HTTP::Request'; -requires 'HTTP::Response'; -requires 'HTTP::Request::AsCGI' => '0.8'; +requires 'HTTP::Request' => '5.814'; +requires 'HTTP::Response' => '5.813'; +requires 'HTTP::Request::AsCGI' => '1.0'; requires 'LWP::UserAgent'; -requires 'Module::Pluggable' => '3.01'; +requires 'Module::Pluggable' => '3.9'; requires 'Path::Class' => '0.09'; requires 'Scalar::Util'; requires 'Sub::Exporter'; @@ -31,60 +45,62 @@ requires 'Text::SimpleTable' => '0.03'; requires 'Time::HiRes'; requires 'Tree::Simple' => '1.15'; requires 'Tree::Simple::Visitor::FindByPath'; +requires 'Try::Tiny'; requires 'URI' => '1.35'; +requires 'Task::Weaken'; requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness requires 'MRO::Compat'; - -recommends 'B::Hooks::OP::Check::StashChange'; +requires 'MooseX::Getopt' => '0.30'; +requires 'MooseX::Types'; +requires 'MooseX::Types::Common::Numeric'; +requires 'String::RewritePrefix' => '0.004'; # Catalyst::Utils::resolve_namespace +requires 'Plack' => '0.9935'; # Setup empty PATH_INFO if needed +requires 'Plack::Middleware::ReverseProxy' => '0.04'; test_requires 'Class::Data::Inheritable'; -test_requires 'Test::MockObject'; - -# aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate is available -if ($ENV{AGGREGATE_TESTS} && can_use('Test::Aggregate', '0.34_01')) { - test_requires('Test::Aggregate', '0.34_01'); +test_requires 'Test::Exception'; +test_requires 'Test::More' => '0.88'; +test_requires 'Data::Dump'; + +# aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate and a Test::Simple it works with is available +if ($ENV{AGGREGATE_TESTS} && can_use('Test::Simple', '0.88') && can_use('Test::Aggregate', '0.364')) { + author_requires('Test::Aggregate', '0.364'); + author_requires('Test::Simple', '0.88'); + open my $fh, '>', '.aggregating'; } else { + unlink '.aggregating'; tests join q{ }, grep { $_ ne 't/aggregate.t' } map { glob } qw[t/*.t t/aggregate/*.t]; } +author_requires 'CatalystX::LeakChecker', '0.05'; +author_requires 'File::Copy::Recursive'; # For http server test -my @force_build_requires_if_author = qw( +author_tests 't/author'; +author_requires(map {; $_ => 0 } qw( Test::NoTabs Test::Pod Test::Pod::Coverage Pod::Coverage -); +)); if ($Module::Install::AUTHOR) { - foreach my $module (@force_build_requires_if_author) { - build_requires $module; - } darwin_check_no_resource_forks(); } +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/', +); + install_script glob('script/*.pl'); auto_install; WriteAll; -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 - strip_author_only_build_requires(@force_build_requires_if_author, 'Test::Aggregate'); - - 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: @@ -95,9 +111,10 @@ print <<"EOF"; you also install the development tools package Catalyst::Devel. perl -MCPANPLUS -e 'install Catalyst::Devel' # or - perl -MCPAN -e 'install Catalyst::Devel' + perl -MCPAN -e 'install Catalyst::Devel' # or + cpanm Catalyst::Devel - To get some commonly used plugins, as well as the TT view and DBIC + To get some commonly used plugins, as well as the TT view and DBIC model, install Task::Catalyst in the same way. Have fun! @@ -106,6 +123,13 @@ EOF # NOTE - This is the version number of the _incompatible_ code, # not the version number of the fixed version. my %conflicts = ( + 'Catalyst::Plugin::SubRequest' => '0.14', + 'Catalyst::Model::Akismet' => '0.02', + 'Catalyst::Component::ACCEPT_CONTEXT' => '0.06', + 'Catalyst::Plugin::ENV' => '9999', # This plugin is just stupid, full stop + # should have been a core fix. + 'Catalyst::Plugin::Unicode::Encoding' => '0.2', + 'Catalyst::Plugin::Authentication' => '0.10010', # _config accessor in ::Credential::Password 'Catalyst::Authentication::Credential::HTTP' => '1.009', 'Catalyst::Plugin::Session::Store::File' => '0.16', 'Catalyst::Plugin::Session' => '0.21', @@ -116,7 +140,7 @@ my %conflicts = ( 'Catalyst::Plugin::Upload::Image::Magick' => '0.03', 'Catalyst::Plugin::ConfigLoader' => '0.22', # Older versions work but # throw Data::Visitor warns - 'Catalyst::Devel' => '0.09', + 'Catalyst::Devel' => '1.19', 'Catalyst::Plugin::SmartURI' => '0.032', 'CatalystX::CRUD' => '0.37', 'Catalyst::Action::RenderView' => '0.07', @@ -127,6 +151,7 @@ my %conflicts = ( 'Catalyst::Action::REST' => '0.67', 'CatalystX::CRUD' => '0.42', 'CatalystX::CRUD::Model::RDBO' => '0.20', + 'Catalyst::View::Mason' => '0.17', ); check_conflicts(%conflicts); @@ -139,64 +164,11 @@ sub darwin_check_no_resource_forks { # 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'; + die("Oh, you got Ceiling Cat, snazzy. Please read the man page for tar or Google to find out if Apple renamed COPYFILE_DISABLE (it was COPY_EXTENDED_ATTRIBUTES_DISABLE originally) again and fix this Makefile.PL please?\n") if $osx_ver =~ /^10.7/; + my $attr = $osx_ver =~ /^10.(5|6)/ ? '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,"; }. + 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_author_only_build_requires { - my @build_requires_to_strip = @_; - Meta->{values}{build_requires} = [ grep { - my $ok = 1; - foreach my $module (@build_requires_to_strip) { - if ($_->[0] =~ /$module/) { - $ok = 0; - last; - } - } - $ok; - } @{Meta->{values}{build_requires}} ]; -} - -sub check_conflicts { - my %conflicts = @_; - - my %conflicts_found; - for my $mod ( sort keys %conflicts ) { - eval "require($mod)"; - next if $@; - - my $installed = $mod->VERSION(); - $conflicts_found{$mod} = $installed if ( $installed le $conflicts{$mod} ); } - - return unless scalar keys %conflicts_found; - - print <<"EOF"; - - WARNING: - - 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 - - foreach my $mod (keys %conflicts_found) { - print sprintf(" %s => %s\n", $mod, $conflicts_found{$mod}); - } - print "\n"; - - # More or less copied from Module::Build, via Moose - return if $ENV{PERL_MM_USE_DEFAULT}; - return unless -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT)); - - sleep 4; }