From 5601e84eaa4264a0566d29316c81464797da3d70 Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Mon, 6 Feb 2012 15:30:03 +1300 Subject: [PATCH 1/3] remove all the skip underscore logic. Its bullshit. Blame drugs --- lib/Dist/Zilla/Plugin/MetaProvides.pm | 27 --------------- lib/Dist/Zilla/Role/MetaProvider/Provider.pm | 35 -------------------- 2 files changed, 62 deletions(-) diff --git a/lib/Dist/Zilla/Plugin/MetaProvides.pm b/lib/Dist/Zilla/Plugin/MetaProvides.pm index 6a61dbb..5edbe53 100644 --- a/lib/Dist/Zilla/Plugin/MetaProvides.pm +++ b/lib/Dist/Zilla/Plugin/MetaProvides.pm @@ -15,13 +15,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 @@ -29,7 +27,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 @@ -148,30 +145,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 f0fa339..1b5d450 100644 --- a/lib/Dist/Zilla/Role/MetaProvider/Provider.pm +++ b/lib/Dist/Zilla/Role/MetaProvider/Provider.pm @@ -117,37 +117,6 @@ has meta_noindex => ( documentation => 'Scan for the meta_noindex metadata key and do not add provides records for things in it', ); -=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 - -=cut - -has skip_underscore => ( - is => 'ro', - isa => Bool, - default => 1, - documentation => 'Skip packages with a leading _ , ie: Foo::_internal::baz', -); - =head1 PRIVATE METHODS =head2 _resolve_version @@ -274,10 +243,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 }; From 552f83c6bc870aca1bd4c4f7b04f8b0a4d6852f3 Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Mon, 6 Feb 2012 15:33:22 +1300 Subject: [PATCH 2/3] update changelog --- Changes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Changes b/Changes index 52d4b86..b43fe61 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,9 @@ Revision history for {{$dist->name}} {{$NEXT}} + [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] From 3e1d534d0f511c79f5e76e53434f6f203637ba78 Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Tue, 7 Feb 2012 21:45:32 +1300 Subject: [PATCH 3/3] v1.14000000 [Features] - Reverted all non-documentation changes since 1.13x. Handling this in the role level was a dumb idea anyway. --- Changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changes b/Changes index b43fe61..e6b57f2 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,8 @@ Revision history for {{$dist->name}} {{$NEXT}} + +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.