diff --git a/Build.PL b/Build.PL index f274dbb..317728c 100644 --- a/Build.PL +++ b/Build.PL @@ -23,7 +23,7 @@ my %module_build_args = ( "Kent Fredric " ], "dist_name" => "Dist-Zilla-Plugin-MetaProvides", - "dist_version" => "1.13000001", + "dist_version" => "1.14000000", "license" => "perl", "module_name" => "Dist::Zilla::Plugin::MetaProvides", "recommends" => {}, diff --git a/Changes b/Changes index 6d4bc60..adc96c7 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,10 @@ Revision history for Dist-Zilla-Plugin-MetaProvides +1.14000000 2012-02-07T08:45:13Z + [Features] + - Reverted all non-documentation changes since 1.13x. Handling this in the + role level was a dumb idea anyway. + 1.13000001 2012-02-04T09:04:53Z [Documentation] - Improve documentation of skip_underscores and meta_noindex at the more diff --git a/META.json b/META.json index 5fc111f..913a621 100644 --- a/META.json +++ b/META.json @@ -4,7 +4,7 @@ "Kent Fredric " ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 4.300007, CPAN::Meta::Converter version 2.113640", + "generated_by" : "Dist::Zilla version 4.300007, CPAN::Meta::Converter version 2.120351", "license" : [ "perl_5" ], @@ -35,9 +35,9 @@ "Dist::Zilla::PluginBundle::Author::KENTNL::Lite" : "0.01009803" }, "requires" : { - "Dist::Zilla::Plugin::Bootstrap::lib" : 0, - "Dist::Zilla::Plugin::MetaNoIndex" : 0, - "Dist::Zilla::PluginBundle::Author::KENTNL::Lite" : 0 + "Dist::Zilla::Plugin::Bootstrap::lib" : "0", + "Dist::Zilla::Plugin::MetaNoIndex" : "0", + "Dist::Zilla::PluginBundle::Author::KENTNL::Lite" : "0" }, "suggests" : { "Dist::Zilla::PluginBundle::Author::KENTNL" : "v1.2.0" @@ -45,51 +45,51 @@ }, "runtime" : { "requires" : { - "Dist::Zilla::Role::MetaProvider" : 0, + "Dist::Zilla::Role::MetaProvider" : "0", "Dist::Zilla::Util::EmulatePhase" : "0.01000101", - "Moose" : 0, - "Moose::Role" : 0, - "MooseX::Types" : 0, - "MooseX::Types::Moose" : 0, - "namespace::autoclean" : 0, + "Moose" : "0", + "Moose::Role" : "0", + "MooseX::Types" : "0", + "MooseX::Types::Moose" : "0", + "namespace::autoclean" : "0", "perl" : "5.006", - "strict" : 0, - "warnings" : 0 + "strict" : "0", + "warnings" : "0" }, "suggests" : { - "Dist::Zilla::Plugin::MetaNoIndex" : 0 + "Dist::Zilla::Plugin::MetaNoIndex" : "0" } }, "test" : { "requires" : { "Dist::Zilla::Util::Test::KENTNL" : "0.01000004", - "File::Find" : 0, - "File::Temp" : 0, - "Scalar::Util" : 0, - "Test::Fatal" : 0, + "File::Find" : "0", + "File::Temp" : "0", + "Scalar::Util" : "0", + "Test::Fatal" : "0", "Test::More" : "0.96" }, "suggests" : { - "Dist::Zilla::Plugin::MetaNoIndex" : 0 + "Dist::Zilla::Plugin::MetaNoIndex" : "0" } } }, "provides" : { "Dist::Zilla::MetaProvides::ProvideRecord" : { "file" : "lib/Dist/Zilla/MetaProvides/ProvideRecord.pm", - "version" : "1.13000001" + "version" : "1.14000000" }, "Dist::Zilla::MetaProvides::Types" : { "file" : "lib/Dist/Zilla/MetaProvides/Types.pm", - "version" : "1.13000001" + "version" : "1.14000000" }, "Dist::Zilla::Plugin::MetaProvides" : { "file" : "lib/Dist/Zilla/Plugin/MetaProvides.pm", - "version" : "1.13000001" + "version" : "1.14000000" }, "Dist::Zilla::Role::MetaProvider::Provider" : { "file" : "lib/Dist/Zilla/Role/MetaProvider/Provider.pm", - "version" : "1.13000001" + "version" : "1.14000000" } }, "release_status" : "stable", @@ -101,7 +101,7 @@ "web" : "https://github.com/kentfredric/dist-zilla-plugin-metaprovides" } }, - "version" : "1.13000001", + "version" : "1.14000000", "x_BuiltWith" : { "modules" : { "Dist::Zilla::Plugin::Bootstrap::lib" : "0.01023601", @@ -114,8 +114,8 @@ "File::Find" : "1.19", "File::Temp" : "0.22", "Module::Build" : "0.38", - "Moose" : "2.0401", - "Moose::Role" : "2.0401", + "Moose" : "2.0402", + "Moose::Role" : "2.0402", "MooseX::Types" : "0.31", "MooseX::Types::Moose" : "0.31", "Scalar::Util" : "1.23", @@ -143,7 +143,7 @@ { "class" : "Dist::Zilla::Plugin::Git::NextVersion", "name" : "@Author::KENTNL/Git::NextVersion", - "version" : "1.113560" + "version" : "1.120370" }, { "class" : "Dist::Zilla::Plugin::MetaConfig", @@ -158,7 +158,7 @@ { "class" : "Dist::Zilla::Plugin::MetaProvides::Package", "name" : "@Author::KENTNL/MetaProvides::Package", - "version" : "1.12060501" + "version" : "1.12060502" }, { "class" : "Dist::Zilla::Plugin::MetaData::BuiltWith", @@ -357,27 +357,27 @@ { "class" : "Dist::Zilla::Plugin::Git::Check", "name" : "@Author::KENTNL/Git::Check", - "version" : "1.113560" + "version" : "1.120370" }, { "class" : "Dist::Zilla::Plugin::Git::Tag", "name" : "@Author::KENTNL/Git::Tag/tag_master", - "version" : "1.113560" + "version" : "1.120370" }, { "class" : "Dist::Zilla::Plugin::Git::Commit", "name" : "@Author::KENTNL/Git::Commit", - "version" : "1.113560" + "version" : "1.120370" }, { "class" : "Dist::Zilla::Plugin::Git::CommitBuild", "name" : "@Author::KENTNL/Git::CommitBuild", - "version" : "1.113560" + "version" : "1.120370" }, { "class" : "Dist::Zilla::Plugin::Git::Tag", "name" : "@Author::KENTNL/Git::Tag/tag_release", - "version" : "1.113560" + "version" : "1.120370" }, { "class" : "Dist::Zilla::Plugin::UploadToCPAN", diff --git a/META.yml b/META.yml index 557bbd0..c9c5f44 100644 --- a/META.yml +++ b/META.yml @@ -13,7 +13,7 @@ build_requires: configure_requires: Module::Build: 0.3601 dynamic_config: 0 -generated_by: 'Dist::Zilla version 4.300007, CPAN::Meta::Converter version 2.113640' +generated_by: 'Dist::Zilla version 4.300007, CPAN::Meta::Converter version 2.120351' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -26,16 +26,16 @@ no_index: provides: Dist::Zilla::MetaProvides::ProvideRecord: file: lib/Dist/Zilla/MetaProvides/ProvideRecord.pm - version: 1.13000001 + version: 1.14000000 Dist::Zilla::MetaProvides::Types: file: lib/Dist/Zilla/MetaProvides/Types.pm - version: 1.13000001 + version: 1.14000000 Dist::Zilla::Plugin::MetaProvides: file: lib/Dist/Zilla/Plugin/MetaProvides.pm - version: 1.13000001 + version: 1.14000000 Dist::Zilla::Role::MetaProvider::Provider: file: lib/Dist/Zilla/Role/MetaProvider/Provider.pm - version: 1.13000001 + version: 1.14000000 requires: Dist::Zilla::Role::MetaProvider: 0 Dist::Zilla::Util::EmulatePhase: 0.01000101 @@ -50,7 +50,7 @@ requires: resources: homepage: https://github.com/kentfredric/dist-zilla-plugin-metaprovides repository: https://github.com/kentfredric/dist-zilla-plugin-metaprovides.git -version: 1.13000001 +version: 1.14000000 x_BuiltWith: modules: Dist::Zilla::Plugin::Bootstrap::lib: 0.01023601 @@ -63,8 +63,8 @@ x_BuiltWith: File::Find: 1.19 File::Temp: 0.22 Module::Build: 0.38 - Moose: 2.0401 - Moose::Role: 2.0401 + Moose: 2.0402 + Moose::Role: 2.0402 MooseX::Types: 0.31 MooseX::Types::Moose: 0.31 Scalar::Util: 1.23 @@ -88,7 +88,7 @@ x_Dist_Zilla: - class: Dist::Zilla::Plugin::Git::NextVersion name: '@Author::KENTNL/Git::NextVersion' - version: 1.113560 + version: 1.120370 - class: Dist::Zilla::Plugin::MetaConfig name: '@Author::KENTNL/MetaConfig' @@ -100,7 +100,7 @@ x_Dist_Zilla: - class: Dist::Zilla::Plugin::MetaProvides::Package name: '@Author::KENTNL/MetaProvides::Package' - version: 1.12060501 + version: 1.12060502 - class: Dist::Zilla::Plugin::MetaData::BuiltWith config: @@ -256,23 +256,23 @@ x_Dist_Zilla: - class: Dist::Zilla::Plugin::Git::Check name: '@Author::KENTNL/Git::Check' - version: 1.113560 + version: 1.120370 - class: Dist::Zilla::Plugin::Git::Tag name: '@Author::KENTNL/Git::Tag/tag_master' - version: 1.113560 + version: 1.120370 - class: Dist::Zilla::Plugin::Git::Commit name: '@Author::KENTNL/Git::Commit' - version: 1.113560 + version: 1.120370 - class: Dist::Zilla::Plugin::Git::CommitBuild name: '@Author::KENTNL/Git::CommitBuild' - version: 1.113560 + version: 1.120370 - class: Dist::Zilla::Plugin::Git::Tag name: '@Author::KENTNL/Git::Tag/tag_release' - version: 1.113560 + version: 1.120370 - class: Dist::Zilla::Plugin::UploadToCPAN name: '@Author::KENTNL/UploadToCPAN' diff --git a/README b/README index 0b252c5..49a48c6 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ NAME in your META.yml VERSION - version 1.13000001 + version 1.14000000 SYNOPSIS In your projects dist.ini @@ -12,13 +12,11 @@ SYNOPSIS inherit_version = 0 ;optional flag inherit_missing = 0 ;optional flag meta_noindex = 1 ;optional flag - skip_underscore = 1 ;optional flag [MetaProvides::Package] inherit_version = 0 ;optional flag inherit_missing = 0 ;optional flag meta_noindex = 1 ;optional flag - skip_underscore = 1 ;optional flag [MetaProvides::FromFile] inherit_version = 0 ;optional flag @@ -26,7 +24,6 @@ SYNOPSIS file = some_file.ini ;mandatory flag reader_name = Config::INI::Reader ;optional flag meta_noindex = 1 ;optional and useless flag - skip_underscore = 1 ;its there as an option, but its probably stupid. And then in some_file.ini @@ -120,25 +117,6 @@ OPTION SUMMARY "meta_noindex" in Dist::Zilla::Role::MetaProvider::Provider - skip_underscore - Filter out detected namespaces with a token with a leading "_", ie: - - Foo::Bar::_internal::Baz; - - This is a convenience to provide sane defaults. For more controlled - exclusion of namespaces, see Dist::Zilla::Plugin::MetaNoIndex - - values - * '0' - - *underscore*'d namespaces will be included. - - * '1' [default] - - *underscore*'d namespaces will not be included. - - "skip_underscore" in Dist::Zilla::Role::MetaProvider::Provider - file ( Dist::Zilla::Plugin::MetaProvides::FromFile ) diff --git a/lib/Dist/Zilla/MetaProvides/ProvideRecord.pm b/lib/Dist/Zilla/MetaProvides/ProvideRecord.pm index 2b9155e..4d8a4fa 100644 --- a/lib/Dist/Zilla/MetaProvides/ProvideRecord.pm +++ b/lib/Dist/Zilla/MetaProvides/ProvideRecord.pm @@ -6,7 +6,7 @@ BEGIN { $Dist::Zilla::MetaProvides::ProvideRecord::AUTHORITY = 'cpan:KENTNL'; } { - $Dist::Zilla::MetaProvides::ProvideRecord::VERSION = '1.13000001'; + $Dist::Zilla::MetaProvides::ProvideRecord::VERSION = '1.14000000'; } # ABSTRACT: Data Management Record for MetaProvider::Provides Based Class @@ -62,7 +62,7 @@ Dist::Zilla::MetaProvides::ProvideRecord - Data Management Record for MetaProvid =head1 VERSION -version 1.13000001 +version 1.14000000 =head1 ATTRIBUTES diff --git a/lib/Dist/Zilla/MetaProvides/Types.pm b/lib/Dist/Zilla/MetaProvides/Types.pm index a80ee7d..d881d4e 100644 --- a/lib/Dist/Zilla/MetaProvides/Types.pm +++ b/lib/Dist/Zilla/MetaProvides/Types.pm @@ -6,7 +6,7 @@ BEGIN { $Dist::Zilla::MetaProvides::Types::AUTHORITY = 'cpan:KENTNL'; } { - $Dist::Zilla::MetaProvides::Types::VERSION = '1.13000001'; + $Dist::Zilla::MetaProvides::Types::VERSION = '1.14000000'; } # ABSTRACT: Utility Types for the MetaProvides Plugin @@ -35,7 +35,7 @@ Dist::Zilla::MetaProvides::Types - Utility Types for the MetaProvides Plugin =head1 VERSION -version 1.13000001 +version 1.14000000 =head1 SUBTYPES diff --git a/lib/Dist/Zilla/Plugin/MetaProvides.pm b/lib/Dist/Zilla/Plugin/MetaProvides.pm index da3b677..2780f57 100644 --- a/lib/Dist/Zilla/Plugin/MetaProvides.pm +++ b/lib/Dist/Zilla/Plugin/MetaProvides.pm @@ -6,7 +6,7 @@ BEGIN { $Dist::Zilla::Plugin::MetaProvides::AUTHORITY = 'cpan:KENTNL'; } { - $Dist::Zilla::Plugin::MetaProvides::VERSION = '1.13000001'; + $Dist::Zilla::Plugin::MetaProvides::VERSION = '1.14000000'; } # ABSTRACT: Generating and Populating 'provides' in your META.yml @@ -23,7 +23,7 @@ Dist::Zilla::Plugin::MetaProvides - Generating and Populating 'provides' in your =head1 VERSION -version 1.13000001 +version 1.14000000 =head1 SYNOPSIS @@ -33,13 +33,11 @@ In your projects dist.ini inherit_version = 0 ;optional flag inherit_missing = 0 ;optional flag meta_noindex = 1 ;optional flag - skip_underscore = 1 ;optional flag [MetaProvides::Package] inherit_version = 0 ;optional flag inherit_missing = 0 ;optional flag meta_noindex = 1 ;optional flag - skip_underscore = 1 ;optional flag [MetaProvides::FromFile] inherit_version = 0 ;optional flag @@ -47,7 +45,6 @@ In your projects dist.ini file = some_file.ini ;mandatory flag reader_name = Config::INI::Reader ;optional flag meta_noindex = 1 ;optional and useless flag - skip_underscore = 1 ;its there as an option, but its probably stupid. And then in some_file.ini @@ -163,30 +160,6 @@ to not be provided in the metadata. L -=head2 skip_underscore - -Filter out detected namespaces with a token with a leading C<_>, ie: - - Foo::Bar::_internal::Baz; - -This is a convenience to provide sane defaults. For more controlled exclusion of namespaces, see L - -=head3 values - -=over 4 - -=item * C<< '0' >> - -I'd namespaces will be included. - -=item * C<< '1' >> B<[default]> - -I'd namespaces will not be included. - -=back - -L - =head2 file ( L ) diff --git a/lib/Dist/Zilla/Role/MetaProvider/Provider.pm b/lib/Dist/Zilla/Role/MetaProvider/Provider.pm index 0982aca..aa5626c 100644 --- a/lib/Dist/Zilla/Role/MetaProvider/Provider.pm +++ b/lib/Dist/Zilla/Role/MetaProvider/Provider.pm @@ -6,7 +6,7 @@ BEGIN { $Dist::Zilla::Role::MetaProvider::Provider::AUTHORITY = 'cpan:KENTNL'; } { - $Dist::Zilla::Role::MetaProvider::Provider::VERSION = '1.13000001'; + $Dist::Zilla::Role::MetaProvider::Provider::VERSION = '1.14000000'; } # ABSTRACT: A Role for Metadata providers specific to the 'provider' key. @@ -48,14 +48,6 @@ has meta_noindex => ( ); -has skip_underscore => ( - is => 'ro', - isa => Bool, - default => 1, - documentation => 'Skip packages with a leading _ , ie: Foo::_internal::baz', -); - - sub _resolve_version { my $self = shift; my $version = shift; @@ -130,10 +122,6 @@ sub metadata { my ($self) = @_; my $discover = {}; for ( $self->provides ) { - if ( $self->skip_underscore and $_->module =~ /(\A_|::_)/msx ) { - $self->log_debug( 'Skipping ' . $_->module . ' due to /skip_underscore = true ' ); - next; - } $_->copy_into($discover); } return { provides => $discover }; @@ -154,7 +142,7 @@ Dist::Zilla::Role::MetaProvider::Provider - A Role for Metadata providers specif =head1 VERSION -version 1.13000001 +version 1.14000000 =head1 PERFORMS ROLES @@ -227,28 +215,6 @@ to not be provided in the metadata. =back -=head2 skip_underscore - -Filter out detected namespaces with a token with a leading C<_>, ie: - - Foo::Bar::_internal::Baz; - -This is a convenience to provide sane defaults. For more controlled exclusion of namespaces, see L - -=head3 values - -=over 4 - -=item * Set to "0" - -I'd namespaces will be included. - -=item * Set to "1" B<[default]> - -I'd namespaces will not be included. - -=back - =head1 PRIVATE METHODS =head2 _resolve_version