From 94f076af79d6334cdb872d2256bb51c73f51f3c0 Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Mon, 6 Mar 2017 18:01:27 +1300 Subject: [PATCH] Build results of 7625c88 (on master) --- .travis.yml | 3 +- Changes | 14 + LICENSE | 6 +- MANIFEST | 2 +- META.json | 247 ++++++++++-------- META.yml | 8 +- Makefile.PL | 8 +- README | 2 +- dist.ini | 10 +- dist.ini.meta | 10 +- lib/Dist/Zilla/Plugin/Prereqs/Soften.pm | 37 ++- misc/Changes.deps | 6 +- misc/Changes.deps.all | 20 +- misc/Changes.deps.dev | 17 +- misc/Changes.deps.opt | 4 +- misc/built_with.json | 127 ++++----- .../lib_Dist_Zilla_Plugin_Prereqs_Soften_pm.t | 24 +- t/00-report-prereqs.dd | 11 +- t/00-report-prereqs.t | 10 +- xt/author/eol.t | 2 +- xt/release/cpan-changes.t | 9 +- 21 files changed, 343 insertions(+), 234 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7c23036..af9ef6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,8 @@ branches: - releases install: - time perl ./maint-travis-ci/install_deps_early.pl - - time perl ./maint-travis-ci/install_deps.pl + - time perl ./maint-travis-ci/autoinstall_dzil.pl + - time perl ./maint-travis-ci/install_deps_2.pl language: perl matrix: allow_failures: diff --git a/Changes b/Changes index 30f700d..068ae19 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,19 @@ Release history for Dist-Zilla-Plugin-Prereqs-Soften +0.006003 2017-03-06T04:53:19Z f764946 + [Bugfix] + - Avoid testing issues under -Ddefault_inc_excludes_dot + - Closes https://github.com/kentnl/Dist-Zilla-Plugin-Prereqs-Soften/issues/6 + + [Dependencies::Stats] + - Dependencies changed since 0.006002, see misc/*.deps* for details + - develop: +2 ↑1 -1 (suggests: ↑2) + - test: ↓1 + + [Internals] + - Add much more extensive logging about decision making, including outcomes of each decision + - Closes https://github.com/kentnl/Dist-Zilla-Plugin-Prereqs-Soften/issues/5 + 0.006002 2016-05-01T18:03:38Z f9ed7c0 - Remove usage of dztest. Ironic, seeing this module is where I invented that. So many regrets. - Fix test failure with newer OptionalFeature due to injected depedencies. diff --git a/LICENSE b/LICENSE index efe03f2..d0f6bfd 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -This software is copyright (c) 2016 by Kent Fredric . +This software is copyright (c) 2017 by Kent Fredric . 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 @@ b) the "Artistic License" --- The GNU General Public License, Version 1, February 1989 --- -This software is Copyright (c) 2016 by Kent Fredric . +This software is Copyright (c) 2017 by Kent Fredric . This is free software, licensed under: @@ -272,7 +272,7 @@ That's all there is to it! --- The Artistic License 1.0 --- -This software is Copyright (c) 2016 by Kent Fredric . +This software is Copyright (c) 2017 by Kent Fredric . This is free software, licensed under: diff --git a/MANIFEST b/MANIFEST index 894a7d2..ca510ab 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.047. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.009. .gitignore .mailmap .perltidyrc diff --git a/META.json b/META.json index 481a319..95fa827 100644 --- a/META.json +++ b/META.json @@ -4,7 +4,7 @@ "Kent Fredric " ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 5.047, CPAN::Meta::Converter version 2.150001", + "generated_by" : "Dist::Zilla version 6.009, CPAN::Meta::Converter version 2.150010", "license" : [ "perl_5" ], @@ -34,7 +34,6 @@ "Dist::Zilla::Plugin::Author::KENTNL::TravisCI" : "0.001002", "Dist::Zilla::Plugin::Authority" : "1.006", "Dist::Zilla::Plugin::AutoPrereqs" : "0", - "Dist::Zilla::Plugin::Bootstrap::lib" : "0", "Dist::Zilla::Plugin::BumpVersionAfterRelease" : "0", "Dist::Zilla::Plugin::ConfirmRelease" : "0", "Dist::Zilla::Plugin::CopyFilesFromBuild" : "0", @@ -71,7 +70,7 @@ "Dist::Zilla::Plugin::RewriteVersion::Sanitized" : "0", "Dist::Zilla::Plugin::RunExtraTests" : "0", "Dist::Zilla::Plugin::Test::CPAN::Changes" : "0", - "Dist::Zilla::Plugin::Test::Compile::PerFile" : "0", + "Dist::Zilla::Plugin::Test::Compile::PerFile" : "0.003902", "Dist::Zilla::Plugin::Test::EOL" : "0", "Dist::Zilla::Plugin::Test::Kwalitee" : "0", "Dist::Zilla::Plugin::Test::MinimumVersion" : "0", @@ -80,6 +79,7 @@ "Dist::Zilla::Plugin::TestRelease" : "0", "Dist::Zilla::Plugin::Twitter" : "0", "Dist::Zilla::Plugin::UploadToCPAN" : "0", + "Dist::Zilla::Plugin::lib" : "0", "English" : "0", "Pod::Coverage::TrustPod" : "0", "Software::License::Perl_5" : "0", @@ -87,6 +87,7 @@ "Test::CPAN::Meta" : "0", "Test::EOL" : "0", "Test::Kwalitee" : "1.21", + "Test::MinimumVersion" : "0", "Test::More" : "0.96", "Test::Pod" : "1.41", "Test::Pod::Coverage" : "1.08", @@ -94,8 +95,8 @@ "warnings" : "0" }, "suggests" : { - "Dist::Zilla::App::Command::bakeini" : "0.002005", - "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.025010" + "Dist::Zilla::App::Command::bakeini" : "0.002006", + "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.025021" } }, "runtime" : { @@ -127,7 +128,7 @@ "Path::Tiny" : "0", "Test::DZil" : "0", "Test::Differences" : "0", - "Test::More" : "0.89", + "Test::More" : "0", "Test::Requires" : "0", "perl" : "5.006" } @@ -136,7 +137,7 @@ "provides" : { "Dist::Zilla::Plugin::Prereqs::Soften" : { "file" : "lib/Dist/Zilla/Plugin/Prereqs/Soften.pm", - "version" : "0.006002" + "version" : "0.006003" } }, "release_status" : "stable", @@ -151,33 +152,31 @@ "web" : "https://github.com/kentnl/Dist-Zilla-Plugin-Prereqs-Soften" } }, - "version" : "0.006002", + "version" : "0.006003", "x_BuiltWith" : { "external_file" : "misc/built_with.json" }, "x_Dist_Zilla" : { "perl" : { - "version" : "5.022001" + "version" : "5.025010" }, "plugins" : [ { - "class" : "Dist::Zilla::Plugin::Bootstrap::lib", + "class" : "Dist::Zilla::Plugin::lib", "config" : { - "Dist::Zilla::Role::Bootstrap" : { - "$Dist::Zilla::Role::Bootstrap::VERSION" : "1.001003", - "distname" : "Dist-Zilla-Plugin-Prereqs-Soften", - "fallback" : "1", - "try_built" : null, - "try_built_method" : "mtime" + "Dist::Zilla::Plugin::lib" : { + "lib" : [ + "lib" + ] } }, - "name" : "Bootstrap::lib", - "version" : "1.001000" + "name" : "lib", + "version" : "0.001001" }, { "class" : "Dist::Zilla::Plugin::MetaConfig", "name" : "@Author::KENTNL/MetaConfig", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::GithubMeta", @@ -192,28 +191,30 @@ { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : "@Author::KENTNL/MetaProvides::Package/AUTOVIV/:InstallModulesPM", - "version" : "5.047" + "version" : "6.009" } - ] + ], + "include_underscores" : 0 }, "Dist::Zilla::Role::MetaProvider::Provider" : { - "Dist::Zilla::Role::MetaProvider::Provider::VERSION" : "2.002000", - "inherit_missing" : "1", - "inherit_version" : "1", - "meta_noindex" : "1" + "$Dist::Zilla::Role::MetaProvider::Provider::VERSION" : "2.002004", + "inherit_missing" : 1, + "inherit_version" : 1, + "meta_noindex" : 1 }, "Dist::Zilla::Role::ModuleMetadata" : { - "Module::Metadata" : "1.000031", - "version" : "0.003" + "Module::Metadata" : "1.000033", + "version" : "0.004" } }, "name" : "@Author::KENTNL/MetaProvides::Package", - "version" : "2.004000" + "version" : "2.004003" }, { "class" : "Dist::Zilla::Plugin::MetaData::BuiltWith", "config" : { "Dist::Zilla::Plugin::MetaData::BuiltWith" : { + "$Module::Metadata::VERSION" : "1.000033", "_stash_key" : "x_BuiltWith", "external_file_name" : "misc/built_with.json", "show_config" : "1", @@ -232,22 +233,21 @@ } }, "name" : "@Author::KENTNL/MetaData::BuiltWith", - "version" : "1.004002" + "version" : "1.004005" }, { "class" : "Dist::Zilla::Plugin::Git::Contributors", "config" : { "Dist::Zilla::Plugin::Git::Contributors" : { + "git --version" : "2.11.1", "include_authors" : 0, "include_releaser" : 0, "order_by" : "name", - "paths" : [ - "." - ] + "paths" : [] } }, "name" : "@Author::KENTNL/Git::Contributors", - "version" : "0.022" + "version" : "0.029" }, { "class" : "Dist::Zilla::Plugin::Git::GatherDir", @@ -273,17 +273,17 @@ } }, "name" : "@Author::KENTNL/Git::GatherDir", - "version" : "2.036" + "version" : "2.041" }, { "class" : "Dist::Zilla::Plugin::License", "name" : "@Author::KENTNL/License", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::MetaJSON", "name" : "@Author::KENTNL/MetaJSON", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::MetaYAML::Minimal", @@ -294,17 +294,25 @@ } }, "name" : "@Author::KENTNL/MetaYAML::Minimal", - "version" : "0.001000" + "version" : "0.001001" }, { "class" : "Dist::Zilla::Plugin::Manifest", "name" : "@Author::KENTNL/Manifest", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::Author::KENTNL::TravisCI", + "config" : { + "Dist::Zilla::Plugin::Author::KENTNL::TravisCI" : { + "fail_perls" : [ + "5.8" + ], + "skip_perls" : [] + } + }, "name" : "@Author::KENTNL/Author::KENTNL::TravisCI", - "version" : "0.001002" + "version" : "0.001004" }, { "class" : "Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING", @@ -319,12 +327,12 @@ "location" : "root", "phase" : "build", "source_filename" : "contributing-0.1.pod", - "version" : "0.009" + "version" : "0.013" }, "Dist::Zilla::Role::RepoFileInjector" : { "allow_overwrite" : 1, "repo_root" : ".", - "version" : "0.006" + "version" : "0.007" } }, "name" : "@Author::KENTNL/Author::KENTNL::CONTRIBUTING", @@ -333,27 +341,27 @@ { "class" : "Dist::Zilla::Plugin::CopyFilesFromBuild", "name" : "@Author::KENTNL/CopyXBuild", - "version" : "0.161150" + "version" : "0.163040" }, { "class" : "Dist::Zilla::Plugin::MetaTests", "name" : "@Author::KENTNL/MetaTests", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::PodCoverageTests", "name" : "@Author::KENTNL/PodCoverageTests", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::PodSyntaxTests", "name" : "@Author::KENTNL/PodSyntaxTests", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::Test::ReportPrereqs", "name" : "@Author::KENTNL/Test::ReportPrereqs", - "version" : "0.024" + "version" : "0.025" }, { "class" : "Dist::Zilla::Plugin::Test::Kwalitee", @@ -372,25 +380,25 @@ "Dist::Zilla::Plugin::Test::EOL" : { "filename" : "xt/author/eol.t", "finder" : [ - ":InstallModules", ":ExecFiles", + ":InstallModules", ":TestFiles" ], - "trailing_whitespace" : "1" + "trailing_whitespace" : 1 } }, "name" : "@Author::KENTNL/Test::EOL", - "version" : "0.18" + "version" : "0.19" }, { "class" : "Dist::Zilla::Plugin::Test::MinimumVersion", "name" : "@Author::KENTNL/Test::MinimumVersion", - "version" : "2.000006" + "version" : "2.000007" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : "@Author::KENTNL/Test::Compile::PerFile/AUTOVIV/:InstallModulesPM", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::Test::Compile::PerFile", @@ -402,12 +410,12 @@ "path_translator" : "base64_filter", "prefix" : "t/00-compile", "skip" : [], - "test_template" : "01-basic.t.tpl", + "test_template" : "02-raw-require.t.tpl", "xt_mode" : null } }, "name" : "@Author::KENTNL/Test::Compile::PerFile", - "version" : "0.003000" + "version" : "0.004000" }, { "class" : "Dist::Zilla::Plugin::Test::Perl::Critic", @@ -417,7 +425,7 @@ { "class" : "Dist::Zilla::Plugin::ManifestSkip", "name" : "@Author::KENTNL/ManifestSkip", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::RewriteVersion::Sanitized", @@ -432,12 +440,13 @@ "skip_version_provider" : 0 }, "Dist::Zilla::Role::Version::Sanitize" : { + "$Dist::Zilla::Role::Version::Sanitize::VERSION" : "0.002003", "mantissa" : "6", "normal_form" : "numify" } }, "name" : "@Author::KENTNL/RewriteVersion::Sanitized", - "version" : "0.001005" + "version" : "0.001006" }, { "class" : "Dist::Zilla::Plugin::PodWeaver", @@ -451,87 +460,87 @@ { "class" : "Pod::Weaver::Plugin::EnsurePod5", "name" : "@CorePrep/EnsurePod5", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Plugin::H1Nester", "name" : "@CorePrep/H1Nester", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Plugin::SingleEncoding", "name" : "-SingleEncoding", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Section::Name", "name" : "Name", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Section::Version", "name" : "Version", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Section::Region", "name" : "prelude", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Section::Generic", "name" : "SYNOPSIS", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Section::Generic", "name" : "DESCRIPTION", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Section::Generic", "name" : "OVERVIEW", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "METHODS", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "ATTRIBUTES", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "PRIVATE_ATTRIBUTES", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "PRIVATE_METHODS", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Section::Leftovers", "name" : "Leftovers", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Section::Region", "name" : "postlude", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Section::Authors", "name" : "Authors", - "version" : "4.013" + "version" : "4.015" }, { "class" : "Pod::Weaver::Section::Legal", "name" : "Legal", - "version" : "4.013" + "version" : "4.015" } ] } @@ -542,7 +551,7 @@ { "class" : "Dist::Zilla::Plugin::AutoPrereqs", "name" : "@Author::KENTNL/AutoPrereqs", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::Prereqs", @@ -553,12 +562,12 @@ } }, "name" : "@Author::KENTNL/BundleDevelSuggests", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::Prereqs::AuthorDeps", "name" : "@Author::KENTNL/Prereqs::AuthorDeps", - "version" : "0.005" + "version" : "0.006" }, { "class" : "Dist::Zilla::Plugin::MinimumPerl", @@ -578,17 +587,17 @@ } }, "name" : "@Author::KENTNL/MakeMaker", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes", "name" : "@Author::KENTNL/Author::KENTNL::RecommendFixes", - "version" : "0.005001" + "version" : "0.005004" }, { "class" : "Dist::Zilla::Plugin::Readme::Brief", "name" : "@Author::KENTNL/ShippedReadme", - "version" : "0.003000" + "version" : "0.003001" }, { "class" : "Dist::Zilla::Plugin::ReadmeAnyFromPod", @@ -598,12 +607,17 @@ } }, "name" : "@Author::KENTNL/ReadmeAnyFromPod", - "version" : "0.161170" + "version" : "0.163250" }, { "class" : "Dist::Zilla::Plugin::Test::CPAN::Changes", + "config" : { + "Dist::Zilla::Plugin::Test::CPAN::Changes" : { + "changelog" : "Changes" + } + }, "name" : "@Author::KENTNL/Test::CPAN::Changes", - "version" : "0.009" + "version" : "0.012" }, { "class" : "Dist::Zilla::Plugin::RunExtraTests", @@ -613,17 +627,17 @@ } }, "name" : "@Author::KENTNL/RunExtraTests", - "version" : "0.028" + "version" : "0.029" }, { "class" : "Dist::Zilla::Plugin::TestRelease", "name" : "@Author::KENTNL/TestRelease", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::ConfirmRelease", "name" : "@Author::KENTNL/ConfirmRelease", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::Git::Check", @@ -640,11 +654,12 @@ "changelog" : "Changes" }, "Dist::Zilla::Role::Git::Repo" : { + "git --version" : "2.11.1", "repo_root" : "." } }, "name" : "@Author::KENTNL/Git::Check", - "version" : "2.036" + "version" : "2.041" }, { "class" : "Dist::Zilla::Plugin::Git::Commit", @@ -662,6 +677,7 @@ "changelog" : "Changes" }, "Dist::Zilla::Role::Git::Repo" : { + "git --version" : "2.11.1", "repo_root" : "." }, "Dist::Zilla::Role::Git::StringFormatter" : { @@ -669,7 +685,7 @@ } }, "name" : "@Author::KENTNL/commit_dirty_files", - "version" : "2.036" + "version" : "2.041" }, { "class" : "Dist::Zilla::Plugin::Git::Tag", @@ -678,11 +694,12 @@ "branch" : null, "changelog" : "Changes", "signed" : 0, - "tag" : "0.006002-source", + "tag" : "0.006003-source", "tag_format" : "%v-source", "tag_message" : "v%v" }, "Dist::Zilla::Role::Git::Repo" : { + "git --version" : "2.11.1", "repo_root" : "." }, "Dist::Zilla::Role::Git::StringFormatter" : { @@ -690,7 +707,7 @@ } }, "name" : "@Author::KENTNL/tag_master", - "version" : "2.036" + "version" : "2.041" }, { "class" : "Dist::Zilla::Plugin::Git::NextRelease", @@ -735,6 +752,7 @@ "changelog" : "Changes" }, "Dist::Zilla::Role::Git::Repo" : { + "git --version" : "2.11.1", "repo_root" : "." }, "Dist::Zilla::Role::Git::StringFormatter" : { @@ -742,7 +760,7 @@ } }, "name" : "@Author::KENTNL/commit_release_changes", - "version" : "2.036" + "version" : "2.041" }, { "class" : "Dist::Zilla::Plugin::Git::CommitBuild", @@ -756,11 +774,12 @@ "release_message" : "Build results of %h (on %b)" }, "Dist::Zilla::Role::Git::Repo" : { + "git --version" : "2.11.1", "repo_root" : "." } }, "name" : "@Author::KENTNL/Git::CommitBuild", - "version" : "2.036" + "version" : "2.041" }, { "class" : "Dist::Zilla::Plugin::Git::Tag", @@ -769,11 +788,12 @@ "branch" : "releases", "changelog" : "Changes", "signed" : 0, - "tag" : "0.006002", + "tag" : "0.006003", "tag_format" : "%v", "tag_message" : "v%v" }, "Dist::Zilla::Role::Git::Repo" : { + "git --version" : "2.11.1", "repo_root" : "." }, "Dist::Zilla::Role::Git::StringFormatter" : { @@ -781,12 +801,12 @@ } }, "name" : "@Author::KENTNL/tag_release", - "version" : "2.036" + "version" : "2.041" }, { "class" : "Dist::Zilla::Plugin::UploadToCPAN", "name" : "@Author::KENTNL/UploadToCPAN", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::Twitter", @@ -811,7 +831,7 @@ } }, "name" : "@Author::KENTNL/Prereqs::Upgrade", - "version" : "0.001000" + "version" : "0.001001" }, { "class" : "Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled", @@ -832,12 +852,12 @@ } }, "name" : "@Author::KENTNL/always_latest_develop_bundle", - "version" : "0.003001" + "version" : "0.003002" }, { "class" : "Dist::Zilla::Plugin::RemovePrereqs::Provided", "name" : "@Author::KENTNL/RemovePrereqs::Provided", - "version" : "0.001000" + "version" : "0.001001" }, { "class" : "Dist::Zilla::Plugin::Prereqs", @@ -848,7 +868,7 @@ } }, "name" : "@Author::KENTNL/::Role::BundleDeps", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::Prereqs", @@ -859,7 +879,7 @@ } }, "name" : "TestRequires", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::Prereqs", @@ -870,7 +890,7 @@ } }, "name" : "TestRecommends", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::Prereqs::Soften", @@ -890,72 +910,73 @@ } }, "name" : "Prereqs::Soften", - "version" : "0.006002" + "version" : "0.006003" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":InstallModules", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":IncModules", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":TestFiles", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExtraTestFiles", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExecFiles", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":PerlExecFiles", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ShareFiles", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":MainModule", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":AllFiles", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":NoFiles", - "version" : "5.047" + "version" : "6.009" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : "@Author::KENTNL/MetaProvides::Package/AUTOVIV/:InstallModulesPM", - "version" : "5.047" + "version" : "6.009" } ], "zilla" : { "class" : "Dist::Zilla::Dist::Builder", "config" : { - "is_trial" : "0" + "is_trial" : 0 }, - "version" : "5.047" + "version" : "6.009" } }, - "x_authority" : "cpan:KENTNL" + "x_authority" : "cpan:KENTNL", + "x_serialization_backend" : "Cpanel::JSON::XS version 3.0227" } diff --git a/META.yml b/META.yml index f60250a..39a6f71 100644 --- a/META.yml +++ b/META.yml @@ -8,14 +8,14 @@ build_requires: Path::Tiny: '0' Test::DZil: '0' Test::Differences: '0' - Test::More: '0.89' + Test::More: '0' Test::Requires: '0' perl: '5.006' configure_requires: ExtUtils::MakeMaker: '0' perl: '5.006' dynamic_config: 0 -generated_by: 'Dist::Zilla version 5.047, CPAN::Meta::Converter version 2.150001' +generated_by: 'Dist::Zilla version 6.009, CPAN::Meta::Converter version 2.150010' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -24,7 +24,7 @@ name: Dist-Zilla-Plugin-Prereqs-Soften provides: Dist::Zilla::Plugin::Prereqs::Soften: file: lib/Dist/Zilla/Plugin/Prereqs/Soften.pm - version: '0.006002' + version: '0.006003' recommends: Moose: '2.000' strict: '0' @@ -39,4 +39,4 @@ resources: bugtracker: https://github.com/kentnl/Dist-Zilla-Plugin-Prereqs-Soften/issues homepage: https://github.com/kentnl/Dist-Zilla-Plugin-Prereqs-Soften repository: https://github.com/kentnl/Dist-Zilla-Plugin-Prereqs-Soften.git -version: '0.006002' +version: '0.006003' diff --git a/Makefile.PL b/Makefile.PL index 8c24dad..850db12 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.047. +# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.009. use strict; use warnings; @@ -28,10 +28,10 @@ my %WriteMakefileArgs = ( "Path::Tiny" => 0, "Test::DZil" => 0, "Test::Differences" => 0, - "Test::More" => "0.89", + "Test::More" => 0, "Test::Requires" => 0 }, - "VERSION" => "0.006002", + "VERSION" => "0.006003", "test" => { "TESTS" => "t/*.t t/00-compile/*.t" } @@ -48,7 +48,7 @@ my %FallbackPrereqs = ( "Path::Tiny" => 0, "Test::DZil" => 0, "Test::Differences" => 0, - "Test::More" => "0.89", + "Test::More" => 0, "Test::Requires" => 0 ); diff --git a/README b/README index bba181e..131e523 100644 --- a/README +++ b/README @@ -25,7 +25,7 @@ Should you wish to install this module manually, the procedure is COPYRIGHT AND LICENSE -This software is copyright (c) 2016 by Kent Fredric +This software is copyright (c) 2017 by Kent Fredric . This is free software; you can redistribute it and/or modify it under diff --git a/dist.ini b/dist.ini index 21386a3..16e9f45 100644 --- a/dist.ini +++ b/dist.ini @@ -2,13 +2,13 @@ ; Edit that file or the bundles contained within for long-term changes. ; Generated by Dist::Zilla::Plugin::Author::KENTNL::DistINI version 2.012000 at Tue Feb 18 14:46:56 2014 ; vim: syntax=dosini -; Uncomment this to bootstrap via self name = Dist-Zilla-Plugin-Prereqs-Soften author = Kent Fredric license = Perl_5 copyright_holder = Kent Fredric -[Bootstrap::lib] +[lib] +lib = lib [MetaConfig / @Author::KENTNL/MetaConfig] @@ -77,6 +77,8 @@ trailing_whitespace = 1 [Test::MinimumVersion / @Author::KENTNL/Test::MinimumVersion] [Test::Compile::PerFile / @Author::KENTNL/Test::Compile::PerFile] +:version = 0.003902 +test_template = 02-raw-require.t.tpl [Test::Perl::Critic / @Author::KENTNL/Test::Perl::Critic] @@ -95,7 +97,7 @@ replacer = replace_with_blank -phase = develop -type = suggests Dist::Zilla::App::Command::bakeini = 0.001000 -Dist::Zilla::PluginBundle::Author::KENTNL = 2.025010 +Dist::Zilla::PluginBundle::Author::KENTNL = 2.025021 [Prereqs::AuthorDeps / @Author::KENTNL/Prereqs::AuthorDeps] @@ -234,7 +236,7 @@ Dist::Zilla::Plugin::RemovePrereqs::Provided = 0 Dist::Zilla::Plugin::RewriteVersion::Sanitized = 0 Dist::Zilla::Plugin::RunExtraTests = 0 Dist::Zilla::Plugin::Test::CPAN::Changes = 0 -Dist::Zilla::Plugin::Test::Compile::PerFile = 0 +Dist::Zilla::Plugin::Test::Compile::PerFile = 0.003902 Dist::Zilla::Plugin::Test::EOL = 0 Dist::Zilla::Plugin::Test::Kwalitee = 0 Dist::Zilla::Plugin::Test::MinimumVersion = 0 diff --git a/dist.ini.meta b/dist.ini.meta index be3f06c..57da192 100644 --- a/dist.ini.meta +++ b/dist.ini.meta @@ -5,18 +5,18 @@ author = Kent Fredric license = Perl_5 copyright_holder = Kent Fredric -; Uncomment this to bootstrap via self -[Bootstrap::lib] +[lib] +lib = lib [@Author::KENTNL] -:version = 2.025 +:version = 2.025020 normal_form = numify mantissa = 6 toolkit = eumm toolkit_hardness = soft twitter_extra_hash_tags = #distzilla -srcreadme = mkdn -bumpversions = 1 +src_readme = mkdn +bump_versions = 1 ; version_major = 0 ; version_minor = 1 diff --git a/lib/Dist/Zilla/Plugin/Prereqs/Soften.pm b/lib/Dist/Zilla/Plugin/Prereqs/Soften.pm index 124e1c1..3979c21 100644 --- a/lib/Dist/Zilla/Plugin/Prereqs/Soften.pm +++ b/lib/Dist/Zilla/Plugin/Prereqs/Soften.pm @@ -4,7 +4,7 @@ use warnings; package Dist::Zilla::Plugin::Prereqs::Soften; -our $VERSION = '0.006002'; +our $VERSION = '0.006003'; # ABSTRACT: Downgrade listed dependencies to recommendations if present. @@ -163,7 +163,7 @@ sub _build__copy_to_extras { push @{$to}, { phase => $copy_phase, relation => $copy_rel }; next; } - return $self->log_fatal(['copy_to contained value not in form: phase.relation, got %s', $copy ]); + return $self->log_fatal( [ 'copy_to contained value not in form: phase.relation, got %s', $copy ] ); } return $to; } @@ -183,6 +183,7 @@ sub _get_feature_modules { for my $phase_name ( keys %{$rel} ) { my $phase = $rel->{$phase_name}; for my $module ( keys %{$phase} ) { + $self->log_debug("Got module ${module} from ${feature}.${rel_name}.${phase}"); $hash->{$module} = 1; } } @@ -215,15 +216,38 @@ sub _soften_prereqs { for my $target ( @{ $conf->{to} } ) { next if 'none' eq $target->{relation}; - push @target_reqs, $prereqs->requirements_for( $target->{phase}, $target->{relation} ); + push @target_reqs, + { + phase => $target->{phase}, + relation => $target->{relation}, + reqs => $prereqs->requirements_for( $target->{phase}, $target->{relation} ), + }; } for my $module ( $source_reqs->required_modules ) { next unless $self->_user_wants_softening_on($module); + $self->log_debug("$conf->{from_phase}.$conf->{from_relation} contains $module"); my $reqstring = $source_reqs->requirements_for_module($module); + $self->log_debug( [ ' - %-20s %s = %s', "$conf->{from_phase}.$conf->{from_relation}", $module, $reqstring ] ); $source_reqs->clear_requirement($module); for my $target (@target_reqs) { - $target->add_string_requirement( $module, $reqstring ); + my $old_string = $target->{reqs}->requirements_for_module($module); + $target->{reqs}->add_string_requirement( $module, $reqstring ); + my $new_string = $target->{reqs}->requirements_for_module($module); + + # Calcluating the nature of the change for log debugging + my $change = + ( defined $old_string ) + ? ( $old_string eq $new_string ) + ? ( $new_string eq $reqstring ) + ? " (was already \"$new_string\")" + : " (unchanged from \"$old_string\")" + : " (was \"$old_string\", now \"$new_string\")" + : ( defined $new_string ) ? ' (new requirement)' + : ' (Possible Error, undef after assignment)'; + + $self->log_debug( [ ' + %-20s %s = %s%s', "$target->{phase}.$target->{relation}", $module, $reqstring, $change ] ); + } } return $self; @@ -232,6 +256,7 @@ sub _soften_prereqs { sub register_prereqs { my ($self) = @_; + $self->log_debug( [ 'Softening modules: %s', join q[, ], sort keys %{ $self->_modules_hash } ] ); for my $phase (qw( build test runtime )) { for my $relation (qw( requires )) { $self->_soften_prereqs( @@ -260,7 +285,7 @@ Dist::Zilla::Plugin::Prereqs::Soften - Downgrade listed dependencies to recommen =head1 VERSION -version 0.006002 +version 0.006003 =head1 SYNOPSIS @@ -353,7 +378,7 @@ Kent Fredric =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2016 by Kent Fredric . +This software is copyright (c) 2017 by Kent Fredric . 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 --git a/misc/Changes.deps b/misc/Changes.deps index 62dbff2..2c8b280 100644 --- a/misc/Changes.deps +++ b/misc/Changes.deps @@ -1,6 +1,10 @@ This file contains changes in REQUIRED dependencies for standard CPAN phases (configure/build/runtime/test) -0.006002 +0.006003 + [Changed / test requires] + - Test::More 0.89 → 0 + +0.006002 2016-05-01T18:03:38Z [Added / test requires] - Path::Tiny - Test::Differences diff --git a/misc/Changes.deps.all b/misc/Changes.deps.all index 61fcb38..0c27348 100644 --- a/misc/Changes.deps.all +++ b/misc/Changes.deps.all @@ -1,6 +1,24 @@ This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL dependencies for all phases (configure/build/runtime/test/develop) -0.006002 +0.006003 + [Added / develop requires] + - Dist::Zilla::Plugin::lib + - Test::MinimumVersion + + [Changed / develop requires] + - Dist::Zilla::Plugin::Test::Compile::PerFile 0 → 0.003902 + + [Changed / develop suggests] + - Dist::Zilla::App::Command::bakeini 0.002005 → 0.002006 + - Dist::Zilla::PluginBundle::Author::KENTNL 2.025010 → 2.025021 + + [Changed / test requires] + - Test::More 0.89 → 0 + + [Removed / develop requires] + - Dist::Zilla::Plugin::Bootstrap::lib + +0.006002 2016-05-01T18:03:38Z [Added / test recommends] - Path::Tiny 0.058 diff --git a/misc/Changes.deps.dev b/misc/Changes.deps.dev index ccd4aea..4f9fbba 100644 --- a/misc/Changes.deps.dev +++ b/misc/Changes.deps.dev @@ -1,6 +1,21 @@ This file contains changes to DEVELOPMENT dependencies only ( both REQUIRED and OPTIONAL ) -0.006002 +0.006003 + [Added / develop requires] + - Dist::Zilla::Plugin::lib + - Test::MinimumVersion + + [Changed / develop requires] + - Dist::Zilla::Plugin::Test::Compile::PerFile 0 → 0.003902 + + [Changed / develop suggests] + - Dist::Zilla::App::Command::bakeini 0.002005 → 0.002006 + - Dist::Zilla::PluginBundle::Author::KENTNL 2.025010 → 2.025021 + + [Removed / develop requires] + - Dist::Zilla::Plugin::Bootstrap::lib + +0.006002 2016-05-01T18:03:38Z [Changed / develop suggests] - Dist::Zilla::PluginBundle::Author::KENTNL 2.025002 → 2.025010 diff --git a/misc/Changes.deps.opt b/misc/Changes.deps.opt index cf7d819..c640b6d 100644 --- a/misc/Changes.deps.opt +++ b/misc/Changes.deps.opt @@ -1,6 +1,8 @@ This file contains changes in OPTIONAL dependencies for standard CPAN phases (configure/build/runtime/test) -0.006002 +0.006003 + +0.006002 2016-05-01T18:03:38Z [Added / test recommends] - Path::Tiny 0.058 diff --git a/misc/built_with.json b/misc/built_with.json index 50c028d..d50c997 100644 --- a/misc/built_with.json +++ b/misc/built_with.json @@ -1,97 +1,98 @@ { "modules" : { - "CPAN::Meta" : "2.150001", - "Dist::Zilla" : "5.047", - "Dist::Zilla::App::Command::bakeini" : "0.002005", + "CPAN::Meta" : "2.150010", + "Dist::Zilla" : "6.009", + "Dist::Zilla::App::Command::bakeini" : "0.002006", "Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING" : "0.001005", - "Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes" : "0.005001", - "Dist::Zilla::Plugin::Author::KENTNL::TravisCI" : "0.001002", + "Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes" : "0.005004", + "Dist::Zilla::Plugin::Author::KENTNL::TravisCI" : "0.001004", "Dist::Zilla::Plugin::Authority" : "1.009", - "Dist::Zilla::Plugin::AutoPrereqs" : "5.047", - "Dist::Zilla::Plugin::Bootstrap::lib" : "1.001000", + "Dist::Zilla::Plugin::AutoPrereqs" : "6.009", "Dist::Zilla::Plugin::BumpVersionAfterRelease" : "0.015", - "Dist::Zilla::Plugin::ConfirmRelease" : "5.047", - "Dist::Zilla::Plugin::CopyFilesFromBuild" : "0.161150", - "Dist::Zilla::Plugin::Git::Check" : "2.036", - "Dist::Zilla::Plugin::Git::Commit" : "2.036", - "Dist::Zilla::Plugin::Git::CommitBuild" : "2.036", - "Dist::Zilla::Plugin::Git::Contributors" : "0.022", - "Dist::Zilla::Plugin::Git::GatherDir" : "2.036", + "Dist::Zilla::Plugin::ConfirmRelease" : "6.009", + "Dist::Zilla::Plugin::CopyFilesFromBuild" : "0.163040", + "Dist::Zilla::Plugin::Git::Check" : "2.041", + "Dist::Zilla::Plugin::Git::Commit" : "2.041", + "Dist::Zilla::Plugin::Git::CommitBuild" : "2.041", + "Dist::Zilla::Plugin::Git::Contributors" : "0.029", + "Dist::Zilla::Plugin::Git::GatherDir" : "2.041", "Dist::Zilla::Plugin::Git::NextRelease" : "0.004000", - "Dist::Zilla::Plugin::Git::Tag" : "2.036", + "Dist::Zilla::Plugin::Git::Tag" : "2.041", "Dist::Zilla::Plugin::GithubMeta" : "0.54", - "Dist::Zilla::Plugin::License" : "5.047", - "Dist::Zilla::Plugin::MakeMaker" : "5.047", - "Dist::Zilla::Plugin::Manifest" : "5.047", - "Dist::Zilla::Plugin::ManifestSkip" : "5.047", - "Dist::Zilla::Plugin::MetaConfig" : "5.047", - "Dist::Zilla::Plugin::MetaData::BuiltWith" : "1.004002", - "Dist::Zilla::Plugin::MetaJSON" : "5.047", - "Dist::Zilla::Plugin::MetaProvides::Package" : "2.004000", - "Dist::Zilla::Plugin::MetaTests" : "5.047", - "Dist::Zilla::Plugin::MetaYAML::Minimal" : "0.001000", + "Dist::Zilla::Plugin::License" : "6.009", + "Dist::Zilla::Plugin::MakeMaker" : "6.009", + "Dist::Zilla::Plugin::Manifest" : "6.009", + "Dist::Zilla::Plugin::ManifestSkip" : "6.009", + "Dist::Zilla::Plugin::MetaConfig" : "6.009", + "Dist::Zilla::Plugin::MetaData::BuiltWith" : "1.004005", + "Dist::Zilla::Plugin::MetaJSON" : "6.009", + "Dist::Zilla::Plugin::MetaProvides::Package" : "2.004003", + "Dist::Zilla::Plugin::MetaTests" : "6.009", + "Dist::Zilla::Plugin::MetaYAML::Minimal" : "0.001001", "Dist::Zilla::Plugin::MinimumPerl" : "1.006", - "Dist::Zilla::Plugin::OptionalFeature" : "0.022", - "Dist::Zilla::Plugin::PodCoverageTests" : "5.047", - "Dist::Zilla::Plugin::PodSyntaxTests" : "5.047", + "Dist::Zilla::Plugin::OptionalFeature" : "0.023", + "Dist::Zilla::Plugin::PodCoverageTests" : "6.009", + "Dist::Zilla::Plugin::PodSyntaxTests" : "6.009", "Dist::Zilla::Plugin::PodWeaver" : "4.008", - "Dist::Zilla::Plugin::Prereqs" : "5.047", - "Dist::Zilla::Plugin::Prereqs::AuthorDeps" : "0.005", - "Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled" : "0.003001", - "Dist::Zilla::Plugin::Prereqs::Upgrade" : "0.001000", - "Dist::Zilla::Plugin::Readme::Brief" : "0.003000", - "Dist::Zilla::Plugin::ReadmeAnyFromPod" : "0.161170", - "Dist::Zilla::Plugin::RemovePrereqs::Provided" : "0.001000", - "Dist::Zilla::Plugin::RewriteVersion::Sanitized" : "0.001005", - "Dist::Zilla::Plugin::RunExtraTests" : "0.028", - "Dist::Zilla::Plugin::Test::CPAN::Changes" : "0.009", - "Dist::Zilla::Plugin::Test::Compile::PerFile" : "0.003000", - "Dist::Zilla::Plugin::Test::EOL" : "0.18", + "Dist::Zilla::Plugin::Prereqs" : "6.009", + "Dist::Zilla::Plugin::Prereqs::AuthorDeps" : "0.006", + "Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled" : "0.003002", + "Dist::Zilla::Plugin::Prereqs::Upgrade" : "0.001001", + "Dist::Zilla::Plugin::Readme::Brief" : "0.003001", + "Dist::Zilla::Plugin::ReadmeAnyFromPod" : "0.163250", + "Dist::Zilla::Plugin::RemovePrereqs::Provided" : "0.001001", + "Dist::Zilla::Plugin::RewriteVersion::Sanitized" : "0.001006", + "Dist::Zilla::Plugin::RunExtraTests" : "0.029", + "Dist::Zilla::Plugin::Test::CPAN::Changes" : "0.012", + "Dist::Zilla::Plugin::Test::Compile::PerFile" : "0.004000", + "Dist::Zilla::Plugin::Test::EOL" : "0.19", "Dist::Zilla::Plugin::Test::Kwalitee" : "2.12", - "Dist::Zilla::Plugin::Test::MinimumVersion" : "2.000006", + "Dist::Zilla::Plugin::Test::MinimumVersion" : "2.000007", "Dist::Zilla::Plugin::Test::Perl::Critic" : "3.000", - "Dist::Zilla::Plugin::Test::ReportPrereqs" : "0.024", - "Dist::Zilla::Plugin::TestRelease" : "5.047", + "Dist::Zilla::Plugin::Test::ReportPrereqs" : "0.025", + "Dist::Zilla::Plugin::TestRelease" : "6.009", "Dist::Zilla::Plugin::Twitter" : "0.026", - "Dist::Zilla::Plugin::UploadToCPAN" : "5.047", - "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.025010", - "Dist::Zilla::Role::PrereqSource" : "5.047", - "English" : "1.09", - "ExtUtils::MakeMaker" : "7.14", - "File::Spec" : "3.56", - "Moose" : "2.1800", - "Moose::Util::TypeConstraints" : "2.1800", - "MooseX::Types::Moose" : "0.46", - "Path::Tiny" : "0.088", + "Dist::Zilla::Plugin::UploadToCPAN" : "6.009", + "Dist::Zilla::Plugin::lib" : "0.001001", + "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.025021", + "Dist::Zilla::Role::PrereqSource" : "6.009", + "English" : "1.10", + "ExtUtils::MakeMaker" : "7.24", + "File::Spec" : "3.66", + "Moose" : "2.2004", + "Moose::Util::TypeConstraints" : "2.2004", + "MooseX::Types::Moose" : "0.50", + "Path::Tiny" : "0.104", "Pod::Coverage::TrustPod" : "0.100003", "Software::License::Perl_5" : "0.103012", "Test::CPAN::Changes" : "0.400002", "Test::CPAN::Meta" : "0.25", - "Test::DZil" : "5.047", + "Test::DZil" : "6.009", "Test::Differences" : "0.64", "Test::EOL" : "1.6", - "Test::Kwalitee" : "1.22", - "Test::More" : "1.001014", + "Test::Kwalitee" : "1.25", + "Test::MinimumVersion" : "0.101082", + "Test::More" : "1.302073", "Test::Pod" : "1.51", "Test::Pod::Coverage" : "1.10", "Test::Requires" : "0.10", - "strict" : "1.09", - "warnings" : "1.34" + "strict" : "1.11", + "warnings" : "1.37" }, "perl" : { - "original" : "v5.22.1", + "original" : "v5.25.10", "qv" : 1, "version" : [ 5, - 22, - 1 + 25, + 10 ] }, "perl-config" : { - "gccversion" : "5.2.0", + "gccversion" : "5.4.0", "myarchname" : "x86_64-linux", "osname" : "linux" }, "platform" : "linux", - "uname" : "Linux 4.4.0-gentoo-r1 x86_64 GenuineIntel GNU/Linux" + "uname" : "Linux 4.8.5-gentoo x86_64 GenuineIntel GNU/Linux" } diff --git a/t/00-compile/lib_Dist_Zilla_Plugin_Prereqs_Soften_pm.t b/t/00-compile/lib_Dist_Zilla_Plugin_Prereqs_Soften_pm.t index 0d96e93..8957f31 100644 --- a/t/00-compile/lib_Dist_Zilla_Plugin_Prereqs_Soften_pm.t +++ b/t/00-compile/lib_Dist_Zilla_Plugin_Prereqs_Soften_pm.t @@ -1,11 +1,17 @@ -use strict; -use warnings; - # This test was generated for -# using by Dist::Zilla::Plugin::Test::Compile::PerFile ( @Author::KENTNL/Test::Compile::PerFile ) version 0.003000 -# with template 01-basic.t.tpl - -use Test::More 0.89 tests => 1; - -require_ok("lib/Dist/Zilla/Plugin/Prereqs/Soften.pm"); +# using by Dist::Zilla::Plugin::Test::Compile::PerFile ( @Author::KENTNL/Test::Compile::PerFile ) version 0.004000 +# with template 02-raw-require.t.tpl +my $file = "Dist/Zilla/Plugin/Prereqs/Soften.pm"; +my $err; +{ + local $@; + eval { require $file; 1 } or $err = $@; +}; +if( not defined $err ) { + print "1..1\nok 1 - require ${file}\n"; + exit 0; +} +print "1..1\nnot ok 1 - require ${file}\n"; +print STDERR "# ${_}\n" for split /\n/, $err; +exit 1; diff --git a/t/00-report-prereqs.dd b/t/00-report-prereqs.dd index 1f4544d..c56bb78 100644 --- a/t/00-report-prereqs.dd +++ b/t/00-report-prereqs.dd @@ -19,7 +19,6 @@ do { my $x = { 'Dist::Zilla::Plugin::Author::KENTNL::TravisCI' => '0.001002', 'Dist::Zilla::Plugin::Authority' => '1.006', 'Dist::Zilla::Plugin::AutoPrereqs' => '0', - 'Dist::Zilla::Plugin::Bootstrap::lib' => '0', 'Dist::Zilla::Plugin::BumpVersionAfterRelease' => '0', 'Dist::Zilla::Plugin::ConfirmRelease' => '0', 'Dist::Zilla::Plugin::CopyFilesFromBuild' => '0', @@ -56,7 +55,7 @@ do { my $x = { 'Dist::Zilla::Plugin::RewriteVersion::Sanitized' => '0', 'Dist::Zilla::Plugin::RunExtraTests' => '0', 'Dist::Zilla::Plugin::Test::CPAN::Changes' => '0', - 'Dist::Zilla::Plugin::Test::Compile::PerFile' => '0', + 'Dist::Zilla::Plugin::Test::Compile::PerFile' => '0.003902', 'Dist::Zilla::Plugin::Test::EOL' => '0', 'Dist::Zilla::Plugin::Test::Kwalitee' => '0', 'Dist::Zilla::Plugin::Test::MinimumVersion' => '0', @@ -65,6 +64,7 @@ do { my $x = { 'Dist::Zilla::Plugin::TestRelease' => '0', 'Dist::Zilla::Plugin::Twitter' => '0', 'Dist::Zilla::Plugin::UploadToCPAN' => '0', + 'Dist::Zilla::Plugin::lib' => '0', 'English' => '0', 'Pod::Coverage::TrustPod' => '0', 'Software::License::Perl_5' => '0', @@ -72,6 +72,7 @@ do { my $x = { 'Test::CPAN::Meta' => '0', 'Test::EOL' => '0', 'Test::Kwalitee' => '1.21', + 'Test::MinimumVersion' => '0', 'Test::More' => '0.96', 'Test::Pod' => '1.41', 'Test::Pod::Coverage' => '1.08', @@ -79,8 +80,8 @@ do { my $x = { 'warnings' => '0' }, 'suggests' => { - 'Dist::Zilla::App::Command::bakeini' => '0.002005', - 'Dist::Zilla::PluginBundle::Author::KENTNL' => '2.025010' + 'Dist::Zilla::App::Command::bakeini' => '0.002006', + 'Dist::Zilla::PluginBundle::Author::KENTNL' => '2.025021' } }, 'runtime' => { @@ -112,7 +113,7 @@ do { my $x = { 'Path::Tiny' => '0', 'Test::DZil' => '0', 'Test::Differences' => '0', - 'Test::More' => '0.89', + 'Test::More' => '0', 'Test::Requires' => '0', 'perl' => '5.006' } diff --git a/t/00-report-prereqs.t b/t/00-report-prereqs.t index d1f9a07..e338372 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.024 +# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.025 use Test::More tests => 1; @@ -78,10 +78,10 @@ my $full_prereqs = _merge_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) } ) { - $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs); - } +if ( $source && $HAS_CPAN_META + && (my $meta = eval { CPAN::Meta->load_file($source) } ) +) { + $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs); } else { $source = 'static metadata'; diff --git a/xt/author/eol.t b/xt/author/eol.t index 59fc901..7a7e42c 100644 --- a/xt/author/eol.t +++ b/xt/author/eol.t @@ -1,7 +1,7 @@ use strict; use warnings; -# this test was generated with Dist::Zilla::Plugin::Test::EOL 0.18 +# this test was generated with Dist::Zilla::Plugin::Test::EOL 0.19 use Test::More 0.88; use Test::EOL; diff --git a/xt/release/cpan-changes.t b/xt/release/cpan-changes.t index 8e6e413..286005a 100644 --- a/xt/release/cpan-changes.t +++ b/xt/release/cpan-changes.t @@ -1,11 +1,10 @@ -#!perl - use strict; use warnings; -use Test::More 0.96 tests => 2; -use_ok('Test::CPAN::Changes'); +# this test was generated with Dist::Zilla::Plugin::Test::CPAN::Changes 0.012 + +use Test::More 0.96 tests => 1; +use Test::CPAN::Changes; subtest 'changes_ok' => sub { changes_file_ok('Changes'); }; -done_testing();