Update Module-Metadata to version 1.000030

1.000030  2015-11-20 03:03:24Z (TRIAL RELEASE)
  - temp dirs cleaned up during tests (Steve Hay)
  - more accurately mark tests as TODO, so as to have a quieter and less
    confusing test run without passing TODO tests. This release is primarily
    intended for the perl 5.23.5 release.

2 files changed, 27 insertions, 15 deletions

diff --git a/cpan/Module-Metadata/lib/Module/Metadata.pm b/cpan/Module-Metadata/lib/Module/Metadata.pm
index 3fa404ea23..cc05549020 100644
--- a/cpan/Module-Metadata/lib/Module/Metadata.pm
+++ b/cpan/Module-Metadata/lib/Module/Metadata.pm
@@ -1,6 +1,6 @@
 # -*- mode: cperl; tab-width: 8; indent-tabs-mode: nil; basic-offset: 2 -*-
 # vim:ts=8:sw=2:et:sta:sts=2
-package Module::Metadata; # git description: v1.000028-4-gb283720
+package Module::Metadata; # git description: v1.000029-6-gae0d3b6
 # ABSTRACT: Gather package and POD information from perl module files
 
 # Adapted from Perl-licensed code originally distributed with
@@ -14,7 +14,7 @@ sub __clean_eval { eval $_[0] }
 use strict;
 use warnings;
 
-our $VERSION = '1.000029'; # TRIAL
+our $VERSION = '1.000030'; # TRIAL
 
 use Carp qw/croak/;
 use File::Spec;
@@ -820,7 +820,7 @@ Module::Metadata - Gather package and POD information from perl module files
 
 =head1 VERSION
 
-version 1.000029
+version 1.000030
 
 =head1 SYNOPSIS
 
@@ -1034,10 +1034,10 @@ Bugs may be submitted through L<the RT bug tracker|https://rt.cpan.org/Public/Di
 (or L<bug-Module-Metadata@rt.cpan.org|mailto:bug-Module-Metadata@rt.cpan.org>).
 
 There is also a mailing list available for users of this distribution, at
-http://lists.perl.org/list/cpan-workers.html.
+L<http://lists.perl.org/list/cpan-workers.html>.
 
 There is also an irc channel available for users of this distribution, at
-irc://irc.perl.org/#toolchain.
+L<irc://irc.perl.org/#toolchain>.
 
 =head1 AUTHOR
 
@@ -1049,7 +1049,7 @@ assistance from David Golden (xdg) <dagolden@cpan.org>.
 
 =head1 CONTRIBUTORS
 
-=for stopwords Karen Etheridge David Golden Vincent Pit Matt S Trout Chris Nehren Graham Knop Olivier Mengué Tomas Doran Tatsuhiko Miyagawa tokuhirom Peter Rabbitson Jerry D. Hedden Craig A. Berry Mitchell Steinbrunner Edward Zborowski Gareth Harper James Raspass 'BinGOs' Williams Josh Jore Kent Fredric
+=for stopwords Karen Etheridge David Golden Vincent Pit Matt S Trout Chris Nehren Graham Knop Olivier Mengué Tomas Doran Tatsuhiko Miyagawa tokuhirom Peter Rabbitson Steve Hay Josh Jore Craig A. Berry Mitchell Steinbrunner Edward Zborowski Gareth Harper James Raspass Jerry D. Hedden 'BinGOs' Williams Kent Fredric
 
 =over 4
 
@@ -1099,7 +1099,11 @@ Peter Rabbitson <ribasushi@cpan.org>
 
 =item *
 
-Jerry D. Hedden <jdhedden@cpan.org>
+Steve Hay <steve.m.hay@googlemail.com>
+
+=item *
+
+Josh Jore <jjore@cpan.org>
 
 =item *
 
@@ -1127,11 +1131,11 @@ James Raspass <jraspass@gmail.com>
 
 =item *
 
