Skip to content

Commit

Permalink
Removed legacy, fixed the Repository<=>GithubMeta collide introduced …
Browse files Browse the repository at this point in the history
…by latest Dist::Zilla updates
  • Loading branch information
Getty committed Nov 25, 2014
1 parent c797511 commit ca257a1
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 27 deletions.
1 change: 0 additions & 1 deletion cpanfile
Expand Up @@ -15,7 +15,6 @@ requires 'Dist::Zilla::Plugin::Repository', '0.19';
requires 'Dist::Zilla::Plugin::Prereqs::FromCPANfile', '0';
requires 'Dist::Zilla::Plugin::Run', '0.018';
requires 'Dist::Zilla::Plugin::TaskWeaver', '0.101624';
requires 'Dist::Zilla::Plugin::UploadToDuckPAN', '0.002';
requires 'Dist::Zilla::Plugin::TravisCI', '0';
requires 'Pod::Elemental', '0.102362';
requires 'Pod::Elemental::Transformer::List', '0.101620';
Expand Down
3 changes: 1 addition & 2 deletions dist.ini
Expand Up @@ -2,9 +2,8 @@ name = Dist-Zilla-PluginBundle-Author-GETTY
author = Torsten Raudssus <torsten@raudss.us> L<http://www.raudss.us/>
license = Perl_5
copyright_holder = Torsten Raudssus L<http://www.raudss.us/>
copyright_year = 2012
copyright_year = 2014

[Bootstrap::lib]
try_built = 1

[@Author::GETTY]
35 changes: 11 additions & 24 deletions lib/Dist/Zilla/PluginBundle/Author/GETTY.pm
Expand Up @@ -30,7 +30,6 @@ are default):
weaver_config = @Author::GETTY
no_cpan = 0
no_travis = 0
duckpan = 0
no_install = 0
no_makemaker = 0
no_installrelease = 0
Expand Down Expand Up @@ -107,7 +106,7 @@ You can use all options of L<Dist::Zilla::Plugin::TravisCI> just by prefix
them with B<travis_>, like here:
[@Author::GETTY]
travis_before_install = duckpan DDGC::Static
travis_before_install = install_additional_packages.sh
It also combines on request with L<Dist::Zilla::Plugin::Alien>, you can set
all parameter of the Alien plugin here, just by preceeding with I<alien_>, the
Expand Down Expand Up @@ -139,6 +138,11 @@ will be allowed. See L<Dist::Zilla::Plugin::Git::CheckFor::CorrectBranch/release
This defines the L<PodWeaver> config that is used. See B<config_plugin> on
L<Dist::Zilla::Plugin::PodWeaver>.
=head2 no_github
If set to 1, this attribute will disable L<Dist::Zilla::Plugin::GithubMeta> and
will add L<Dist::Zilla::Plugin::Repository> instead.
=head2 no_cpan
If set to 1, this attribute will disable L<Dist::Zilla::Plugin::UploadToCPAN>.
Expand All @@ -163,15 +167,6 @@ L<Dist::Zilla::Plugin::NextRelease> will be used.
If set to 1, then L<Dist::Zilla::Plugin::PodWeaver> is not used.
=head2 duckpan
If set to 1, this attribute will activate L<Dist::Zilla::Plugin::UploadToDuckPAN>.
With this way you upload your distribution to L<DuckPAN|http://duckpan.org>. So
far only employee of L<DuckDuckGo|http://duckduckgo.com> can use this option.
This attribute is NOT disabling the upload to CPAN. So if L</no_cpan> isn't
set, the distribution will be uploaded to both. For more information about
DuckPAN you can also go to the L<DuckDuckGo Community Platform|https://dukgo.com/>.
=head2 no_install
If set to 1, the resulting distribution can't be installed.
Expand Down Expand Up @@ -226,8 +221,6 @@ L<Dist::Zilla::Plugin::Run>
L<Dist::Zilla::Plugin::TaskWeaver>
L<Dist::Zilla::Plugin::UploadToDuckPAN>
L<Dist::Zilla::Plugin::TravisCI>
=cut
Expand Down Expand Up @@ -277,11 +270,11 @@ has release_branch => (
default => sub { $_[0]->payload->{release_branch} || 'master' },
);

has duckpan => (
has no_github => (
is => 'ro',
isa => 'Bool',
lazy => 1,
default => sub { $_[0]->payload->{duckpan} },
default => sub { $_[0]->payload->{no_github} },
);

has no_cpan => (
Expand Down Expand Up @@ -440,12 +433,6 @@ sub configure {
$self->add_bundle('@Basic');
}

if ($self->duckpan) {
$self->add_plugins(qw(
UploadToDuckPAN
));
}

if ($self->no_install) {
$self->add_plugins(qw(
MakeMaker::SkipInstall
Expand Down Expand Up @@ -490,9 +477,9 @@ sub configure {
MetaConfig
MetaJSON
PodSyntaxTests
Repository
GithubMeta
));
));

$self->add_plugins($self->no_github ? 'Repository' : 'GithubMeta');

unless ($self->no_travis) {
$self->add_plugins([
Expand Down

0 comments on commit ca257a1

Please sign in to comment.