diff --git a/Changes b/Changes index 20e5ddb..ca7714d 100644 --- a/Changes +++ b/Changes @@ -1,13 +1,18 @@ Release history for Dist-Zilla-Plugin-Prereqs-Soften -0.005002 2015-02-28T04:51:06Z b7fcc23 +0.006000 2015-02-28T05:06:54Z ac9c807 [Dependencies::Stats] - Dependencies changed since 0.005001, see misc/*.deps* for details - configure: +1 (recommends: ↑1) - - develop: +10 ↑2 -2 (recommends: +1, suggests: ↑2) - - runtime: (recommends: +1) + - develop: +10 ↑2 -3 (recommends: +1, suggests: ↑2) + - runtime: ↓1 (recommends: +1 -1) - test: +1 (recommends: ↑1 ↓1) + [Features] + - Can now specify to_relationship = none. This is useful in conjunction with copy_to to move phases. Its admittedly + awkward syntax, but I need to re-write half the internals now because YAGNI made them too simple earlier, and now + IGNI. + 0.005001 2014-09-29T14:03:18Z [Bugfix] - Dont fail with newer OptionalFaetures due to test subsequently needing a Makefile.PL to work diff --git a/MANIFEST b/MANIFEST index 62dc025..5403d80 100644 --- a/MANIFEST +++ b/MANIFEST @@ -28,6 +28,7 @@ t/01-basic.t t/02-to_relationship-suggested.t t/03-copy_to-develop-requires.t t/04-modules_from_features.t +t/05-to_relationship-none.t weaver.ini xt/author/critic.t xt/author/eol.t diff --git a/META.json b/META.json index c346ce1..b9d04c8 100644 --- a/META.json +++ b/META.json @@ -132,7 +132,7 @@ "provides" : { "Dist::Zilla::Plugin::Prereqs::Soften" : { "file" : "lib/Dist/Zilla/Plugin/Prereqs/Soften.pm", - "version" : "0.005002" + "version" : "0.006000" } }, "release_status" : "stable", @@ -147,7 +147,7 @@ "web" : "https://github.com/kentnl/Dist-Zilla-Plugin-Prereqs-Soften" } }, - "version" : "0.005002", + "version" : "0.006000", "x_BuiltWith" : { "external_file" : "misc/built_with.json" }, @@ -617,7 +617,7 @@ "Dist::Zilla::Plugin::Git::Tag" : { "branch" : null, "signed" : 0, - "tag" : "0.005002-source", + "tag" : "0.006000-source", "tag_format" : "%v-source", "tag_message" : "v%v", "time_zone" : "local" @@ -688,7 +688,7 @@ "Dist::Zilla::Plugin::Git::Tag" : { "branch" : "releases", "signed" : 0, - "tag" : "0.005002", + "tag" : "0.006000", "tag_format" : "%v", "tag_message" : "v%v", "time_zone" : "local" diff --git a/META.yml b/META.yml index b9eb074..61a0fc7 100644 --- a/META.yml +++ b/META.yml @@ -23,7 +23,7 @@ name: Dist-Zilla-Plugin-Prereqs-Soften provides: Dist::Zilla::Plugin::Prereqs::Soften: file: lib/Dist/Zilla/Plugin/Prereqs/Soften.pm - version: '0.005002' + version: '0.006000' recommends: Moose: '2.000' strict: '0' @@ -39,7 +39,7 @@ 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.005002' +version: '0.006000' x_BuiltWith: external_file: misc/built_with.json x_Dist_Zilla: @@ -401,7 +401,7 @@ x_Dist_Zilla: Dist::Zilla::Plugin::Git::Tag: branch: ~ signed: 0 - tag: 0.005002-source + tag: 0.006000-source tag_format: '%v-source' tag_message: v%v time_zone: local @@ -455,7 +455,7 @@ x_Dist_Zilla: Dist::Zilla::Plugin::Git::Tag: branch: releases signed: 0 - tag: '0.005002' + tag: '0.006000' tag_format: '%v' tag_message: v%v time_zone: local diff --git a/Makefile.PL b/Makefile.PL index 27a1ef0..f2cba71 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -32,7 +32,7 @@ my %WriteMakefileArgs = ( "Test::More" => "0.89", "Test::Requires" => 0 }, - "VERSION" => "0.005002", + "VERSION" => "0.006000", "test" => { "TESTS" => "t/*.t t/00-compile/*.t" } diff --git a/lib/Dist/Zilla/Plugin/Prereqs/Soften.pm b/lib/Dist/Zilla/Plugin/Prereqs/Soften.pm index 704ae4a..45be18b 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.005002'; +our $VERSION = '0.006000'; # ABSTRACT: Downgrade listed dependencies to recommendations if present. @@ -48,7 +48,7 @@ use Moose::Util::TypeConstraints qw(enum); has 'to_relationship' => ( is => ro =>, - isa => enum( [qw(requires recommends suggests conflicts)] ), + isa => enum( [qw(none requires recommends suggests conflicts)] ), lazy => 1, default => sub { 'recommends' }, ); @@ -193,6 +193,7 @@ sub _soften_prereqs { my @target_reqs; for my $target ( @{ $conf->{to} } ) { + next if $target->{relation} eq 'none'; push @target_reqs, $prereqs->requirements_for( $target->{phase}, $target->{relation} ); } @@ -241,7 +242,7 @@ Dist::Zilla::Plugin::Prereqs::Soften - Downgrade listed dependencies to recommen =head1 VERSION -version 0.005002 +version 0.006000 =head1 SYNOPSIS diff --git a/misc/Changes.deps b/misc/Changes.deps index dbad607..b6b4e22 100644 --- a/misc/Changes.deps +++ b/misc/Changes.deps @@ -2,10 +2,13 @@ This file contains changes in REQUIRED dependencies for standard CPAN phases (co 0.005002 [Added / configure requires] - - perl 5.008 + - perl 5.006 [Added / test requires] - - perl 5.008 + - perl 5.006 + + [Changed / runtime requires] + - perl 5.008 → 5.006 0.005001 2014-09-29T14:03:18Z diff --git a/misc/Changes.deps.all b/misc/Changes.deps.all index aefeb38..62144fe 100644 --- a/misc/Changes.deps.all +++ b/misc/Changes.deps.all @@ -2,7 +2,7 @@ This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL depen 0.005002 [Added / configure requires] - - perl 5.008 + - perl 5.006 [Added / develop recommends] - Test::More 0.99 @@ -23,7 +23,7 @@ This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL depen - Moose 2.000 [Added / test requires] - - perl 5.008 + - perl 5.006 [Changed / configure recommends] - ExtUtils::MakeMaker 6.98 → 7.00 @@ -36,6 +36,9 @@ This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL depen - Dist::Zilla::App::Command::bakeini 0.001002 → 0.002000 - Dist::Zilla::PluginBundle::Author::KENTNL 2.020003 → 2.023003 + [Changed / runtime requires] + - perl 5.008 → 5.006 + [Changed / test recommends] - ExtUtils::MakeMaker 6.98 → 7.00 - Test::More 1.001006 → 0.99 @@ -43,6 +46,10 @@ This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL depen [Removed / develop requires] - Dist::Zilla::Plugin::EOLTests - Dist::Zilla::Plugin::ReadmeFromPod + - utf8 + + [Removed / runtime recommends] + - utf8 0.005001 2014-09-29T14:03:18Z [Added / test recommends] diff --git a/misc/Changes.deps.dev b/misc/Changes.deps.dev index 57dba29..07809ca 100644 --- a/misc/Changes.deps.dev +++ b/misc/Changes.deps.dev @@ -27,6 +27,7 @@ This file contains changes to DEVELOPMENT dependencies only ( both REQUIRED and [Removed / develop requires] - Dist::Zilla::Plugin::EOLTests - Dist::Zilla::Plugin::ReadmeFromPod + - utf8 0.005001 2014-09-29T14:03:18Z [Changed / develop suggests] diff --git a/misc/Changes.deps.opt b/misc/Changes.deps.opt index 22f5320..a7b0773 100644 --- a/misc/Changes.deps.opt +++ b/misc/Changes.deps.opt @@ -11,6 +11,9 @@ This file contains changes in OPTIONAL dependencies for standard CPAN phases (co - ExtUtils::MakeMaker 6.98 → 7.00 - Test::More 1.001006 → 0.99 + [Removed / runtime recommends] + - utf8 + 0.005001 2014-09-29T14:03:18Z [Added / test recommends] - Dist::Zilla 5.020 diff --git a/t/05-to_relationship-none.t b/t/05-to_relationship-none.t new file mode 100644 index 0000000..d1d8608 --- /dev/null +++ b/t/05-to_relationship-none.t @@ -0,0 +1,44 @@ + +use strict; +use warnings; + +use Test::More; + +# FILENAME: 01-basic.t +# CREATED: 03/23/14 19:41:51 by Kent Fredric (kentnl) +# ABSTRACT: Basic interface test + +use Test::DZil qw(simple_ini); +use Dist::Zilla::Util::Test::KENTNL 1.003002 qw( dztest ); + +my $test = dztest(); +my @ini; + +push @ini, [ 'Prereqs', { 'Foo' => 1 } ]; +push @ini, [ 'Prereqs::Soften', { 'module' => 'Foo', 'to_relationship' => 'none', copy_to => 'develop.requires' } ]; +push @ini, ['GatherDir']; + +$test->add_file( 'dist.ini', simple_ini(@ini) ); +$test->add_file( 'lib/E.pm', <<'EO_EPM'); +use strict; +use warnings; + +package E; + +# ABSTRACT: Fake dist stub + +use Moose; +with 'Dist::Zilla::Role::Plugin'; + +1; +EO_EPM + +$test->build_ok; +$test->prereqs_deeply( + { + develop => { requires => { 'Foo' => '1' } }, + } +); + +done_testing; + diff --git a/xt/author/eol.t b/xt/author/eol.t index 2facc60..0d88c8e 100644 --- a/xt/author/eol.t +++ b/xt/author/eol.t @@ -14,7 +14,8 @@ my @files = ( 't/01-basic.t', 't/02-to_relationship-suggested.t', 't/03-copy_to-develop-requires.t', - 't/04-modules_from_features.t' + 't/04-modules_from_features.t', + 't/05-to_relationship-none.t' ); eol_unix_ok($_, { trailing_whitespace => 1 }) foreach @files;