Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Rename bundle to @Author::CJM

  @CJM now prints deprecation warning & loads @Author::CJM
  Bump version to 4.10
  Require PodLoom 4.01
  • Loading branch information...
commit f726c3860e797000a4c1c406dd903070f87a7b0f 1 parent 157aba6
Christopher J. Madsen authored
4 .gitignore
View
@@ -2,5 +2,5 @@
/.build/
Makefile
/pm_to_blib
-Dist-Zilla-PluginBundle-CJM-*.tar.gz
-Dist-Zilla-PluginBundle-CJM-*/
+Dist-Zilla-PluginBundle-Author-CJM-*.tar.gz
+Dist-Zilla-PluginBundle-Author-CJM-*/
8 Changes
View
@@ -1,4 +1,10 @@
-Revision history for Dist-Zilla-PluginBundle-CJM
+Revision history for Dist-Zilla-PluginBundle-Author-CJM
+
+4.10 NOT
+ - Rename bundle from @CJM to @Author::CJM. This dist still
+ contains a @CJM bundle, but it just issues a deprecation
+ warning and loads @Author::CJM. It will be removed soon.
+ - Require PodLoom version 4.01 (latest version).
4.02 May 5, 2011
- Specify master branch in push_to, so it can push to a new repository
1  MANIFEST
View
@@ -5,6 +5,7 @@ META.json
META.yml
Makefile.PL
README
+lib/Dist/Zilla/PluginBundle/Author/CJM.pm
lib/Dist/Zilla/PluginBundle/CJM.pm
t/00-compile.t
t/release-pod-coverage.t
2  MANIFEST.SKIP
View
@@ -12,7 +12,7 @@
^blib/
\bcjm_
^pm_to_blib$
-^Dist-Zilla-PluginBundle-CJM-\d
+^Dist-Zilla-PluginBundle-Author-CJM-\d
^_build\b
^Build$
^Build.bat$
6 dist.ini
View
@@ -1,10 +1,10 @@
; -*-conf-windows-*-
-name = Dist-Zilla-PluginBundle-CJM
+name = Dist-Zilla-PluginBundle-Author-CJM
author = Christopher J. Madsen <perl@cjmweb.net>
license = Perl_5
copyright_holder = Christopher J. Madsen
-[@CJM]
+[@Author::CJM / CJM]
[Prereqs]
Dist::Zilla = 4.200001 ; abstract_from_file change
@@ -22,7 +22,7 @@ Dist::Zilla::Plugin::License = 0
Dist::Zilla::Plugin::PodSyntaxTests = 0
Dist::Zilla::Plugin::PodCoverageTests = 0
Dist::Zilla::Plugin::ExtraTests = 0
-Dist::Zilla::Plugin::PodLoom = 4.00 ; dzil 4.200001 compatible
+Dist::Zilla::Plugin::PodLoom = 4.01 ; latest version
Dist::Zilla::Plugin::MakeMaker = 0
Dist::Zilla::Plugin::MetaConfig = 0
Dist::Zilla::Plugin::MatchManifest = 4.00 ; works on Windows
140 lib/Dist/Zilla/PluginBundle/Author/CJM.pm
View
@@ -0,0 +1,140 @@
+#---------------------------------------------------------------------
+package Dist::Zilla::PluginBundle::Author::CJM;
+#
+# Copyright 2011 Christopher J. Madsen
+#
+# Author: Christopher J. Madsen <perl@cjmweb.net>
+# Created: 19 Oct 2011
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the same terms as Perl itself.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See either the
+# GNU General Public License or the Artistic License for more details.
+#
+# ABSTRACT: Build a distribution like CJM
+#---------------------------------------------------------------------
+
+our $VERSION = '4.10';
+# This file is part of {{$dist}} {{$dist_version}} ({{$date}})
+
+use Moose;
+use Moose::Autobox;
+with 'Dist::Zilla::Role::PluginBundle::Easy';
+
+=head1 SYNOPSIS
+
+In dist.ini:
+
+ [@Author::CJM / CJM]
+
+=head1 DESCRIPTION
+
+This is the plugin bundle that CJM uses. It is equivalent to:
+
+ [VersionFromModule]
+
+ [GatherDir]
+ [PruneCruft]
+ [ManifestSkip]
+ [MetaJSON]
+ [MetaYAML]
+ [License]
+ [PodSyntaxTests]
+ [PodCoverageTests]
+ [ExtraTests]
+ [PodLoom]
+ data = tools/loom.pl
+ [MakeMaker]
+ [MetaConfig]
+ [MatchManifest]
+ [GitVersionCheckCJM]
+ [TemplateCJM]
+
+ [Repository]
+ git_remote = github
+
+ [@Git]
+ allow_dirty = Changes
+ commit_msg = Updated Changes for %{MMMM d, yyyy}d%{ trial}t release of %v
+ tag_format = %v%t
+ tag_message = Tagged %N %v%{ (trial release)}t
+ push_to = github master
+
+ [TestRelease]
+ [UploadToCPAN]
+ [ArchiveRelease]
+ directory = cjm_releases
+
+If the C<manual_version> argument is given to the bundle,
+VersionFromModule is omitted. If the C<builder> argument is given, it
+is used instead of MakeMaker. If the C<pod_template> argument is
+given, it is passed to PodLoom as its C<template>.
+
+=cut
+
+sub configure
+{
+ my $self = shift;
+
+ my $arg = $self->payload;
+
+ $self->add_plugins('VersionFromModule')
+ unless $arg->{manual_version};
+
+ $self->add_plugins(
+ qw(
+ GatherDir
+ PruneCruft
+ ManifestSkip
+ MetaJSON
+ MetaYAML
+ License
+ PodSyntaxTests
+ PodCoverageTests
+ ExtraTests
+ ),
+ [PodLoom => {
+ data => 'tools/loom.pl',
+ $self->config_slice({
+ pod_template => 'template',
+ })->flatten,
+ } ],
+ # either MakeMaker or ModuleBuild:
+ [ ($arg->{builder} || 'MakeMaker') =>
+ scalar $self->config_slice(qw( eumm_version mb_version ))
+ ],
+ qw(
+ MetaConfig
+ MatchManifest
+ GitVersionCheckCJM
+ TemplateCJM
+ ),
+ [ Repository => { git_remote => 'github' } ],
+ );
+
+ $self->add_bundle(Git => {
+ allow_dirty => 'Changes',
+ commit_msg => 'Updated Changes for %{MMMM d, yyyy}d%{ trial}t release of %v',
+ tag_format => '%v%t',
+ tag_message => 'Tagged %N %v%{ (trial release)}t',
+ push_to => 'github master',
+ });
+
+ $self->add_plugins(
+ 'TestRelease',
+ 'UploadToCPAN',
+ [ ArchiveRelease => { directory => 'cjm_releases' } ],
+ );
+} # end configure
+
+no Moose;
+__PACKAGE__->meta->make_immutable;
+1;
+
+__END__
+
+=for Pod::Coverage
+configure
117 lib/Dist/Zilla/PluginBundle/CJM.pm
View
@@ -17,112 +17,39 @@ package Dist::Zilla::PluginBundle::CJM;
# ABSTRACT: Build a distribution like CJM
#---------------------------------------------------------------------
-our $VERSION = '4.02';
+our $VERSION = '4.10';
# This file is part of {{$dist}} {{$dist_version}} ({{$date}})
use Moose;
-use Moose::Autobox;
-with 'Dist::Zilla::Role::PluginBundle::Easy';
+extends 'Dist::Zilla::PluginBundle::Author::CJM';
=head1 DESCRIPTION
-This is the plugin bundle that CJM uses. It is equivalent to:
-
- [VersionFromModule]
-
- [GatherDir]
- [PruneCruft]
- [ManifestSkip]
- [MetaJSON]
- [MetaYAML]
- [License]
- [PodSyntaxTests]
- [PodCoverageTests]
- [ExtraTests]
- [PodLoom]
- data = tools/loom.pl
- [MakeMaker]
- [MetaConfig]
- [MatchManifest]
- [GitVersionCheckCJM]
- [TemplateCJM]
-
- [Repository]
- git_remote = github
-
- [@Git]
- allow_dirty = Changes
- commit_msg = Updated Changes for %{MMMM d, yyyy}d%{ trial}t release of %v
- tag_format = %v%t
- tag_message = Tagged %N %v%{ (trial release)}t
- push_to = github master
-
- [TestRelease]
- [UploadToCPAN]
- [ArchiveRelease]
- directory = cjm_releases
-
-If the C<manual_version> argument is given to the bundle,
-VersionFromModule is omitted. If the C<builder> argument is given, it
-is used instead of MakeMaker. If the C<pod_template> argument is
-given, it is passed to PodLoom as its C<template>.
+B<This bundle is deprecated.>
+
+This is the old name for the plugin bundle that CJM uses. The new
+name is L<Author::CJM|Dist::Zilla::PluginBundle::Author::CJM>, to
+avoid cluttering up the PluginBundle namespace.
+
+Just replace
+
+ [@CJM]
+
+with
+
+ [@Author::CJM / CJM]
+
+(The C< / CJM> is not necessary; but it shortens the prefix on log messages.)
=cut
-sub configure
-{
+before configure => sub {
my $self = shift;
- my $arg = $self->payload;
-
- $self->add_plugins('VersionFromModule')
- unless $arg->{manual_version};
-
- $self->add_plugins(
- qw(
- GatherDir
- PruneCruft
- ManifestSkip
- MetaJSON
- MetaYAML
- License
- PodSyntaxTests
- PodCoverageTests
- ExtraTests
- ),
- [PodLoom => {
- data => 'tools/loom.pl',
- $self->config_slice({
- pod_template => 'template',
- })->flatten,
- } ],
- # either MakeMaker or ModuleBuild:
- [ ($arg->{builder} || 'MakeMaker') =>
- scalar $self->config_slice(qw( eumm_version mb_version ))
- ],
- qw(
- MetaConfig
- MatchManifest
- GitVersionCheckCJM
- TemplateCJM
- ),
- [ Repository => { git_remote => 'github' } ],
- );
-
- $self->add_bundle(Git => {
- allow_dirty => 'Changes',
- commit_msg => 'Updated Changes for %{MMMM d, yyyy}d%{ trial}t release of %v',
- tag_format => '%v%t',
- tag_message => 'Tagged %N %v%{ (trial release)}t',
- push_to => 'github master',
- });
-
- $self->add_plugins(
- 'TestRelease',
- 'UploadToCPAN',
- [ ArchiveRelease => { directory => 'cjm_releases' } ],
- );
-} # end configure
+ # Bundles don't have a logger, so we'll fake it:
+ warn('[' . $self->name .
+ "] This bundle is deprecated. Please switch to \@Author::CJM\a\n");
+}; # end before configure
no Moose;
__PACKAGE__->meta->make_immutable;
4 t/00-compile.t
View
@@ -1,5 +1,5 @@
use Test::More tests => 1;
-use_ok('Dist::Zilla::PluginBundle::CJM');
+use_ok('Dist::Zilla::PluginBundle::Author::CJM');
-diag("Testing Dist::Zilla::PluginBundle::CJM $Dist::Zilla::PluginBundle::CJM::VERSION");
+diag("Testing Dist::Zilla::PluginBundle::Author::CJM $Dist::Zilla::PluginBundle::Author::CJM::VERSION");
Please sign in to comment.
Something went wrong with that request. Please try again.