-Chris 'BinGOs' Williams <chris@bingosnet.co.uk>
+Jerry D. Hedden <jdhedden@cpan.org>
 
 =item *
 
-Josh Jore <jjore@cpan.org>
+Chris 'BinGOs' Williams <chris@bingosnet.co.uk>
 
 =item *
 
diff --git a/cpan/Module-Metadata/t/extract-version.t b/cpan/Module-Metadata/t/extract-version.t
index 3329aa1b84..f1d8d21de6 100644
--- a/cpan/Module-Metadata/t/extract-version.t
+++ b/cpan/Module-Metadata/t/extract-version.t
@@ -543,7 +543,8 @@ package Simple;
 ---
   vers => '1.23',
   all_versions => { Simple => '1.23' },
-  TODO => 'apply fix from ExtUtils-MakeMaker PR#135',
+  TODO_scalar => 'apply fix from ExtUtils-MakeMaker PR#135',
+  TODO_all_versions => 'apply fix from ExtUtils-MakeMaker PR#135',
 },
 {
   name => 'our $VERSION inside BEGIN block',
@@ -555,7 +556,8 @@ package Simple;
 ---
   vers => '1.23',
   all_versions => { Simple => '1.23' },
-  TODO => 'apply fix from ExtUtils-MakeMaker PR#135',
+  TODO_scalar => 'apply fix from ExtUtils-MakeMaker PR#135',
+  TODO_all_versions => 'apply fix from ExtUtils-MakeMaker PR#135',
 },
 {
   name => 'no assumption of primary version merely if a package\'s $VERSION is referenced',
@@ -573,7 +575,7 @@ $VERSION = '1.23';
 ---
   vers => undef,
   all_versions => { '____caller' => '1.23' },
-  TODO => 'FIXME! RT#74741',
+  TODO_all_versions => 'FIXME! RT#74741',
 },
 {
   name => 'no package statement; bare $VERSION with our',
@@ -582,7 +584,7 @@ our $VERSION = '1.23';
 ---
   vers => undef,
   all_versions => { '____caller' => '1.23' },
-  TODO => 'FIXME! RT#74741',
+  TODO_all_versions => 'FIXME! RT#74741',
 },
 {
   name => 'no package statement; fully-qualified $VERSION for main',
@@ -612,7 +614,7 @@ foreach my $test_case (@modules) {
   note $test_case->{name};
   my $code = $test_case->{code};
   my $expected_version = $test_case->{vers};
-  local $TODO = $test_case->{TODO};
+
   SKIP: {
     skip( "No our() support until perl 5.6", (defined $expected_version ? 3 : 2) )
         if $] < 5.006 && $code =~ /\bour\b/;
@@ -636,9 +638,13 @@ foreach my $test_case (@modules) {
     # from 0.95_01 and later, it just lets the objects figure out how to handle 'eq'
     # We want to ensure we preserve the original, as long as it's legal, so we
     # explicitly check the stringified form.
-    isa_ok($got, 'version') if defined $expected_version;
+    {
+      local $TODO = $test_case->{TODO_got_version};
+      isa_ok($got, 'version') if defined $expected_version;
+    }
 
     if (ref($expected_version) eq 'CODE') {
+      local $TODO = $test_case->{TODO_code_sub};
       ok(
         $expected_version->($got),
         "case '$test_case->{name}': module version passes match sub"
@@ -646,6 +652,7 @@ foreach my $test_case (@modules) {
       or $errs++;
     }
     else {
+      local $TODO = $test_case->{TODO_scalar};
       is(
         (defined $got ? "$got" : $got),
         $expected_version,
@@ -657,6 +664,7 @@ foreach my $test_case (@modules) {
     }
 
     if (exists $test_case->{all_versions}) {
+      local $TODO = $test_case->{TODO_all_versions};
       if (ref($expected_version) eq 'CODE') {
         ok(
           $test_case->{all_versions}->($pm_info->{versions}),