From: Charles McGarvey Date: Fri, 8 Apr 2022 21:53:49 +0000 (-0600) Subject: Release Dist-Zilla-PluginBundle-Author-CCM 0.012 X-Git-Tag: v0.012^0 X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fp5-Dist-Zilla-PluginBundle-Author-CCM;a=commitdiff_plain;h=HEAD;hp=30fbdca8a4ddfe0831cc8ce1795b55ce564ec902 Release Dist-Zilla-PluginBundle-Author-CCM 0.012 * Allow no installer --- diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..e223cde --- /dev/null +++ b/.editorconfig @@ -0,0 +1,20 @@ + +# Please follow these code style guidelines. You can use this file to +# automatically configure your editor. +# For instructions, see: http://editorconfig.org/ + +[*] +charset = utf8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[{**.pl,**.pm,**.pod,**.t}] +indent_style = space +indent_size = 4 +max_line_length = 110 + +[{.editorconfig,**.ini}] +indent_style = space +indent_size = 4 + diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..4744c4b --- /dev/null +++ b/.mailmap @@ -0,0 +1 @@ +Charles McGarvey diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e90dbdc..0000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -sudo: false -language: perl -perl: - - '5.26' - - '5.24' - - '5.22' - - '5.20' - - '5.18' - - '5.16' - - '5.14' -matrix: - fast_finish: true -before_install: - - git config --global user.name "TravisCI" - - git config --global user.email $HOSTNAME":not-for-mail@travis-ci.org" -install: - - cpanm --quiet --notest --skip-satisfied Dist::Zilla - - "dzil authordeps --missing | grep -vP '[^\\w:]' | xargs -n 5 -P 10 cpanm --quiet --notest" - - "dzil listdeps --author --missing | grep -vP '[^\\w:]' | cpanm --verbose" -script: - - dzil smoke --release --author diff --git a/Changes b/Changes index e6e2073..20c1dd1 100644 --- a/Changes +++ b/Changes @@ -2,35 +2,55 @@ Revision history for Dist-Zilla-PluginBundle-Author-CCM. {{$NEXT}} -0.008 2017-08-25 21:28:07-06:00 MST7MDT +0.012 2022-04-08 15:53:36-0600 + + * Allow no installer + +0.011 2022-03-31 08:24:44-0600 + + * Change NextRelease datetime format + +0.010 2022-03-29 20:09:03-0600 + + * Add no_index option so MetaNoIndex is easily configurable + +0.009 2018-11-22 22:46:42-0700 + + * Remove use of DZP::TravisYML and DZP::ReversionOnRelease + +0.008001 2017-08-25 22:00:56-0600 + + * Declare new dependency on Perl::Version + +0.008 2017-08-25 21:28:07-0600 * Automatically figure out perl_version and perl_version_build TravisYML configuration based on configured minimum perl requirement -0.007 2017-03-11 18:33:58-07:00 MST7MDT +0.007 2017-03-11 18:33:58-0700 * Prevent writing wrong version to Changes -0.006 2016-11-28 02:08:07-07:00 MST7MDT +0.006 2016-11-28 02:08:07-0700 * Work around a bug in DZP::TravisYML -0.005 2016-11-27 19:52:27-07:00 MST7MDT +0.005 2016-11-27 19:52:27-0700 * Move dependencies from cpanfile to dist.ini (fixes testing) * Set copyright year -0.004 2016-11-27 18:28:43-07:00 MST7MDT +0.004 2016-11-27 18:28:43-0700 * This bundle now requires at least perl 5.14.0 * Add Test::MinimumVersion as a release test -0.003 2016-11-26 00:09:53-07:00 MST7MDT +0.003 2016-11-26 00:09:53-0700 * Set default authority to cpan:CCM * Add Test::CPAN::Meta to prereqs -0.002 2016-11-25 22:12:27-07:00 MST7MDT +0.002 2016-11-25 22:12:27-0700 * Add DZIL_NO_UPLOAD to enable no_upload mode * Only rewrite repo README on release @@ -38,7 +58,7 @@ Revision history for Dist-Zilla-PluginBundle-Author-CCM. * Use Bootstrap::lib * Require Dist::Zilla 5.038 (for :ExtraTestFiles) -0.001 2016-11-25 18:28:13-07:00 MST7MDT +0.001 2016-11-25 18:28:13-0700 * Initial version diff --git a/LICENSE b/LICENSE index 1935df6..99e5ee2 100644 --- a/LICENSE +++ b/LICENSE @@ -292,21 +292,21 @@ Definitions: - "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 @@ products derived from this software without specific prior written permission. 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 --git a/README.md b/README.md index 4b82d8a..f715647 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Dist::Zilla::PluginBundle::Author::CCM - A plugin bundle for distributions built # VERSION -version 0.008 +version 0.012 # SYNOPSIS @@ -17,8 +17,6 @@ You probably don't want to use this. ; VERSION [Git::NextVersion] - [ReversionOnRelease] - prompt = 1 ; GATHER [Git::GatherDir] @@ -87,8 +85,6 @@ You probably don't want to use this. filename = README location = build type = text - [TravisYML] - build_branch = /^(dist|build\/.*)$/ [Manifest] [ManifestSkip] @@ -120,6 +116,12 @@ You probably don't want to use this. Specify the minimum perl version. Defaults to `5.10.1`. +## no\_index + +Set directories to not index. + +Default: + ## authority Specify the release authority. Defaults to `cpan:CCM`. @@ -143,12 +145,12 @@ Do not upload to CPAN or git push. ## configure -Required by [Dist::Zilla::Role::PluginBundle::Easy](https://metacpan.org/pod/Dist::Zilla::Role::PluginBundle::Easy). +Required by [Dist::Zilla::Role::PluginBundle::Easy](https://metacpan.org/pod/Dist%3A%3AZilla%3A%3ARole%3A%3APluginBundle%3A%3AEasy). # SEE ALSO -- [Dist::Zilla](https://metacpan.org/pod/Dist::Zilla) -- [Dist::Zilla::PluginBundle::Author::ETHER](https://metacpan.org/pod/Dist::Zilla::PluginBundle::Author::ETHER) +- [Dist::Zilla](https://metacpan.org/pod/Dist%3A%3AZilla) +- [Dist::Zilla::PluginBundle::Author::ETHER](https://metacpan.org/pod/Dist%3A%3AZilla%3A%3APluginBundle%3A%3AAuthor%3A%3AETHER) # BUGS @@ -161,7 +163,7 @@ feature. # AUTHOR -Charles McGarvey +Charles McGarvey # COPYRIGHT AND LICENSE diff --git a/dist.ini b/dist.ini index 58e6add..9aaf88a 100644 --- a/dist.ini +++ b/dist.ini @@ -1,6 +1,6 @@ name = Dist-Zilla-PluginBundle-Author-CCM -author = Charles McGarvey +author = Charles McGarvey copyright_holder = Charles McGarvey copyright_year = 2016 license = Perl_5 @@ -52,7 +52,6 @@ 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 @@ -65,7 +64,6 @@ 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 Perl::Version = 0 Pod::Elemental::Transformer::List = 0 @@ -83,10 +81,6 @@ 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] @@ -97,5 +91,4 @@ 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 177b79b..a8b8a9c 100644 --- a/lib/Dist/Zilla/PluginBundle/Author/CCM.pm +++ b/lib/Dist/Zilla/PluginBundle/Author/CCM.pm @@ -13,8 +13,6 @@ You probably don't want to use this. ; VERSION [Git::NextVersion] - [ReversionOnRelease] - prompt = 1 ; GATHER [Git::GatherDir] @@ -83,8 +81,6 @@ You probably don't want to use this. filename = README location = build type = text - [TravisYML] - build_branch = /^(dist|build\/.*)$/ [Manifest] [ManifestSkip] @@ -141,7 +137,29 @@ has max_target_perl => ( lazy => 1, default => sub { my $self = shift; - $self->payload->{'Test::MinimumVersion.max_target_perl'} // $self->payload->{max_target_perl} // '5.10.1'; + $self->payload->{'Test::MinimumVersion.max_target_perl'} + // $self->payload->{max_target_perl} + // '5.10.1'; + }, +); + +=attr no_index + +Set directories to not index. + +Default: + +=cut + +has no_index => ( + is => 'ro', + isa => 'ArrayRef', + lazy => 1, + default => sub { + my $self = shift; + [split(/\s+/, $self->payload->{'MetaNoIndex.directories'} + // $self->payload->{no_index} + // 'eg share shares t xt')]; }, ); @@ -217,43 +235,21 @@ sub configure { my @network_plugins = qw(Git::Push Test::Pod::No404s UploadToCPAN); my @gather_exclude = (@copy_from_build, qw(README.md)); my @gather_prune = qw(dist.ini); - my @no_index = qw(eg share shares t xt); - my @allow_dirty = (@copy_from_build, qw(.travis.yml Changes LICENSE README.md)); + my @no_index = @{$self->no_index}; + my @allow_dirty = (@copy_from_build, qw(Changes LICENSE README.md)); my @git_remotes = qw(github origin); my @check_files = qw(:InstallModules :ExecFiles :TestFiles :ExtraTestFiles); my $perl_version_target = $self->max_target_perl; - my ($perl_version, $perl_version_build) = $self->_travis_perl_versions($perl_version_target); + my $installer = $self->installer; if ($self->no_upload) { say '[@Author::CCM] WARNING! WARNING! WARNING! *** You are in no_upload mode!! ***'; } - if (!$self->payload->{'TravisYML.support_builddir'}) { - # swap perl_version and perl_version_build because DZP::TravisYML got it backwards! - # https://github.com/SineSwiper/Dist-Zilla-TravisCI/pull/40 - - my $tmp = $self->payload->{'TravisYML.perl_version_build'}; - if (defined $self->payload->{'TravisYML.perl_version'}) { - $self->payload->{'TravisYML.perl_version_build'} = $self->payload->{'TravisYML.perl_version'} - } - else { - delete $self->payload->{'TravisYML.perl_version_build'}; - } - if (defined $tmp) { - $self->payload->{'TravisYML.perl_version'} = $tmp; - } - else { - delete $self->payload->{'TravisYML.perl_version'}; - } - - ($perl_version, $perl_version_build) = ($perl_version_build, $perl_version); - } - my @plugins = ( # VERSION ['Git::NextVersion'], - ['ReversionOnRelease' => {prompt => 1}], # GATHER ['Git::GatherDir' => {exclude_filename => [@gather_exclude]}], @@ -301,14 +297,13 @@ sub configure { ['License'], ['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'], - $self->installer, # e.g. MakeMaker + $installer ? $self->installer : (), # e.g. MakeMaker # RELEASE - ['NextRelease'], + ['NextRelease' => {format => '%-9v %{yyyy-MM-dd HH:mm:ssZZZ}d%{ (TRIAL RELEASE)}T'}], ['CheckChangesHasContent'], ['Git::Check' => {allow_dirty => [@allow_dirty], untracked_files => 'ignore'}], ['RunExtraTests'], @@ -334,29 +329,6 @@ sub configure { $self->add_plugins(@plugins); } -sub _travis_perl_versions { - my $self = shift; - - my $perl_version_target = Perl::Version->new(shift or die 'Missing target version'); - my $min_version = Perl::Version->new('5.14'); - my $min_version_build = Perl::Version->new($perl_version_target); - $min_version_build->subversion(0); - - my @versions; - my @versions_build; - - for my $v (qw{5.26 5.24 5.22 5.20 5.18 5.16 5.14 5.12 5.10 5.8}) { - my $version = Perl::Version->new($v); - push @versions, "$version" if $version >= $min_version_build && $version >= $min_version; - push @versions_build, "$version" if $version >= $min_version_build; - } - - my $perl_version = join(' ', @versions); - my $perl_version_build = join(' ', @versions_build); - - return ($perl_version, $perl_version_build); -} - with 'Dist::Zilla::Role::PluginBundle::Easy'; with 'Dist::Zilla::Role::PluginBundle::PluginRemover'; with 'Dist::Zilla::Role::PluginBundle::Config::Slicer'; diff --git a/t/01-basic.t b/t/basic.t similarity index 100% rename from t/01-basic.t rename to t/basic.t