diff -Nru libpath-iterator-rule-perl-1.008/Changes libpath-iterator-rule-perl-1.009/Changes
--- libpath-iterator-rule-perl-1.008/Changes	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/Changes	2015-09-21 02:02:26.000000000 +0000
@@ -1,5 +1,12 @@
 Revision history for Path-Iterator-Rule
 
+1.009     2015-09-20 22:02:20-04:00 America/New_York
+
+    [FIXED]
+
+    - Regular expressions flags were being lost.  Now name(qr/foo/i) works
+      like iname(qr/foo/)
+
 1.008     2014-02-04 17:40:45-05:00 America/New_York
 
     [ADDED]
diff -Nru libpath-iterator-rule-perl-1.008/CONTRIBUTING libpath-iterator-rule-perl-1.009/CONTRIBUTING
--- libpath-iterator-rule-perl-1.008/CONTRIBUTING	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/CONTRIBUTING	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-## HOW TO CONTRIBUTE
-
-Thank you for considering contributing to this distribution.  This file
-contains instructions that will help you work with the source code.
-
-The distribution is managed with Dist::Zilla.  This means than many of the
-usual files you might expect are not in the repository, but are generated
-at release time (e.g. Makefile.PL).
-
-### Getting dependencies
-
-See the included `cpanfile` file for a list of dependencies.  If you have
-App::cpanminus 1.6 or later installed, you can use `cpanm` to satisfy
-dependencies like this:
-
-    $ cpanm --installdeps .
-
-Otherwise, you can install Module::CPANfile 1.0002 or later and then satisfy
-dependencies with the regular `cpan` client and `cpanfile-dump`:
-
-    $ cpan `cpanfile-dump`
-
-### Running tests
-
-You can run tests directly using the `prove` tool:
-
-    $ prove -l
-    $ prove -lv t/some_test_file.t
-
-For most distributions, `prove` is entirely sufficent for you to test any
-patches you have.
-
-### Code style and tidying
-
-Please try to match any existing coding style.  If there is a `.perltidyrc`
-file, please install Perl::Tidy and use perltidy before submitting patches.
-
-If there is a `tidyall.ini` file, you can also install Code::TidyAll and run
-`tidyall` on a file or `tidyall -a` to tidy all files.
-
-### Patching documentation
-
-Much of the documentation Pod is generated at release time.
-Depending on the distribution, some documentation may be written in a Pod
-dialect called WikiDoc. (See Pod::WikiDoc on CPAN.)
-
-If you would like to submit a documentation edit, please limit yourself to the
-documentation you see.
-
-If you see typos or documentation issues in the generated docs, please
-email or open a bug ticket instead of patching.
-
-### Learning Dist::Zilla
-
-Dist::Zilla is a very powerful authoring tool, but requires a number of
-author-specific plugins.  If you would like to use it for contributing,
-install it from CPAN, then run one of the following commands, depending on
-your CPAN client:
-
-    $ cpan `dzil authordeps`
-    $ dzil authordeps | cpanm
-
-Once installed, here are some dzil commands you might try:
-
-    $ dzil build
-    $ dzil test
-    $ dzil xtest
-
-You can learn more about Dist::Zilla at http://dzil.org/
-
diff -Nru libpath-iterator-rule-perl-1.008/CONTRIBUTING.mkdn libpath-iterator-rule-perl-1.009/CONTRIBUTING.mkdn
--- libpath-iterator-rule-perl-1.008/CONTRIBUTING.mkdn	1970-01-01 00:00:00.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/CONTRIBUTING.mkdn	2015-09-21 02:02:26.000000000 +0000
@@ -0,0 +1,100 @@
+## HOW TO CONTRIBUTE
+
+Thank you for considering contributing to this distribution.  This file
+contains instructions that will help you work with the source code.
+
+The distribution is managed with Dist::Zilla.  This means that many of the
+usual files you might expect are not in the repository, but are generated at
+release time, as is much of the documentation.  Some generated files are
+kept in the repository as a convenience (e.g. Makefile.PL or cpanfile).
+
+Generally, **you do not need Dist::Zilla to contribute patches**.  You do need
+Dist::Zilla to create a tarball.  See below for guidance.
+
+### Getting dependencies
+
+If you have App::cpanminus 1.6 or later installed, you can use `cpanm` to
+satisfy dependencies like this:
+
+    $ cpanm --installdeps .
+
+Otherwise, look for either a `Makefile.PL` or `cpanfile` file for
+a list of dependencies to satisfy.
+
+### Running tests
+
+You can run tests directly using the `prove` tool:
+
+    $ prove -l
+    $ prove -lv t/some_test_file.t
+
+For most of my distributions, `prove` is entirely sufficient for you to test any
+patches you have. I use `prove` for 99% of my testing during development.
+
+### Code style and tidying
+
+Please try to match any existing coding style.  If there is a `.perltidyrc`
+file, please install Perl::Tidy and use perltidy before submitting patches.
+
+If there is a `tidyall.ini` file, you can also install Code::TidyAll and run
+`tidyall` on a file or `tidyall -a` to tidy all files.
+
+### Patching documentation
+
+Much of the documentation Pod is generated at release time.  Some is
+generated boilerplate; other documentation is built from pseudo-POD
+directives in the source like C<=method> or C<=func>.
+
+If you would like to submit a documentation edit, please limit yourself to
+the documentation you see.
+
+If you see typos or documentation issues in the generated docs, please
+email or open a bug ticket instead of patching.
+
+### Where to send patches and pull requests
+
+If you found this distribution on Github, sending a pull-request is the
+best way to contribute.
+
+If a pull-request isn't possible, a bug ticket with a patch file is the
+next best option.
+
+As a last resort, an email to the author(s) is acceptable.
+
+## Installing and using Dist::Zilla
+
+Dist::Zilla is not required for contributing, but if you'd like to learn
+more, this section will get you up to speed.
+
+Dist::Zilla is a very powerful authoring tool, optimized for maintaining a
+large number of distributions with a high degree of automation, but it has a
+large dependency chain, a bit of a learning curve and requires a number of
+author-specific plugins.
+
+To install it from CPAN, I recommend one of the following approaches for
+the quickest installation:
+
+    # using CPAN.pm, but bypassing non-functional pod tests
+    $ cpan TAP::Harness::Restricted
+    $ PERL_MM_USE_DEFAULT=1 HARNESS_CLASS=TAP::Harness::Restricted cpan Dist::Zilla
+
+    # using cpanm, bypassing *all* tests
+    $ cpanm -n Dist::Zilla
+
+In either case, it's probably going to take about 10 minutes.  Go for a walk,
+go get a cup of your favorite beverage, take a bathroom break, or whatever.
+When you get back, Dist::Zilla should be ready for you.
+
+Then you need to install any plugins specific to this distribution:
+
+    $ cpan `dzil authordeps`
+    $ dzil authordeps | cpanm
+
+Once installed, here are some dzil commands you might try:
+
+    $ dzil build
+    $ dzil test
+    $ dzil xtest
+
+You can learn more about Dist::Zilla at http://dzil.org/
+
diff -Nru libpath-iterator-rule-perl-1.008/cpanfile libpath-iterator-rule-perl-1.009/cpanfile
--- libpath-iterator-rule-perl-1.008/cpanfile	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/cpanfile	2015-09-21 02:02:26.000000000 +0000
@@ -15,7 +15,7 @@
 on 'test' => sub {
   requires "Exporter" => "0";
   requires "ExtUtils::MakeMaker" => "0";
-  requires "File::Spec::Functions" => "0";
+  requires "File::Spec" => "0";
   requires "File::Temp" => "0";
   requires "File::pushd" => "0";
   requires "Path::Tiny" => "0";
@@ -23,27 +23,33 @@
   requires "Test::Filename" => "0.03";
   requires "Test::More" => "0.92";
   requires "lib" => "0";
-  requires "version" => "0";
+  requires "perl" => "5.010";
 };
 
 on 'test' => sub {
-  recommends "CPAN::Meta" => "0";
-  recommends "CPAN::Meta::Requirements" => "2.120900";
+  recommends "CPAN::Meta" => "2.120900";
 };
 
 on 'configure' => sub {
   requires "ExtUtils::MakeMaker" => "6.17";
+  requires "perl" => "5.010";
 };
 
 on 'develop' => sub {
-  requires "Dist::Zilla" => "5.012";
+  requires "Dist::Zilla" => "5";
   requires "Dist::Zilla::Plugin::AppendExternalData" => "0";
-  requires "Dist::Zilla::PluginBundle::DAGOLDEN" => "0.053";
+  requires "Dist::Zilla::PluginBundle::DAGOLDEN" => "0.072";
+  requires "English" => "0";
   requires "File::Spec" => "0";
   requires "File::Temp" => "0";
   requires "IO::Handle" => "0";
   requires "IPC::Open3" => "0";
+  requires "Pod::Wordlist" => "0";
+  requires "Software::License::Apache_2_0" => "0";
   requires "Test::CPAN::Meta" => "0";
   requires "Test::More" => "0";
   requires "Test::Pod" => "1.41";
+  requires "Test::Spelling" => "0.12";
+  requires "Test::Version" => "1";
+  requires "blib" => "1.01";
 };
