Hello community, here is the log from the commit of package perl-Capture-Tiny for openSUSE:Factory checked in at 2014-09-17 17:24:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Capture-Tiny (Old) and /work/SRC/openSUSE:Factory/.perl-Capture-Tiny.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Capture-Tiny" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Capture-Tiny/perl-Capture-Tiny.changes 2014-02-12 17:22:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Capture-Tiny.new/perl-Capture-Tiny.changes 2014-09-17 17:24:36.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 15 16:01:08 UTC 2014 - [email protected] + +- updated to 0.25 + Prereqs: + - Amended recommended modules to list Inline::C rather than Inline + +------------------------------------------------------------------- Old: ---- Capture-Tiny-0.24.tar.gz New: ---- Capture-Tiny-0.25.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Capture-Tiny.spec ++++++ --- /var/tmp/diff_new_pack.IvvLpJ/_old 2014-09-17 17:24:37.000000000 +0200 +++ /var/tmp/diff_new_pack.IvvLpJ/_new 2014-09-17 17:24:37.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Capture-Tiny -Version: 0.24 +Version: 0.25 Release: 0 %define cpan_name Capture-Tiny Summary: Capture STDOUT and STDERR from Perl, XS or external programs @@ -29,7 +29,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(version) %{perl_requires} %description ++++++ Capture-Tiny-0.24.tar.gz -> Capture-Tiny-0.25.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/Changes new/Capture-Tiny-0.25/Changes --- old/Capture-Tiny-0.24/Changes 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/Changes 2014-08-16 16:08:48.000000000 +0200 @@ -1,11 +1,17 @@ Revision history for Capture-Tiny +0.25 2014-08-16 10:08:42-04:00 America/New_York + + Prereqs: + + - Amended recommended modules to list Inline::C rather than Inline + 0.24 2014-02-06 17:15:37-05:00 America/New_York Fixed: - - Closed security hole in use of semaphore flag in /tmp; - now opens semaphore the using O_CREAT|O_EXCL + - Closed security hole in use of semaphore file in /tmp; + now opens the semaphore file using O_CREAT|O_EXCL 0.23 2013-10-20 11:25:34 America/New_York diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/MANIFEST new/Capture-Tiny-0.25/MANIFEST --- old/Capture-Tiny-0.24/MANIFEST 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/MANIFEST 2014-08-16 16:08:48.000000000 +0200 @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.012. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.020. CONTRIBUTING Changes LICENSE @@ -14,6 +14,7 @@ examples/tee.pl lib/Capture/Tiny.pm perlcritic.rc +t/00-report-prereqs.dd t/00-report-prereqs.t t/01-Capture-Tiny.t t/02-capture.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/META.json new/Capture-Tiny-0.25/META.json --- old/Capture-Tiny-0.24/META.json 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/META.json 2014-08-16 16:08:48.000000000 +0200 @@ -4,7 +4,7 @@ "David Golden <[email protected]>" ], "dynamic_config" : 1, - "generated_by" : "Dist::Zilla version 5.012, CPAN::Meta::Converter version 2.133380", + "generated_by" : "Dist::Zilla version 5.020, CPAN::Meta::Converter version 2.140640", "license" : [ "apache_2_0" ], @@ -32,7 +32,7 @@ }, "develop" : { "requires" : { - "Dist::Zilla" : "5.012", + "Dist::Zilla" : "5", "Dist::Zilla::Plugin::OSPrereqs" : "0", "Dist::Zilla::Plugin::Prereqs" : "0", "Dist::Zilla::Plugin::RemovePrereqs" : "0", @@ -45,7 +45,8 @@ "Test::CPAN::Meta" : "0", "Test::More" : "0", "Test::Pod" : "1.41", - "Test::Pod::Coverage" : "1.08" + "Test::Pod::Coverage" : "1.08", + "Test::Spelling" : "0.12" } }, "runtime" : { @@ -63,25 +64,22 @@ }, "test" : { "recommends" : { - "CPAN::Meta" : "0", - "CPAN::Meta::Requirements" : "2.120900", - "Inline" : "0.50" + "CPAN::Meta" : "2.120900", + "Inline::C" : "0.50" }, "requires" : { "ExtUtils::MakeMaker" : "0", - "File::Spec::Functions" : "0", + "File::Spec" : "0", "IO::File" : "0", - "List::Util" : "0", "Test::More" : "0.62", - "lib" : "0", - "version" : "0" + "lib" : "0" } } }, "provides" : { "Capture::Tiny" : { "file" : "lib/Capture/Tiny.pm", - "version" : "0.24" + "version" : "0.25" } }, "release_status" : "stable", @@ -96,10 +94,11 @@ "web" : "https://github.com/dagolden/Capture-Tiny"; } }, - "version" : "0.24", + "version" : "0.25", "x_authority" : "cpan:DAGOLDEN", "x_contributors" : [ - "Dagfinn Ilmari Manns\u00e5ker <[email protected]>" + "Dagfinn Ilmari Mannsåker <[email protected]>", + "David E. Wheeler <[email protected]>" ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/META.yml new/Capture-Tiny-0.25/META.yml --- old/Capture-Tiny-0.24/META.yml 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/META.yml 2014-08-16 16:08:48.000000000 +0200 @@ -4,16 +4,14 @@ - 'David Golden <[email protected]>' build_requires: ExtUtils::MakeMaker: '0' - File::Spec::Functions: '0' + File::Spec: '0' IO::File: '0' - List::Util: '0' Test::More: '0.62' lib: '0' - version: '0' configure_requires: ExtUtils::MakeMaker: '6.17' dynamic_config: 1 -generated_by: 'Dist::Zilla version 5.012, CPAN::Meta::Converter version 2.133380' +generated_by: 'Dist::Zilla version 5.020, CPAN::Meta::Converter version 2.140640' license: apache meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -30,7 +28,7 @@ provides: Capture::Tiny: file: lib/Capture/Tiny.pm - version: '0.24' + version: '0.25' requires: Carp: '0' Exporter: '0' @@ -45,7 +43,8 @@ bugtracker: https://github.com/dagolden/Capture-Tiny/issues homepage: https://github.com/dagolden/Capture-Tiny repository: https://github.com/dagolden/Capture-Tiny.git -version: '0.24' +version: '0.25' x_authority: cpan:DAGOLDEN x_contributors: - 'Dagfinn Ilmari Mannsåker <[email protected]>' + - 'David E. Wheeler <[email protected]>' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/Makefile.PL new/Capture-Tiny-0.25/Makefile.PL --- old/Capture-Tiny-0.24/Makefile.PL 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/Makefile.PL 2014-08-16 16:08:48.000000000 +0200 @@ -1,5 +1,5 @@ -# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.012. +# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.020. use strict; use warnings; @@ -12,7 +12,6 @@ my %WriteMakefileArgs = ( "ABSTRACT" => "Capture STDOUT and STDERR from Perl, XS or external programs", "AUTHOR" => "David Golden <dagolden\@cpan.org>", - "BUILD_REQUIRES" => {}, "CONFIGURE_REQUIRES" => { "ExtUtils::MakeMaker" => "6.17" }, @@ -32,14 +31,12 @@ }, "TEST_REQUIRES" => { "ExtUtils::MakeMaker" => 0, - "File::Spec::Functions" => 0, + "File::Spec" => 0, "IO::File" => 0, - "List::Util" => 0, "Test::More" => "0.62", - "lib" => 0, - "version" => 0 + "lib" => 0 }, - "VERSION" => "0.24", + "VERSION" => "0.25", "test" => { "TESTS" => "t/*.t" } @@ -51,16 +48,13 @@ "Exporter" => 0, "ExtUtils::MakeMaker" => 0, "File::Spec" => 0, - "File::Spec::Functions" => 0, "File::Temp" => 0, "IO::File" => 0, "IO::Handle" => 0, - "List::Util" => 0, "Scalar::Util" => 0, "Test::More" => "0.62", "lib" => 0, "strict" => 0, - "version" => 0, "warnings" => 0 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/README new/Capture-Tiny-0.25/README --- old/Capture-Tiny-0.24/README 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/README 2014-08-16 16:08:48.000000000 +0200 @@ -3,7 +3,7 @@ programs VERSION - version 0.24 + version 0.25 SYNOPSIS use Capture::Tiny ':all'; @@ -341,8 +341,10 @@ AUTHOR David Golden <[email protected]> -CONTRIBUTOR - Dagfinn Ilmari Mannsåker <[email protected]> +CONTRIBUTORS + * Dagfinn Ilmari Mannsåker <[email protected]> + + * David E. Wheeler <[email protected]> COPYRIGHT AND LICENSE This software is Copyright (c) 2009 by David Golden. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/cpanfile new/Capture-Tiny-0.25/cpanfile --- old/Capture-Tiny-0.24/cpanfile 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/cpanfile 2014-08-16 16:08:48.000000000 +0200 @@ -10,18 +10,15 @@ on 'test' => sub { requires "ExtUtils::MakeMaker" => "0"; - requires "File::Spec::Functions" => "0"; + requires "File::Spec" => "0"; requires "IO::File" => "0"; - requires "List::Util" => "0"; requires "Test::More" => "0.62"; requires "lib" => "0"; - requires "version" => "0"; }; on 'test' => sub { - recommends "CPAN::Meta" => "0"; - recommends "CPAN::Meta::Requirements" => "2.120900"; - recommends "Inline" => "0.50"; + recommends "CPAN::Meta" => "2.120900"; + recommends "Inline::C" => "0.50"; }; on 'configure' => sub { @@ -29,7 +26,7 @@ }; on 'develop' => sub { - requires "Dist::Zilla" => "5.012"; + requires "Dist::Zilla" => "5"; requires "Dist::Zilla::Plugin::OSPrereqs" => "0"; requires "Dist::Zilla::Plugin::Prereqs" => "0"; requires "Dist::Zilla::Plugin::RemovePrereqs" => "0"; @@ -43,4 +40,5 @@ requires "Test::More" => "0"; requires "Test::Pod" => "1.41"; requires "Test::Pod::Coverage" => "1.08"; + requires "Test::Spelling" => "0.12"; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/dist.ini new/Capture-Tiny-0.25/dist.ini --- old/Capture-Tiny-0.24/dist.ini 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/dist.ini 2014-08-16 16:08:48.000000000 +0200 @@ -24,7 +24,7 @@ remove = perl [Prereqs / TestRecommends] -Inline = 0.50 +Inline::C = 0.50 [Prereqs] perl = 5.006 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/lib/Capture/Tiny.pm new/Capture-Tiny-0.25/lib/Capture/Tiny.pm --- old/Capture-Tiny-0.24/lib/Capture/Tiny.pm 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/lib/Capture/Tiny.pm 2014-08-16 16:08:48.000000000 +0200 @@ -3,7 +3,7 @@ use warnings; package Capture::Tiny; # ABSTRACT: Capture STDOUT and STDERR from Perl, XS or external programs -our $VERSION = '0.24'; # VERSION +our $VERSION = '0.25'; # VERSION use Carp (); use Exporter (); use IO::Handle (); @@ -420,7 +420,7 @@ =head1 VERSION -version 0.24 +version 0.25 =head1 SYNOPSIS @@ -824,10 +824,22 @@ David Golden <[email protected]> -=head1 CONTRIBUTOR +=head1 CONTRIBUTORS + +=for stopwords Dagfinn Ilmari Mannsåker David E. Wheeler + +=over 4 + +=item * Dagfinn Ilmari Mannsåker <[email protected]> +=item * + +David E. Wheeler <[email protected]> + +=back + =head1 COPYRIGHT AND LICENSE This software is Copyright (c) 2009 by David Golden. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/t/00-report-prereqs.dd new/Capture-Tiny-0.25/t/00-report-prereqs.dd --- old/Capture-Tiny-0.24/t/00-report-prereqs.dd 1970-01-01 01:00:00.000000000 +0100 +++ new/Capture-Tiny-0.25/t/00-report-prereqs.dd 2014-08-16 16:08:48.000000000 +0200 @@ -0,0 +1,54 @@ +do { my $x = { + 'configure' => { + 'requires' => { + 'ExtUtils::MakeMaker' => '6.17' + } + }, + 'develop' => { + 'requires' => { + 'Dist::Zilla' => '5', + 'Dist::Zilla::Plugin::OSPrereqs' => '0', + 'Dist::Zilla::Plugin::Prereqs' => '0', + 'Dist::Zilla::Plugin::RemovePrereqs' => '0', + 'Dist::Zilla::PluginBundle::DAGOLDEN' => '0.060', + 'File::Spec' => '0', + 'File::Temp' => '0', + 'IO::Handle' => '0', + 'IPC::Open3' => '0', + 'Pod::Coverage::TrustPod' => '0', + 'Test::CPAN::Meta' => '0', + 'Test::More' => '0', + 'Test::Pod' => '1.41', + 'Test::Pod::Coverage' => '1.08', + 'Test::Spelling' => '0.12' + } + }, + 'runtime' => { + 'requires' => { + 'Carp' => '0', + 'Exporter' => '0', + 'File::Spec' => '0', + 'File::Temp' => '0', + 'IO::Handle' => '0', + 'Scalar::Util' => '0', + 'perl' => '5.006', + 'strict' => '0', + 'warnings' => '0' + } + }, + 'test' => { + 'recommends' => { + 'CPAN::Meta' => '2.120900', + 'Inline::C' => '0.50' + }, + 'requires' => { + 'ExtUtils::MakeMaker' => '0', + 'File::Spec' => '0', + 'IO::File' => '0', + 'Test::More' => '0.62', + 'lib' => '0' + } + } + }; + $x; + } \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/t/00-report-prereqs.t new/Capture-Tiny-0.25/t/00-report-prereqs.t --- old/Capture-Tiny-0.24/t/00-report-prereqs.t 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/t/00-report-prereqs.t 2014-08-16 16:08:48.000000000 +0200 @@ -3,186 +3,172 @@ 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.019 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::OSPrereqs' => '0', - 'Dist::Zilla::Plugin::Prereqs' => '0', - 'Dist::Zilla::Plugin::RemovePrereqs' => '0', - 'Dist::Zilla::PluginBundle::DAGOLDEN' => '0.060', - 'File::Spec' => '0', - 'File::Temp' => '0', - 'IO::Handle' => '0', - 'IPC::Open3' => '0', - 'Pod::Coverage::TrustPod' => '0', - 'Test::CPAN::Meta' => '0', - 'Test::More' => '0', - 'Test::Pod' => '1.41', - 'Test::Pod::Coverage' => '1.08' - } - }, - 'runtime' => { - 'requires' => { - 'Carp' => '0', - 'Exporter' => '0', - 'File::Spec' => '0', - 'File::Temp' => '0', - 'IO::Handle' => '0', - 'Scalar::Util' => '0', - 'perl' => '5.006', - 'strict' => '0', - 'warnings' => '0' - } - }, - 'test' => { - 'recommends' => { - 'CPAN::Meta' => '0', - 'CPAN::Meta::Requirements' => '2.120900', - 'Inline' => '0.50' - }, - 'requires' => { - 'ExtUtils::MakeMaker' => '0', - 'File::Spec::Functions' => '0', - 'IO::File' => '0', - 'List::Util' => '0', - 'Test::More' => '0.62', - '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 ); + 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/xt/author/00-compile.t new/Capture-Tiny-0.25/xt/author/00-compile.t --- old/Capture-Tiny-0.24/xt/author/00-compile.t 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/xt/author/00-compile.t 2014-08-16 16:08:48.000000000 +0200 @@ -2,7 +2,7 @@ use strict; use warnings; -# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.039 +# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.045 use Test::More tests => 1 + ($ENV{AUTHOR_TESTING} ? 1 : 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/xt/author/pod-spell.t new/Capture-Tiny-0.25/xt/author/pod-spell.t --- old/Capture-Tiny-0.24/xt/author/pod-spell.t 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/xt/author/pod-spell.t 2014-08-16 16:08:48.000000000 +0200 @@ -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.006008 use Test::Spelling 0.12; use Pod::Wordlist; @@ -22,6 +22,8 @@ Ilmari Mannsåker ilmari +Wheeler +david lib Capture Tiny diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/xt/release/distmeta.t new/Capture-Tiny-0.25/xt/release/distmeta.t --- old/Capture-Tiny-0.24/xt/release/distmeta.t 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/xt/release/distmeta.t 2014-08-16 16:08:48.000000000 +0200 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/xt/release/pod-coverage.t new/Capture-Tiny-0.25/xt/release/pod-coverage.t --- old/Capture-Tiny-0.24/xt/release/pod-coverage.t 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/xt/release/pod-coverage.t 2014-08-16 16:08:48.000000000 +0200 @@ -1,14 +1,7 @@ #!perl # This file was automatically generated by Dist::Zilla::Plugin::PodCoverageTests. -use Test::More; - -eval "use Test::Pod::Coverage 1.08"; -plan skip_all => "Test::Pod::Coverage 1.08 required for testing POD coverage" - if $@; - -eval "use Pod::Coverage::TrustPod"; -plan skip_all => "Pod::Coverage::TrustPod required for testing POD coverage" - if $@; +use Test::Pod::Coverage 1.08; +use Pod::Coverage::TrustPod; all_pod_coverage_ok({ coverage_class => 'Pod::Coverage::TrustPod' }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Capture-Tiny-0.24/xt/release/pod-syntax.t new/Capture-Tiny-0.25/xt/release/pod-syntax.t --- old/Capture-Tiny-0.24/xt/release/pod-syntax.t 2014-02-06 23:15:44.000000000 +0100 +++ new/Capture-Tiny-0.25/xt/release/pod-syntax.t 2014-08-16 16:08:48.000000000 +0200 @@ -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(); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
