From 9a45789a6df60b52a49ae7b31d8b7f0069780b37 Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Wed, 29 Jun 2016 18:37:06 +1200 Subject: [PATCH] Build results of 3870e79 (on master) --- Changes | 10 + MANIFEST | 3 +- META.json | 188 +++++++++---------- META.yml | 15 +- Makefile.PL | 10 +- dist.ini | 3 - dist.ini.meta | 3 - lib/Dist/Zilla/MetaProvides/ProvideRecord.pm | 4 +- lib/Dist/Zilla/MetaProvides/Types.pm | 4 +- lib/Dist/Zilla/Plugin/MetaProvides.pm | 4 +- lib/Dist/Zilla/Role/MetaProvider/Provider.pm | 21 ++- misc/Changes.deps | 12 +- misc/Changes.deps.all | 15 +- misc/Changes.deps.dev | 4 +- misc/Changes.deps.opt | 6 +- misc/built_with.json | 89 +++++---- t/00-report-prereqs.dd | 4 +- t/01-Provider/01-boolean-attrs.t | 22 ++- t/01-Provider/02-resolve-versions.t | 22 ++- t/01-Provider/03-metanoindex.t | 26 +-- t/01-Provider/04-integration.t | 77 ++++++++ t/02-MetaProvides-ProvideRecord.t | 23 ++- t/lib/Dist/Zilla/Plugin/FakePlugin.pm | 12 +- xt/author/eol.t | 1 + 24 files changed, 358 insertions(+), 220 deletions(-) create mode 100644 t/01-Provider/04-integration.t diff --git a/Changes b/Changes index 2c849b2..dde4fae 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,15 @@ Revision history for Dist-Zilla-Plugin-MetaProvides +2.002001 2016-06-29T06:09:34Z 2be5312 + - Remove usage of ConfigDumper and inline dump_config code instead. + - use '$' on front of role-injected '$VERSION' identifier to be clearer. + - Remove usage of my dztest testing util. + + [Dependencies::Stats] + - Dependencies changed since 2.002000, see misc/*.deps* for details + - runtime: -1 + - test: +1 -1 (recommends: +1) + 2.002000 2016-04-22T14:20:31Z 8cd4f33 - IMPORTANT: Previously, MetaNoIndex compatibility implemented the "namespace" feature in contradiction of https://metacpan.org/pod/CPAN::Meta::Spec#namespace , which means packages that exactly matched the "namespace" diff --git a/MANIFEST b/MANIFEST index 7e58066..7bbf625 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.043. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.047. .gitignore .mailmap .perltidyrc @@ -34,6 +34,7 @@ t/00-report-prereqs.t t/01-Provider/01-boolean-attrs.t t/01-Provider/02-resolve-versions.t t/01-Provider/03-metanoindex.t +t/01-Provider/04-integration.t t/02-MetaProvides-ProvideRecord.t t/03-Types.t t/04-MetaProvides.t diff --git a/META.json b/META.json index 43bc215..c4edcb0 100644 --- a/META.json +++ b/META.json @@ -4,13 +4,13 @@ "Kent Fredric " ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 5.043, CPAN::Meta::Converter version 2.150001", + "generated_by" : "Dist::Zilla version 5.047, CPAN::Meta::Converter version 2.150005", "license" : [ "perl_5" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", - "version" : "2" + "version" : 2 }, "name" : "Dist-Zilla-Plugin-MetaProvides", "no_index" : { @@ -108,7 +108,6 @@ "requires" : { "Carp" : "0", "Dist::Zilla::Role::MetaProvider" : "0", - "Dist::Zilla::Util::ConfigDumper" : "0.002001", "Hash::Merge::Simple" : "0", "Moose" : "0", "Moose::Role" : "0", @@ -127,12 +126,13 @@ "recommends" : { "CPAN::Meta" : "2.120900", "ExtUtils::MakeMaker" : "7.00", + "Path::Tiny" : "0.058", "Test::More" : "0.99" }, "requires" : { - "Dist::Zilla::Util::Test::KENTNL" : "1.003001", "ExtUtils::MakeMaker" : "0", "File::Spec" : "0", + "Path::Tiny" : "0", "Scalar::Util" : "0", "Test::DZil" : "0", "Test::Fatal" : "0", @@ -148,19 +148,19 @@ "provides" : { "Dist::Zilla::MetaProvides::ProvideRecord" : { "file" : "lib/Dist/Zilla/MetaProvides/ProvideRecord.pm", - "version" : "2.002000" + "version" : "2.002001" }, "Dist::Zilla::MetaProvides::Types" : { "file" : "lib/Dist/Zilla/MetaProvides/Types.pm", - "version" : "2.002000" + "version" : "2.002001" }, "Dist::Zilla::Plugin::MetaProvides" : { "file" : "lib/Dist/Zilla/Plugin/MetaProvides.pm", - "version" : "2.002000" + "version" : "2.002001" }, "Dist::Zilla::Role::MetaProvider::Provider" : { "file" : "lib/Dist/Zilla/Role/MetaProvider/Provider.pm", - "version" : "2.002000" + "version" : "2.002001" } }, "release_status" : "testing", @@ -175,7 +175,7 @@ "web" : "https://github.com/kentnl/Dist-Zilla-Plugin-MetaProvides" } }, - "version" : "2.002000", + "version" : "2.002001", "x_BuiltWith" : { "external_file" : "misc/built_with.json" }, @@ -188,6 +188,7 @@ "class" : "Dist::Zilla::Plugin::Bootstrap::lib", "config" : { "Dist::Zilla::Role::Bootstrap" : { + "$Dist::Zilla::Role::Bootstrap::VERSION" : "1.001003", "distname" : "Dist-Zilla-Plugin-MetaProvides", "fallback" : "0", "try_built" : "1", @@ -200,7 +201,7 @@ { "class" : "Dist::Zilla::Plugin::MetaConfig", "name" : "@Author::KENTNL/MetaConfig", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::GithubMeta", @@ -215,24 +216,29 @@ { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : "@Author::KENTNL/MetaProvides::Package/AUTOVIV/:InstallModulesPM", - "version" : "5.043" + "version" : "5.047" } ] }, "Dist::Zilla::Role::MetaProvider::Provider" : { - "Dist::Zilla::Role::MetaProvider::Provider::VERSION" : "2.002000", + "$Dist::Zilla::Role::MetaProvider::Provider::VERSION" : "2.002001", "inherit_missing" : "1", "inherit_version" : "1", "meta_noindex" : "1" + }, + "Dist::Zilla::Role::ModuleMetadata" : { + "Module::Metadata" : "1.000031", + "version" : "0.003" } }, "name" : "@Author::KENTNL/MetaProvides::Package", - "version" : "2.003001" + "version" : "2.004000" }, { "class" : "Dist::Zilla::Plugin::MetaData::BuiltWith", "config" : { "Dist::Zilla::Plugin::MetaData::BuiltWith" : { + "$Module::Metadata::VERSION" : "1.000031", "_stash_key" : "x_BuiltWith", "external_file_name" : "misc/built_with.json", "show_config" : "1", @@ -251,7 +257,7 @@ } }, "name" : "@Author::KENTNL/MetaData::BuiltWith", - "version" : "1.004002" + "version" : "1.004003" }, { "class" : "Dist::Zilla::Plugin::Git::Contributors", @@ -266,7 +272,7 @@ } }, "name" : "@Author::KENTNL/Git::Contributors", - "version" : "0.015" + "version" : "0.023" }, { "class" : "Dist::Zilla::Plugin::Git::GatherDir", @@ -292,17 +298,17 @@ } }, "name" : "@Author::KENTNL/Git::GatherDir", - "version" : "2.036" + "version" : "2.039" }, { "class" : "Dist::Zilla::Plugin::License", "name" : "@Author::KENTNL/License", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::MetaJSON", "name" : "@Author::KENTNL/MetaJSON", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::MetaYAML::Minimal", @@ -318,7 +324,7 @@ { "class" : "Dist::Zilla::Plugin::Manifest", "name" : "@Author::KENTNL/Manifest", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::Author::KENTNL::TravisCI", @@ -343,7 +349,7 @@ "Dist::Zilla::Role::RepoFileInjector" : { "allow_overwrite" : 1, "repo_root" : ".", - "version" : "0.005" + "version" : "0.007" } }, "name" : "@Author::KENTNL/Author::KENTNL::CONTRIBUTING", @@ -352,22 +358,22 @@ { "class" : "Dist::Zilla::Plugin::CopyFilesFromBuild", "name" : "@Author::KENTNL/CopyXBuild", - "version" : "0.151680" + "version" : "0.161350" }, { "class" : "Dist::Zilla::Plugin::MetaTests", "name" : "@Author::KENTNL/MetaTests", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::PodCoverageTests", "name" : "@Author::KENTNL/PodCoverageTests", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::PodSyntaxTests", "name" : "@Author::KENTNL/PodSyntaxTests", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::Test::ReportPrereqs", @@ -409,7 +415,7 @@ { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : "@Author::KENTNL/Test::Compile::PerFile/AUTOVIV/:InstallModulesPM", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::Test::Compile::PerFile", @@ -439,7 +445,7 @@ { "class" : "Dist::Zilla::Plugin::ManifestSkip", "name" : "@Author::KENTNL/ManifestSkip", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::RewriteVersion::Sanitized", @@ -454,6 +460,7 @@ "skip_version_provider" : 0 }, "Dist::Zilla::Role::Version::Sanitize" : { + "$Dist::Zilla::Role::Version::Sanitize::VERSION" : "0.002002", "mantissa" : "6", "normal_form" : "numify" } @@ -473,123 +480,123 @@ { "class" : "Pod::Weaver::Plugin::EnsurePod5", "name" : "@CorePrep/EnsurePod5", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Plugin::H1Nester", "name" : "@CorePrep/H1Nester", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Plugin::SingleEncoding", "name" : "-SingleEncoding", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Name", "name" : "Name", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Version", "name" : "Version", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Region", "name" : "prelude", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Generic", "name" : "QUICK REFERENCE", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Generic", "name" : "SYNOPSIS", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Generic", "name" : "DESCRIPTION", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Generic", "name" : "OVERVIEW", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "METHODS", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "ATTRIBUTES", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "SUBTYPES", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "PERFORMS", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "REQUIRES", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "PMETHODS", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "PRIVATE_ATTRIBUTES", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "PRIVATE_METHODS", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Leftovers", "name" : "Leftovers", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Region", "name" : "postlude", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Authors", "name" : "Authors", - "version" : "4.012" + "version" : "4.013" }, { "class" : "Pod::Weaver::Section::Legal", "name" : "Legal", - "version" : "4.012" + "version" : "4.013" } ] } }, "name" : "@Author::KENTNL/PodWeaver", - "version" : "4.006" + "version" : "4.008" }, { "class" : "Dist::Zilla::Plugin::AutoPrereqs", "name" : "@Author::KENTNL/AutoPrereqs", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::Prereqs", @@ -600,12 +607,12 @@ } }, "name" : "@Author::KENTNL/BundleDevelSuggests", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::Prereqs::AuthorDeps", "name" : "@Author::KENTNL/Prereqs::AuthorDeps", - "version" : "0.005" + "version" : "0.006" }, { "class" : "Dist::Zilla::Plugin::MinimumPerl", @@ -625,7 +632,7 @@ } }, "name" : "@Author::KENTNL/MakeMaker", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes", @@ -635,7 +642,7 @@ { "class" : "Dist::Zilla::Plugin::Readme::Brief", "name" : "@Author::KENTNL/ShippedReadme", - "version" : "0.002005" + "version" : "0.003000" }, { "class" : "Dist::Zilla::Plugin::ReadmeAnyFromPod", @@ -645,7 +652,7 @@ } }, "name" : "@Author::KENTNL/ReadmeAnyFromPod", - "version" : "0.160630" + "version" : "0.161170" }, { "class" : "Dist::Zilla::Plugin::Test::CPAN::Changes", @@ -660,17 +667,17 @@ } }, "name" : "@Author::KENTNL/RunExtraTests", - "version" : "0.028" + "version" : "0.029" }, { "class" : "Dist::Zilla::Plugin::TestRelease", "name" : "@Author::KENTNL/TestRelease", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::ConfirmRelease", "name" : "@Author::KENTNL/ConfirmRelease", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::Git::Check", @@ -691,7 +698,7 @@ } }, "name" : "@Author::KENTNL/Git::Check", - "version" : "2.036" + "version" : "2.039" }, { "class" : "Dist::Zilla::Plugin::Git::Commit", @@ -716,7 +723,7 @@ } }, "name" : "@Author::KENTNL/commit_dirty_files", - "version" : "2.036" + "version" : "2.039" }, { "class" : "Dist::Zilla::Plugin::Git::Tag", @@ -725,7 +732,7 @@ "branch" : null, "changelog" : "Changes", "signed" : 0, - "tag" : "2.002000-source", + "tag" : "2.002001-source", "tag_format" : "%v-source", "tag_message" : "v%v" }, @@ -737,7 +744,7 @@ } }, "name" : "@Author::KENTNL/tag_master", - "version" : "2.036" + "version" : "2.039" }, { "class" : "Dist::Zilla::Plugin::Git::NextRelease", @@ -762,7 +769,7 @@ } }, "name" : "@Author::KENTNL/BumpVersionAfterRelease", - "version" : "0.012" + "version" : "0.015" }, { "class" : "Dist::Zilla::Plugin::Git::Commit", @@ -789,7 +796,7 @@ } }, "name" : "@Author::KENTNL/commit_release_changes", - "version" : "2.036" + "version" : "2.039" }, { "class" : "Dist::Zilla::Plugin::Git::CommitBuild", @@ -807,7 +814,7 @@ } }, "name" : "@Author::KENTNL/Git::CommitBuild", - "version" : "2.036" + "version" : "2.039" }, { "class" : "Dist::Zilla::Plugin::Git::Tag", @@ -816,7 +823,7 @@ "branch" : "releases", "changelog" : "Changes", "signed" : 0, - "tag" : "2.002000", + "tag" : "2.002001", "tag_format" : "%v", "tag_message" : "v%v" }, @@ -828,12 +835,12 @@ } }, "name" : "@Author::KENTNL/tag_release", - "version" : "2.036" + "version" : "2.039" }, { "class" : "Dist::Zilla::Plugin::UploadToCPAN", "name" : "@Author::KENTNL/UploadToCPAN", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::Twitter", @@ -895,7 +902,7 @@ } }, "name" : "@Author::KENTNL/::Role::BundleDeps", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::Prereqs", @@ -906,7 +913,7 @@ } }, "name" : "RuntimeSuggests", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::Prereqs", @@ -917,7 +924,7 @@ } }, "name" : "TestSuggests", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::Prereqs", @@ -928,78 +935,67 @@ } }, "name" : "DevelopRequires", - "version" : "5.043" - }, - { - "class" : "Dist::Zilla::Plugin::Prereqs", - "config" : { - "Dist::Zilla::Plugin::Prereqs" : { - "phase" : "test", - "type" : "requires" - } - }, - "name" : "TestRequires", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::MetaNoIndex", "name" : "MetaNoIndex", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":InstallModules", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":IncModules", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":TestFiles", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExtraTestFiles", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExecFiles", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":PerlExecFiles", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ShareFiles", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":MainModule", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":AllFiles", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":NoFiles", - "version" : "5.043" + "version" : "5.047" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : "@Author::KENTNL/MetaProvides::Package/AUTOVIV/:InstallModulesPM", - "version" : "5.043" + "version" : "5.047" } ], "zilla" : { @@ -1007,7 +1003,7 @@ "config" : { "is_trial" : "1" }, - "version" : "5.043" + "version" : "5.047" } }, "x_authority" : "cpan:KENTNL" diff --git a/META.yml b/META.yml index a33240f..9582d20 100644 --- a/META.yml +++ b/META.yml @@ -3,9 +3,9 @@ abstract: "Generating and Populating 'provides' in your META.yml" author: - 'Kent Fredric ' build_requires: - Dist::Zilla::Util::Test::KENTNL: '1.003001' ExtUtils::MakeMaker: '0' File::Spec: '0' + Path::Tiny: '0' Scalar::Util: '0' Test::DZil: '0' Test::Fatal: '0' @@ -16,7 +16,7 @@ configure_requires: ExtUtils::MakeMaker: '0' perl: '5.006' dynamic_config: 0 -generated_by: 'Dist::Zilla version 5.043, CPAN::Meta::Converter version 2.150001' +generated_by: 'Dist::Zilla version 5.047, CPAN::Meta::Converter version 2.150005' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -28,22 +28,21 @@ no_index: provides: Dist::Zilla::MetaProvides::ProvideRecord: file: lib/Dist/Zilla/MetaProvides/ProvideRecord.pm - version: '2.002000' + version: '2.002001' Dist::Zilla::MetaProvides::Types: file: lib/Dist/Zilla/MetaProvides/Types.pm - version: '2.002000' + version: '2.002001' Dist::Zilla::Plugin::MetaProvides: file: lib/Dist/Zilla/Plugin/MetaProvides.pm - version: '2.002000' + version: '2.002001' Dist::Zilla::Role::MetaProvider::Provider: file: lib/Dist/Zilla/Role/MetaProvider/Provider.pm - version: '2.002000' + version: '2.002001' recommends: Moose: '2.000' requires: Carp: '0' Dist::Zilla::Role::MetaProvider: '0' - Dist::Zilla::Util::ConfigDumper: '0.002001' Hash::Merge::Simple: '0' Moose: '0' Moose::Role: '0' @@ -57,4 +56,4 @@ resources: bugtracker: https://github.com/kentnl/Dist-Zilla-Plugin-MetaProvides/issues homepage: https://github.com/kentnl/Dist-Zilla-Plugin-MetaProvides repository: https://github.com/kentnl/Dist-Zilla-Plugin-MetaProvides.git -version: '2.002000' +version: '2.002001' diff --git a/Makefile.PL b/Makefile.PL index af682df..39b7704 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.043. +# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.047. use strict; use warnings; @@ -19,7 +19,6 @@ my %WriteMakefileArgs = ( "PREREQ_PM" => { "Carp" => 0, "Dist::Zilla::Role::MetaProvider" => 0, - "Dist::Zilla::Util::ConfigDumper" => "0.002001", "Hash::Merge::Simple" => 0, "Moose" => 0, "Moose::Role" => 0, @@ -30,16 +29,16 @@ my %WriteMakefileArgs = ( "warnings" => 0 }, "TEST_REQUIRES" => { - "Dist::Zilla::Util::Test::KENTNL" => "1.003001", "ExtUtils::MakeMaker" => 0, "File::Spec" => 0, + "Path::Tiny" => 0, "Scalar::Util" => 0, "Test::DZil" => 0, "Test::Fatal" => 0, "Test::More" => "0.96", "lib" => 0 }, - "VERSION" => "2.002000", + "VERSION" => "2.002001", "test" => { "TESTS" => "t/*.t t/00-compile/*.t t/01-Provider/*.t" } @@ -49,8 +48,6 @@ my %WriteMakefileArgs = ( my %FallbackPrereqs = ( "Carp" => 0, "Dist::Zilla::Role::MetaProvider" => 0, - "Dist::Zilla::Util::ConfigDumper" => "0.002001", - "Dist::Zilla::Util::Test::KENTNL" => "1.003001", "ExtUtils::MakeMaker" => 0, "File::Spec" => 0, "Hash::Merge::Simple" => 0, @@ -58,6 +55,7 @@ my %FallbackPrereqs = ( "Moose::Role" => 0, "MooseX::Types" => 0, "MooseX::Types::Moose" => 0, + "Path::Tiny" => 0, "Scalar::Util" => 0, "Test::DZil" => 0, "Test::Fatal" => 0, diff --git a/dist.ini b/dist.ini index 929aba5..86a8714 100644 --- a/dist.ini +++ b/dist.ini @@ -253,8 +253,5 @@ Dist::Zilla::Plugin::MetaNoIndex = 0 Dist::Zilla::Plugin::MetaNoIndex = 0 Dist::Zilla::Plugin::Bootstrap::lib = 0 -[Prereqs / TestRequires] -Dist::Zilla::Util::Test::KENTNL = 1.003001 - [MetaNoIndex] directory = t/lib diff --git a/dist.ini.meta b/dist.ini.meta index d0f215d..be78925 100644 --- a/dist.ini.meta +++ b/dist.ini.meta @@ -36,8 +36,5 @@ Dist::Zilla::Plugin::MetaNoIndex = 0 Dist::Zilla::Plugin::MetaNoIndex = 0 Dist::Zilla::Plugin::Bootstrap::lib = 0 -[Prereqs / TestRequires] -Dist::Zilla::Util::Test::KENTNL = 1.003001 - [MetaNoIndex] directory = t/lib diff --git a/lib/Dist/Zilla/MetaProvides/ProvideRecord.pm b/lib/Dist/Zilla/MetaProvides/ProvideRecord.pm index ab0c992..6fbebfc 100644 --- a/lib/Dist/Zilla/MetaProvides/ProvideRecord.pm +++ b/lib/Dist/Zilla/MetaProvides/ProvideRecord.pm @@ -4,7 +4,7 @@ use warnings; package Dist::Zilla::MetaProvides::ProvideRecord; -our $VERSION = '2.002000'; # TRIAL +our $VERSION = '2.002001'; # TRIAL # ABSTRACT: Data Management Record for MetaProvider::Provides Based Class @@ -112,7 +112,7 @@ Dist::Zilla::MetaProvides::ProvideRecord - Data Management Record for MetaProvid =head1 VERSION -version 2.002000 +version 2.002001 =head1 PUBLIC METHODS diff --git a/lib/Dist/Zilla/MetaProvides/Types.pm b/lib/Dist/Zilla/MetaProvides/Types.pm index 8c1943e..035b2ca 100644 --- a/lib/Dist/Zilla/MetaProvides/Types.pm +++ b/lib/Dist/Zilla/MetaProvides/Types.pm @@ -4,7 +4,7 @@ use warnings; package Dist::Zilla::MetaProvides::Types; -our $VERSION = '2.002000'; # TRIAL +our $VERSION = '2.002001'; # TRIAL # ABSTRACT: Utility Types for the MetaProvides Plugin @@ -60,7 +60,7 @@ Dist::Zilla::MetaProvides::Types - Utility Types for the MetaProvides Plugin =head1 VERSION -version 2.002000 +version 2.002001 =head1 SUBTYPES diff --git a/lib/Dist/Zilla/Plugin/MetaProvides.pm b/lib/Dist/Zilla/Plugin/MetaProvides.pm index 94577f7..5d5aafd 100644 --- a/lib/Dist/Zilla/Plugin/MetaProvides.pm +++ b/lib/Dist/Zilla/Plugin/MetaProvides.pm @@ -4,7 +4,7 @@ use warnings; package Dist::Zilla::Plugin::MetaProvides; -our $VERSION = '2.002000'; # TRIAL +our $VERSION = '2.002001'; # TRIAL # ABSTRACT: Generating and Populating 'provides' in your META.yml @@ -44,7 +44,7 @@ Dist::Zilla::Plugin::MetaProvides - Generating and Populating 'provides' in your =head1 VERSION -version 2.002000 +version 2.002001 =head1 SYNOPSIS diff --git a/lib/Dist/Zilla/Role/MetaProvider/Provider.pm b/lib/Dist/Zilla/Role/MetaProvider/Provider.pm index 3a171ba..3138b47 100644 --- a/lib/Dist/Zilla/Role/MetaProvider/Provider.pm +++ b/lib/Dist/Zilla/Role/MetaProvider/Provider.pm @@ -4,7 +4,7 @@ use warnings; package Dist::Zilla::Role::MetaProvider::Provider; -our $VERSION = '2.002000'; # TRIAL +our $VERSION = '2.002001'; # TRIAL # ABSTRACT: A Role for Metadata providers specific to the 'provider' key. @@ -249,13 +249,18 @@ sub _apply_meta_noindex { return @items; } -use Dist::Zilla::Util::ConfigDumper 0.002001 qw( config_dumper ); +around dump_config => sub { + my ( $orig, $self, @args ) = @_; + my $config = $orig->( $self, @args ); + my $payload = $config->{ +__PACKAGE__ } = {}; -around dump_config => config_dumper( - __PACKAGE__, - { attrs => [qw( inherit_version inherit_missing meta_noindex )] }, - sub { $_[1]->{ __PACKAGE__ . '::VERSION' } = $VERSION }, -); + $payload->{inherit_version} = $self->inherit_version; + $payload->{inherit_missing} = $self->inherit_missing; + $payload->{meta_noindex} = $self->meta_noindex; + + $payload->{ q[$] . __PACKAGE__ . '::VERSION' } = $VERSION; + return $config; +}; no Moose::Role; @@ -289,7 +294,7 @@ Dist::Zilla::Role::MetaProvider::Provider - A Role for Metadata providers specif =head1 VERSION -version 2.002000 +version 2.002001 =head1 PUBLIC METHODS diff --git a/misc/Changes.deps b/misc/Changes.deps index 302e0d4..46fab06 100644 --- a/misc/Changes.deps +++ b/misc/Changes.deps @@ -1,6 +1,16 @@ This file contains changes in REQUIRED dependencies for standard CPAN phases (configure/build/runtime/test) -2.002000 +2.002001 + [Added / test requires] + - Path::Tiny + + [Removed / runtime requires] + - Dist::Zilla::Util::ConfigDumper 0.002001 + + [Removed / test requires] + - Dist::Zilla::Util::Test::KENTNL 1.003001 + +2.002000 2016-04-22T14:20:31Z 2.001011 2016-01-24T11:24:45Z [Added / runtime requires] diff --git a/misc/Changes.deps.all b/misc/Changes.deps.all index 9289812..a38021a 100644 --- a/misc/Changes.deps.all +++ b/misc/Changes.deps.all @@ -1,6 +1,19 @@ This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL dependencies for all phases (configure/build/runtime/test/develop) -2.002000 +2.002001 + [Added / test recommends] + - Path::Tiny 0.058 + + [Added / test requires] + - Path::Tiny + + [Removed / runtime requires] + - Dist::Zilla::Util::ConfigDumper 0.002001 + + [Removed / test requires] + - Dist::Zilla::Util::Test::KENTNL 1.003001 + +2.002000 2016-04-22T14:20:31Z 2.001011 2016-01-24T11:24:45Z [Added / runtime requires] diff --git a/misc/Changes.deps.dev b/misc/Changes.deps.dev index 1dbbe13..939351c 100644 --- a/misc/Changes.deps.dev +++ b/misc/Changes.deps.dev @@ -1,6 +1,8 @@ This file contains changes to DEVELOPMENT dependencies only ( both REQUIRED and OPTIONAL ) -2.002000 +2.002001 + +2.002000 2016-04-22T14:20:31Z 2.001011 2016-01-24T11:24:45Z [Changed / develop suggests] diff --git a/misc/Changes.deps.opt b/misc/Changes.deps.opt index cc089f2..017387b 100644 --- a/misc/Changes.deps.opt +++ b/misc/Changes.deps.opt @@ -1,6 +1,10 @@ This file contains changes in OPTIONAL dependencies for standard CPAN phases (configure/build/runtime/test) -2.002000 +2.002001 + [Added / test recommends] + - Path::Tiny 0.058 + +2.002000 2016-04-22T14:20:31Z 2.001011 2016-01-24T11:24:45Z diff --git a/misc/built_with.json b/misc/built_with.json index 070acc6..2f2cd7b 100644 --- a/misc/built_with.json +++ b/misc/built_with.json @@ -1,50 +1,50 @@ { "modules" : { - "CPAN::Meta" : "2.150001", - "Carp" : "1.36", - "Dist::Zilla" : "5.043", + "CPAN::Meta" : "2.150005", + "Carp" : "1.38", + "Dist::Zilla" : "5.047", "Dist::Zilla::App::Command::bakeini" : "0.002005", "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::Authority" : "1.009", - "Dist::Zilla::Plugin::AutoPrereqs" : "5.043", + "Dist::Zilla::Plugin::AutoPrereqs" : "5.047", "Dist::Zilla::Plugin::Bootstrap::lib" : "1.001000", - "Dist::Zilla::Plugin::BumpVersionAfterRelease" : "0.012", - "Dist::Zilla::Plugin::ConfirmRelease" : "5.043", - "Dist::Zilla::Plugin::CopyFilesFromBuild" : "0.151680", - "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.015", - "Dist::Zilla::Plugin::Git::GatherDir" : "2.036", + "Dist::Zilla::Plugin::BumpVersionAfterRelease" : "0.015", + "Dist::Zilla::Plugin::ConfirmRelease" : "5.047", + "Dist::Zilla::Plugin::CopyFilesFromBuild" : "0.161350", + "Dist::Zilla::Plugin::Git::Check" : "2.039", + "Dist::Zilla::Plugin::Git::Commit" : "2.039", + "Dist::Zilla::Plugin::Git::CommitBuild" : "2.039", + "Dist::Zilla::Plugin::Git::Contributors" : "0.023", + "Dist::Zilla::Plugin::Git::GatherDir" : "2.039", "Dist::Zilla::Plugin::Git::NextRelease" : "0.004000", - "Dist::Zilla::Plugin::Git::Tag" : "2.036", + "Dist::Zilla::Plugin::Git::Tag" : "2.039", "Dist::Zilla::Plugin::GithubMeta" : "0.54", - "Dist::Zilla::Plugin::License" : "5.043", - "Dist::Zilla::Plugin::MakeMaker" : "5.043", - "Dist::Zilla::Plugin::Manifest" : "5.043", - "Dist::Zilla::Plugin::ManifestSkip" : "5.043", - "Dist::Zilla::Plugin::MetaConfig" : "5.043", - "Dist::Zilla::Plugin::MetaData::BuiltWith" : "1.004002", - "Dist::Zilla::Plugin::MetaJSON" : "5.043", - "Dist::Zilla::Plugin::MetaNoIndex" : "5.043", - "Dist::Zilla::Plugin::MetaProvides::Package" : "2.003001", - "Dist::Zilla::Plugin::MetaTests" : "5.043", + "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.004003", + "Dist::Zilla::Plugin::MetaJSON" : "5.047", + "Dist::Zilla::Plugin::MetaNoIndex" : "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::MinimumPerl" : "1.006", - "Dist::Zilla::Plugin::PodCoverageTests" : "5.043", - "Dist::Zilla::Plugin::PodSyntaxTests" : "5.043", - "Dist::Zilla::Plugin::PodWeaver" : "4.006", - "Dist::Zilla::Plugin::Prereqs" : "5.043", - "Dist::Zilla::Plugin::Prereqs::AuthorDeps" : "0.005", + "Dist::Zilla::Plugin::PodCoverageTests" : "5.047", + "Dist::Zilla::Plugin::PodSyntaxTests" : "5.047", + "Dist::Zilla::Plugin::PodWeaver" : "4.008", + "Dist::Zilla::Plugin::Prereqs" : "5.047", + "Dist::Zilla::Plugin::Prereqs::AuthorDeps" : "0.006", "Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled" : "0.003001", "Dist::Zilla::Plugin::Prereqs::Upgrade" : "0.001000", - "Dist::Zilla::Plugin::Readme::Brief" : "0.002005", - "Dist::Zilla::Plugin::ReadmeAnyFromPod" : "0.160630", + "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::RunExtraTests" : "0.029", "Dist::Zilla::Plugin::Test::CPAN::Changes" : "0.009", "Dist::Zilla::Plugin::Test::Compile::PerFile" : "0.003000", "Dist::Zilla::Plugin::Test::EOL" : "0.18", @@ -52,31 +52,30 @@ "Dist::Zilla::Plugin::Test::MinimumVersion" : "2.000006", "Dist::Zilla::Plugin::Test::Perl::Critic" : "3.000", "Dist::Zilla::Plugin::Test::ReportPrereqs" : "0.024", - "Dist::Zilla::Plugin::TestRelease" : "5.043", + "Dist::Zilla::Plugin::TestRelease" : "5.047", "Dist::Zilla::Plugin::Twitter" : "0.026", - "Dist::Zilla::Plugin::UploadToCPAN" : "5.043", + "Dist::Zilla::Plugin::UploadToCPAN" : "5.047", "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.025010", - "Dist::Zilla::Role::MetaProvider" : "5.043", - "Dist::Zilla::Util::ConfigDumper" : "0.003007", - "Dist::Zilla::Util::Test::KENTNL" : "1.005013", + "Dist::Zilla::Role::MetaProvider" : "5.047", "English" : "1.09", - "ExtUtils::MakeMaker" : "7.11_06", - "File::Spec" : "3.56", + "ExtUtils::MakeMaker" : "7.18", + "File::Spec" : "3.62", "Hash::Merge::Simple" : "0.051", - "Moose" : "2.1605", - "Moose::Role" : "2.1605", + "Moose" : "2.1804", + "Moose::Role" : "2.1804", "MooseX::Types" : "0.46", "MooseX::Types::Moose" : "0.46", + "Path::Tiny" : "0.094", "Pod::Coverage::TrustPod" : "0.100003", - "Scalar::Util" : "1.44", - "Software::License::Perl_5" : "0.103010", + "Scalar::Util" : "1.45", + "Software::License::Perl_5" : "0.103012", "Test::CPAN::Changes" : "0.400002", "Test::CPAN::Meta" : "0.25", - "Test::DZil" : "5.043", + "Test::DZil" : "5.047", "Test::EOL" : "1.6", "Test::Fatal" : "0.014", "Test::Kwalitee" : "1.22", - "Test::More" : "1.001014", + "Test::More" : "1.302022", "Test::Pod" : "1.51", "Test::Pod::Coverage" : "1.10", "lib" : "0.63", @@ -99,5 +98,5 @@ "osname" : "linux" }, "platform" : "linux", - "uname" : "Linux 4.4.0-gentoo-r1 x86_64 GenuineIntel GNU/Linux" + "uname" : "Linux 4.6.0-gentoo x86_64 GenuineIntel GNU/Linux" } diff --git a/t/00-report-prereqs.dd b/t/00-report-prereqs.dd index d0adf75..f973072 100644 --- a/t/00-report-prereqs.dd +++ b/t/00-report-prereqs.dd @@ -88,7 +88,6 @@ do { my $x = { 'requires' => { 'Carp' => '0', 'Dist::Zilla::Role::MetaProvider' => '0', - 'Dist::Zilla::Util::ConfigDumper' => '0.002001', 'Hash::Merge::Simple' => '0', 'Moose' => '0', 'Moose::Role' => '0', @@ -107,12 +106,13 @@ do { my $x = { 'recommends' => { 'CPAN::Meta' => '2.120900', 'ExtUtils::MakeMaker' => '7.00', + 'Path::Tiny' => '0.058', 'Test::More' => '0.99' }, 'requires' => { - 'Dist::Zilla::Util::Test::KENTNL' => '1.003001', 'ExtUtils::MakeMaker' => '0', 'File::Spec' => '0', + 'Path::Tiny' => '0', 'Scalar::Util' => '0', 'Test::DZil' => '0', 'Test::Fatal' => '0', diff --git a/t/01-Provider/01-boolean-attrs.t b/t/01-Provider/01-boolean-attrs.t index 811a280..e959b8a 100644 --- a/t/01-Provider/01-boolean-attrs.t +++ b/t/01-Provider/01-boolean-attrs.t @@ -4,19 +4,27 @@ use warnings; use Test::More 0.96; use Test::Fatal; -use Test::DZil qw( simple_ini ); +use Path::Tiny qw( path ); +use Test::DZil qw( simple_ini Builder ); use lib 't/lib'; -use Dist::Zilla::Util::Test::KENTNL 1.001 qw( dztest ); - -my $dzil; +# Keepalive +my $builder; sub make_plugin { my @args = @_; - $dzil = dztest(); - $dzil->add_file( 'dist.ini', simple_ini( [ 'FakePlugin' => {@args} ] ) ); - return $dzil->builder->plugin_named('FakePlugin'); + $builder = Builder->from_config( + { + dist_root => 'invalid', + }, + { + add_files => { + path('source/dist.ini') => simple_ini( [ 'FakePlugin' => {@args} ] ), + }, + } + ); + return $builder->plugin_named('FakePlugin'); } subtest 'inherit_version boolean tests' => sub { diff --git a/t/01-Provider/02-resolve-versions.t b/t/01-Provider/02-resolve-versions.t index 86c0f7b..f1742d3 100644 --- a/t/01-Provider/02-resolve-versions.t +++ b/t/01-Provider/02-resolve-versions.t @@ -4,19 +4,27 @@ use warnings; use Test::More 0.96; use Test::Fatal; -use Test::DZil qw( simple_ini ); +use Path::Tiny qw( path ); +use Test::DZil qw( simple_ini Builder ); use lib 't/lib'; -use Dist::Zilla::Util::Test::KENTNL 1.001 qw( dztest ); - -my $dzil; +# Keepalive +my $builder; sub make_plugin { my @args = @_; - $dzil = dztest(); - $dzil->add_file( 'dist.ini', simple_ini( [ 'FakePlugin' => {@args} ] ) ); - return $dzil->builder->plugin_named('FakePlugin'); + $builder = Builder->from_config( + { + dist_root => 'invalid', + }, + { + add_files => { + path('source/dist.ini') => simple_ini( [ 'FakePlugin' => {@args} ] ), + }, + } + ); + return $builder->plugin_named('FakePlugin'); } subtest 'default behaviour' => sub { diff --git a/t/01-Provider/03-metanoindex.t b/t/01-Provider/03-metanoindex.t index 9bc9e02..3c8f6af 100644 --- a/t/01-Provider/03-metanoindex.t +++ b/t/01-Provider/03-metanoindex.t @@ -4,24 +4,28 @@ use warnings; use Test::More 0.96; use Test::Fatal; -use Test::DZil qw( simple_ini ); +use Path::Tiny qw( path ); +use Test::DZil qw( simple_ini Builder ); use lib 't/lib'; -use Dist::Zilla::Util::Test::KENTNL 1.001 qw( dztest ); - -my $dzil; +# Keepalive +my $builder; sub make_plugin_metanoindex { my $iconfig = shift; - $dzil = dztest(); - $dzil->add_file( - 'dist.ini' => simple_ini( - [ 'FakePlugin' => $iconfig->{fakeplugin} ], # - [ 'MetaNoIndex' => $iconfig->{noindex} ], # - ) + $builder = Builder->from_config( + { dist_root => 'invalid' }, + { + add_files => { + path('source/dist.ini') => simple_ini( + [ 'FakePlugin' => $iconfig->{fakeplugin} ], # + [ 'MetaNoIndex' => $iconfig->{noindex} ], # + ) + }, + }, ); - return $dzil->builder->plugin_named('FakePlugin'); + return $builder->plugin_named('FakePlugin'); } subtest '_try_regen_metadata tests' => sub { diff --git a/t/01-Provider/04-integration.t b/t/01-Provider/04-integration.t new file mode 100644 index 0000000..72a0690 --- /dev/null +++ b/t/01-Provider/04-integration.t @@ -0,0 +1,77 @@ + +use strict; +use warnings; + +use Test::More 0.96; +use Test::Fatal; +use Path::Tiny qw( path ); +use Test::DZil qw( simple_ini Builder ); + +use lib 't/lib'; + +subtest "missing-meta-noindex" => sub { + my $builder = Builder->from_config( + { + dist_root => 'invalid', + }, + { + add_files => { + path('source/dist.ini') => simple_ini( 'GatherDir', [ 'FakePlugin' => { meta_noindex => 1 } ] ), + }, + } + ); + $builder->chrome->logger->set_debug(1); + my $plugin = $builder->plugin_named('FakePlugin'); + + my $meta = $plugin->metadata; + ok( grep { /No no_index attribute/ } @{ $builder->log_messages } ); + is_deeply( + $meta, + { provides => { 'FakeModule' => { file => 'C:\temp\notevenonwindows.pl', version => '0.001' } } }, + 'Top level metadata hash returns deep result' + ); + +}; + +# Keepalive +subtest "empty-meta-noindex" => sub { + { + + package Dist::Zilla::Plugin::Fake::MetaNoIndex; + use Moose; + with 'Dist::Zilla::Role::MetaProvider'; + around isa => sub { + my ( $orig, $class, $hwhat ) = @_; + return 1 if $hwhat eq 'Dist::Zilla::Plugin::MetaNoIndex'; + return $class->$orig($hwhat); + }; + + sub metadata { + return { 'x_this_key_not_relevant' => 1 }; + } + $INC{'Dist/Zilla/Plugin/Fake/MetaNoIndex.pm'} = 1; + } + my $builder = Builder->from_config( + { + dist_root => 'invalid', + }, + { + add_files => { + path('source/dist.ini') => simple_ini( 'GatherDir', [ 'FakePlugin' => { meta_noindex => 1 } ], ['Fake::MetaNoIndex'] ), + }, + } + ); + $builder->chrome->logger->set_debug(1); + my $plugin = $builder->plugin_named('FakePlugin'); + + my $meta = $plugin->metadata; + ok( grep { /No no_index attribute/ } @{ $builder->log_messages }, "Got meta-no-index warning" ); + is_deeply( + $meta, + { provides => { 'FakeModule' => { file => 'C:\temp\notevenonwindows.pl', version => '0.001' } } }, + 'Top level metadata hash returns deep result' + ); + +}; + +done_testing; diff --git a/t/02-MetaProvides-ProvideRecord.t b/t/02-MetaProvides-ProvideRecord.t index 2c042a1..9f4778d 100644 --- a/t/02-MetaProvides-ProvideRecord.t +++ b/t/02-MetaProvides-ProvideRecord.t @@ -4,15 +4,22 @@ use warnings; use Test::More 0.96; use lib 't/lib'; -use Dist::Zilla::Util::Test::KENTNL qw( dztest ); use Dist::Zilla::MetaProvides::ProvideRecord; use Test::Fatal; -use Test::DZil qw( simple_ini ); +use Path::Tiny qw( path ); +use Test::DZil qw( simple_ini Builder ); use Scalar::Util qw( refaddr ); -my $test = dztest(); -$test->add_file( 'dist.ini', simple_ini( [ 'FakePlugin' => {} ] ) ); -my $fake_dzil = $test->builder; +my $tzil = Builder->from_config( + { + dist_root => 'invalid' + }, + { + add_files => { + path('source/dist.ini') => simple_ini( [ 'FakePlugin' => {} ] ), + }, + } +); my $record; @@ -22,7 +29,7 @@ is( version => '1.0', module => 'FakeModule', file => 'fakefile', - parent => $fake_dzil->plugin_named('FakePlugin'), + parent => $tzil->plugin_named('FakePlugin'), ); }, undef, @@ -39,10 +46,10 @@ can_ok( $record, 'file' ); is( $record->file, 'fakefile', 'file is consistent' ); can_ok( $record, 'parent' ); -is( refaddr $record->parent, refaddr $fake_dzil->plugin_named('FakePlugin'), 'parent link is right' ); +is( refaddr $record->parent, refaddr $tzil->plugin_named('FakePlugin'), 'parent link is right' ); can_ok( $record, 'zilla' ); -is( refaddr $record->zilla, refaddr $fake_dzil , 'dzil link is right' ); +is( refaddr $record->zilla, refaddr $tzil, 'dzil link is right' ); can_ok( $record, '_resolve_version' ); diff --git a/t/lib/Dist/Zilla/Plugin/FakePlugin.pm b/t/lib/Dist/Zilla/Plugin/FakePlugin.pm index 36fb3df..35556db 100644 --- a/t/lib/Dist/Zilla/Plugin/FakePlugin.pm +++ b/t/lib/Dist/Zilla/Plugin/FakePlugin.pm @@ -11,11 +11,13 @@ with 'Dist::Zilla::Role::MetaProvider::Provider'; sub provides { my $self = shift; - return Dist::Zilla::MetaProvides::ProvideRecord->new( - module => 'FakeModule', - file => 'C:\temp\notevenonwindows.pl', - version => '3.1414', - parent => $self, + return $self->_apply_meta_noindex( + Dist::Zilla::MetaProvides::ProvideRecord->new( + module => 'FakeModule', + file => 'C:\temp\notevenonwindows.pl', + version => '3.1414', + parent => $self, + ) ); } diff --git a/xt/author/eol.t b/xt/author/eol.t index b2449fa..fe4d2dc 100644 --- a/xt/author/eol.t +++ b/xt/author/eol.t @@ -20,6 +20,7 @@ my @files = ( 't/01-Provider/01-boolean-attrs.t', 't/01-Provider/02-resolve-versions.t', 't/01-Provider/03-metanoindex.t', + 't/01-Provider/04-integration.t', 't/02-MetaProvides-ProvideRecord.t', 't/03-Types.t', 't/04-MetaProvides.t',