diff -Nru libpath-iterator-rule-perl-1.008/debian/changelog libpath-iterator-rule-perl-1.009/debian/changelog
--- libpath-iterator-rule-perl-1.008/debian/changelog	2014-06-02 10:25:04.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/debian/changelog	2015-10-24 20:16:27.000000000 +0000
@@ -1,3 +1,25 @@
+libpath-iterator-rule-perl (1.009-1) unstable; urgency=medium
+
+  [ upstream ]
+  * New release.
+    + Regular expressions flags were being lost.  Now name(qr/foo/i)
+      works like iname(qr/foo/).
+
+  [ Salvatore Bonaccorso ]
+  * Update Vcs-Browser URL to use cgit web frontend.
+
+  [ Jonas Smedegaard ]
+  * Update copyright info:
+    + Use License-Grant and License-Reference fields.
+      Thanks to Ben Finney.
+  * Add lintian override regarding license in License-Reference field.
+    See bug#786450.
+  * Bump debhelper compatibility level to 9.
+  * Add lintian override regarding debhelper 9.
+  * Declare compliance with Debian Policy 3.9.6.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sat, 24 Oct 2015 22:15:18 +0200
+
 libpath-iterator-rule-perl (1.008-1) unstable; urgency=low
 
   * Initial packaging release.
diff -Nru libpath-iterator-rule-perl-1.008/debian/compat libpath-iterator-rule-perl-1.009/debian/compat
--- libpath-iterator-rule-perl-1.008/debian/compat	2014-05-10 18:37:54.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/debian/compat	2015-10-24 20:10:43.000000000 +0000
@@ -1 +1 @@
-8
+9
diff -Nru libpath-iterator-rule-perl-1.008/debian/control libpath-iterator-rule-perl-1.009/debian/control
--- libpath-iterator-rule-perl-1.008/debian/control	2014-06-02 10:31:22.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/debian/control	2015-10-24 20:16:36.000000000 +0000
@@ -17,9 +17,9 @@
  libcpan-meta-requirements-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers@lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr@jones.dk>
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libpath-iterator-rule-perl
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libpath-iterator-rule-perl.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libpath-iterator-rule-perl.git
 Homepage: https://github.com/dagolden/Path-Iterator-Rule
 
 Package: libpath-iterator-rule-perl
diff -Nru libpath-iterator-rule-perl-1.008/debian/control.in libpath-iterator-rule-perl-1.009/debian/control.in
--- libpath-iterator-rule-perl-1.008/debian/control.in	2014-06-02 10:30:59.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/debian/control.in	2015-10-24 20:11:49.000000000 +0000
@@ -4,9 +4,9 @@
 Build-Depends: @cdbs@
 Maintainer: Debian Perl Group <pkg-perl-maintainers@lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr@jones.dk>
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libpath-iterator-rule-perl
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libpath-iterator-rule-perl.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libpath-iterator-rule-perl.git
 Homepage: https://github.com/dagolden/Path-Iterator-Rule
 
 Package: libpath-iterator-rule-perl
diff -Nru libpath-iterator-rule-perl-1.008/debian/copyright libpath-iterator-rule-perl-1.009/debian/copyright
--- libpath-iterator-rule-perl-1.008/debian/copyright	2014-06-02 09:50:15.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/debian/copyright	2015-10-24 20:10:03.000000000 +0000
@@ -6,39 +6,23 @@
 
 Files: *
 Copyright: 2013, David Golden <dagolden@cpan.org>
-License: Apache-2.0
-Comment:
- License:
- .
+License-Grant:
  This is free software, licensed under:
  .
  The Apache License, Version 2.0, January 2004
