distarify

diff --git a/.gitignore b/.gitignore
index 6387d28..642f530 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,19 @@
-!.gitignore
-Makefile*
-!Makefile.PL
-META.yml
-MYMETA.*
-blib
-build
-inc
-pm_to_blib
-MANIFEST*
-!MANIFEST.SKIP
-Debian*
-README
-Catalyst-Plugin-Static-Simple-*
-*.bs
+/MANIFEST
+/MANIFEST.bak
+/MANIFEST.SKIP
+/META.*
+/MYMETA.*
+/Makefile
+/Makefile.old
+/README
+/blib/
+/pm_to_blib
+/Distar
+/cover_db/
+/_eumm/
+*~
+*#
+.#*
+/Catalyst-Plugin-Static-Simple-*/
+/Catalyst-Plugin-Static-Simple-*.tar
+/Catalyst-Plugin-Static-Simple-*.tar.gz

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
deleted file mode 100644 (file)
index 72e7fed..0000000
--- a/MANIFEST.SKIP
+++ /dev/null
@@ -1,36 +0,0 @@
-#!include_default
-\bCatalyst-Plugin-Static-Simple-
-
-# Avoid version control files.
-\bRCS\b
-\bCVS\b
-,v$
-\B\.svn\b
-\B\.git\b
-\B\.gitignore\b
-
-# Avoid Makemaker generated and utility files.
-\bMakefile$
-\bblib
-\bMakeMaker-\d
-\bpm_to_blib$
-\bblibdirs$
-^MANIFEST\.SKIP$
-
-# Avoid Module::Build generated and utility files.
-\bBuild$
-\b_build
-
-# Avoid temp and backup files.
-~$
-\.tmp$
-\.old$
-\.bak$
-\#$
-\b\.#
-
-# Don't ship the test db
-^t/var
-
-# Module::Install can't handle files with spaces
-t/lib/TestApp/root/files/space file.txt

diff --git a/Makefile.PL b/Makefile.PL
index bf23827..ac2bc10 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,42 +1,109 @@
 use strict;
 use warnings;
+use 5.006;
 
-BEGIN { push @INC, '.' unless $INC[-1] eq '.'; }
+my %META = (
+  name => 'Catalyst-Plugin-Static-Simple',
+  license => 'perl_5',
+  prereqs => {
+    configure => { requires => {
+      'ExtUtils::MakeMaker' => 0,
+    } },
+    test => {
+      requires => {
+        'Test::More' => 0,
+      },
+    },
+    runtime => {
+      requires => {
+        'Catalyst::Runtime'     => '5.80008',
+        'MIME::Types'           => '2.03',
+        'Moose'                 => 0,
+        'MooseX::Types'         => 0,
+        'namespace::autoclean'  => 0,
+      },
+    },
+    develop => {
+      requires => {
+        'Test::NoTabs'        => 0,
+        'Test::Pod'           => '1.14',
+        'Test::Pod::Coverage' => '1.04',
+      },
+    },
+  },
+  resources => {
+    repository => {
+      url => 'git://git.shadowcat.co.uk/catagits/Catalyst-Plugin-Static-Simple.git',
+      web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits/Catalyst-Plugin-Static-Simple.git',
+      type => 'git',
+    },
+    bugtracker => {
+      web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Catalyst-Plugin-Static-Simple',
+      mailto => 'bug-Catalyst-Plugin-Static-Simple@rt.cpan.org',
+    },
+    license => [ 'http://dev.perl.org/licenses/' ],
+  },
+  no_index => {
+    directory => [ 't', 'xt' ]
+  },
+);
 
-use inc::Module::Install 0.91;
-use Module::Install::AuthorRequires;
-use Module::Install::AuthorTests;
+my %MM_ARGS = ();
 
-name 'Catalyst-Plugin-Static-Simple';
-all_from 'lib/Catalyst/Plugin/Static/Simple.pm';
-
-requires 'Catalyst::Runtime' => '5.80008';
-requires 'MIME::Types' => '2.03';
-requires 'Test::More';
-requires 'Moose';
-requires 'MooseX::Types';
-requires 'namespace::autoclean';
+if (
+  eval { require Catalyst::Plugin::SubRequest }
+  && !eval { Catalyst::Plugin::SubRequest->VERSION(0.08) }
+) {
+  print "** WARNING **\n"
+      . "You appear to have a version of Catalyst::Plugin::SubRequest "
+      . "older than 0.08.\n"
+      . "You must upgrade to SubRequest 0.08 or later if you use it "
+      . "in any applications with Static::Simple.\n";
+  $MM_ARGS{PREREQ_PM}{'Catalyst::Plugin::SubRequest'} = '0.08';
+}
 
