diff --git a/cpanfile b/cpanfile index ca83955..e6295e7 100644 --- a/cpanfile +++ b/cpanfile @@ -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'; diff --git a/dist.ini b/dist.ini index 756a8f7..e304304 100644 --- a/dist.ini +++ b/dist.ini @@ -2,9 +2,8 @@ name = Dist-Zilla-PluginBundle-Author-GETTY author = Torsten Raudssus L license = Perl_5 copyright_holder = Torsten Raudssus L -copyright_year = 2012 +copyright_year = 2014 [Bootstrap::lib] -try_built = 1 [@Author::GETTY] diff --git a/lib/Dist/Zilla/PluginBundle/Author/GETTY.pm b/lib/Dist/Zilla/PluginBundle/Author/GETTY.pm index 24437a5..30359bb 100644 --- a/lib/Dist/Zilla/PluginBundle/Author/GETTY.pm +++ b/lib/Dist/Zilla/PluginBundle/Author/GETTY.pm @@ -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 @@ -107,7 +106,7 @@ You can use all options of L just by prefix them with B, like here: [@Author::GETTY] - travis_before_install = duckpan DDGC::Static + travis_before_install = install_additional_packages.sh It also combines on request with L, you can set all parameter of the Alien plugin here, just by preceeding with I, the @@ -139,6 +138,11 @@ will be allowed. See L config that is used. See B on L. +=head2 no_github + +If set to 1, this attribute will disable L and +will add L instead. + =head2 no_cpan If set to 1, this attribute will disable L. @@ -163,15 +167,6 @@ L will be used. If set to 1, then L is not used. -=head2 duckpan - -If set to 1, this attribute will activate L. -With this way you upload your distribution to L. So -far only employee of L can use this option. -This attribute is NOT disabling the upload to CPAN. So if L isn't -set, the distribution will be uploaded to both. For more information about -DuckPAN you can also go to the L. - =head2 no_install If set to 1, the resulting distribution can't be installed. @@ -226,8 +221,6 @@ L L -L - L =cut @@ -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 => ( @@ -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 @@ -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([