X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fp5-Dist-Zilla-PluginBundle-Author-CCM;a=blobdiff_plain;f=lib%2FDist%2FZilla%2FPluginBundle%2FAuthor%2FCCM.pm;h=177b79b26989386930f31d419fedf0a46c13e8af;hp=3cdcea1d5e751a36035f4cc18b07acbcf37dee91;hb=b3d8e8697c056b409772cd63145088d5cec4d153;hpb=faf846a96d49554080e9d65f66e1ad26e54104b1 diff --git a/lib/Dist/Zilla/PluginBundle/Author/CCM.pm b/lib/Dist/Zilla/PluginBundle/Author/CCM.pm index 3cdcea1..177b79b 100644 --- a/lib/Dist/Zilla/PluginBundle/Author/CCM.pm +++ b/lib/Dist/Zilla/PluginBundle/Author/CCM.pm @@ -13,13 +13,9 @@ You probably don't want to use this. ; VERSION [Git::NextVersion] - [NextRelease] [ReversionOnRelease] prompt = 1 - [ExecDir] - [ExtraTests] - ; GATHER [Git::GatherDir] exclude_filename = LICENSE @@ -30,6 +26,7 @@ You probably don't want to use this. [CopyFilesFromBuild] copy = LICENSE + [ExecDir] ; PREREQS [AutoPrereqs] @@ -43,6 +40,8 @@ You probably don't want to use this. [PodSyntaxTests] [Test::Pod::No404s] [Test::Compile] + [Test::MinimumVersion] + max_target_perl = 5.10.1 [Test::EOL] [Test::NoTabs] [Test::Perl::Critic] @@ -85,14 +84,17 @@ You probably don't want to use this. location = build type = text [TravisYML] + build_branch = /^(dist|build\/.*)$/ [Manifest] [ManifestSkip] [MakeMaker] ; override with the "installer" attribute ; RELEASE + [NextRelease] [CheckChangesHasContent] [Git::Check] + [RunExtraTests] [TestRelease] [ConfirmRelease] [UploadToCPAN] ; disable with the "no_upload" attribute @@ -116,6 +118,7 @@ You probably don't want to use this. =cut +use 5.014; use warnings; use strict; @@ -123,8 +126,41 @@ our $VERSION = '999.999'; # VERSION use Dist::Zilla::Util; use Moose; +use Perl::Version; use namespace::autoclean; +=attr max_target_perl + +Specify the minimum perl version. Defaults to C<5.10.1>. + +=cut + +has max_target_perl => ( + is => 'ro', + isa => 'Str', + lazy => 1, + default => sub { + my $self = shift; + $self->payload->{'Test::MinimumVersion.max_target_perl'} // $self->payload->{max_target_perl} // '5.10.1'; + }, +); + +=attr authority + +Specify the release authority. Defaults to C. + +=cut + +has authority => ( + is => 'ro', + isa => 'Str', + lazy => 1, + default => sub { + my $self = shift; + $self->payload->{'Authority.authority'} // $self->payload->{authority} // 'cpan:CCM'; + }, +); + =attr installer Specify which installer to use, such as: @@ -139,7 +175,7 @@ has installer => ( is => 'ro', isa => 'Str', lazy => 1, - default => sub { shift->payload->{installer} || 'MakeMaker' }, + default => sub { shift->payload->{installer} // 'MakeMaker' }, ); =attr airplane @@ -177,35 +213,55 @@ Required by L. sub configure { my $self = shift; + my @copy_from_build = qw(LICENSE); + 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 @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); + if ($self->no_upload) { - print '[@Author::CCM] WARNING! WARNING! WARNING! *** You are in no_upload mode!! ***', "\n"; + say '[@Author::CCM] WARNING! WARNING! WARNING! *** You are in no_upload mode!! ***'; } - my @copy_from_build = qw(LICENSE); - 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 @git_remotes = qw(github origin); - my @check_files = qw(:InstallModules :ExecFiles :TestFiles :ExtraTestFiles); + 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'], - ['NextRelease'], ['ReversionOnRelease' => {prompt => 1}], - ['ExecDir'], - ['ExtraTests'], - # GATHER ['Git::GatherDir' => {exclude_filename => [@gather_exclude]}], ['PruneCruft'], ['PruneFiles' => {filename => [@gather_prune]}], ['CopyFilesFromBuild' => {copy => [@copy_from_build]}], + ['ExecDir'], # PREREQS ['AutoPrereqs'], @@ -219,6 +275,7 @@ sub configure { ['PodSyntaxTests'], ['Test::Pod::No404s'], ['Test::Compile'], + ['Test::MinimumVersion' => {max_target_perl => $perl_version_target}], ['Test::EOL' => {finder => [@check_files]}], ['Test::NoTabs' => {finder => [@check_files]}], ['Test::Perl::Critic'], @@ -227,7 +284,7 @@ sub configure { ['Test::ReportPrereqs'], # METADATA - ['Authority' => {do_munging => 0}], + ['Authority' => {authority => $self->authority, do_munging => 0}], ['MetaJSON'], ['MetaYAML'], ['MetaNoIndex' => {directory => [@no_index]}], @@ -242,17 +299,19 @@ 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'}], - ['TravisYML'], + ['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 # RELEASE + ['NextRelease'], ['CheckChangesHasContent'], ['Git::Check' => {allow_dirty => [@allow_dirty], untracked_files => 'ignore'}], + ['RunExtraTests'], ['TestRelease'], # ['ConfirmRelease'], $self->no_upload ? ['FakeRelease'] : ['UploadToCPAN'], @@ -275,6 +334,29 @@ 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';