diff -Nru libstring-flogger-perl-1.101245/Changes libstring-flogger-perl-1.101246/Changes --- libstring-flogger-perl-1.101245/Changes 2014-08-08 22:43:45.000000000 +0000 +++ libstring-flogger-perl-1.101246/Changes 2022-10-30 01:51:46.000000000 +0000 @@ -1,5 +1,10 @@ Revision history for String-Flogger +1.101246 2022-10-29 21:51:45-04:00 America/New_York + - add some tests + - update to require newer perl + - update package metadata + 1.101245 2014-08-08 18:43:38-04:00 America/New_York - switch from JSON to JSON::MaybeXS diff -Nru libstring-flogger-perl-1.101245/debian/changelog libstring-flogger-perl-1.101246/debian/changelog --- libstring-flogger-perl-1.101245/debian/changelog 2022-11-21 14:39:39.000000000 +0000 +++ libstring-flogger-perl-1.101246/debian/changelog 2022-12-23 19:10:03.000000000 +0000 @@ -1,3 +1,14 @@ +libstring-flogger-perl (1.101246-1) unstable; urgency=medium + + * Import upstream version 1.101246. + * Update years of upstream and packaging copyright. + * Update debian/upstream/metadata. + * Update altenative test dependency. + * Declare compliance with Debian Policy 4.6.2. + * Annotate test-only build dependencies with . + + -- gregor herrmann Fri, 23 Dec 2022 20:10:03 +0100 + libstring-flogger-perl (1.101245-3) unstable; urgency=medium [ gregor herrmann ] diff -Nru libstring-flogger-perl-1.101245/debian/control libstring-flogger-perl-1.101246/debian/control --- libstring-flogger-perl-1.101245/debian/control 2022-11-21 14:39:39.000000000 +0000 +++ libstring-flogger-perl-1.101246/debian/control 2022-12-23 19:10:03.000000000 +0000 @@ -3,24 +3,24 @@ Uploaders: gregor herrmann , Ansgar Burchardt Section: perl -Rules-Requires-Root: no Testsuite: autopkgtest-pkg-perl Priority: optional Build-Depends: debhelper-compat (= 13) -Build-Depends-Indep: perl, - libjson-maybexs-perl, - libparams-util-perl, - libsub-exporter-perl, - perl | libtest-simple-perl -Standards-Version: 4.1.3 +Build-Depends-Indep: libjson-maybexs-perl , + libparams-util-perl , + libsub-exporter-perl , + libtest-simple-perl , + perl +Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/libstring-flogger-perl Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/libstring-flogger-perl.git Homepage: https://metacpan.org/release/String-Flogger +Rules-Requires-Root: no Package: libstring-flogger-perl Architecture: all -Depends: ${perl:Depends}, - ${misc:Depends}, +Depends: ${misc:Depends}, + ${perl:Depends}, libjson-maybexs-perl, libparams-util-perl, libsub-exporter-perl diff -Nru libstring-flogger-perl-1.101245/debian/copyright libstring-flogger-perl-1.101246/debian/copyright --- libstring-flogger-perl-1.101245/debian/copyright 2022-11-21 14:39:39.000000000 +0000 +++ libstring-flogger-perl-1.101246/debian/copyright 2022-12-23 19:10:03.000000000 +0000 @@ -1,14 +1,14 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: String-Flogger -Upstream-Contact: Ricardo SIGNES +Upstream-Contact: Ricardo SIGNES Source: https://metacpan.org/release/String-Flogger Files: * -Copyright: 2014, Ricardo SIGNES +Copyright: 2022, Ricardo SIGNES License: Artistic or GPL-1+ Files: debian/* -Copyright: 2009-2014, gregor herrmann +Copyright: 2009-2022, gregor herrmann 2010, Jonathan Yu License: Artistic or GPL-1+ diff -Nru libstring-flogger-perl-1.101245/debian/upstream/metadata libstring-flogger-perl-1.101246/debian/upstream/metadata --- libstring-flogger-perl-1.101245/debian/upstream/metadata 2022-11-21 14:39:39.000000000 +0000 +++ libstring-flogger-perl-1.101246/debian/upstream/metadata 2022-12-23 19:10:03.000000000 +0000 @@ -1,4 +1,5 @@ --- +Archive: CPAN Bug-Database: https://github.com/rjbs/String-Flogger/issues Bug-Submit: https://github.com/rjbs/String-Flogger/issues/new Repository: https://github.com/rjbs/String-Flogger.git diff -Nru libstring-flogger-perl-1.101245/dist.ini libstring-flogger-perl-1.101246/dist.ini --- libstring-flogger-perl-1.101245/dist.ini 2014-08-08 22:43:45.000000000 +0000 +++ libstring-flogger-perl-1.101246/dist.ini 2022-10-30 01:51:46.000000000 +0000 @@ -1,8 +1,6 @@ name = String-Flogger -author = Ricardo SIGNES +author = Ricardo SIGNES license = Perl_5 -copyright_holder = Ricardo SIGNES [@RJBS] -version = 1 -github_issues = 1 +perl-window = standard diff -Nru libstring-flogger-perl-1.101245/lib/String/Flogger.pm libstring-flogger-perl-1.101246/lib/String/Flogger.pm --- libstring-flogger-perl-1.101245/lib/String/Flogger.pm 2014-08-08 22:43:45.000000000 +0000 +++ libstring-flogger-perl-1.101246/lib/String/Flogger.pm 2022-10-30 01:51:46.000000000 +0000 @@ -1,8 +1,8 @@ use strict; use warnings; -package String::Flogger; +package String::Flogger 1.101246; # ABSTRACT: string munging for loggers -$String::Flogger::VERSION = '1.101245'; + use Params::Util qw(_ARRAYLIKE _CODELIKE); use Scalar::Util qw(blessed); use Sub::Exporter::Util (); @@ -125,7 +125,7 @@ =head1 VERSION -version 1.101245 +version 1.101246 =head1 SYNOPSIS @@ -157,6 +157,18 @@ while avoiding sprintfiness, if needed +=head1 PERL VERSION + +This module should work on any version of perl still receiving updates from +the Perl 5 Porters. This means it should work on any version of perl released +in the last two to three years. (That is, if the most recently released +version is v5.40, then this module should work on both v5.40 and v5.38.) + +Although it may work on older versions of perl, no guarantee is made that the +minimum required version will not be increased. The version may be increased +for any reason, and there is no promise that patches will be accepted to lower +the minimum required perl. + =head1 METHODS =head2 flog @@ -173,11 +185,27 @@ =head1 AUTHOR -Ricardo SIGNES +Ricardo SIGNES + +=head1 CONTRIBUTORS + +=for stopwords Randy Stauner Ricardo Signes + +=over 4 + +=item * + +Randy Stauner + +=item * + +Ricardo Signes + +=back =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2014 by Ricardo SIGNES . +This software is copyright (c) 2022 by Ricardo Signes. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. diff -Nru libstring-flogger-perl-1.101245/LICENSE libstring-flogger-perl-1.101246/LICENSE --- libstring-flogger-perl-1.101245/LICENSE 2014-08-08 22:43:45.000000000 +0000 +++ libstring-flogger-perl-1.101246/LICENSE 2022-10-30 01:51:46.000000000 +0000 @@ -1,4 +1,4 @@ -This software is copyright (c) 2014 by Ricardo SIGNES . +This software is copyright (c) 2022 by Ricardo Signes. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. @@ -12,7 +12,7 @@ --- The GNU General Public License, Version 1, February 1989 --- -This software is Copyright (c) 2014 by Ricardo SIGNES . +This software is Copyright (c) 2022 by Ricardo Signes. This is free software, licensed under: @@ -272,7 +272,7 @@ --- The Artistic License 1.0 --- -This software is Copyright (c) 2014 by Ricardo SIGNES . +This software is Copyright (c) 2022 by Ricardo Signes. This is free software, licensed under: @@ -292,21 +292,21 @@ - "Package" refers to the collection of files distributed by the Copyright Holder, and derivatives of that collection of files created through - textual modification. + textual modification. - "Standard Version" refers to such a Package if it has not been modified, or has been modified in accordance with the wishes of the Copyright - Holder. + Holder. - "Copyright Holder" is whoever is named in the copyright or copyrights for - the package. + the package. - "You" is you, if you're thinking about copying or distributing this Package. - "Reasonable copying fee" is whatever you can justify on the basis of media cost, duplication charges, time of people involved, and so on. (You will not be required to justify it to the Copyright Holder, but only to the - computing community at large as a market that must bear the fee.) + computing community at large as a market that must bear the fee.) - "Freely Available" means that no fee is charged for the item itself, though there may be fees involved in handling the item. It also means that recipients of the item may redistribute it under the same conditions they - received it. + received it. 1. You may make and give away verbatim copies of the source form of the Standard Version of this Package without restriction, provided that you @@ -373,7 +373,7 @@ 9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF -MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. The End diff -Nru libstring-flogger-perl-1.101245/Makefile.PL libstring-flogger-perl-1.101246/Makefile.PL --- libstring-flogger-perl-1.101245/Makefile.PL 2014-08-08 22:43:45.000000000 +0000 +++ libstring-flogger-perl-1.101246/Makefile.PL 2022-10-30 01:51:46.000000000 +0000 @@ -1,23 +1,20 @@ - -# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.020. +# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.025. use strict; use warnings; +use 5.012; - -use ExtUtils::MakeMaker ; - - +use ExtUtils::MakeMaker 6.78; my %WriteMakefileArgs = ( "ABSTRACT" => "string munging for loggers", - "AUTHOR" => "Ricardo SIGNES ", + "AUTHOR" => "Ricardo SIGNES ", "CONFIGURE_REQUIRES" => { - "ExtUtils::MakeMaker" => 0 + "ExtUtils::MakeMaker" => "6.78" }, "DISTNAME" => "String-Flogger", - "EXE_FILES" => [], "LICENSE" => "perl", + "MIN_PERL_VERSION" => "5.012", "NAME" => "String::Flogger", "PREREQ_PM" => { "JSON::MaybeXS" => 0, @@ -29,9 +26,11 @@ "warnings" => 0 }, "TEST_REQUIRES" => { + "ExtUtils::MakeMaker" => 0, + "File::Spec" => 0, "Test::More" => "0.96" }, - "VERSION" => "1.101245", + "VERSION" => "1.101246", "test" => { "TESTS" => "t/*.t" } @@ -39,6 +38,8 @@ my %FallbackPrereqs = ( + "ExtUtils::MakeMaker" => 0, + "File::Spec" => 0, "JSON::MaybeXS" => 0, "Params::Util" => 0, "Scalar::Util" => 0, @@ -60,6 +61,3 @@ unless eval { ExtUtils::MakeMaker->VERSION(6.52) }; WriteMakefile(%WriteMakefileArgs); - - - diff -Nru libstring-flogger-perl-1.101245/MANIFEST libstring-flogger-perl-1.101246/MANIFEST --- libstring-flogger-perl-1.101245/MANIFEST 2014-08-08 22:43:45.000000000 +0000 +++ libstring-flogger-perl-1.101246/MANIFEST 2022-10-30 01:51:46.000000000 +0000 @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.020. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.025. Changes LICENSE MANIFEST @@ -8,8 +8,9 @@ README dist.ini lib/String/Flogger.pm -t/000-report-versions-tiny.t +t/00-report-prereqs.dd +t/00-report-prereqs.t t/basic.t t/synopsis.t +xt/author/pod-syntax.t xt/release/changes_has_content.t -xt/release/pod-syntax.t diff -Nru libstring-flogger-perl-1.101245/META.json libstring-flogger-perl-1.101246/META.json --- libstring-flogger-perl-1.101245/META.json 2014-08-08 22:43:45.000000000 +0000 +++ libstring-flogger-perl-1.101246/META.json 2022-10-30 01:51:46.000000000 +0000 @@ -1,28 +1,29 @@ { "abstract" : "string munging for loggers", "author" : [ - "Ricardo SIGNES " + "Ricardo SIGNES " ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 5.020, CPAN::Meta::Converter version 2.141520", + "generated_by" : "Dist::Zilla version 6.025, CPAN::Meta::Converter version 2.150010", "license" : [ "perl_5" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", - "version" : "2" + "version" : 2 }, "name" : "String-Flogger", "prereqs" : { "configure" : { "requires" : { - "ExtUtils::MakeMaker" : "0" + "ExtUtils::MakeMaker" : "6.78" } }, "develop" : { "requires" : { - "Test::Pod" : "1.41", - "version" : "0.9901" + "Encode" : "0", + "Test::More" : "0", + "Test::Pod" : "1.41" } }, "runtime" : { @@ -32,12 +33,18 @@ "Scalar::Util" : "0", "Sub::Exporter" : "0", "Sub::Exporter::Util" : "0", + "perl" : "5.012", "strict" : "0", "warnings" : "0" } }, "test" : { + "recommends" : { + "CPAN::Meta" : "2.120900" + }, "requires" : { + "ExtUtils::MakeMaker" : "0", + "File::Spec" : "0", "Test::More" : "0.96" } } @@ -54,34 +61,40 @@ "web" : "https://github.com/rjbs/String-Flogger" } }, - "version" : "1.101245", + "version" : "1.101246", "x_Dist_Zilla" : { "perl" : { - "version" : "5.021002" + "version" : "5.037002" }, "plugins" : [ { "class" : "Dist::Zilla::Plugin::Git::GatherDir", "config" : { - "Dist::Zilla::Plugin::Git::GatherDir" : { - "include_untracked" : "0" + "Dist::Zilla::Plugin::GatherDir" : { + "exclude_filename" : [], + "exclude_match" : [], + "follow_symlinks" : 0, + "include_dotfiles" : 0, + "prefix" : "", + "prune_directory" : [], + "root" : "." }, - "Dist::Zilla::Role::Git::Repo" : { - "repo_root" : "." + "Dist::Zilla::Plugin::Git::GatherDir" : { + "include_untracked" : 0 } }, "name" : "@RJBS/Git::GatherDir", - "version" : "2.023" + "version" : "2.048" }, { "class" : "Dist::Zilla::Plugin::CheckPrereqsIndexed", "name" : "@RJBS/CheckPrereqsIndexed", - "version" : "0.012" + "version" : "0.021" }, { "class" : "Dist::Zilla::Plugin::CheckExtraTests", "name" : "@RJBS/CheckExtraTests", - "version" : "0.022" + "version" : "0.029" }, { "class" : "Dist::Zilla::Plugin::PromptIfStale", @@ -93,80 +106,84 @@ "Dist::Zilla::PluginBundle::RJBS" ], "phase" : "build", + "run_under_travis" : 0, "skip" : [] } }, "name" : "@RJBS/RJBS-Outdated", - "version" : "0.024" + "version" : "0.057" }, { "class" : "Dist::Zilla::Plugin::PromptIfStale", "config" : { "Dist::Zilla::Plugin::PromptIfStale" : { - "check_all_plugins" : "1", + "check_all_plugins" : 1, "check_all_prereqs" : 0, "modules" : [], "phase" : "release", - "skip" : [] + "run_under_travis" : 0, + "skip" : [ + "Dist::Zilla::Plugin::RJBSMisc" + ] } }, "name" : "@RJBS/CPAN-Outdated", - "version" : "0.024" + "version" : "0.057" }, { "class" : "Dist::Zilla::Plugin::PruneCruft", "name" : "@RJBS/@Filter/PruneCruft", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::ManifestSkip", "name" : "@RJBS/@Filter/ManifestSkip", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::MetaYAML", "name" : "@RJBS/@Filter/MetaYAML", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::License", "name" : "@RJBS/@Filter/License", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::Readme", "name" : "@RJBS/@Filter/Readme", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::ExecDir", "name" : "@RJBS/@Filter/ExecDir", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::ShareDir", "name" : "@RJBS/@Filter/ShareDir", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::Manifest", "name" : "@RJBS/@Filter/Manifest", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::TestRelease", "name" : "@RJBS/@Filter/TestRelease", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::ConfirmRelease", "name" : "@RJBS/@Filter/ConfirmRelease", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::UploadToCPAN", "name" : "@RJBS/@Filter/UploadToCPAN", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::MakeMaker", @@ -176,62 +193,68 @@ } }, "name" : "@RJBS/MakeMaker", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::AutoPrereqs", "name" : "@RJBS/AutoPrereqs", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::Git::NextVersion", "config" : { "Dist::Zilla::Plugin::Git::NextVersion" : { "first_version" : "0.001", - "version_by_branch" : "0", + "version_by_branch" : 1, "version_regexp" : "(?^:^([0-9]+\\.[0-9]+)$)" }, "Dist::Zilla::Role::Git::Repo" : { + "git_version" : "2.38.0", "repo_root" : "." } }, "name" : "@RJBS/Git::NextVersion", - "version" : "2.023" + "version" : "2.048" }, { "class" : "Dist::Zilla::Plugin::PkgVersion", "name" : "@RJBS/PkgVersion", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::MetaConfig", "name" : "@RJBS/MetaConfig", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::MetaJSON", "name" : "@RJBS/MetaJSON", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::NextRelease", "name" : "@RJBS/NextRelease", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::Test::ChangesHasContent", "name" : "@RJBS/Test::ChangesHasContent", - "version" : "0.006" + "version" : "0.011" }, { "class" : "Dist::Zilla::Plugin::PodSyntaxTests", "name" : "@RJBS/PodSyntaxTests", - "version" : "5.020" + "version" : "6.025" + }, + { + "class" : "Dist::Zilla::Plugin::Test::ReportPrereqs", + "name" : "@RJBS/Test::ReportPrereqs", + "version" : "0.028" }, { - "class" : "Dist::Zilla::Plugin::ReportVersions::Tiny", - "name" : "@RJBS/ReportVersions::Tiny", - "version" : "1.10" + "class" : "Dist::Zilla::Plugin::Git::Remote::Check", + "name" : "@RJBS/Git::Remote::Check", + "version" : "0.1.2" }, { "class" : "Dist::Zilla::Plugin::Prereqs", @@ -242,7 +265,7 @@ } }, "name" : "@RJBS/TestMoreWithSubtests", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::PodWeaver", @@ -259,103 +282,118 @@ { "class" : "Pod::Weaver::Plugin::EnsurePod5", "name" : "@CorePrep/EnsurePod5", - "version" : "4.006" + "version" : "4.018" }, { "class" : "Pod::Weaver::Plugin::H1Nester", "name" : "@CorePrep/H1Nester", - "version" : "4.006" + "version" : "4.018" }, { "class" : "Pod::Weaver::Plugin::SingleEncoding", "name" : "@RJBS/SingleEncoding", - "version" : "4.006" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Name", "name" : "@RJBS/Name", - "version" : "4.006" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Version", "name" : "@RJBS/Version", - "version" : "4.006" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Region", "name" : "@RJBS/Prelude", - "version" : "4.006" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Generic", "name" : "@RJBS/Synopsis", - "version" : "4.006" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Generic", "name" : "@RJBS/Description", - "version" : "4.006" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Generic", "name" : "@RJBS/Overview", - "version" : "4.006" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Generic", "name" : "@RJBS/Stability", - "version" : "4.006" + "version" : "4.018" + }, + { + "class" : "Pod::Weaver::Section::GenerateSection", + "name" : "@RJBS/PerlSupport", + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "Attributes", - "version" : "4.006" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "Methods", - "version" : "4.006" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "Functions", - "version" : "4.006" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Leftovers", "name" : "@RJBS/Leftovers", - "version" : "4.006" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Region", "name" : "@RJBS/postlude", - "version" : "4.006" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Authors", "name" : "@RJBS/Authors", - "version" : "4.006" + "version" : "4.018" + }, + { + "class" : "Pod::Weaver::Section::Contributors", + "name" : "@RJBS/Contributors", + "version" : "0.009" }, { "class" : "Pod::Weaver::Section::Legal", "name" : "@RJBS/Legal", - "version" : "4.006" + "version" : "4.018" }, { "class" : "Pod::Weaver::Plugin::Transformer", "name" : "@RJBS/List", - "version" : "4.006" + "version" : "4.018" } ] } }, "name" : "@RJBS/PodWeaver", - "version" : "4.005" + "version" : "4.009" + }, + { + "class" : "Dist::Zilla::Plugin::RJBSMisc", + "name" : "@RJBS/RJBSMisc", + "version" : "5.020" }, { "class" : "Dist::Zilla::Plugin::GithubMeta", "name" : "@RJBS/GithubMeta", - "version" : "0.46" + "version" : "0.58" }, { "class" : "Dist::Zilla::Plugin::Git::Check", @@ -365,125 +403,166 @@ }, "Dist::Zilla::Role::Git::DirtyFiles" : { "allow_dirty" : [ - "dist.ini", - "Changes" + "Changes", + "dist.ini" ], "allow_dirty_match" : [], "changelog" : "Changes" }, "Dist::Zilla::Role::Git::Repo" : { + "git_version" : "2.38.0", "repo_root" : "." } }, "name" : "@RJBS/@Git/Check", - "version" : "2.023" + "version" : "2.048" }, { "class" : "Dist::Zilla::Plugin::Git::Commit", "config" : { "Dist::Zilla::Plugin::Git::Commit" : { "add_files_in" : [], - "commit_msg" : "v%v%n%n%c", - "time_zone" : "local" + "commit_msg" : "v%V%n%n%c", + "signoff" : 0 }, "Dist::Zilla::Role::Git::DirtyFiles" : { "allow_dirty" : [ - "dist.ini", - "Changes" + "Changes", + "dist.ini" ], "allow_dirty_match" : [], "changelog" : "Changes" }, "Dist::Zilla::Role::Git::Repo" : { + "git_version" : "2.38.0", "repo_root" : "." + }, + "Dist::Zilla::Role::Git::StringFormatter" : { + "time_zone" : "local" } }, "name" : "@RJBS/@Git/Commit", - "version" : "2.023" + "version" : "2.048" }, { "class" : "Dist::Zilla::Plugin::Git::Tag", "config" : { "Dist::Zilla::Plugin::Git::Tag" : { "branch" : null, + "changelog" : "Changes", "signed" : 0, - "tag" : "1.101245", + "tag" : "1.101246", "tag_format" : "%v", - "tag_message" : "v%v", - "time_zone" : "local" + "tag_message" : "v%V" }, "Dist::Zilla::Role::Git::Repo" : { + "git_version" : "2.38.0", "repo_root" : "." + }, + "Dist::Zilla::Role::Git::StringFormatter" : { + "time_zone" : "local" } }, "name" : "@RJBS/@Git/Tag", - "version" : "2.023" + "version" : "2.048" }, { "class" : "Dist::Zilla::Plugin::Git::Push", "config" : { "Dist::Zilla::Plugin::Git::Push" : { "push_to" : [ - "origin :", "github :" ], "remotes_must_exist" : 0 }, "Dist::Zilla::Role::Git::Repo" : { + "git_version" : "2.38.0", "repo_root" : "." } }, "name" : "@RJBS/@Git/Push", - "version" : "2.023" + "version" : "2.048" + }, + { + "class" : "Dist::Zilla::Plugin::Git::Contributors", + "config" : { + "Dist::Zilla::Plugin::Git::Contributors" : { + "git_version" : "2.38.0", + "include_authors" : 0, + "include_releaser" : 1, + "order_by" : "name", + "paths" : [] + } + }, + "name" : "@RJBS/Git::Contributors", + "version" : "0.036" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":InstallModules", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":IncModules", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":TestFiles", - "version" : "5.020" + "version" : "6.025" + }, + { + "class" : "Dist::Zilla::Plugin::FinderCode", + "name" : ":ExtraTestFiles", + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExecFiles", - "version" : "5.020" + "version" : "6.025" + }, + { + "class" : "Dist::Zilla::Plugin::FinderCode", + "name" : ":PerlExecFiles", + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ShareFiles", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":MainModule", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":AllFiles", - "version" : "5.020" + "version" : "6.025" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":NoFiles", - "version" : "5.020" + "version" : "6.025" } ], "zilla" : { "class" : "Dist::Zilla::Dist::Builder", "config" : { - "is_trial" : "0" + "is_trial" : 0 }, - "version" : "5.020" + "version" : "6.025" } - } + }, + "x_contributors" : [ + "Randy Stauner ", + "Ricardo Signes " + ], + "x_generated_by_perl" : "v5.37.2", + "x_rjbs_perl_window" : "standard", + "x_serialization_backend" : "Cpanel::JSON::XS version 4.30", + "x_spdx_expression" : "Artistic-1.0-Perl OR GPL-1.0-or-later" } diff -Nru libstring-flogger-perl-1.101245/META.yml libstring-flogger-perl-1.101246/META.yml --- libstring-flogger-perl-1.101245/META.yml 2014-08-08 22:43:45.000000000 +0000 +++ libstring-flogger-perl-1.101246/META.yml 2022-10-30 01:51:46.000000000 +0000 @@ -1,13 +1,15 @@ --- abstract: 'string munging for loggers' author: - - 'Ricardo SIGNES ' + - 'Ricardo SIGNES ' build_requires: + ExtUtils::MakeMaker: '0' + File::Spec: '0' Test::More: '0.96' configure_requires: - ExtUtils::MakeMaker: '0' + ExtUtils::MakeMaker: '6.78' dynamic_config: 0 -generated_by: 'Dist::Zilla version 5.020, CPAN::Meta::Converter version 2.141520' +generated_by: 'Dist::Zilla version 6.025, CPAN::Meta::Converter version 2.150010' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -19,34 +21,41 @@ Scalar::Util: '0' Sub::Exporter: '0' Sub::Exporter::Util: '0' + perl: '5.012' strict: '0' warnings: '0' resources: bugtracker: https://github.com/rjbs/String-Flogger/issues homepage: https://github.com/rjbs/String-Flogger repository: https://github.com/rjbs/String-Flogger.git -version: '1.101245' +version: '1.101246' x_Dist_Zilla: perl: - version: '5.021002' + version: '5.037002' plugins: - class: Dist::Zilla::Plugin::Git::GatherDir config: + Dist::Zilla::Plugin::GatherDir: + exclude_filename: [] + exclude_match: [] + follow_symlinks: 0 + include_dotfiles: 0 + prefix: '' + prune_directory: [] + root: . Dist::Zilla::Plugin::Git::GatherDir: - include_untracked: '0' - Dist::Zilla::Role::Git::Repo: - repo_root: . + include_untracked: 0 name: '@RJBS/Git::GatherDir' - version: '2.023' + version: '2.048' - class: Dist::Zilla::Plugin::CheckPrereqsIndexed name: '@RJBS/CheckPrereqsIndexed' - version: '0.012' + version: '0.021' - class: Dist::Zilla::Plugin::CheckExtraTests name: '@RJBS/CheckExtraTests' - version: '0.022' + version: '0.029' - class: Dist::Zilla::Plugin::PromptIfStale config: @@ -56,114 +65,122 @@ modules: - Dist::Zilla::PluginBundle::RJBS phase: build + run_under_travis: 0 skip: [] name: '@RJBS/RJBS-Outdated' - version: '0.024' + version: '0.057' - class: Dist::Zilla::Plugin::PromptIfStale config: Dist::Zilla::Plugin::PromptIfStale: - check_all_plugins: '1' + check_all_plugins: 1 check_all_prereqs: 0 modules: [] phase: release - skip: [] + run_under_travis: 0 + skip: + - Dist::Zilla::Plugin::RJBSMisc name: '@RJBS/CPAN-Outdated' - version: '0.024' + version: '0.057' - class: Dist::Zilla::Plugin::PruneCruft name: '@RJBS/@Filter/PruneCruft' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::ManifestSkip name: '@RJBS/@Filter/ManifestSkip' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::MetaYAML name: '@RJBS/@Filter/MetaYAML' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::License name: '@RJBS/@Filter/License' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::Readme name: '@RJBS/@Filter/Readme' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::ExecDir name: '@RJBS/@Filter/ExecDir' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::ShareDir name: '@RJBS/@Filter/ShareDir' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::Manifest name: '@RJBS/@Filter/Manifest' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::TestRelease name: '@RJBS/@Filter/TestRelease' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::ConfirmRelease name: '@RJBS/@Filter/ConfirmRelease' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::UploadToCPAN name: '@RJBS/@Filter/UploadToCPAN' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::MakeMaker config: Dist::Zilla::Role::TestRunner: default_jobs: 9 name: '@RJBS/MakeMaker' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::AutoPrereqs name: '@RJBS/AutoPrereqs' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::Git::NextVersion config: Dist::Zilla::Plugin::Git::NextVersion: first_version: '0.001' - version_by_branch: '0' + version_by_branch: 1 version_regexp: (?^:^([0-9]+\.[0-9]+)$) Dist::Zilla::Role::Git::Repo: + git_version: 2.38.0 repo_root: . name: '@RJBS/Git::NextVersion' - version: '2.023' + version: '2.048' - class: Dist::Zilla::Plugin::PkgVersion name: '@RJBS/PkgVersion' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::MetaConfig name: '@RJBS/MetaConfig' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::MetaJSON name: '@RJBS/MetaJSON' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::NextRelease name: '@RJBS/NextRelease' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::Test::ChangesHasContent name: '@RJBS/Test::ChangesHasContent' - version: '0.006' + version: '0.011' - class: Dist::Zilla::Plugin::PodSyntaxTests name: '@RJBS/PodSyntaxTests' - version: '5.020' + version: '6.025' - - class: Dist::Zilla::Plugin::ReportVersions::Tiny - name: '@RJBS/ReportVersions::Tiny' - version: '1.10' + class: Dist::Zilla::Plugin::Test::ReportPrereqs + name: '@RJBS/Test::ReportPrereqs' + version: '0.028' + - + class: Dist::Zilla::Plugin::Git::Remote::Check + name: '@RJBS/Git::Remote::Check' + version: 0.1.2 - class: Dist::Zilla::Plugin::Prereqs config: @@ -171,7 +188,7 @@ phase: test type: requires name: '@RJBS/TestMoreWithSubtests' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::PodWeaver config: @@ -185,81 +202,93 @@ - class: Pod::Weaver::Plugin::EnsurePod5 name: '@CorePrep/EnsurePod5' - version: '4.006' + version: '4.018' - class: Pod::Weaver::Plugin::H1Nester name: '@CorePrep/H1Nester' - version: '4.006' + version: '4.018' - class: Pod::Weaver::Plugin::SingleEncoding name: '@RJBS/SingleEncoding' - version: '4.006' + version: '4.018' - class: Pod::Weaver::Section::Name name: '@RJBS/Name' - version: '4.006' + version: '4.018' - class: Pod::Weaver::Section::Version name: '@RJBS/Version' - version: '4.006' + version: '4.018' - class: Pod::Weaver::Section::Region name: '@RJBS/Prelude' - version: '4.006' + version: '4.018' - class: Pod::Weaver::Section::Generic name: '@RJBS/Synopsis' - version: '4.006' + version: '4.018' - class: Pod::Weaver::Section::Generic name: '@RJBS/Description' - version: '4.006' + version: '4.018' - class: Pod::Weaver::Section::Generic name: '@RJBS/Overview' - version: '4.006' + version: '4.018' - class: Pod::Weaver::Section::Generic name: '@RJBS/Stability' - version: '4.006' + version: '4.018' + - + class: Pod::Weaver::Section::GenerateSection + name: '@RJBS/PerlSupport' + version: '4.018' - class: Pod::Weaver::Section::Collect name: Attributes - version: '4.006' + version: '4.018' - class: Pod::Weaver::Section::Collect name: Methods - version: '4.006' + version: '4.018' - class: Pod::Weaver::Section::Collect name: Functions - version: '4.006' + version: '4.018' - class: Pod::Weaver::Section::Leftovers name: '@RJBS/Leftovers' - version: '4.006' + version: '4.018' - class: Pod::Weaver::Section::Region name: '@RJBS/postlude' - version: '4.006' + version: '4.018' - class: Pod::Weaver::Section::Authors name: '@RJBS/Authors' - version: '4.006' + version: '4.018' + - + class: Pod::Weaver::Section::Contributors + name: '@RJBS/Contributors' + version: '0.009' - class: Pod::Weaver::Section::Legal name: '@RJBS/Legal' - version: '4.006' + version: '4.018' - class: Pod::Weaver::Plugin::Transformer name: '@RJBS/List' - version: '4.006' + version: '4.018' name: '@RJBS/PodWeaver' - version: '4.005' + version: '4.009' + - + class: Dist::Zilla::Plugin::RJBSMisc + name: '@RJBS/RJBSMisc' + version: '5.020' - class: Dist::Zilla::Plugin::GithubMeta name: '@RJBS/GithubMeta' - version: '0.46' + version: '0.58' - class: Dist::Zilla::Plugin::Git::Check config: @@ -267,91 +296,124 @@ untracked_files: die Dist::Zilla::Role::Git::DirtyFiles: allow_dirty: - - dist.ini - Changes + - dist.ini allow_dirty_match: [] changelog: Changes Dist::Zilla::Role::Git::Repo: + git_version: 2.38.0 repo_root: . name: '@RJBS/@Git/Check' - version: '2.023' + version: '2.048' - class: Dist::Zilla::Plugin::Git::Commit config: Dist::Zilla::Plugin::Git::Commit: add_files_in: [] - commit_msg: v%v%n%n%c - time_zone: local + commit_msg: v%V%n%n%c + signoff: 0 Dist::Zilla::Role::Git::DirtyFiles: allow_dirty: - - dist.ini - Changes + - dist.ini allow_dirty_match: [] changelog: Changes Dist::Zilla::Role::Git::Repo: + git_version: 2.38.0 repo_root: . + Dist::Zilla::Role::Git::StringFormatter: + time_zone: local name: '@RJBS/@Git/Commit' - version: '2.023' + version: '2.048' - class: Dist::Zilla::Plugin::Git::Tag config: Dist::Zilla::Plugin::Git::Tag: branch: ~ + changelog: Changes signed: 0 - tag: '1.101245' + tag: '1.101246' tag_format: '%v' - tag_message: v%v - time_zone: local + tag_message: v%V Dist::Zilla::Role::Git::Repo: + git_version: 2.38.0 repo_root: . + Dist::Zilla::Role::Git::StringFormatter: + time_zone: local name: '@RJBS/@Git/Tag' - version: '2.023' + version: '2.048' - class: Dist::Zilla::Plugin::Git::Push config: Dist::Zilla::Plugin::Git::Push: push_to: - - 'origin :' - 'github :' remotes_must_exist: 0 Dist::Zilla::Role::Git::Repo: + git_version: 2.38.0 repo_root: . name: '@RJBS/@Git/Push' - version: '2.023' + version: '2.048' + - + class: Dist::Zilla::Plugin::Git::Contributors + config: + Dist::Zilla::Plugin::Git::Contributors: + git_version: 2.38.0 + include_authors: 0 + include_releaser: 1 + order_by: name + paths: [] + name: '@RJBS/Git::Contributors' + version: '0.036' - class: Dist::Zilla::Plugin::FinderCode name: ':InstallModules' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::FinderCode name: ':IncModules' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::FinderCode name: ':TestFiles' - version: '5.020' + version: '6.025' + - + class: Dist::Zilla::Plugin::FinderCode + name: ':ExtraTestFiles' + version: '6.025' - class: Dist::Zilla::Plugin::FinderCode name: ':ExecFiles' - version: '5.020' + version: '6.025' + - + class: Dist::Zilla::Plugin::FinderCode + name: ':PerlExecFiles' + version: '6.025' - class: Dist::Zilla::Plugin::FinderCode name: ':ShareFiles' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::FinderCode name: ':MainModule' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::FinderCode name: ':AllFiles' - version: '5.020' + version: '6.025' - class: Dist::Zilla::Plugin::FinderCode name: ':NoFiles' - version: '5.020' + version: '6.025' zilla: class: Dist::Zilla::Dist::Builder config: - is_trial: '0' - version: '5.020' + is_trial: 0 + version: '6.025' +x_contributors: + - 'Randy Stauner ' + - 'Ricardo Signes ' +x_generated_by_perl: v5.37.2 +x_rjbs_perl_window: standard +x_serialization_backend: 'YAML::Tiny version 1.73' +x_spdx_expression: 'Artistic-1.0-Perl OR GPL-1.0-or-later' diff -Nru libstring-flogger-perl-1.101245/README libstring-flogger-perl-1.101246/README --- libstring-flogger-perl-1.101245/README 2014-08-08 22:43:45.000000000 +0000 +++ libstring-flogger-perl-1.101246/README 2022-10-30 01:51:46.000000000 +0000 @@ -1,15 +1,12 @@ - - This archive contains the distribution String-Flogger, -version 1.101245: +version 1.101246: string munging for loggers -This software is copyright (c) 2014 by Ricardo SIGNES . +This software is copyright (c) 2022 by Ricardo Signes. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. -This README file was generated by Dist::Zilla::Plugin::Readme v5.020. - +This README file was generated by Dist::Zilla::Plugin::Readme v6.025. diff -Nru libstring-flogger-perl-1.101245/t/000-report-versions-tiny.t libstring-flogger-perl-1.101246/t/000-report-versions-tiny.t --- libstring-flogger-perl-1.101245/t/000-report-versions-tiny.t 2014-08-08 22:43:45.000000000 +0000 +++ libstring-flogger-perl-1.101246/t/000-report-versions-tiny.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -use strict; -use warnings; -use Test::More 0.88; -# This is a relatively nice way to avoid Test::NoWarnings breaking our -# expectations by adding extra tests, without using no_plan. It also helps -# avoid any other test module that feels introducing random tests, or even -# test plans, is a nice idea. -our $success = 0; -END { $success && done_testing; } - -# List our own version used to generate this -my $v = "\nGenerated by Dist::Zilla::Plugin::ReportVersions::Tiny v1.10\n"; - -eval { # no excuses! - # report our Perl details - my $want = "any version"; - $v .= "perl: $] (wanted $want) on $^O from $^X\n\n"; -}; -defined($@) and diag("$@"); - -# Now, our module version dependencies: -sub pmver { - my ($module, $wanted) = @_; - $wanted = " (want $wanted)"; - my $pmver; - eval "require $module;"; - if ($@) { - if ($@ =~ m/Can't locate .* in \@INC/) { - $pmver = 'module not found.'; - } else { - diag("${module}: $@"); - $pmver = 'died during require.'; - } - } else { - my $version; - eval { $version = $module->VERSION; }; - if ($@) { - diag("${module}: $@"); - $pmver = 'died during VERSION check.'; - } elsif (defined $version) { - $pmver = "$version"; - } else { - $pmver = ''; - } - } - - # So, we should be good, right? - return sprintf('%-45s => %-10s%-15s%s', $module, $pmver, $wanted, "\n"); -} - -eval { $v .= pmver('ExtUtils::MakeMaker','any version') }; -eval { $v .= pmver('JSON::MaybeXS','any version') }; -eval { $v .= pmver('Params::Util','any version') }; -eval { $v .= pmver('Scalar::Util','any version') }; -eval { $v .= pmver('Sub::Exporter','any version') }; -eval { $v .= pmver('Sub::Exporter::Util','any version') }; -eval { $v .= pmver('Test::More','0.96') }; -eval { $v .= pmver('strict','any version') }; -eval { $v .= pmver('warnings','any version') }; - - -# All done. -$v .= <<'EOT'; - -Thanks for using my code. I hope it works for you. -If not, please try and include this output in the bug report. -That will help me reproduce the issue and solve your problem. - -EOT - -diag($v); -ok(1, "we really didn't test anything, just reporting data"); -$success = 1; - -# Work around another nasty module on CPAN. :/ -no warnings 'once'; -$Template::Test::NO_FLUSH = 1; -exit 0; diff -Nru libstring-flogger-perl-1.101245/t/00-report-prereqs.dd libstring-flogger-perl-1.101246/t/00-report-prereqs.dd --- libstring-flogger-perl-1.101245/t/00-report-prereqs.dd 1970-01-01 00:00:00.000000000 +0000 +++ libstring-flogger-perl-1.101246/t/00-report-prereqs.dd 2022-10-30 01:51:46.000000000 +0000 @@ -0,0 +1,38 @@ +do { my $x = { + 'configure' => { + 'requires' => { + 'ExtUtils::MakeMaker' => '6.78' + } + }, + 'develop' => { + 'requires' => { + 'Encode' => '0', + 'Test::More' => '0', + 'Test::Pod' => '1.41' + } + }, + 'runtime' => { + 'requires' => { + 'JSON::MaybeXS' => '0', + 'Params::Util' => '0', + 'Scalar::Util' => '0', + 'Sub::Exporter' => '0', + 'Sub::Exporter::Util' => '0', + 'perl' => '5.012', + 'strict' => '0', + 'warnings' => '0' + } + }, + 'test' => { + 'recommends' => { + 'CPAN::Meta' => '2.120900' + }, + 'requires' => { + 'ExtUtils::MakeMaker' => '0', + 'File::Spec' => '0', + 'Test::More' => '0.96' + } + } + }; + $x; + } \ No newline at end of file diff -Nru libstring-flogger-perl-1.101245/t/00-report-prereqs.t libstring-flogger-perl-1.101246/t/00-report-prereqs.t --- libstring-flogger-perl-1.101245/t/00-report-prereqs.t 1970-01-01 00:00:00.000000000 +0000 +++ libstring-flogger-perl-1.101246/t/00-report-prereqs.t 2022-10-30 01:51:46.000000000 +0000 @@ -0,0 +1,193 @@ +#!perl + +use strict; +use warnings; + +# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.028 + +use Test::More tests => 1; + +use ExtUtils::MakeMaker; +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_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 _max { + my $max = shift; + $max = ( $_ > $max ) ? $_ : $max for @_; + return $max; +} + +sub _merge_prereqs { + my ($collector, $prereqs) = @_; + + # 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 = qw( + +); + +my @exclude = qw( + +); + +# Add static prereqs to the included modules list +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'; +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'; +} + +my @full_reports; +my @dep_errors; +my $req_hash = $HAS_CPAN_META ? $full_prereqs->as_string_hash : $full_prereqs; + +# 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)"; + } + } + } + + 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 ( @full_reports ) { + 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", + "\nThe following REQUIRED prerequisites were not satisfied:\n", + @dep_errors, + "\n" + ); +} + +pass('Reported prereqs'); + +# vim: ts=4 sts=4 sw=4 et: diff -Nru libstring-flogger-perl-1.101245/t/basic.t libstring-flogger-perl-1.101246/t/basic.t --- libstring-flogger-perl-1.101245/t/basic.t 2014-08-08 22:43:45.000000000 +0000 +++ libstring-flogger-perl-1.101246/t/basic.t 2022-10-30 01:51:46.000000000 +0000 @@ -1,7 +1,7 @@ #!perl use strict; use warnings; -use Test::More tests => 6; +use Test::More; use String::Flogger qw(flog); is( @@ -39,3 +39,19 @@ qr/foo.+bar/, "hashref keys/values printed", ); + +my $object = bless {}, 'String::Flogger::Test'; + +like( + flog([ 'an object: %s', $object ]), + qr/\Aan object: obj\(String::Flogger::Test=HASH\(0x[[:xdigit:]]+\)\)\z/, + "an object in the output", +); + +like( + flog([ 'an object: %s', [$object] ]), + qr/\Aan object: \{\{\["obj\(String::Flogger::Test=HASH\(0x[[:xdigit:]]+\)\)"\]}}\z/, + "an object in an array in the output", +); + +done_testing; diff -Nru libstring-flogger-perl-1.101245/xt/author/pod-syntax.t libstring-flogger-perl-1.101246/xt/author/pod-syntax.t --- libstring-flogger-perl-1.101245/xt/author/pod-syntax.t 1970-01-01 00:00:00.000000000 +0000 +++ libstring-flogger-perl-1.101246/xt/author/pod-syntax.t 2022-10-30 01:51:46.000000000 +0000 @@ -0,0 +1,7 @@ +#!perl +# This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests. +use strict; use warnings; +use Test::More; +use Test::Pod 1.41; + +all_pod_files_ok(); diff -Nru libstring-flogger-perl-1.101245/xt/release/changes_has_content.t libstring-flogger-perl-1.101246/xt/release/changes_has_content.t --- libstring-flogger-perl-1.101245/xt/release/changes_has_content.t 2014-08-08 22:43:45.000000000 +0000 +++ libstring-flogger-perl-1.101246/xt/release/changes_has_content.t 2022-10-30 01:51:46.000000000 +0000 @@ -1,11 +1,10 @@ -#!perl - use Test::More tests => 2; note 'Checking Changes'; my $changes_file = 'Changes'; -my $newver = '1.101245'; +my $newver = '1.101246'; my $trial_token = '-TRIAL'; +my $encoding = 'UTF-8'; SKIP: { ok(-e $changes_file, "$changes_file file exists") @@ -16,8 +15,6 @@ done_testing; -# _get_changes copied and adapted from Dist::Zilla::Plugin::Git::Commit -# by Jerome Quelin sub _get_changes { my $newver = shift; @@ -25,6 +22,10 @@ # parse changelog to find commit message open(my $fh, '<', $changes_file) or die "cannot open $changes_file: $!"; my $changelog = join('', <$fh>); + if ($encoding) { + require Encode; + $changelog = Encode::decode($encoding, $changelog, Encode::FB_CROAK()); + } close $fh; my @content = diff -Nru libstring-flogger-perl-1.101245/xt/release/pod-syntax.t libstring-flogger-perl-1.101246/xt/release/pod-syntax.t --- libstring-flogger-perl-1.101245/xt/release/pod-syntax.t 2014-08-08 22:43:45.000000000 +0000 +++ libstring-flogger-perl-1.101246/xt/release/pod-syntax.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -#!perl -# This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests. -use Test::More; -use Test::Pod 1.41; - -all_pod_files_ok();