Permalink
Browse files

The plugins are no longer distributed with @CJM

  PodLoom now distributed separately, in Dist-Zilla-Plugin-PodLoom
  Incremented all versions to 0.08
  • Loading branch information...
1 parent 48e7c90 commit 1ef6a70fd20f06c534df9f3f31248120dc99c265 @madsen committed Apr 14, 2010
View
@@ -2,5 +2,5 @@
/.build/
Makefile
/pm_to_blib
-Dist-Zilla-PluginBundle-CJM-*.tar.gz
-Dist-Zilla-PluginBundle-CJM-*/
+Dist-Zilla-Plugins-CJM-*.tar.gz
+Dist-Zilla-Plugins-CJM-*/
View
11 Changes
@@ -1,9 +1,18 @@
-Revision history for Dist-Zilla-PluginBundle-CJM
+Revision history for Dist-Zilla-Plugins-CJM
0.08 NOT
+ - This distribution is now Dist-Zilla-Plugins-CJM.
+ Dist-Zilla-PluginBundle-CJM now contains only @CJM (and
+ requires this distribution along with the other plugins used
+ by @CJM).
+ - Updated all version numbers to 0.08
+
Dist::Zilla::Plugin::ArchiveRelease
- document the FilePruner role
+ Dist::Zilla::Plugin::PodLoom
+ - now distributed separately, in Dist-Zilla-Plugin-PodLoom
+
Dist::Zilla::Plugin::TemplateCJM
- added build_instructions method
View
@@ -15,10 +15,8 @@ corpus/archives/DZT-Sample-0.03.tar.gz
lib/Dist/Zilla/Plugin/ArchiveRelease.pm
lib/Dist/Zilla/Plugin/GitVersionCheckCJM.pm
lib/Dist/Zilla/Plugin/ModuleBuild/Custom.pm
-lib/Dist/Zilla/Plugin/PodLoom.pm
lib/Dist/Zilla/Plugin/TemplateCJM.pm
lib/Dist/Zilla/Plugin/VersionFromModule.pm
-lib/Dist/Zilla/PluginBundle/CJM.pm
lib/Dist/Zilla/Role/ModuleInfo.pm
t/00-compile.t
t/arcrel.t
View
@@ -12,7 +12,7 @@
^blib/
\bcjm_
^pm_to_blib$
-^Dist-Zilla-PluginBundle-CJM-\d
+^Dist-Zilla-Plugins-CJM-\d
^_build\b
^Build$
^Build.bat$
View
14 README
@@ -1,9 +1,13 @@
-Dist-Zilla-PluginBundle-CJM version {{$version}}, released {{$date}}
+Dist-Zilla-Plugins-CJM version {{$version}}, released {{$date}}
-Dist-Zilla-PluginBundle-CJM is a collection of plugins I've written
-for Dist::Zilla. There isn't actually a @CJM bundle yet, because I'm
-still working out how I want to use Dist::Zilla.
+Dist-Zilla-Plugins-CJM is a collection of plugins I've written for
+Dist::Zilla. The plugins here used to be distributed in
+Dist-Zilla-PluginBundle-CJM, but when I actually wrote @CJM, I decided
+that it had too many prerequisites to be distributed with them. If
+you had previously installed Dist-Zilla-PluginBundle-CJM (and you
+aren't actually using @CJM), you should uninstall that and just
+install this.
I've written some other plugins that are distributed separately,
because they had different prerequisites. The ones collected here
@@ -27,7 +31,7 @@ DEPENDENCIES
CHANGES
- Here's what's new in version {{$version}} of Dist-Zilla-PluginBundle-CJM:
+ Here's what's new in version {{$version}} of Dist-Zilla-Plugins-CJM:
(See the file "Changes" for the full revision history.)
{{$changes}}
View
@@ -1,19 +1,22 @@
-Dist-Zilla-PluginBundle-CJM
-===========================
+Dist-Zilla-Plugins-CJM
+======================
-Dist-Zilla-PluginBundle-CJM is a collection of plugins I've written
-for Dist::Zilla. There isn't actually a @CJM bundle yet, because I'm
-still working out how I want to use Dist::Zilla.
+Dist-Zilla-Plugins-CJM is a collection of plugins I've written for
+Dist::Zilla. The plugins here used to be distributed in
+Dist-Zilla-PluginBundle-CJM, but when I actually wrote @CJM, I decided
+that it had too many prerequisites to be distributed with them.
I've written some other plugins that are distributed separately,
because they had different prerequisites. The ones collected here
have fairly simple prerequisites, and I didn't want to have to make
separate distributions for all of them.
-This is a Git repository where development of Dist-Zilla-PluginBundle-CJM
+This is a Git repository where development of Dist-Zilla-Plugins-CJM
takes place. For more information, visit
-[Dist-Zilla-PluginBundle-CJM on CPAN](http://search.cpan.org/dist/Dist-Zilla-PluginBundle-CJM/).
-
+[Dist-Zilla-Plugins-CJM on CPAN](http://search.cpan.org/dist/Dist-Zilla-Plugins-CJM/).
+This repository used to be called
+[dist-zilla-pluginbundle-cjm](http://github.com/madsen/dist-zilla-pluginbundle-cjm),
+but that now contains only @CJM.
Copyright and License
View
@@ -1,54 +1,27 @@
; -*-conf-windows-*-
-name = Dist-Zilla-PluginBundle-CJM
+name = Dist-Zilla-Plugins-CJM
abstract = CJM's plugins for Dist::Zilla
;' Emacs syntax highlighting gets confused
author = Christopher J. Madsen <perl@cjmweb.net>
license = Perl_5
copyright_holder = Christopher J. Madsen
-[VersionFromModule]
-[GatherDir]
-[PruneCruft]
-[ManifestSkip]
-[MetaYAML]
-[License]
+version = 0.08
+
[=tools::CompileTests]
-[PodSyntaxTests]
-[PodCoverageTests]
-[ExtraTests]
-[PodLoom]
-data = tools/loom.pl
-[MakeMaker]
-[MatchManifest]
-[TemplateCJM]
-[GitVersionCheckCJM]
+[@CJM]
+manual_version = 1
[MetaNoIndex]
dir = corpus
-[Repository]
-git_remote = github
-
-[@Git]
-allow_dirty = Changes
-commit_msg = Updated Changes for %{MMMM d, yyyy}d release of %v
-tag_format = %v
-tag_message = Tagged %N %v
-push_to = github
-
-[UploadToCPAN]
-[ArchiveRelease]
-directory = cjm_releases
-
[Prereq]
Dist::Zilla = 2 ; API changes
File::Temp = 0
-Hash::Merge::Simple = 0
List::Util = 0
Module::Build::ModuleInfo = 0.28
Moose = 0.65 ; attr fulfills requires
Moose::Autobox = 0.09 ; flattten
Path::Class = 0
-Pod::Loom = 0
Scalar::Util = 0
autodie = 0
@@ -17,7 +17,7 @@ package Dist::Zilla::Plugin::GitVersionCheckCJM;
# ABSTRACT: Ensure version numbers are up-to-date
#---------------------------------------------------------------------
-our $VERSION = '0.06';
+our $VERSION = '0.08';
# This file is part of {{$dist}} {{$dist_version}} ({{$date}})
=head1 SYNOPSIS
@@ -17,7 +17,7 @@ package Dist::Zilla::Plugin::ModuleBuild::Custom;
# ABSTRACT: Allow a dist to have a custom Build.PL
#---------------------------------------------------------------------
-our $VERSION = '0.05';
+our $VERSION = '0.08';
# This file is part of {{$dist}} {{$dist_version}} ({{$date}})
=head1 DEPENDENCIES
@@ -1,196 +0,0 @@
-#---------------------------------------------------------------------
-package Dist::Zilla::Plugin::PodLoom;
-#
-# Copyright 2009 Christopher J. Madsen
-#
-# Author: Christopher J. Madsen <perl@cjmweb.net>
-# Created: 7 Oct 2009
-#
-# 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: Process module documentation through Pod::Loom
-#---------------------------------------------------------------------
-
-our $VERSION = '0.05';
-# This file is part of {{$dist}} {{$dist_version}} ({{$date}})
-
-=head1 SYNOPSIS
-
-In your F<dist.ini>:
-
- [PodLoom]
- template = Default ; this is the default
- data = loom.pl ; there is no default for this
-
-=head1 DESCRIPTION
-
-If included, this plugin will process each F<.pm> and F<.pod> file
-under F<lib> or in the root directory through Pod::Loom.
-
-=cut
-
-use Moose;
-#use Moose::Autobox;
-with qw(Dist::Zilla::Role::FileMunger
- Dist::Zilla::Role::ModuleInfo);
-
-use Hash::Merge::Simple ();
-use Pod::Loom ();
-
-=attr template
-
-This will be passed to Pod::Loom as its C<template>.
-Defaults to C<Default>.
-
-=cut
-
-has template => (
- is => 'ro',
- isa => 'Str',
- default => 'Default',
-);
-
-=attr data
-
-Since Pod::Loom templates may want configuration that doesn't fit in
-an INI file, you can specify a file containing Perl code to evaluate.
-The result should be a hash reference, which will be passed to
-Pod::Loom's C<weave> method.
-
-PodLoom automatically includes the following keys, which will be
-merged with the hashref from your code. (Your code can override these
-values.)
-
-=over
-
-=item abstract
-
-The abstract for the file being processed (if it can be determined)
-
-=item authors
-
-C<< $zilla->authors >>
-
-=item dist
-
-C<< $zilla->name >>
-
-=item license_notice
-
-C<< $zilla->license->notice >>
-
-=item module
-
-The primary package of the file being processed
-(if Module::Build::ModuleInfo could determine it)
-
-=item repository
-
-C<< $zilla->distmeta->{resources}{repository} >>
-
-=item version
-
-The version number of the file being processed
-(if Module::Build::ModuleInfo could determine it)
-
-=item zilla
-
-The Dist::Zilla object itself
-
-=back
-
-=cut
-
-has data_file => (
- is => 'ro',
- isa => 'Str',
- init_arg => 'data',
-);
-
-has data => (
- is => 'ro',
- isa => 'HashRef',
- init_arg => undef,
- lazy => 1,
- builder => '_initialize_data',
-);
-
-has loom => (
- is => 'ro',
- isa => 'Pod::Loom',
- init_arg => undef,
- lazy => 1,
- default => sub { Pod::Loom->new(template => shift->template) },
-);
-
-#---------------------------------------------------------------------
-sub _initialize_data
-{
- my $plugin = shift;
-
- my $fname = $plugin->data_file;
-
- return {} unless $fname;
-
- open my $fh, '<', $fname or die "can't open $fname for reading: $!";
- my $code = do { local $/; <$fh> };
- close $fh;
-
- local $@;
- my $result = eval "package Dist::Zilla::Plugin::PodLoom::_eval; $code";
-
- die $@ if $@;
-
- return $result;
-} # end _initialize_data
-
-#---------------------------------------------------------------------
-sub munge_file
-{
- my ($self, $file) = @_;
-
- return unless $file->name =~ /\.(?:pm|pod)$/i
- and ($file->name !~ m{/} or $file->name =~ m{^lib/});
-
- my $info = $self->get_module_info($file);
-
- my $abstract = Dist::Zilla::Util->abstract_from_file($file->name);
-
- my $dataHash = Hash::Merge::Simple::merge(
- {
- ($abstract ? (abstract => $abstract) : ()),
- authors => $self->zilla->authors,
- dist => $self->zilla->name,
- license_notice => $self->zilla->license->notice,
- ($info->name ? (module => $info->name) : ()),
- repository => $self->zilla->distmeta->{resources}{repository},
- # Have to stringify version object:
- ($info->version ? (version => q{} . $info->version) : ()),
- zilla => $self->zilla,
- }, $self->data,
- );
-
- my $content = $file->content;
-
- $file->content( $self->loom->weave(\$content, $file->name, $dataHash) );
-
- return;
-} # end munge_file
-
-no Moose;
-__PACKAGE__->meta->make_immutable;
-1;
-
-__END__
-
-=for Pod::Loom-omit
-CONFIGURATION AND ENVIRONMENT
-
-=for Pod::Coverage
-munge_file
@@ -17,7 +17,7 @@ package Dist::Zilla::Plugin::VersionFromModule;
# ABSTRACT: Get distribution version from its main_module
#---------------------------------------------------------------------
-our $VERSION = '0.05';
+our $VERSION = '0.08';
# This file is part of {{$dist}} {{$dist_version}} ({{$date}})
use Moose;
Oops, something went wrong.

0 comments on commit 1ef6a70

Please sign in to comment.