From b582f56359e9a5e87019876758b1df1ac561875d Mon Sep 17 00:00:00 2001 From: Charles McGarvey Date: Sun, 27 Nov 2016 19:15:12 -0700 Subject: [PATCH] move dependencies from cpanfile to dist.ini Don't use a cpanfile to specify dependencies unless it specifies *all* of the dependencies. --- cpanfile | 74 ------------------- dist.ini | 90 ++++++++++++++++++++++- lib/Dist/Zilla/PluginBundle/Author/CCM.pm | 4 +- 3 files changed, 91 insertions(+), 77 deletions(-) delete mode 100644 cpanfile diff --git a/cpanfile b/cpanfile deleted file mode 100644 index 4f58fc0..0000000 --- a/cpanfile +++ /dev/null @@ -1,74 +0,0 @@ -# requires 'Badge::Depot::Plugin::Coverage'; -# requires 'Badge::Depot::Plugin::Perl'; -# requires 'Badge::Depot::Plugin::Travis'; -# requires 'Pod::Weaver::Section::Badges'; -requires 'Dist::Zilla', '5.038'; -requires 'Dist::Zilla::Plugin::Authority'; -requires 'Dist::Zilla::Plugin::AutoPrereqs'; -requires 'Dist::Zilla::Plugin::BlockRelease'; -requires 'Dist::Zilla::Plugin::CheckChangesHasContent'; -requires 'Dist::Zilla::Plugin::ConfirmRelease'; -requires 'Dist::Zilla::Plugin::CopyFilesFromBuild'; -requires 'Dist::Zilla::Plugin::Encoding'; -requires 'Dist::Zilla::Plugin::ExecDir'; -requires 'Dist::Zilla::Plugin::FakeRelease'; -requires 'Dist::Zilla::Plugin::Git::Check'; -requires 'Dist::Zilla::Plugin::Git::Commit'; -requires 'Dist::Zilla::Plugin::Git::CommitBuild'; -requires 'Dist::Zilla::Plugin::Git::Contributors'; -requires 'Dist::Zilla::Plugin::Git::GatherDir'; -requires 'Dist::Zilla::Plugin::Git::NextVersion'; -requires 'Dist::Zilla::Plugin::Git::Push'; -requires 'Dist::Zilla::Plugin::Git::Tag'; -requires 'Dist::Zilla::Plugin::GithubMeta'; -requires 'Dist::Zilla::Plugin::Keywords'; -requires 'Dist::Zilla::Plugin::License'; -requires 'Dist::Zilla::Plugin::MakeMaker'; -requires 'Dist::Zilla::Plugin::Manifest'; -requires 'Dist::Zilla::Plugin::ManifestSkip'; -requires 'Dist::Zilla::Plugin::MetaJSON'; -requires 'Dist::Zilla::Plugin::MetaNoIndex'; -requires 'Dist::Zilla::Plugin::MetaProvides::Package'; -requires 'Dist::Zilla::Plugin::MetaTests'; -requires 'Dist::Zilla::Plugin::MetaYAML'; -requires 'Dist::Zilla::Plugin::NextRelease'; -requires 'Dist::Zilla::Plugin::OverridePkgVersion'; -requires 'Dist::Zilla::Plugin::PodCoverageTests'; -requires 'Dist::Zilla::Plugin::PodSyntaxTests'; -requires 'Dist::Zilla::Plugin::PodWeaver'; -requires 'Dist::Zilla::Plugin::Prereqs::AuthorDeps'; -requires 'Dist::Zilla::Plugin::Prereqs::FromCPANfile'; -requires 'Dist::Zilla::Plugin::PruneCruft'; -requires 'Dist::Zilla::Plugin::PruneFiles'; -requires 'Dist::Zilla::Plugin::ReadmeAnyFromPod'; -requires 'Dist::Zilla::Plugin::ReversionOnRelease'; -requires 'Dist::Zilla::Plugin::RunExtraTests'; -requires 'Dist::Zilla::Plugin::Test::CPAN::Changes'; -requires 'Dist::Zilla::Plugin::Test::CleanNamespaces'; -requires 'Dist::Zilla::Plugin::Test::Compile'; -requires 'Dist::Zilla::Plugin::Test::EOL'; -requires 'Dist::Zilla::Plugin::Test::MinimumVersion'; -requires 'Dist::Zilla::Plugin::Test::NoTabs'; -requires 'Dist::Zilla::Plugin::Test::Perl::Critic'; -requires 'Dist::Zilla::Plugin::Test::Pod::No404s'; -requires 'Dist::Zilla::Plugin::Test::Portability'; -requires 'Dist::Zilla::Plugin::Test::ReportPrereqs'; -requires 'Dist::Zilla::Plugin::TestRelease'; -requires 'Dist::Zilla::Plugin::TravisYML'; -requires 'Dist::Zilla::Plugin::UploadToCPAN'; -requires 'Pod::Elemental::Transformer::List'; -requires 'Pod::Elemental::Transformer::Verbatim'; -requires 'Pod::Weaver::Plugin::EnsurePod5'; -requires 'Pod::Weaver::Plugin::H1Nester'; -requires 'Pod::Weaver::Plugin::SingleEncoding'; -requires 'Pod::Weaver::Plugin::Transformer'; -requires 'Pod::Weaver::Section::Authors'; -requires 'Pod::Weaver::Section::Bugs'; -requires 'Pod::Weaver::Section::Collect'; -requires 'Pod::Weaver::Section::Contributors'; -requires 'Pod::Weaver::Section::Generic'; -requires 'Pod::Weaver::Section::Legal'; -requires 'Pod::Weaver::Section::Name'; -requires 'Pod::Weaver::Section::Region'; -requires 'Pod::Weaver::Section::Version'; -requires 'Test::CPAN::Meta'; diff --git a/dist.ini b/dist.ini index b484511..401750c 100644 --- a/dist.ini +++ b/dist.ini @@ -1,11 +1,99 @@ name = Dist-Zilla-PluginBundle-Author-CCM author = Charles McGarvey -license = Perl_5 copyright_holder = Charles McGarvey +copyright_year = 2016 +license = Perl_5 [Bootstrap::lib] +; Technically most of these prereqs are recommended (not required) because +; PluginRemover allows us to use the plugin bundle without one or more of the +; plugins that would load by default. Since the relationships are so +; wishy-washy, I'm not going to worry about requiring DZP::MakeMaker even +; though another installer could be used instead. +[Prereqs / runtime requires] +-phase = runtime +-relationship = requires +Dist::Zilla = 5.038 +Dist::Zilla::Plugin::Authority = 0 +Dist::Zilla::Plugin::AutoPrereqs = 0 +Dist::Zilla::Plugin::BlockRelease = 0 +Dist::Zilla::Plugin::CheckChangesHasContent = 0 +Dist::Zilla::Plugin::ConfirmRelease = 0 +Dist::Zilla::Plugin::CopyFilesFromBuild = 0 +Dist::Zilla::Plugin::Encoding = 0 +Dist::Zilla::Plugin::ExecDir = 0 +Dist::Zilla::Plugin::Git::Check = 0 +Dist::Zilla::Plugin::Git::Commit = 0 +Dist::Zilla::Plugin::Git::CommitBuild = 0 +Dist::Zilla::Plugin::Git::Contributors = 0 +Dist::Zilla::Plugin::Git::GatherDir = 0 +Dist::Zilla::Plugin::Git::NextVersion = 0 +Dist::Zilla::Plugin::Git::Push = 0 +Dist::Zilla::Plugin::Git::Tag = 0 +Dist::Zilla::Plugin::GithubMeta = 0 +Dist::Zilla::Plugin::Keywords = 0 +Dist::Zilla::Plugin::License = 0 +Dist::Zilla::Plugin::MakeMaker = 0 +Dist::Zilla::Plugin::Manifest = 0 +Dist::Zilla::Plugin::ManifestSkip = 0 +Dist::Zilla::Plugin::MetaJSON = 0 +Dist::Zilla::Plugin::MetaNoIndex = 0 +Dist::Zilla::Plugin::MetaProvides::Package = 0 +Dist::Zilla::Plugin::MetaTests = 0 +Dist::Zilla::Plugin::MetaYAML = 0 +Dist::Zilla::Plugin::NextRelease = 0 +Dist::Zilla::Plugin::OverridePkgVersion = 0 +Dist::Zilla::Plugin::PodCoverageTests = 0 +Dist::Zilla::Plugin::PodSyntaxTests = 0 +Dist::Zilla::Plugin::PodWeaver = 0 +Dist::Zilla::Plugin::Prereqs::AuthorDeps = 0 +Dist::Zilla::Plugin::PruneCruft = 0 +Dist::Zilla::Plugin::PruneFiles = 0 +Dist::Zilla::Plugin::ReadmeAnyFromPod = 0 +Dist::Zilla::Plugin::ReversionOnRelease = 0 +Dist::Zilla::Plugin::RunExtraTests = 0 +Dist::Zilla::Plugin::Test::CPAN::Changes = 0 +Dist::Zilla::Plugin::Test::CleanNamespaces = 0 +Dist::Zilla::Plugin::Test::Compile = 0 +Dist::Zilla::Plugin::Test::EOL = 0 +Dist::Zilla::Plugin::Test::MinimumVersion = 0 +Dist::Zilla::Plugin::Test::NoTabs = 0 +Dist::Zilla::Plugin::Test::Perl::Critic = 0 +Dist::Zilla::Plugin::Test::Pod::No404s = 0 +Dist::Zilla::Plugin::Test::Portability = 0 +Dist::Zilla::Plugin::Test::ReportPrereqs = 0 +Dist::Zilla::Plugin::TestRelease = 0 +Dist::Zilla::Plugin::TravisYML = 0 +Dist::Zilla::Plugin::UploadToCPAN = 0 +Pod::Elemental::Transformer::List = 0 +Pod::Elemental::Transformer::Verbatim = 0 +Pod::Weaver::Plugin::EnsurePod5 = 0 +Pod::Weaver::Plugin::H1Nester = 0 +Pod::Weaver::Plugin::SingleEncoding = 0 +Pod::Weaver::Plugin::Transformer = 0 +Pod::Weaver::Section::Authors = 0 +Pod::Weaver::Section::Bugs = 0 +Pod::Weaver::Section::Collect = 0 +Pod::Weaver::Section::Contributors = 0 +Pod::Weaver::Section::Generic = 0 +Pod::Weaver::Section::Legal = 0 +Pod::Weaver::Section::Name = 0 +Pod::Weaver::Section::Region = 0 +Pod::Weaver::Section::Version = 0 +; Pod::Weaver::Section::Badges = 0 +; Badge::Depot::Plugin::Coverage = 0 +; Badge::Depot::Plugin::Perl = 0 +; Badge::Depot::Plugin::Travis = 0 +Test::CPAN::Meta = 0 + +[Prereqs / runtime recommends] +-phase = runtime +-relationship = recommends +Dist::Zilla::Plugin::FakeRelease = 0 +Dist::Zilla::Plugin::Prereqs::FromCPANfile = 0 + [@Author::CCM] Test::MinimumVersion.max_target_perl = 5.14.0 TravisYML.perl_version_build = 5.24 5.22 5.20 5.18 5.16 5.14 diff --git a/lib/Dist/Zilla/PluginBundle/Author/CCM.pm b/lib/Dist/Zilla/PluginBundle/Author/CCM.pm index f8e1d9b..27b15b8 100644 --- a/lib/Dist/Zilla/PluginBundle/Author/CCM.pm +++ b/lib/Dist/Zilla/PluginBundle/Author/CCM.pm @@ -263,8 +263,8 @@ sub configure { # GENERATE FILES ['License'], - ['ReadmeAnyFromPod' => 'repo readme' => {filename => 'README.md', location => 'root', type => 'markdown', phase => 'release'}], - ['ReadmeAnyFromPod' => 'dist readme' => {filename => 'README', location => 'build', type => 'text'}], + ['ReadmeAnyFromPod' => 'RepoReadme' => {filename => 'README.md', location => 'root', type => 'markdown', phase => 'release'}], + ['ReadmeAnyFromPod' => 'DistReadme' => {filename => 'README', location => 'build', type => 'text'}], ['TravisYML' => {build_branch => '/^(dist|build\/.*)$/', perl_version => $perl_version, perl_version_build => $perl_version_build}], ['Manifest'], ['ManifestSkip'], -- 2.45.2