Merge remote branch 't0m/json' into json

[catagits/Gitalist.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 9bac265..54e0b01 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,5 +1,8 @@
 #!/usr/bin/env perl
 
+use FindBin;
+BEGIN { do "$FindBin::Bin/script/env" or die $@ }
+
 use strict;
 use warnings;
 
@@ -29,7 +32,7 @@ if ($ENV{GITALIST_RELEASE_TESTING}) {
     # Fill in provides info so that indexing works right (in the face of MX::Declare)
     # by just smashing filenames to package names and not trying to be smart..
     File::Find::find(sub {
-        return unless $File::Find::name =~ /\.pm$/;
+        return unless /^\w.*?\.pm$/;
         my $fn = $File::Find::name;
         my $ver = ExtUtils::MM_Unix->parse_version($fn);
 
@@ -54,9 +57,13 @@ requires 'Catalyst::Plugin::ConfigLoader';
 requires 'Catalyst::Plugin::StackTrace';
 requires 'Catalyst::Plugin::Static::Simple';
 requires 'Catalyst::Plugin::Unicode::Encoding';
+requires 'Catalyst::Plugin::SubRequest' => '0.15';
 requires 'Catalyst::Action::RenderView';
 requires 'Catalyst::Component::InstancePerContext';
+requires 'Catalyst::Controller::ActionRole';
+requires 'Catalyst::View::Component::SubInclude' => '0.07';
 requires 'Catalyst::View::TT';
+requires 'Try::Tiny';
 requires 'Catalyst::Action::Serialize';
 
 requires 'Template';
@@ -67,6 +74,7 @@ requires 'Config::General';
 
 requires 'Moose';
 requires 'Moose::Autobox';
+requires 'MooseX::MultiMethods' => '0.10';
 requires 'MooseX::Declare' => '0.32';
 requires 'MooseX::Types::DateTime';
 requires 'MooseX::Types::ISO8601';
@@ -74,31 +82,31 @@ requires 'MooseX::Types::Common';
 requires 'MooseX::Types::Path::Class';
 requires 'MooseX::Types';
 requires 'MooseX::Storage';
-<<<<<<< HEAD
 requires 'JSON::Any';
-=======
 requires 'JSON::XS';
->>>>>>> origin/json
 requires 'namespace::autoclean';
 
-requires 'Git::PurePerl' => '0.43';
+requires 'Git::PurePerl' => '0.46';
 
 requires 'aliased';
 requires 'CGI';
 requires 'DateTime';
 requires 'DateTime::Format::Mail';
 requires 'File::Copy::Recursive';
+requires 'File::Type';
+requires 'File::Type::WebImages';
 requires 'File::Which';
 requires 'HTML::Entities';
 requires 'IPC::Run';
+requires 'JSON::XS';
 requires 'List::MoreUtils';
 requires 'Path::Class' => '0.17';
 requires 'Sub::Exporter';
 requires 'Syntax::Highlight::Engine::Kate';
 requires 'Sys::Hostname';
-requires 'XML::Atom';
-requires 'XML::RSS';
 requires 'XML::OPML::SimpleGen';
+requires 'XML::Atom::Feed';
+requires 'XML::RSS';
 
 test_requires 'Test::More' => '0.88';
 test_requires 'Test::utf8' => '0.02';
@@ -114,6 +122,16 @@ if ($Module::Install::AUTHOR) {
         and die $!;
 }
 
+if ($ENV{GITALIST_RELEASE_TESTING}) {
+    author_tests('t/author');
+    author_requires('Test::NoTabs');
+    author_requires('Test::Pod' => '1.14');
+    author_requires('Test::Pod::Coverage' => '1.04');
+    author_requires('Test::WWW::Mechanize::Catalyst' => '0.51');
+    author_requires('HTML::TreeBuilder::XPath');
+    author_requires('WWW::Mechanize::TreeBuilder');
+}
+
 install_script glob('script/*.pl');
 auto_install;