diff --git a/Changes b/Changes index dc5cbb6..ed37516 100644 --- a/Changes +++ b/Changes @@ -1,4 +1,15 @@ Revision history for Capture-Tiny + +0.48 2018-04-22 09:01:08+02:00 Europe/Oslo + + - No changes from 0.47-TRIAL + +0.47 2017-07-26 10:34:24-04:00 America/New_York (TRIAL RELEASE) + + [Fixed] + + - Appends PID to random file names for tee signalling to avoid + random name collision when used in multiple forked children. 0.46 2017-02-25 14:19:22-05:00 America/New_York diff --git a/MANIFEST b/MANIFEST index b3dee01..bf5264a 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.008. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.012. CONTRIBUTING.mkdn Changes LICENSE @@ -45,10 +45,10 @@ t/lib/Utils.pm xt/author/00-compile.t xt/author/critic.t +xt/author/minimum-version.t xt/author/pod-coverage.t xt/author/pod-spell.t xt/author/pod-syntax.t xt/author/portability.t xt/author/test-version.t xt/release/distmeta.t -xt/release/minimum-version.t diff --git a/META.json b/META.json index f68907f..257e4f9 100644 --- a/META.json +++ b/META.json @@ -4,7 +4,7 @@ "David Golden " ], "dynamic_config" : 1, - "generated_by" : "Dist::Zilla version 6.008, CPAN::Meta::Converter version 2.150010", + "generated_by" : "Dist::Zilla version 6.012, CPAN::Meta::Converter version 2.150010", "license" : [ "apache_2_0" ], @@ -38,7 +38,6 @@ "Dist::Zilla::Plugin::ReleaseStatus::FromVersion" : "0", "Dist::Zilla::Plugin::RemovePrereqs" : "0", "Dist::Zilla::PluginBundle::DAGOLDEN" : "0.072", - "English" : "0", "File::Spec" : "0", "File::Temp" : "0", "IO::Handle" : "0", @@ -49,12 +48,12 @@ "Test::CPAN::Meta" : "0", "Test::MinimumVersion" : "0", "Test::More" : "0", + "Test::Perl::Critic" : "0", "Test::Pod" : "1.41", "Test::Pod::Coverage" : "1.08", "Test::Portability::Files" : "0", "Test::Spelling" : "0.12", - "Test::Version" : "1", - "blib" : "1.01" + "Test::Version" : "1" } }, "runtime" : { @@ -86,7 +85,7 @@ "provides" : { "Capture::Tiny" : { "file" : "lib/Capture/Tiny.pm", - "version" : "0.46" + "version" : "0.48" } }, "release_status" : "stable", @@ -101,7 +100,7 @@ "web" : "https://github.com/dagolden/Capture-Tiny" } }, - "version" : "0.46", + "version" : "0.48", "x_authority" : "cpan:DAGOLDEN", "x_contributors" : [ "Dagfinn Ilmari Manns\u00e5ker ", @@ -110,6 +109,7 @@ "Graham Knop ", "Peter Rabbitson " ], - "x_serialization_backend" : "Cpanel::JSON::XS version 3.0225" + "x_generated_by_perl" : "v5.26.1", + "x_serialization_backend" : "Cpanel::JSON::XS version 3.0239" } diff --git a/META.yml b/META.yml index 7d92c30..8007bf0 100644 --- a/META.yml +++ b/META.yml @@ -11,7 +11,7 @@ configure_requires: ExtUtils::MakeMaker: '6.17' dynamic_config: 1 -generated_by: 'Dist::Zilla version 6.008, CPAN::Meta::Converter version 2.150010' +generated_by: 'Dist::Zilla version 6.012, CPAN::Meta::Converter version 2.150010' license: apache meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -28,7 +28,7 @@ provides: Capture::Tiny: file: lib/Capture/Tiny.pm - version: '0.46' + version: '0.48' requires: Carp: '0' Exporter: '0' @@ -43,7 +43,7 @@ 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.46' +version: '0.48' x_authority: cpan:DAGOLDEN x_contributors: - 'Dagfinn Ilmari Mannsåker ' @@ -51,4 +51,5 @@ - 'fecundf ' - 'Graham Knop ' - 'Peter Rabbitson ' -x_serialization_backend: 'YAML::Tiny version 1.69' +x_generated_by_perl: v5.26.1 +x_serialization_backend: 'YAML::Tiny version 1.70' diff --git a/Makefile.PL b/Makefile.PL index 92e5f94..04669d3 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.008. +# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.012. use strict; use warnings; @@ -33,7 +33,7 @@ "Test::More" => "0.62", "lib" => 0 }, - "VERSION" => "0.46", + "VERSION" => "0.48", "test" => { "TESTS" => "t/*.t" } @@ -66,7 +66,7 @@ unless eval { ExtUtils::MakeMaker->VERSION(6.52) }; if ( $^O eq 'MSWin32' ) { - $WriteMakefileArgs{PREREQ_PM}{'Win32API::File'} = '0'; + $WriteMakefileArgs{PREREQ_PM}{'Win32API::File'} = $FallbackPrereqs{'Win32API::File'} = '0'; } WriteMakefile(%WriteMakefileArgs); diff --git a/README b/README index f1b68d5..8b58130 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ programs VERSION - version 0.46 + version 0.48 SYNOPSIS use Capture::Tiny ':all'; diff --git a/cpanfile b/cpanfile index bc87cfd..3d5be8d 100644 --- a/cpanfile +++ b/cpanfile @@ -31,7 +31,6 @@ requires "Dist::Zilla::Plugin::ReleaseStatus::FromVersion" => "0"; requires "Dist::Zilla::Plugin::RemovePrereqs" => "0"; requires "Dist::Zilla::PluginBundle::DAGOLDEN" => "0.072"; - requires "English" => "0"; requires "File::Spec" => "0"; requires "File::Temp" => "0"; requires "IO::Handle" => "0"; @@ -42,10 +41,10 @@ requires "Test::CPAN::Meta" => "0"; requires "Test::MinimumVersion" => "0"; requires "Test::More" => "0"; + requires "Test::Perl::Critic" => "0"; requires "Test::Pod" => "1.41"; requires "Test::Pod::Coverage" => "1.08"; requires "Test::Portability::Files" => "0"; requires "Test::Spelling" => "0.12"; requires "Test::Version" => "1"; - requires "blib" => "1.01"; }; diff --git a/lib/Capture/Tiny.pm b/lib/Capture/Tiny.pm index 8907ec3..2a5af95 100644 --- a/lib/Capture/Tiny.pm +++ b/lib/Capture/Tiny.pm @@ -3,7 +3,7 @@ use warnings; package Capture::Tiny; # ABSTRACT: Capture STDOUT and STDERR from Perl, XS or external programs -our $VERSION = '0.46'; +our $VERSION = '0.48'; use Carp (); use Exporter (); use IO::Handle (); @@ -214,7 +214,7 @@ stderr => $stash->{capture}{$which}, }; # flag file is used to signal the child is ready - $stash->{flag_files}{$which} = scalar tmpnam(); + $stash->{flag_files}{$which} = scalar( tmpnam() ) . $$; # execute @cmd as a separate process if ( $IS_WIN32 ) { my $old_eval_err=$@; @@ -436,7 +436,7 @@ =head1 VERSION -version 0.46 +version 0.48 =head1 SYNOPSIS diff --git a/t/00-report-prereqs.dd b/t/00-report-prereqs.dd index 32ad767..3a4465a 100644 --- a/t/00-report-prereqs.dd +++ b/t/00-report-prereqs.dd @@ -12,7 +12,6 @@ 'Dist::Zilla::Plugin::ReleaseStatus::FromVersion' => '0', 'Dist::Zilla::Plugin::RemovePrereqs' => '0', 'Dist::Zilla::PluginBundle::DAGOLDEN' => '0.072', - 'English' => '0', 'File::Spec' => '0', 'File::Temp' => '0', 'IO::Handle' => '0', @@ -23,12 +22,12 @@ 'Test::CPAN::Meta' => '0', 'Test::MinimumVersion' => '0', 'Test::More' => '0', + 'Test::Perl::Critic' => '0', 'Test::Pod' => '1.41', 'Test::Pod::Coverage' => '1.08', 'Test::Portability::Files' => '0', 'Test::Spelling' => '0.12', - 'Test::Version' => '1', - 'blib' => '1.01' + 'Test::Version' => '1' } }, 'runtime' => { diff --git a/t/00-report-prereqs.t b/t/00-report-prereqs.t index e338372..c72183a 100644 --- a/t/00-report-prereqs.t +++ b/t/00-report-prereqs.t @@ -3,7 +3,7 @@ use strict; use warnings; -# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.025 +# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.027 use Test::More tests => 1; @@ -68,7 +68,7 @@ ); # Add static prereqs to the included modules list -my $static_prereqs = do 't/00-report-prereqs.dd'; +my $static_prereqs = do './t/00-report-prereqs.dd'; # Merge all prereqs (either with ::Prereqs or a hashref) my $full_prereqs = _merge_prereqs( @@ -78,12 +78,14 @@ # Add dynamic prereqs to the included modules list (if we can) my ($source) = grep { -f } 'MYMETA.json', 'MYMETA.yml'; +my $cpan_meta_error; if ( $source && $HAS_CPAN_META && (my $meta = eval { CPAN::Meta->load_file($source) } ) ) { $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs); } else { + $cpan_meta_error = $@; # capture error from CPAN::Meta->load_file($source) $source = 'static metadata'; } @@ -169,10 +171,18 @@ diag "\nVersions for all modules listed in $source (including optional ones):\n\n", @full_reports; } +if ( $cpan_meta_error || @dep_errors ) { + diag "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n"; +} + +if ( $cpan_meta_error ) { + my ($orig_source) = grep { -f } 'MYMETA.json', 'MYMETA.yml'; + diag "\nCPAN::Meta->load_file('$orig_source') failed with: $cpan_meta_error\n"; +} + if ( @dep_errors ) { diag join("\n", - "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n", - "The following REQUIRED prerequisites were not satisfied:\n", + "\nThe following REQUIRED prerequisites were not satisfied:\n", @dep_errors, "\n" ); diff --git a/xt/author/00-compile.t b/xt/author/00-compile.t index 15246ec..6404e65 100644 --- a/xt/author/00-compile.t +++ b/xt/author/00-compile.t @@ -2,7 +2,7 @@ use strict; use warnings; -# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.056 +# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.058 use Test::More; @@ -46,7 +46,7 @@ is($?, 0, "$lib loaded ok"); shift @_warnings if @_warnings and $_warnings[0] =~ /^Using .*\bblib/ - and not eval { require blib; blib->VERSION('1.01') }; + and not eval { +require blib; blib->VERSION('1.01') }; if (@_warnings) { diff --git a/xt/author/critic.t b/xt/author/critic.t index d5b4c96..80ccdad 100644 --- a/xt/author/critic.t +++ b/xt/author/critic.t @@ -3,10 +3,5 @@ use strict; use warnings; -use Test::More; -use English qw(-no_match_vars); - -eval "use Test::Perl::Critic"; -plan skip_all => 'Test::Perl::Critic required to criticise code' if $@; -Test::Perl::Critic->import( -profile => "perlcritic.rc" ) if -e "perlcritic.rc"; +use Test::Perl::Critic (-profile => "perlcritic.rc") x!! -e "perlcritic.rc"; all_critic_ok(); diff --git a/xt/author/minimum-version.t b/xt/author/minimum-version.t new file mode 100644 index 0000000..d4a20c3 --- /dev/null +++ b/xt/author/minimum-version.t @@ -0,0 +1,6 @@ +#!perl + +use Test::More; + +use Test::MinimumVersion; +all_minimum_version_ok( qq{5.010} ); diff --git a/xt/author/pod-spell.t b/xt/author/pod-spell.t index eef8e74..e98b029 100644 --- a/xt/author/pod-spell.t +++ b/xt/author/pod-spell.t @@ -2,7 +2,7 @@ use warnings; use Test::More; -# generated by Dist::Zilla::Plugin::Test::PodSpelling 2.007004 +# generated by Dist::Zilla::Plugin::Test::PodSpelling 2.007005 use Test::Spelling 0.12; use Pod::Wordlist; diff --git a/xt/release/minimum-version.t b/xt/release/minimum-version.t deleted file mode 100644 index 708ba15..0000000 --- a/xt/release/minimum-version.t +++ /dev/null @@ -1,8 +0,0 @@ -#!perl - -use Test::More; - -eval "use Test::MinimumVersion"; -plan skip_all => "Test::MinimumVersion required for testing minimum versions" - if $@; -all_minimum_version_ok( qq{5.010} );