+License: Apache-2.0
 
 Files: debian/*
 Copyright: 2013, Jonas Smedegaard <dr@jones.dk>
+License-Grant:
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 3, or (at your option) any
+ later version.
 License: GPL-3+
 
 License: Apache-2.0
- Comment:
- .
- On Debian systems the 'Apache License' version 2.0 is located in
- '/usr/share/common-licenses/Apache-2.0'.
+License-Reference: /usr/share/common-licenses/Apache-2.0
 
 License: GPL-3+
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 3, or (at your option) any
- later version.
- .
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
- .
- Comment:
- .
- On Debian systems the 'GNU General Public License' version 3 is located
- in '/usr/share/common-licenses/GPL-3'.
- .
- You should have received a copy of the 'GNU General Public License'
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+License-Reference: /usr/share/common-licenses/GPL-3
diff -Nru libpath-iterator-rule-perl-1.008/debian/copyright_hints libpath-iterator-rule-perl-1.009/debian/copyright_hints
--- libpath-iterator-rule-perl-1.008/debian/copyright_hints	2014-06-02 10:31:17.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/debian/copyright_hints	2015-10-24 20:04:43.000000000 +0000
@@ -4,7 +4,7 @@
 Source: FIXME
 Disclaimer: Autogenerated by CDBS
 
-Files: CONTRIBUTING
+Files: CONTRIBUTING.mkdn
  Changes
  MANIFEST
  META.json
@@ -22,6 +22,7 @@
  dist.ini
  examples/modules-in-inc.pl
  perlcritic.rc
+ t/00-report-prereqs.dd
  t/00-report-prereqs.t
  t/clone.t
  t/lib/PCNTest.pm
@@ -30,19 +31,16 @@
  xt/author/00-compile.t
  xt/author/critic.t
  xt/author/pod-spell.t
+ xt/author/test-version.t
  xt/release/distmeta.t
  xt/release/minimum-version.t
  xt/release/pod-syntax.t
  xt/release/portability.t
- xt/release/test-version.t
 Copyright: *No copyright*
 License: UNKNOWN
  FIXME
 
-Files: README
- lib/PIR.pm
- lib/Path/Iterator/Rule.pm
- t/basic.t
+Files: t/basic.t
  t/breadth-depth-files.t
  t/breadth-depth.t
  t/content.t
@@ -66,10 +64,16 @@
 License: UNKNOWN
  FIXME
 
+Files: README
+ lib/PIR.pm
+ lib/Path/Iterator/Rule.pm
+Copyright: 2013, David Golden
+  AND LICENSE
+License: UNKNOWN
+ FIXME
+
 Files: LICENSE
 Copyright: 2013, David Golden
-  License. Subject to the terms and conditions of
-  [yyyy
 License: Apache-2.0
  FIXME
 
diff -Nru libpath-iterator-rule-perl-1.008/debian/rules libpath-iterator-rule-perl-1.009/debian/rules
--- libpath-iterator-rule-perl-1.008/debian/rules	2014-06-02 10:22:31.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/debian/rules	2015-10-24 20:10:58.000000000 +0000
@@ -26,6 +26,10 @@
 DEB_UPSTREAM_PACKAGE = Path-Iterator-Rule
 DEB_UPSTREAM_URL = http://www.cpan.org/authors/id/D/DA/DAGOLDEN
 
+# Build-depend unversioned on debhelper
+#  TODO: Drop when adopted in cdbs
+CDBS_BUILD_DEPENDS_rules_debhelper_v9 = debhelper
+
 # Needed by upstream build and (always/often) at runtime
 deps = libtext-glob-perl, libtry-tiny-perl
 deps +=, libnumber-compare-perl (>= 0.02)
diff -Nru libpath-iterator-rule-perl-1.008/debian/source/lintian-overrides libpath-iterator-rule-perl-1.009/debian/source/lintian-overrides
--- libpath-iterator-rule-perl-1.008/debian/source/lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/debian/source/lintian-overrides	2015-08-03 15:02:15.000000000 +0000
@@ -0,0 +1,8 @@
+# License is in License-Reference field (see bug#786450)
+missing-license-text-in-dep5-copyright
+
+# License is in License-Reference field (see bug#786450)
+missing-license-paragraph-in-dep5-copyright
+
+# Debhelper 9 is satisfied even in oldstable
+package-needs-versioned-debhelper-build-depends 9
diff -Nru libpath-iterator-rule-perl-1.008/dist.ini libpath-iterator-rule-perl-1.009/dist.ini
--- libpath-iterator-rule-perl-1.008/dist.ini	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/dist.ini	2015-09-21 02:02:26.000000000 +0000
@@ -8,7 +8,7 @@
 source_dir = pod
 
 [@DAGOLDEN]
-:version = 0.053
+:version = 0.072
 no_coverage = 1
 stopwords = postorder
 stopwords = rjbs
diff -Nru libpath-iterator-rule-perl-1.008/lib/Path/Iterator/Rule.pm libpath-iterator-rule-perl-1.009/lib/Path/Iterator/Rule.pm
--- libpath-iterator-rule-perl-1.008/lib/Path/Iterator/Rule.pm	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/lib/Path/Iterator/Rule.pm	2015-09-21 02:02:26.000000000 +0000
@@ -4,7 +4,7 @@
 
 package Path::Iterator::Rule;
 # ABSTRACT: Iterative, recursive file finder
-our $VERSION = '1.008'; # VERSION
+our $VERSION = '1.009';
 
 # Register warnings category
 use warnings::register;
@@ -432,6 +432,7 @@
     my ( $re, $add ) = @_;
     $add ||= '';
     my $new = ref($re) eq 'Regexp' ? $re : Text::Glob::glob_to_regex($re);
+    return $new unless $add;
     my ( $pattern, $flags ) = regexp_pattern($new);
     my $new_flags = $add ? _reflag( $flags, $add ) : "";
     return qr/$new_flags$pattern/;
@@ -717,7 +718,7 @@
 
 =head1 VERSION
 
-version 1.008
+version 1.009
 
 =head1 SYNOPSIS
 
@@ -1535,6 +1536,8 @@
 
 =head1 CONTRIBUTORS
 
+=for stopwords David Steinbrunner Gian Piero Carrubba Graham Knop Ricardo Signes Toby Inkster
+
 =over 4
 
 =item *
diff -Nru libpath-iterator-rule-perl-1.008/lib/PIR.pm libpath-iterator-rule-perl-1.009/lib/PIR.pm
--- libpath-iterator-rule-perl-1.008/lib/PIR.pm	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/lib/PIR.pm	2015-09-21 02:02:26.000000000 +0000
@@ -4,7 +4,7 @@
 
 package PIR;
 # ABSTRACT: Short alias for Path::Iterator::Rule
-our $VERSION = '1.008'; # VERSION
+our $VERSION = '1.009';
 
 # Dependencies
 use Path::Iterator::Rule;
@@ -27,7 +27,7 @@
 
 =head1 VERSION
 
-version 1.008
+version 1.009
 
 =head1 SYNOPSIS
 
diff -Nru libpath-iterator-rule-perl-1.008/Makefile.PL libpath-iterator-rule-perl-1.009/Makefile.PL
--- libpath-iterator-rule-perl-1.008/Makefile.PL	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/Makefile.PL	2015-09-21 02:02:26.000000000 +0000
@@ -1,5 +1,4 @@
-
-# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.012.
+# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.039.
 use strict;
 use warnings;
 
@@ -7,18 +6,15 @@
 
 use ExtUtils::MakeMaker 6.17;
 
-
-
 my %WriteMakefileArgs = (
   "ABSTRACT" => "Iterative, recursive file finder",
   "AUTHOR" => "David Golden <dagolden\@cpan.org>",
-  "BUILD_REQUIRES" => {},
   "CONFIGURE_REQUIRES" => {
     "ExtUtils::MakeMaker" => "6.17"
   },
   "DISTNAME" => "Path-Iterator-Rule",
-  "EXE_FILES" => [],
   "LICENSE" => "apache",
+  "MIN_PERL_VERSION" => "5.010",
   "NAME" => "Path::Iterator::Rule",
   "PREREQ_PM" => {
     "Carp" => 0,
@@ -37,17 +33,16 @@
   "TEST_REQUIRES" => {
     "Exporter" => 0,
     "ExtUtils::MakeMaker" => 0,
-    "File::Spec::Functions" => 0,
+    "File::Spec" => 0,
     "File::Temp" => 0,
     "File::pushd" => 0,
     "Path::Tiny" => 0,
     "Test::Deep" => 0,
     "Test::Filename" => "0.03",
     "Test::More" => "0.92",
-    "lib" => 0,
-    "version" => 0
+    "lib" => 0
   },
-  "VERSION" => "1.008",
+  "VERSION" => "1.009",
   "test" => {
     "TESTS" => "t/*.t"
   }
@@ -60,7 +55,6 @@
   "ExtUtils::MakeMaker" => 0,
   "File::Basename" => 0,
   "File::Spec" => 0,
-  "File::Spec::Functions" => 0,
   "File::Temp" => 0,
   "File::pushd" => 0,
   "List::Util" => 0,
@@ -75,7 +69,6 @@
   "lib" => 0,
   "re" => 0,
   "strict" => 0,
-  "version" => 0,
   "warnings" => 0,
   "warnings::register" => 0
 );
@@ -91,6 +84,3 @@
   unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
 
 WriteMakefile(%WriteMakefileArgs);
-
-
-
diff -Nru libpath-iterator-rule-perl-1.008/MANIFEST libpath-iterator-rule-perl-1.009/MANIFEST
--- libpath-iterator-rule-perl-1.008/MANIFEST	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/MANIFEST	2015-09-21 02:02:26.000000000 +0000
@@ -1,5 +1,5 @@
-# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.012.
-CONTRIBUTING
+# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.039.
+CONTRIBUTING.mkdn
 Changes
 LICENSE
 MANIFEST
@@ -13,6 +13,7 @@
 lib/PIR.pm
 lib/Path/Iterator/Rule.pm
 perlcritic.rc
+t/00-report-prereqs.dd
 t/00-report-prereqs.t
 t/basic.t
 t/breadth-depth-files.t
@@ -41,8 +42,8 @@
 xt/author/00-compile.t
 xt/author/critic.t
 xt/author/pod-spell.t
+xt/author/test-version.t
 xt/release/distmeta.t
 xt/release/minimum-version.t
 xt/release/pod-syntax.t
 xt/release/portability.t
-xt/release/test-version.t
diff -Nru libpath-iterator-rule-perl-1.008/META.json libpath-iterator-rule-perl-1.009/META.json
--- libpath-iterator-rule-perl-1.008/META.json	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/META.json	2015-09-21 02:02:26.000000000 +0000
@@ -4,13 +4,13 @@
       "David Golden <dagolden@cpan.org>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "Dist::Zilla version 5.012, CPAN::Meta::Converter version 2.133380",
+   "generated_by" : "Dist::Zilla version 5.039, CPAN::Meta::Converter version 2.150005",
    "license" : [
       "apache_2_0"
    ],
    "meta-spec" : {
       "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-      "version" : "2"
+      "version" : 2
    },
    "name" : "Path-Iterator-Rule",
    "no_index" : {
@@ -27,21 +27,28 @@
    "prereqs" : {
       "configure" : {
          "requires" : {
-            "ExtUtils::MakeMaker" : "6.17"
+            "ExtUtils::MakeMaker" : "6.17",
+            "perl" : "5.010"
          }
       },
       "develop" : {
          "requires" : {
-            "Dist::Zilla" : "5.012",
+            "Dist::Zilla" : "5",
             "Dist::Zilla::Plugin::AppendExternalData" : "0",
-            "Dist::Zilla::PluginBundle::DAGOLDEN" : "0.053",
+            "Dist::Zilla::PluginBundle::DAGOLDEN" : "0.072",
+            "English" : "0",
             "File::Spec" : "0",
             "File::Temp" : "0",
             "IO::Handle" : "0",
             "IPC::Open3" : "0",
+            "Pod::Wordlist" : "0",
+            "Software::License::Apache_2_0" : "0",
             "Test::CPAN::Meta" : "0",
             "Test::More" : "0",
-            "Test::Pod" : "1.41"
+            "Test::Pod" : "1.41",
+            "Test::Spelling" : "0.12",
+            "Test::Version" : "1",
+            "blib" : "1.01"
          }
       },
       "runtime" : {
@@ -63,13 +70,12 @@
       },
       "test" : {
          "recommends" : {
-            "CPAN::Meta" : "0",
-            "CPAN::Meta::Requirements" : "2.120900"
+            "CPAN::Meta" : "2.120900"
          },
          "requires" : {
             "Exporter" : "0",
             "ExtUtils::MakeMaker" : "0",
-            "File::Spec::Functions" : "0",
+            "File::Spec" : "0",
             "File::Temp" : "0",
             "File::pushd" : "0",
             "Path::Tiny" : "0",
@@ -77,18 +83,18 @@
             "Test::Filename" : "0.03",
             "Test::More" : "0.92",
             "lib" : "0",
-            "version" : "0"
+            "perl" : "5.010"
          }
       }
    },
    "provides" : {
       "PIR" : {
          "file" : "lib/PIR.pm",
-         "version" : "1.008"
+         "version" : "1.009"
       },
       "Path::Iterator::Rule" : {
          "file" : "lib/Path/Iterator/Rule.pm",
-         "version" : "1.008"
+         "version" : "1.009"
       }
    },
    "release_status" : "stable",
@@ -103,7 +109,7 @@
          "web" : "https://github.com/dagolden/Path-Iterator-Rule"
       }
    },
-   "version" : "1.008",
+   "version" : "1.009",
    "x_authority" : "cpan:DAGOLDEN",
    "x_contributors" : [
       "David Steinbrunner <dsteinbrunner@pobox.com>",
diff -Nru libpath-iterator-rule-perl-1.008/META.yml libpath-iterator-rule-perl-1.009/META.yml
--- libpath-iterator-rule-perl-1.008/META.yml	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/META.yml	2015-09-21 02:02:26.000000000 +0000
@@ -3,25 +3,26 @@
 author:
   - 'David Golden <dagolden@cpan.org>'
 build_requires:
-  Exporter: 0
-  ExtUtils::MakeMaker: 0
-  File::Spec::Functions: 0
-  File::Temp: 0
-  File::pushd: 0
-  Path::Tiny: 0
-  Test::Deep: 0
-  Test::Filename: 0.03
-  Test::More: 0.92
-  lib: 0
-  version: 0
+  Exporter: '0'
+  ExtUtils::MakeMaker: '0'
+  File::Spec: '0'
+  File::Temp: '0'
+  File::pushd: '0'
+  Path::Tiny: '0'
+  Test::Deep: '0'
+  Test::Filename: '0.03'
+  Test::More: '0.92'
+  lib: '0'
+  perl: '5.010'
 configure_requires:
-  ExtUtils::MakeMaker: 6.17
+  ExtUtils::MakeMaker: '6.17'
+  perl: '5.010'
 dynamic_config: 0
-generated_by: 'Dist::Zilla version 5.012, CPAN::Meta::Converter version 2.133380'
+generated_by: 'Dist::Zilla version 5.039, CPAN::Meta::Converter version 2.150005'
 license: apache
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: 1.4
+  version: '1.4'
 name: Path-Iterator-Rule
 no_index:
   directory:
@@ -34,29 +35,29 @@
 provides:
   PIR:
     file: lib/PIR.pm
-    version: 1.008
+    version: '1.009'
   Path::Iterator::Rule:
     file: lib/Path/Iterator/Rule.pm
-    version: 1.008
+    version: '1.009'
 requires:
-  Carp: 0
-  File::Basename: 0
-  File::Spec: 0
-  List::Util: 0
-  Number::Compare: 0.02
-  Scalar::Util: 0
-  Text::Glob: 0
-  Try::Tiny: 0
-  perl: 5.010
-  re: 0
-  strict: 0
-  warnings: 0
-  warnings::register: 0
+  Carp: '0'
+  File::Basename: '0'
+  File::Spec: '0'
+  List::Util: '0'
+  Number::Compare: '0.02'
+  Scalar::Util: '0'
+  Text::Glob: '0'
+  Try::Tiny: '0'
+  perl: '5.010'
+  re: '0'
+  strict: '0'
+  warnings: '0'
+  warnings::register: '0'
 resources:
   bugtracker: https://github.com/dagolden/Path-Iterator-Rule/issues
   homepage: https://github.com/dagolden/Path-Iterator-Rule
   repository: https://github.com/dagolden/Path-Iterator-Rule.git
-version: 1.008
+version: '1.009'
 x_authority: cpan:DAGOLDEN
 x_contributors:
   - 'David Steinbrunner <dsteinbrunner@pobox.com>'
diff -Nru libpath-iterator-rule-perl-1.008/perlcritic.rc libpath-iterator-rule-perl-1.009/perlcritic.rc
--- libpath-iterator-rule-perl-1.008/perlcritic.rc	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/perlcritic.rc	2015-09-21 02:02:26.000000000 +0000
@@ -7,6 +7,9 @@
 [TestingAndDebugging::ProhibitNoStrict]
 allow = refs
 
+[Variables::ProhibitEvilVariables]
+variables = $DB::single
+
 # Turn these off
 [-BuiltinFunctions::ProhibitStringyEval]
 [-ControlStructures::ProhibitPostfixControls]
diff -Nru libpath-iterator-rule-perl-1.008/README libpath-iterator-rule-perl-1.009/README
--- libpath-iterator-rule-perl-1.008/README	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/README	2015-09-21 02:02:26.000000000 +0000
@@ -2,7 +2,7 @@
     Path::Iterator::Rule - Iterative, recursive file finder
 
 VERSION
-    version 1.008
+    version 1.009
 
 SYNOPSIS
       use Path::Iterator::Rule;
diff -Nru libpath-iterator-rule-perl-1.008/t/00-report-prereqs.dd libpath-iterator-rule-perl-1.009/t/00-report-prereqs.dd
--- libpath-iterator-rule-perl-1.008/t/00-report-prereqs.dd	1970-01-01 00:00:00.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/t/00-report-prereqs.dd	2015-09-21 02:02:26.000000000 +0000
@@ -0,0 +1,65 @@
+do { my $x = {
+       'configure' => {
+                        'requires' => {
+                                        'ExtUtils::MakeMaker' => '6.17',
+                                        'perl' => '5.010'
+                                      }
+                      },
+       'develop' => {
+                      'requires' => {
+                                      'Dist::Zilla' => '5',
+                                      'Dist::Zilla::Plugin::AppendExternalData' => '0',
+                                      'Dist::Zilla::PluginBundle::DAGOLDEN' => '0.072',
+                                      'English' => '0',
+                                      'File::Spec' => '0',
+                                      'File::Temp' => '0',
+                                      'IO::Handle' => '0',
+                                      'IPC::Open3' => '0',
+                                      'Pod::Wordlist' => '0',
+                                      'Software::License::Apache_2_0' => '0',
+                                      'Test::CPAN::Meta' => '0',
+                                      'Test::More' => '0',
+                                      'Test::Pod' => '1.41',
+                                      'Test::Spelling' => '0.12',
+                                      'Test::Version' => '1',
+                                      'blib' => '1.01'
+                                    }
+                    },
+       'runtime' => {
+                      'requires' => {
+                                      'Carp' => '0',
+                                      'File::Basename' => '0',
+                                      'File::Spec' => '0',
+                                      'List::Util' => '0',
+                                      'Number::Compare' => '0.02',
+                                      'Scalar::Util' => '0',
+                                      'Text::Glob' => '0',
+                                      'Try::Tiny' => '0',
+                                      'perl' => '5.010',
+                                      're' => '0',
+                                      'strict' => '0',
+                                      'warnings' => '0',
+                                      'warnings::register' => '0'
+                                    }
+                    },
+       'test' => {
+                   'recommends' => {
+                                     'CPAN::Meta' => '2.120900'
+                                   },
+                   'requires' => {
+                                   'Exporter' => '0',
+                                   'ExtUtils::MakeMaker' => '0',
+                                   'File::Spec' => '0',
+                                   'File::Temp' => '0',
+                                   'File::pushd' => '0',
+                                   'Path::Tiny' => '0',
+                                   'Test::Deep' => '0',
+                                   'Test::Filename' => '0.03',
+                                   'Test::More' => '0.92',
+                                   'lib' => '0',
+                                   'perl' => '5.010'
+                                 }
+                 }
+     };
+  $x;
+ }
\ No newline at end of file
diff -Nru libpath-iterator-rule-perl-1.008/t/00-report-prereqs.t libpath-iterator-rule-perl-1.009/t/00-report-prereqs.t
--- libpath-iterator-rule-perl-1.008/t/00-report-prereqs.t	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/t/00-report-prereqs.t	2015-09-21 02:02:26.000000000 +0000
@@ -3,189 +3,179 @@
 use strict;
 use warnings;
 
-# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.013
+# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.021
 
 use Test::More tests => 1;
 
 use ExtUtils::MakeMaker;
-use File::Spec::Functions;
-use List::Util qw/max/;
-use version;
+use File::Spec;
+
+# from $version::LAX
+my $lax_version_re =
+    qr/(?: undef | (?: (?:[0-9]+) (?: \. | (?:\.[0-9]+) (?:_[0-9]+)? )?
+            |
+            (?:\.[0-9]+) (?:_[0-9]+)?
+        ) | (?:
+            v (?:[0-9]+) (?: (?:\.[0-9]+)+ (?:_[0-9]+)? )?
+            |
+            (?:[0-9]+)? (?:\.[0-9]+){2,} (?:_[0-9]+)?
+        )
+    )/x;
 
 # hide optional CPAN::Meta modules from prereq scanner
 # and check if they are available
 my $cpan_meta = "CPAN::Meta";
-my $cpan_meta_req = "CPAN::Meta::Requirements";
-my $HAS_CPAN_META = eval "require $cpan_meta"; ## no critic
-my $HAS_CPAN_META_REQ = eval "require $cpan_meta_req; $cpan_meta_req->VERSION('2.120900')";
+my $cpan_meta_pre = "CPAN::Meta::Prereqs";
+my $HAS_CPAN_META = eval "require $cpan_meta; $cpan_meta->VERSION('2.120900')" && eval "require $cpan_meta_pre"; ## no critic
 
 # Verify requirements?
 my $DO_VERIFY_PREREQS = 1;
 
-sub _merge_requires {
+sub _max {
+    my $max = shift;
+    $max = ( $_ > $max ) ? $_ : $max for @_;
+    return $max;
+}
+
+sub _merge_prereqs {
     my ($collector, $prereqs) = @_;
-    for my $phase ( qw/configure build test runtime develop/ ) {
-        next unless exists $prereqs->{$phase};
-        if ( my $req = $prereqs->{$phase}{'requires'} ) {
-            my $cmr = CPAN::Meta::Requirements->from_string_hash( $req );
-            $collector->add_requirements( $cmr );
+
+    # CPAN::Meta::Prereqs object
+    if (ref $collector eq $cpan_meta_pre) {
+        return $collector->with_merged_prereqs(
+            CPAN::Meta::Prereqs->new( $prereqs )
+        );
+    }
+
+    # Raw hashrefs
+    for my $phase ( keys %$prereqs ) {
+        for my $type ( keys %{ $prereqs->{$phase} } ) {
+            for my $module ( keys %{ $prereqs->{$phase}{$type} } ) {
+                $collector->{$phase}{$type}{$module} = $prereqs->{$phase}{$type}{$module};
+            }
         }
     }
+
+    return $collector;
 }
 
-my %include = map {; $_ => 1 } qw(
+my @include = qw(
 
 );
 
-my %exclude = map {; $_ => 1 } qw(
+my @exclude = qw(
 
 );
 
 # Add static prereqs to the included modules list
-my $static_prereqs = do { my $x = {
-       'configure' => {
-                        'requires' => {
-                                        'ExtUtils::MakeMaker' => '6.17'
-                                      }
-                      },
-       'develop' => {
-                      'requires' => {
-                                      'Dist::Zilla' => '5.012',
-                                      'Dist::Zilla::Plugin::AppendExternalData' => '0',
-                                      'Dist::Zilla::PluginBundle::DAGOLDEN' => '0.053',
-                                      'File::Spec' => '0',
-                                      'File::Temp' => '0',
-                                      'IO::Handle' => '0',
-                                      'IPC::Open3' => '0',
-                                      'Test::CPAN::Meta' => '0',
-                                      'Test::More' => '0',
-                                      'Test::Pod' => '1.41'
-                                    }
-                    },
-       'runtime' => {
-                      'requires' => {
-                                      'Carp' => '0',
-                                      'File::Basename' => '0',
-                                      'File::Spec' => '0',
-                                      'List::Util' => '0',
-                                      'Number::Compare' => '0.02',
-                                      'Scalar::Util' => '0',
-                                      'Text::Glob' => '0',
-                                      'Try::Tiny' => '0',
-                                      'perl' => '5.010',
-                                      're' => '0',
-                                      'strict' => '0',
-                                      'warnings' => '0',
-                                      'warnings::register' => '0'
-                                    }
-                    },
-       'test' => {
-                   'recommends' => {
-                                     'CPAN::Meta' => '0',
-                                     'CPAN::Meta::Requirements' => '2.120900'
-                                   },
-                   'requires' => {
-                                   'Exporter' => '0',
-                                   'ExtUtils::MakeMaker' => '0',
-                                   'File::Spec::Functions' => '0',
-                                   'File::Temp' => '0',
-                                   'File::pushd' => '0',
-                                   'Path::Tiny' => '0',
-                                   'Test::Deep' => '0',
-                                   'Test::Filename' => '0.03',
-                                   'Test::More' => '0.92',
-                                   'lib' => '0',
-                                   'version' => '0'
-                                 }
-                 }
-     };
-  $x;
- };
-
-delete $static_prereqs->{develop} if not $ENV{AUTHOR_TESTING};
-$include{$_} = 1 for map { keys %$_ } map { values %$_ } values %$static_prereqs;
-
-# Merge requirements for major phases (if we can)
-my $all_requires;
-if ( $DO_VERIFY_PREREQS && $HAS_CPAN_META_REQ ) {
-    $all_requires = $cpan_meta_req->new;
-    _merge_requires($all_requires, $static_prereqs);
-}
+my $static_prereqs = do 't/00-report-prereqs.dd';
 
+# Merge all prereqs (either with ::Prereqs or a hashref)
+my $full_prereqs = _merge_prereqs(
+    ( $HAS_CPAN_META ? $cpan_meta_pre->new : {} ),
+    $static_prereqs
+);
 
 # Add dynamic prereqs to the included modules list (if we can)
 my ($source) = grep { -f } 'MYMETA.json', 'MYMETA.yml';
 if ( $source && $HAS_CPAN_META ) {
-  if ( my $meta = eval { CPAN::Meta->load_file($source) } ) {
-    my $dynamic_prereqs = $meta->prereqs;
-    delete $dynamic_prereqs->{develop} if not $ENV{AUTHOR_TESTING};
-    $include{$_} = 1 for map { keys %$_ } map { values %$_ } values %$dynamic_prereqs;
-
-    if ( $DO_VERIFY_PREREQS && $HAS_CPAN_META_REQ ) {
-        _merge_requires($all_requires, $dynamic_prereqs);
+    if ( my $meta = eval { CPAN::Meta->load_file($source) } ) {
+        $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs);
     }
-  }
 }
 else {
-  $source = 'static metadata';
+    $source = 'static metadata';
 }
 
-my @modules = sort grep { ! $exclude{$_} } keys %include;
-my @reports = [qw/Version Module/];
+my @full_reports;
 my @dep_errors;
-my $req_hash = defined($all_requires) ? $all_requires->as_string_hash : {};
+my $req_hash = $HAS_CPAN_META ? $full_prereqs->as_string_hash : $full_prereqs;
 
-for my $mod ( @modules ) {
-  next if $mod eq 'perl';
-  my $file = $mod;
-  $file =~ s{::}{/}g;
-  $file .= ".pm";
-  my ($prefix) = grep { -e catfile($_, $file) } @INC;
-  if ( $prefix ) {
-    my $ver = MM->parse_version( catfile($prefix, $file) );
-    $ver = "undef" unless defined $ver; # Newer MM should do this anyway
-    push @reports, [$ver, $mod];
-
-    if ( $DO_VERIFY_PREREQS && $all_requires ) {
-      my $req = $req_hash->{$mod};
-      if ( defined $req && length $req ) {
-        if ( ! defined eval { version->parse($ver) } ) {
-          push @dep_errors, "$mod version '$ver' cannot be parsed (version '$req' required)";
+# Add static includes into a fake section
+for my $mod (@include) {
+    $req_hash->{other}{modules}{$mod} = 0;
+}
+
+for my $phase ( qw(configure build test runtime develop other) ) {
+    next unless $req_hash->{$phase};
+    next if ($phase eq 'develop' and not $ENV{AUTHOR_TESTING});
+
+    for my $type ( qw(requires recommends suggests conflicts modules) ) {
+        next unless $req_hash->{$phase}{$type};
+
+        my $title = ucfirst($phase).' '.ucfirst($type);
+        my @reports = [qw/Module Want Have/];
+
+        for my $mod ( sort keys %{ $req_hash->{$phase}{$type} } ) {
+            next if $mod eq 'perl';
+            next if grep { $_ eq $mod } @exclude;
+
+            my $file = $mod;
+            $file =~ s{::}{/}g;
+            $file .= ".pm";
+            my ($prefix) = grep { -e File::Spec->catfile($_, $file) } @INC;
+
+            my $want = $req_hash->{$phase}{$type}{$mod};
+            $want = "undef" unless defined $want;
+            $want = "any" if !$want && $want == 0;
+
+            my $req_string = $want eq 'any' ? 'any version required' : "version '$want' required";
+
+            if ($prefix) {
+                my $have = MM->parse_version( File::Spec->catfile($prefix, $file) );
+                $have = "undef" unless defined $have;
+                push @reports, [$mod, $want, $have];
+
+                if ( $DO_VERIFY_PREREQS && $HAS_CPAN_META && $type eq 'requires' ) {
+                    if ( $have !~ /\A$lax_version_re\z/ ) {
+                        push @dep_errors, "$mod version '$have' cannot be parsed ($req_string)";
+                    }
+                    elsif ( ! $full_prereqs->requirements_for( $phase, $type )->accepts_module( $mod => $have ) ) {
+                        push @dep_errors, "$mod version '$have' is not in required range '$want'";
+                    }
+                }
+            }
+            else {
+                push @reports, [$mod, $want, "missing"];
+
+                if ( $DO_VERIFY_PREREQS && $type eq 'requires' ) {
+                    push @dep_errors, "$mod is not installed ($req_string)";
+                }
+            }
         }
-        elsif ( ! $all_requires->accepts_module( $mod => $ver ) ) {
-          push @dep_errors, "$mod version '$ver' is not in required range '$req'";
-        }
-      }
-    }
 
-  }
-  else {
-    push @reports, ["missing", $mod];
-
-    if ( $DO_VERIFY_PREREQS && $all_requires ) {
-      my $req = $req_hash->{$mod};
-      if ( defined $req && length $req ) {
-        push @dep_errors, "$mod is not installed (version '$req' required)";
-      }
+        if ( @reports ) {
+            push @full_reports, "=== $title ===\n\n";
+
+            my $ml = _max( map { length $_->[0] } @reports );
+            my $wl = _max( map { length $_->[1] } @reports );
+            my $hl = _max( map { length $_->[2] } @reports );
+
+            if ($type eq 'modules') {
+                splice @reports, 1, 0, ["-" x $ml, "", "-" x $hl];
+                push @full_reports, map { sprintf("    %*s %*s\n", -$ml, $_->[0], $hl, $_->[2]) } @reports;
+            }
+            else {
+                splice @reports, 1, 0, ["-" x $ml, "-" x $wl, "-" x $hl];
+                push @full_reports, map { sprintf("    %*s %*s %*s\n", -$ml, $_->[0], $wl, $_->[1], $hl, $_->[2]) } @reports;
+            }
+
+            push @full_reports, "\n";
+        }
     }
-  }
 }
 
-if ( @reports ) {
-  my $vl = max map { length $_->[0] } @reports;
-  my $ml = max map { length $_->[1] } @reports;
-  splice @reports, 1, 0, ["-" x $vl, "-" x $ml];
-  diag "\nVersions for all modules listed in $source (including optional ones):\n",
-    map {sprintf("  %*s %*s\n",$vl,$_->[0],-$ml,$_->[1])} @reports;
+if ( @full_reports ) {
+    diag "\nVersions for all modules listed in $source (including optional ones):\n\n", @full_reports;
 }
 
 if ( @dep_errors ) {
-  diag join("\n",
-    "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n",
-    "The following REQUIRED prerequisites were not satisfied:\n",
-    @dep_errors,
-    "\n"
-  );
+    diag join("\n",
+        "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n",
+        "The following REQUIRED prerequisites were not satisfied:\n",
+        @dep_errors,
+        "\n"
+    );
 }
 
 pass;
diff -Nru libpath-iterator-rule-perl-1.008/t/names.t libpath-iterator-rule-perl-1.009/t/names.t
--- libpath-iterator-rule-perl-1.008/t/names.t	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/t/names.t	2015-09-21 02:02:26.000000000 +0000
@@ -55,6 +55,32 @@
 }
 
 {
+    my $rule     = Path::Iterator::Rule->new->name(qr/foo/i);
+    my $expected = [
+        qw(
+          lib/Foo.pm
+          lib/Foo.pod
+          )
+    ];
+    my @files = map { unixify( $_, $td ) } $rule->all($td);
+    cmp_deeply( \@files, $expected, "name(qr/Foo/) match" )
+      or diag explain { got => \@files, expected => $expected };
+}
+
+{
+    my $rule     = Path::Iterator::Rule->new->name(qr/ foo /ix);
+    my $expected = [
+        qw(
+          lib/Foo.pm
+          lib/Foo.pod
+          )
+    ];
+    my @files = map { unixify( $_, $td ) } $rule->all($td);
+    cmp_deeply( \@files, $expected, "name(qr/Foo/) match" )
+      or diag explain { got => \@files, expected => $expected };
+}
+
+{
     my $rule = Path::Iterator::Rule->new->name( "*.pod", "*.pm" );
     my $expected = [
         qw(
@@ -72,6 +98,19 @@
     my $expected = [
         qw(
           lib/Foo.pm
+          lib/Foo.pod
+          )
+    ];
+    my @files = map { unixify( $_, $td ) } $rule->all($td);
+    cmp_deeply( \@files, $expected, "iname(qr/foo/) match" )
+      or diag explain { got => \@files, expected => $expected };
+}
+
+{
+    my $rule     = Path::Iterator::Rule->new->iname(qr/ foo /x);
+    my $expected = [
+        qw(
+          lib/Foo.pm
           lib/Foo.pod
           )
     ];
diff -Nru libpath-iterator-rule-perl-1.008/xt/author/00-compile.t libpath-iterator-rule-perl-1.009/xt/author/00-compile.t
--- libpath-iterator-rule-perl-1.008/xt/author/00-compile.t	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/xt/author/00-compile.t	2015-09-21 02:02:26.000000000 +0000
@@ -2,11 +2,11 @@
 use strict;
 use warnings;
 
-# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.039
-
-use Test::More  tests => 2 + ($ENV{AUTHOR_TESTING} ? 1 : 0);
+# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.054
 
+use Test::More;
 
+plan tests => 3;
 
 my @module_files = (
     'PIR.pm',
@@ -40,6 +40,9 @@
     waitpid($pid, 0);
     is($?, 0, "$lib loaded ok");
 
+    shift @_warnings if @_warnings and $_warnings[0] =~ /^Using .*\bblib/
+        and not eval { require blib; blib->VERSION('1.01') };
+
     if (@_warnings)
     {
         warn @_warnings;
@@ -49,6 +52,7 @@
 
 
 
-is(scalar(@warnings), 0, 'no warnings found') if $ENV{AUTHOR_TESTING};
+is(scalar(@warnings), 0, 'no warnings found')
+    or diag 'got warnings: ', ( Test::More->can('explain') ? Test::More::explain(\@warnings) : join("\n", '', @warnings) );
 
 
diff -Nru libpath-iterator-rule-perl-1.008/xt/author/pod-spell.t libpath-iterator-rule-perl-1.009/xt/author/pod-spell.t
--- libpath-iterator-rule-perl-1.008/xt/author/pod-spell.t	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/xt/author/pod-spell.t	2015-09-21 02:02:26.000000000 +0000
@@ -2,7 +2,7 @@
 use warnings;
 use Test::More;
 
-# generated by Dist::Zilla::Plugin::Test::PodSpelling 2.006002
+# generated by Dist::Zilla::Plugin::Test::PodSpelling 2.006009
 use Test::Spelling 0.12;
 use Pod::Wordlist;
 
@@ -33,7 +33,7 @@
 Inkster
 tobyink
 lib
+PIR
 Path
 Iterator
 Rule
-PIR
diff -Nru libpath-iterator-rule-perl-1.008/xt/author/test-version.t libpath-iterator-rule-perl-1.009/xt/author/test-version.t
--- libpath-iterator-rule-perl-1.008/xt/author/test-version.t	1970-01-01 00:00:00.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/xt/author/test-version.t	2015-09-21 02:02:26.000000000 +0000
@@ -0,0 +1,24 @@
+use strict;
+use warnings;
+use Test::More;
+
+# generated by Dist::Zilla::Plugin::Test::Version 1.05
+use Test::Version;
+
+my @imports = qw( version_all_ok );
+
+my $params = {
+    is_strict      => 0,
+    has_version    => 1,
+    multiple       => 0,
+
+};
+
+push @imports, $params
+    if version->parse( $Test::Version::VERSION ) >= version->parse('1.002');
+
+
+Test::Version->import(@imports);
+
+version_all_ok;
+done_testing;
diff -Nru libpath-iterator-rule-perl-1.008/xt/release/distmeta.t libpath-iterator-rule-perl-1.009/xt/release/distmeta.t
--- libpath-iterator-rule-perl-1.008/xt/release/distmeta.t	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/xt/release/distmeta.t	2015-09-21 02:02:26.000000000 +0000
@@ -1,8 +1,6 @@
 #!perl
 # This file was automatically generated by Dist::Zilla::Plugin::MetaTests.
 
-use Test::More;
+use Test::CPAN::Meta;
 
-eval "use Test::CPAN::Meta";
-plan skip_all => "Test::CPAN::Meta required for testing META.yml" if $@;
 meta_yaml_ok();
diff -Nru libpath-iterator-rule-perl-1.008/xt/release/pod-syntax.t libpath-iterator-rule-perl-1.009/xt/release/pod-syntax.t
--- libpath-iterator-rule-perl-1.008/xt/release/pod-syntax.t	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/xt/release/pod-syntax.t	2015-09-21 02:02:26.000000000 +0000
@@ -1,8 +1,6 @@
 #!perl
 # This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests.
 use Test::More;
-
-eval "use Test::Pod 1.41";
-plan skip_all => "Test::Pod 1.41 required for testing POD" if $@;
+use Test::Pod 1.41;
 
 all_pod_files_ok();
diff -Nru libpath-iterator-rule-perl-1.008/xt/release/test-version.t libpath-iterator-rule-perl-1.009/xt/release/test-version.t
--- libpath-iterator-rule-perl-1.008/xt/release/test-version.t	2014-02-04 22:40:53.000000000 +0000
+++ libpath-iterator-rule-perl-1.009/xt/release/test-version.t	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-
-# generated by Dist::Zilla::Plugin::Test::Version 0.002004
-BEGIN { eval "use Test::Version; 1;" or die $@; }
-
-my @imports = ( 'version_all_ok' );
-
-my $params = {
-    is_strict   => 0,
-    has_version => 1,
-};
-
-push @imports, $params
-    if version->parse( $Test::Version::VERSION ) >= version->parse('1.002');
-
-
-Test::Version->import(@imports);
-
-version_all_ok;
-done_testing;