-test_requires 'Test::More';
+## BOILERPLATE ###############################################################
+require ExtUtils::MakeMaker;
+(do './maint/Makefile.PL.include' or die $@) unless -f 'META.yml';
 
-author_requires 'Test::NoTabs';
-author_requires 'Test::Pod' => '1.14';
-author_requires 'Test::Pod::Coverage' => '1.04';
+# have to do this since old EUMM dev releases miss the eval $VERSION line
+my $eumm_version  = eval $ExtUtils::MakeMaker::VERSION;
+my $mymeta        = $eumm_version >= 6.57_02;
+my $mymeta_broken = $mymeta && $eumm_version < 6.57_07;
 
-author_tests 't/author';
+($MM_ARGS{NAME} = $META{name}) =~ s/-/::/g;
+($MM_ARGS{VERSION_FROM} = "lib/$MM_ARGS{NAME}.pm") =~ s{::}{/}g;
+$META{license} = [ $META{license} ]
+  if $META{license} && !ref $META{license};
+$MM_ARGS{LICENSE} = $META{license}[0]
+  if $META{license} && $eumm_version >= 6.30;
+$MM_ARGS{NO_MYMETA} = 1
+  if $mymeta_broken;
+$MM_ARGS{META_ADD} = { 'meta-spec' => { version => 2 }, %META }
+  unless -f 'META.yml';
+$MM_ARGS{PL_FILES} ||= {};
+$MM_ARGS{NORECURS} = 1
+  if not exists $MM_ARGS{NORECURS};
 
-if( can_use 'Catalyst::Plugin::SubRequest' ) {
-    unless( can_use 'Catalyst::Plugin::SubRequest' => '0.08' ) {
-        print "** WARNING **\n"
-            . "You appear to have a version of Catalyst::Plugin::SubRequest "
-            . "older than 0.08.\n"
-            . "You must upgrade to SubRequest 0.08 or later if you use it "
-            . "in any applications with Static::Simple.\n";
-        requires 'Catalyst::Plugin::SubRequest' => '0.08';
-    }
+for (qw(configure build test runtime)) {
+  my $key = $_ eq 'runtime' ? 'PREREQ_PM' : uc $_.'_REQUIRES';
+  my $r = $MM_ARGS{$key} = {
+    %{$META{prereqs}{$_}{requires} || {}},
+    %{delete $MM_ARGS{$key} || {}},
+  };
+  defined $r->{$_} or delete $r->{$_} for keys %$r;
 }
 
-auto_install;
-resources repository => 'git://git.shadowcat.co.uk/catagits/Catalyst-Plugin-Static-Simple.git';
+$MM_ARGS{MIN_PERL_VERSION} = delete $MM_ARGS{PREREQ_PM}{perl} || 0;
+
+delete $MM_ARGS{MIN_PERL_VERSION}
+  if $eumm_version < 6.47_01;
+$MM_ARGS{BUILD_REQUIRES} = {%{$MM_ARGS{BUILD_REQUIRES}}, %{delete $MM_ARGS{TEST_REQUIRES}}}
+  if $eumm_version < 6.63_03;
+$MM_ARGS{PREREQ_PM} = {%{$MM_ARGS{PREREQ_PM}}, %{delete $MM_ARGS{BUILD_REQUIRES}}}
+  if $eumm_version < 6.55_01;
+delete $MM_ARGS{CONFIGURE_REQUIRES}
+  if $eumm_version < 6.51_03;
 
-WriteAll;
+ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS);
+## END BOILERPLATE ###########################################################

diff --git a/maint/Makefile.PL.include b/maint/Makefile.PL.include
new file mode 100644 (file)
index 0000000..de7cfa1
--- /dev/null
+++ b/maint/Makefile.PL.include
@@ -0,0 +1,10 @@
+BEGIN { -e 'Distar' or system qw(git clone https://github.com/p5sagit/Distar.git) }
+use lib 'Distar/lib';
+use Distar 0.001;
+
+author 'Andy Grundman <andy@hybridized.org>';
+
+manifest_include 't/lib/TestApp/root' => qr/.*/;
+manifest_include 't/lib/IncTestApp/root' => qr/.*/;
+
+1;

diff --git a/t/author/02pod.t b/xt/02pod.t
similarity index 100%
rename from t/author/02pod.t
rename to xt/02pod.t

diff --git a/t/author/03podcoverage.t b/xt/03podcoverage.t
similarity index 100%
rename from t/author/03podcoverage.t
rename to xt/03podcoverage.t

diff --git a/t/author/notabs.t b/xt/notabs.t
similarity index 100%
rename from t/author/notabs.t
rename to xt/notabs.t