In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/d676fe861a0916d8787409f8268b68369798ef21?hp=04ffa453028a3e2c49438e66d56c99d43987c4f2>
- Log ----------------------------------------------------------------- commit d676fe861a0916d8787409f8268b68369798ef21 Author: James E Keenan <[email protected]> Date: Sat Jan 17 22:09:21 2015 -0500 perldelta update for 5944609. M pod/perldelta.pod commit 594460974065ab5ddb90da24aaead0d5882df9a4 Author: Karen Etheridge <[email protected]> Date: Sat Jan 17 11:31:47 2015 -0800 Module::Metadata 1.000026 M cpan/Module-Metadata/lib/Module/Metadata.pm M cpan/Module-Metadata/t/metadata.t ----------------------------------------------------------------------- Summary of changes: cpan/Module-Metadata/lib/Module/Metadata.pm | 4 ++-- cpan/Module-Metadata/t/metadata.t | 35 ++++++++++++++++++++--------- pod/perldelta.pod | 4 ++++ 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/cpan/Module-Metadata/lib/Module/Metadata.pm b/cpan/Module-Metadata/lib/Module/Metadata.pm index dddfedb..7ea1210 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.000024-12-g978f25c +package Module::Metadata; # git description: v1.000025-7-g47ca1b2 # Adapted from Perl-licensed code originally distributed with # Module-Build by Ken Williams @@ -13,7 +13,7 @@ sub __clean_eval { eval $_[0] } use strict; use warnings; -our $VERSION = '1.000025'; +our $VERSION = '1.000026'; use Carp qw/croak/; use File::Spec; diff --git a/cpan/Module-Metadata/t/metadata.t b/cpan/Module-Metadata/t/metadata.t index 3d55111..ca92863 100644 --- a/cpan/Module-Metadata/t/metadata.t +++ b/cpan/Module-Metadata/t/metadata.t @@ -237,6 +237,11 @@ our $VERSION = '1.12.B55J2qn'; our $WTF = $VERSION; $WTF =~ s/^\d+\.\d+\.//; package Simple; { our $VERSION = '1.12'; } --- + sub { defined $_[0] and $_[0] =~ /^3\.14159/ } => <<'---', # calculated version - from Acme-Pi-3.14 +package Simple; +my $version = atan2(1,1) * 4; $Simple::VERSION = "$version"; +1; +--- ); # format: expected package name => code snippet @@ -308,12 +313,12 @@ sub tmpdir { } my $tmp; -BEGIN { $tmp = tmpdir; diag "using temp dir $tmp"; } +BEGIN { $tmp = tmpdir; note "using temp dir $tmp"; } END { die "tests failed; leaving temp dir $tmp behind" if $ENV{AUTHOR_TESTING} and not Test::Builder->new->is_passing; - diag "removing temp dir $tmp"; + note "removing temp dir $tmp"; chdir original_cwd; File::Path::rmtree($tmp); } @@ -415,14 +420,24 @@ while (++$test_case and my ($expected_version, $code) = splice @modules, 0, 2 ) # 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; - is( - (defined $got ? "$got" : $got), - $expected_version, - "case $test_case: correct module version (" - . (defined $expected_version? "'$expected_version'" : 'undef') - . ')' - ) - or $errs++; + + if (ref($expected_version) eq 'CODE') { + ok( + $expected_version->($got), + "case $test_case: module version passes match sub" + ) + or $errs++; + } + else { + is( + (defined $got ? "$got" : $got), + $expected_version, + "case $test_case: correct module version (" + . (defined $expected_version? "'$expected_version'" : 'undef') + . ')' + ) + or $errs++; + } is( $warnings, '', "case $test_case: no warnings from parsing" ) or $errs++; diag Dumper({ got => $pm_info->version, module_contents => $code }) if $errs; diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 73d808c..a29ed10 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -191,6 +191,10 @@ precedence, causing C<foo($a<$b)> to be deparsed without the parentheses. =item * +L<Module::Metadata> has been upgraded from version 1.000025 to 1.000026. + +=item * + L<Safe> has been upgraded from version 2.38 to 2.39. C<reval> was not propagating void context properly. -- Perl5 Master Repository
