Merge branch 'master' into xs

Conflicts: Makefile.PL cpanfile lib/mop.pm lib/mop/role.pm
stevan · Oct 15, 2013 · 7eae4e9 · 7eae4e9
2 parents 9989cdc + f47c72f
commit 7eae4e9
Show file tree

Hide file tree

Showing 44 changed files with 2,161 additions and 576 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,8 @@
 __PLAN__.txt
 cover_db
-META.*
 MYMETA.*
 Makefile
 blib
-inc
 pm_to_blib
 MANIFEST
 Makefile.old
@@ -13,6 +11,7 @@ MANIFEST.bak
 *.sw[po]
 .DS_Store
 .build
+mop-*
 *.bs
 *.o
 mop.c

diff --git a/.travis/TravisHelper.pm b/.travis/TravisHelper.pm
@@ -6,10 +6,6 @@ our @EXPORT = qw(clone_repos installdeps test);
 
 use Cwd 'cwd';
 
-# note: there are a couple shortcuts in here that assume that p5-mop-redux
-# itself has no author tests and doesn't use dzil. if either of those stop
-# being true, a few things will probably need to be adjusted.
-
 my $mop_dir = cwd;
 # XXX we should probably not be setting this while testing p5-mop-redux itself,
 # but i don't think it will hurt anything at the moment
@@ -78,14 +74,14 @@ sub clone_repos {
 
 sub installdeps {
     each_dir {
-        if (-e 'Makefile.PL' || -e 'Build.PL') {
-            _cpanm(qw(cpanm --installdeps -q --notest --with-develop .));
-        }
-        elsif (-e 'dist.ini') {
+        if (-e 'dist.ini' && !/Plack/) {
             _cpanm(qw(cpanm -q --notest Dist::Zilla)) ||
             _cpanm("dzil authordeps --missing | cpanm -q --notest") ||
             _cpanm("dzil listdeps --author --missing | grep -v 'find abstract in' | grep -v '^mop\$' | cpanm -q --notest");
         }
+        elsif (-e 'Makefile.PL' || -e 'Build.PL') {
+            _cpanm(qw(cpanm --installdeps -q --notest --with-develop .));
+        }
         else {
             warn "Don't know how to install deps";
             warn "Cannot find any of Build.PL, Makefile.PL, or dist.ini";
@@ -99,24 +95,27 @@ sub test {
     each_dir {
         # these fail release tests
         local $ENV{RELEASE_TESTING}
-            if /Plack|http-headers-actionpack|BreadBoard/;
+            if /Plack|http-headers-actionpack|BreadBoard|Action-Retry/;
 
         my $failed = 0;
 
-        if (-e 'Build.PL') {
+        if (-e 'dist.ini' && !/Plack/) {
+            my $cmd = "dzil test";
+            $cmd .= ' --all'
+                unless /Plack|http-headers-actionpack|BreadBoard|Action-Retry/;
+            $failed ||= _system($cmd);
+        }
+        elsif (-e 'Build.PL') {
             $failed ||= _system("perl Build.PL && ./Build test");
         }
         elsif (-e 'Makefile.PL') {
             $failed ||= _system("perl Makefile.PL && make test");
         }
-        elsif (-e 'dist.ini') {
-            $failed ||= _system("dzil test");
-        }
         else {
             $failed ||= _system("prove -lr t");
         }
 
-        if (-e 'xt') {
+        if (-e 'xt' && !-e 'dist.ini') {
             $failed ||= _system("prove -lr xt");
         }