use strict;
use warnings;
-use inc::Module::Install 0.91;
+use inc::Module::Install 1.06;
# 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;
+use Module::Install::Authority;
+
+# (Stolen from DBIC)
+# nasty hook into both M::AI init and the prompter, so that the optdep message
+# comes at the right places (on top and then right above the prompt)
+my $optdep_msg = '';
+{
+ require Module::AutoInstall;
+ no warnings 'redefine';
+ no strict 'refs';
+
+ for (qw/_prompt import/) {
+ my $meth = "Module::AutoInstall::$_";
+ my $orig = \&{$meth};
+ *{$meth} = sub {
+ print $optdep_msg;
+ goto $orig;
+ };
+ }
+}
-perl_version '5.008004';
+perl_version '5.008003';
name 'Catalyst-Runtime';
+author 'Sebastian Riedel <sri@cpan.org>';
+authority 'MSTROUT';
all_from 'lib/Catalyst/Runtime.pm';
requires 'List::MoreUtils';
requires 'namespace::autoclean' => '0.09';
-requires 'namespace::clean' => '0.13';
-requires 'B::Hooks::EndOfScope' => '0.08';
+requires 'namespace::clean' => '0.23';
requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00903';
+requires 'Class::Load' => '0.12';
requires 'Class::MOP' => '0.95';
+requires 'Data::OptList';
requires 'Moose' => '1.03';
-requires 'MooseX::MethodAttributes::Inheritable' => '0.19';
-requires 'MooseX::Role::WithOverloading' => '0.05';
+requires 'MooseX::MethodAttributes::Inheritable' => '0.24';
+requires 'MooseX::Role::WithOverloading' => '0.09';
+requires 'MooseX::Types::LoadableClass' => '0.003';
requires 'Carp';
requires 'Class::C3::Adopt::NEXT' => '0.07';
requires 'CGI::Simple::Cookie' => '1.109';
requires 'Data::Dump';
requires 'Data::OptList';
requires 'HTML::Entities';
+requires 'HTML::HeadParser';
requires 'HTTP::Body' => '1.06'; # ->cleanup(1)
requires 'HTTP::Headers' => '1.64';
requires 'HTTP::Request' => '5.814';
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';
-requires 'MooseX::Getopt' => '0.25';
+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.9974'; # IIS6 fix middleware
+requires 'Plack::Middleware::ReverseProxy' => '0.04';
+requires 'Plack::Test::ExternalServer';
test_requires 'Class::Data::Inheritable';
test_requires 'Test::Exception';
test_requires 'Test::More' => '0.88';
+test_requires 'Data::Dump';
+test_requires 'HTTP::Request::Common';
-# 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.35_05')) {
- author_requires('Test::Aggregate', '0.35_05');
- author_requires('Test::Simple', '0.88');
-}
-else {
- tests join q{ },
- grep { $_ ne 't/aggregate.t' }
- map { glob } qw[t/*.t t/aggregate/*.t];
-}
-author_requires 'CatalystX::LeakChecker', '0.05'; # Skipped if this isn't installed
-author_requires 'File::Copy::Recursive'; # For http server test
-
-author_tests 't/author';
-author_requires(map {; $_ => 0 } qw(
- Test::NoTabs
- Test::Pod
- Test::Pod::Coverage
- Pod::Coverage
-));
-
+# No fatal author_* BS! This is the sole AUTHOR block
if ($Module::Install::AUTHOR) {
+ $optdep_msg .= <<'EOW';
+
+******************************************************************************
+******************************************************************************
+*** ***
+*** AUTHOR MODE: all optional test dependencies converted to hard requires ***
+*** ***
+******************************************************************************
+******************************************************************************
+
+EOW
+ # This is now default to on unless it is explicitly set to zero
+ #my $aggregate_tests = exists $ENV{AGGREGATE_TESTS} ? $ENV{AGGREGATE_TESTS} : 1;
+
+ #### This is NOT default until Test::Aggregate fixes their Test::Builder monkey patching!
+ #### Remove this code and uncomment the above when it's fixed!
+ my $aggregate_tests = $ENV{AGGREGATE_TESTS};
+
+ # aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate and a Test::Simple it works with is available
+ if ($aggregate_tests && can_use('Test::Simple', '0.88') && can_use('Test::Aggregate', '0.364')) {
+ test_requires('Test::Aggregate', '0.364');
+ test_requires('Test::Simple', '0.88');
+ open my $fh, '>', '.aggregating';
+ }
+ else {
+ if ($aggregate_tests) {
+ # Friendly Reminder...
+ # There's no such thing as test_recommends (which wouldn't even end
+ # up on the module list, anyway), so we just print.
+ $optdep_msg .= <<'EOW';
+******************************************************************************
+* Author-level aggregate testing can go a lot smoother with Test::Aggregate *
+* and Test::Simple installed. Resorting to old-style multi-processed tests. *
+* *
+* (This notice can be silenced by explicitly setting AGGREGATE_TESTS=0.) *
+******************************************************************************
+EOW
+ #recommends('Test::Aggregate', '0.364');
+ #recommends('Test::Simple', '0.88');
+ }
+ unlink '.aggregating';
+ tests 't/*.t t/aggregate/*.t';
+ }
+
+ test_requires 'CatalystX::LeakChecker', '0.05';
+ test_requires 'File::Copy::Recursive'; # For http server test
+ test_requires 'Catalyst::Devel', '1.0'; # For http server test
+ test_requires 'Catalyst::Engine::PSGI';
+ test_requires 'Test::Without::Module';
+ unless ($^O eq 'MSWin32') {
+ test_requires 'Starman';
+ test_requires 'MooseX::Daemonize';
+ }
+
+ tests ('t/*.t t/author/*.t');
+ test_requires(map {; $_ => 0 } qw(
+ Test::NoTabs
+ Test::Pod
+ Test::Pod::Coverage
+ Test::Spelling
+ Pod::Coverage::TrustPod
+ ));
+
darwin_check_no_resource_forks();
}
'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/',
+ 'repository', => 'git://git.shadowcat.co.uk/catagits/Catalyst-Runtime.git',
);
install_script glob('script/*.pl');
'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',
- 'Catalyst::Plugin::Session::State::Cookie' => '0.10',
+ 'Catalyst::Plugin::Session::Store::File' => '0.16',
+ 'Catalyst::Plugin::Session' => '0.21',
+ 'Catalyst::Plugin::Session::State::Cookie' => '0.10',
'Catalyst::Plugin::Session::Store::FastMmap' => '0.09',
- 'Catalyst::Controller::AllowDisable' => '0.03',
- 'Reaction' => '0.001999',
- 'Catalyst::Plugin::Upload::Image::Magick' => '0.03',
- 'Catalyst::Plugin::ConfigLoader' => '0.22', # Older versions work but
+ 'Catalyst::Controller::AllowDisable' => '0.03',
+ 'Reaction' => '0.001999',
+ 'Catalyst::Plugin::Upload::Image::Magick' => '0.03',
+ 'Catalyst::Plugin::ConfigLoader' => '0.22', # Older versions work but
# throw Data::Visitor warns
- 'Catalyst::Devel' => '1.19',
- 'Catalyst::Plugin::SmartURI' => '0.032',
- 'CatalystX::CRUD' => '0.37',
- 'Catalyst::Action::RenderView' => '0.07',
- 'Catalyst::Plugin::DebugCookie' => '0.999002',
- 'Catalyst::Plugin::Authentication' => '0.100091',
- 'CatalystX::Imports' => '0.03',
- 'Catalyst::Plugin::HashedCookies' => '1.03',
- 'Catalyst::Action::REST' => '0.67',
- 'CatalystX::CRUD' => '0.42',
- 'CatalystX::CRUD::Model::RDBO' => '0.20',
- 'Catalyst::View::Mason' => '0.17',
+ 'Catalyst::Devel' => '1.19',
+ 'Catalyst::Plugin::SmartURI' => '0.032',
+ 'CatalystX::CRUD' => '0.37',
+ 'Catalyst::Action::RenderView' => '0.07',
+ 'Catalyst::Plugin::DebugCookie' => '0.999002',
+ 'Catalyst::Plugin::Authentication' => '0.100091',
+ 'CatalystX::Imports' => '0.03',
+ 'Catalyst::Plugin::HashedCookies' => '1.03',
+ 'Catalyst::Action::REST' => '0.67',
+ 'CatalystX::CRUD' => '0.42',
+ 'CatalystX::CRUD::Model::RDBO' => '0.20',
+ 'Catalyst::View::Mason' => '0.17',
+# Note these are not actually needed - they fail tests against the
+# new version, but still work fine..
+# 'Catalyst::ActionRole::ACL' => '0.05',
+# 'Catalyst::Plugin::Session::Store::DBIC' => '0.11',
+ 'Test::WWW::Mechanize::Catalyst' => '0.53', # Dep warnings unless upgraded.
);
check_conflicts(%conflicts);
# TAR on 10.4 wants COPY_EXTENDED_ATTRIBUTES_DISABLE
# On 10.5 (Leopard) it wants COPYFILE_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';
+ 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.8/;
+ my $attr = $osx_ver =~ /^10.(5|6|7)/ ? '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',"; }.