r65018 - in /trunk/libdist-zilla-plugins-cjm-perl: ./ corpus/ debian/ lib/Dist/Zilla/Plugin/ lib/Dist/Zilla/Plugin/ModuleBuild/ lib/Dist/Zilla/Role/ t/
ddumont-guest at users.alioth.debian.org
ddumont-guest at users.alioth.debian.org
Thu Nov 18 12:14:28 UTC 2010
Author: ddumont-guest
Date: Thu Nov 18 12:13:36 2010
New Revision: 65018
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=65018
Log:
new upstream release
Added:
trunk/libdist-zilla-plugins-cjm-perl/META.json
- copied unchanged from r64992, branches/upstream/libdist-zilla-plugins-cjm-perl/current/META.json
trunk/libdist-zilla-plugins-cjm-perl/corpus/gitvercheck.git
- copied unchanged from r64992, branches/upstream/libdist-zilla-plugins-cjm-perl/current/corpus/gitvercheck.git
trunk/libdist-zilla-plugins-cjm-perl/t/gitvercheck.t
- copied unchanged from r64992, branches/upstream/libdist-zilla-plugins-cjm-perl/current/t/gitvercheck.t
Modified:
trunk/libdist-zilla-plugins-cjm-perl/Changes
trunk/libdist-zilla-plugins-cjm-perl/MANIFEST
trunk/libdist-zilla-plugins-cjm-perl/META.yml
trunk/libdist-zilla-plugins-cjm-perl/Makefile.PL
trunk/libdist-zilla-plugins-cjm-perl/README
trunk/libdist-zilla-plugins-cjm-perl/debian/changelog
trunk/libdist-zilla-plugins-cjm-perl/debian/copyright
trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ArchiveRelease.pm
trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/GitVersionCheckCJM.pm
trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ModuleBuild/Custom.pm
trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/TemplateCJM.pm
trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/VersionFromModule.pm
trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Role/ModuleInfo.pm
trunk/libdist-zilla-plugins-cjm-perl/t/00-compile.t
trunk/libdist-zilla-plugins-cjm-perl/t/mb_custom.t
trunk/libdist-zilla-plugins-cjm-perl/t/template.t
Modified: trunk/libdist-zilla-plugins-cjm-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/Changes?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/Changes (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/Changes Thu Nov 18 12:13:36 2010
@@ -1,4 +1,13 @@
Revision history for Dist-Zilla-Plugins-CJM
+
+3.02 November 11, 2010
+ - Fixed test prerequisites (needed Test::More 0.88)
+
+ Dist::Zilla::Plugin::GitVersionCheckCJM
+ - Use Git::Wrapper instead of Git (RT#60140)
+ - Complain if a module's version exceeds the dist's version
+ - Indicate when the dist's version needs to be incremented
+ - Now has tests
3.01 August 9, 2010
Dist::Zilla::Plugin::ArchiveRelease
Modified: trunk/libdist-zilla-plugins-cjm-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/MANIFEST?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/MANIFEST (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/MANIFEST Thu Nov 18 12:13:36 2010
@@ -1,6 +1,7 @@
Changes
LICENSE
MANIFEST
+META.json
META.yml
Makefile.PL
README
@@ -12,6 +13,7 @@
corpus/archives/DZT-Sample-0.01.tar.gz
corpus/archives/DZT-Sample-0.02.tar.gz
corpus/archives/DZT-Sample-0.03.tar.gz
+corpus/gitvercheck.git
lib/Dist/Zilla/Plugin/ArchiveRelease.pm
lib/Dist/Zilla/Plugin/GitVersionCheckCJM.pm
lib/Dist/Zilla/Plugin/ModuleBuild/Custom.pm
@@ -20,6 +22,7 @@
lib/Dist/Zilla/Role/ModuleInfo.pm
t/00-compile.t
t/arcrel.t
+t/gitvercheck.t
t/mb_custom.t
t/release-pod-coverage.t
t/release-pod-syntax.t
Modified: trunk/libdist-zilla-plugins-cjm-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/META.yml?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/META.yml (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/META.yml Thu Nov 18 12:13:36 2010
@@ -2,11 +2,13 @@
abstract: "CJM's plugins for Dist::Zilla"
author:
- 'Christopher J. Madsen <perl at cjmweb.net>'
-build_requires: {}
+build_requires:
+ File::pushd: 0
+ Test::More: 0.88
configure_requires:
ExtUtils::MakeMaker: 6.31
dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.101900, CPAN::Meta::Converter version 2.101670'
+generated_by: 'Dist::Zilla version 4.102343, CPAN::Meta::Converter version 2.102400'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -15,12 +17,14 @@
no_index:
directory:
- corpus
+recommends:
+ Git::Wrapper: 0
requires:
CPAN::Meta::Converter: 2.101550
Dist::Zilla: 3
File::Copy: 0
File::HomeDir: 0.81
- File::Temp: 0
+ File::Temp: 0.19
List::Util: 0
Module::Build::ModuleInfo: 0.28
Moose: 0.65
@@ -28,43 +32,48 @@
Path::Class: 0
Scalar::Util: 0
autodie: 0
+ version: 0.77
resources:
- repository: http://github.com/madsen/dist-zilla-plugins-cjm
-version: 3.01
+ repository: git://github.com/madsen/dist-zilla-plugins-cjm.git
+version: 3.02
x_Dist_Zilla:
plugins:
-
class: Dist::Zilla::Plugin::GatherDir
name: '@CJM/GatherDir'
- version: 4.101900
+ version: 4.102343
-
class: Dist::Zilla::Plugin::PruneCruft
name: '@CJM/PruneCruft'
- version: 4.101900
+ version: 4.102343
-
class: Dist::Zilla::Plugin::ManifestSkip
name: '@CJM/ManifestSkip'
- version: 4.101900
+ version: 4.102343
+ -
+ class: Dist::Zilla::Plugin::MetaJSON
+ name: '@CJM/MetaJSON'
+ version: 4.102343
-
class: Dist::Zilla::Plugin::MetaYAML
name: '@CJM/MetaYAML'
- version: 4.101900
+ version: 4.102343
-
class: Dist::Zilla::Plugin::License
name: '@CJM/License'
- version: 4.101900
+ version: 4.102343
-
class: Dist::Zilla::Plugin::PodSyntaxTests
name: '@CJM/PodSyntaxTests'
- version: 4.101900
+ version: 4.102343
-
class: Dist::Zilla::Plugin::PodCoverageTests
name: '@CJM/PodCoverageTests'
- version: 4.101900
+ version: 4.102343
-
class: Dist::Zilla::Plugin::ExtraTests
name: '@CJM/ExtraTests'
- version: 4.101900
+ version: 4.102343
-
class: Dist::Zilla::Plugin::PodLoom
name: '@CJM/PodLoom'
@@ -72,19 +81,19 @@
-
class: Dist::Zilla::Plugin::MakeMaker
name: '@CJM/MakeMaker'
- version: 4.101900
+ version: 4.102343
-
class: Dist::Zilla::Plugin::MetaConfig
name: '@CJM/MetaConfig'
- version: 4.101900
+ version: 4.102343
-
class: Dist::Zilla::Plugin::MatchManifest
name: '@CJM/MatchManifest'
- version: 0.03
+ version: 0.04
-
class: Dist::Zilla::Plugin::GitVersionCheckCJM
name: '@CJM/GitVersionCheckCJM'
- version: 0.08
+ version: 3.02
-
class: Dist::Zilla::Plugin::TemplateCJM
name: '@CJM/TemplateCJM'
@@ -92,31 +101,31 @@
-
class: Dist::Zilla::Plugin::Repository
name: '@CJM/Repository'
- version: 0.13
+ version: 0.16
-
class: Dist::Zilla::Plugin::Git::Check
name: '@CJM/@Git/Check'
- version: 1.102010
+ version: 1.102810
-
class: Dist::Zilla::Plugin::Git::Commit
name: '@CJM/@Git/Commit'
- version: 1.102010
+ version: 1.102810
-
class: Dist::Zilla::Plugin::Git::Tag
name: '@CJM/@Git/Tag'
- version: 1.102010
+ version: 1.102810
-
class: Dist::Zilla::Plugin::Git::Push
name: '@CJM/@Git/Push'
- version: 1.102010
+ version: 1.102810
-
class: Dist::Zilla::Plugin::TestRelease
name: '@CJM/TestRelease'
- version: 4.101900
+ version: 4.102343
-
class: Dist::Zilla::Plugin::UploadToCPAN
name: '@CJM/UploadToCPAN'
- version: 4.101900
+ version: 4.102343
-
class: Dist::Zilla::Plugin::ArchiveRelease
name: '@CJM/ArchiveRelease'
@@ -130,31 +139,55 @@
name: MetaNoIndex
version: 1.101550
-
- class: Dist::Zilla::Plugin::Prereq
+ class: Dist::Zilla::Plugin::Prereqs
config:
Dist::Zilla::Plugin::Prereqs:
phase: runtime
type: requires
- name: Prereq
- version: 4.101900
+ name: Prereqs
+ version: 4.102343
+ -
+ class: Dist::Zilla::Plugin::Prereqs
+ config:
+ Dist::Zilla::Plugin::Prereqs:
+ phase: runtime
+ type: recommends
+ name: RuntimeRecommends
+ version: 4.102343
+ -
+ class: Dist::Zilla::Plugin::Prereqs
+ config:
+ Dist::Zilla::Plugin::Prereqs:
+ phase: test
+ type: requires
+ name: TestRequires
+ version: 4.102343
+ -
+ class: Dist::Zilla::Plugin::Prereqs
+ config:
+ Dist::Zilla::Plugin::Prereqs:
+ phase: test
+ type: recommends
+ name: TestRecommends
+ version: 4.102343
-
class: Dist::Zilla::Plugin::FinderCode
name: ':InstallModules'
- version: 4.101900
+ version: 4.102343
-
class: Dist::Zilla::Plugin::FinderCode
name: ':TestFiles'
- version: 4.101900
+ version: 4.102343
-
class: Dist::Zilla::Plugin::FinderCode
name: ':ExecFiles'
- version: 4.101900
+ version: 4.102343
-
class: Dist::Zilla::Plugin::FinderCode
name: ':ShareFiles'
- version: 4.101900
+ version: 4.102343
zilla:
class: Dist::Zilla::Dist::Builder
config:
is_trial: 0
- version: 4.101900
+ version: 4.102343
Modified: trunk/libdist-zilla-plugins-cjm-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/Makefile.PL?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/Makefile.PL (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/Makefile.PL Thu Nov 18 12:13:36 2010
@@ -11,7 +11,10 @@
my %WriteMakefileArgs = (
'ABSTRACT' => 'CJM\'s plugins for Dist::Zilla',
'AUTHOR' => 'Christopher J. Madsen <perl at cjmweb.net>',
- 'BUILD_REQUIRES' => {},
+ 'BUILD_REQUIRES' => {
+ 'File::pushd' => '0',
+ 'Test::More' => '0.88'
+ },
'CONFIGURE_REQUIRES' => {
'ExtUtils::MakeMaker' => '6.31'
},
@@ -24,16 +27,17 @@
'Dist::Zilla' => '3',
'File::Copy' => '0',
'File::HomeDir' => '0.81',
- 'File::Temp' => '0',
+ 'File::Temp' => '0.19',
'List::Util' => '0',
'Module::Build::ModuleInfo' => '0.28',
'Moose' => '0.65',
'Moose::Autobox' => '0.09',
'Path::Class' => '0',
'Scalar::Util' => '0',
- 'autodie' => '0'
+ 'autodie' => '0',
+ 'version' => '0.77'
},
- 'VERSION' => '3.01',
+ 'VERSION' => '3.02',
'test' => {
'TESTS' => 't/*.t'
}
Modified: trunk/libdist-zilla-plugins-cjm-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/README?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/README (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/README Thu Nov 18 12:13:36 2010
@@ -1,4 +1,4 @@
-Dist-Zilla-Plugins-CJM version 3.01, released August 9, 2010
+Dist-Zilla-Plugins-CJM version 3.02, released November 11, 2010
Dist-Zilla-Plugins-CJM is a collection of plugins I've written for
@@ -35,26 +35,28 @@
Dist::Zilla 3
File::Copy
File::HomeDir 0.81
- File::Temp
+ File::Temp 0.19
List::Util
Module::Build::ModuleInfo 0.28
Moose 0.65
Moose::Autobox 0.09
Path::Class
Scalar::Util
- autodie
+ autodie
+ version 0.77
CHANGES
- Here's what's new in version 3.01 of Dist-Zilla-Plugins-CJM:
+ Here's what's new in version 3.02 of Dist-Zilla-Plugins-CJM:
(See the file "Changes" for the full revision history.)
- Dist::Zilla::Plugin::ArchiveRelease
- - Use File::Copy::move to support cross-filesystem moves (RT#59288)
+ - Fixed test prerequisites (needed Test::More 0.88)
- Dist::Zilla::Plugin::ModuleBuild::Custom
- - Now compatible with Dist::Zilla 3 & 4
+ Dist::Zilla::Plugin::GitVersionCheckCJM
+ - Use Git::Wrapper instead of Git (RT#60140)
+ - Complain if a module's version exceeds the dist's version
+ - Indicate when the dist's version needs to be incremented
- Now has tests
Modified: trunk/libdist-zilla-plugins-cjm-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/debian/changelog?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/debian/changelog (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/debian/changelog Thu Nov 18 12:13:36 2010
@@ -1,22 +1,24 @@
-libdist-zilla-plugins-cjm-perl (3.01-1) UNRELEASED; urgency=low
+libdist-zilla-plugins-cjm-perl (3.02-1) UNRELEASED; urgency=low
TODO:
- - missing debian/source/format [lintian]
- - I'd remove debian/libdist-zilla-plugins-cjm-perl.docs (README doesn't
+ X missing debian/source/format [lintian]
+ X I'd remove debian/libdist-zilla-plugins-cjm-perl.docs (README doesn't
seems useful for users)
- - debian/copyright: interesting order, missing newlines, one missing year
+ X debian/copyright: interesting order, missing newlines, one missing year
(and probably the Copyright line in the header doesn't conform to the
cited Format-Specification, it's rather new -- side remark for M::C)
- - debian/control:
- + s/Colections/collection/
- + libdist-zilla-perl probably needs a higher version?
+ X debian/control:
+ X s/Colections/collection/
+ X libdist-zilla-perl probably needs a higher version?
or not, the package builds fine for me with 4.102341-1, no complaints or
test failures (except for warnings about Prereq/s) ?!
- + " .\n" before the bullet list, IIRC, to avoid mangling [at least there
+ No: compatibility with Dist::Zilla 3 and 4 is mentioned in Changes file
+ X " .\n" before the bullet list, IIRC, to avoid mangling [at least there
was some discussion at some point]
- + libcpan-meta-perl needs no version (nothing older in archive)
- + same for libmoose-autobox-perl
+ X libcpan-meta-perl needs no version (nothing older in archive)
+ X same for libmoose-autobox-perl
* Initial Release. (Closes: #597613)
+ * New upstream release
- -- Dominique Dumont <dominique.dumont at hp.com> Tue, 21 Sep 2010 17:07:09 +0200
+ -- Dominique Dumont <dominique.dumont at hp.com> Wed, 17 Nov 2010 19:50:59 +0100
Modified: trunk/libdist-zilla-plugins-cjm-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/debian/copyright?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/debian/copyright (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/debian/copyright Thu Nov 18 12:13:36 2010
@@ -1,8 +1,8 @@
Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: Dist-Zilla-Plugins-CJM
Maintainer: Christopher J. Madsen <perl at cjmweb.net>
Source: http://search.cpan.org/dist/Dist-Zilla-Plugins-CJM/
-Name: Dist-Zilla-Plugins-CJM
-Copyright: 2010, Christopher J. Madsen.
+Copyright: 2010, Christopher J. Madsen <perl at cjmweb.net>
Files: *
Copyright: 2010, Christopher J. Madsen <perl at cjmweb.net>
@@ -19,7 +19,7 @@
On Debian systems, the complete text of the Artistic License can be
found in `/usr/share/common-licenses/Artistic'.
-License: GPL-1
+License: GPL-1+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 1, or (at your option)
Modified: trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ArchiveRelease.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ArchiveRelease.pm?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ArchiveRelease.pm (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ArchiveRelease.pm Thu Nov 18 12:13:36 2010
@@ -19,7 +19,7 @@
use 5.008;
our $VERSION = '3.01';
-# This file is part of Dist-Zilla-Plugins-CJM 3.01 (August 9, 2010)
+# This file is part of Dist-Zilla-Plugins-CJM 3.02 (November 11, 2010)
use Moose;
@@ -148,8 +148,8 @@
=head1 VERSION
This document describes version 3.01 of
-Dist::Zilla::Plugin::ArchiveRelease, released August 9, 2010
-as part of Dist-Zilla-Plugins-CJM version 3.01.
+Dist::Zilla::Plugin::ArchiveRelease, released November 11, 2010
+as part of Dist-Zilla-Plugins-CJM version 3.02.
=head1 SYNOPSIS
@@ -207,7 +207,7 @@
L<http://rt.cpan.org/Public/Bug/Report.html?Queue=Dist-Zilla-Plugins-CJM>
You can follow or contribute to Dist-Zilla-Plugins-CJM's development at
-L<< http://github.com/madsen/dist-zilla-plugins-cjm >>.
+git://github.com/madsen/dist-zilla-plugins-cjm.git.
=head1 COPYRIGHT AND LICENSE
Modified: trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/GitVersionCheckCJM.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/GitVersionCheckCJM.pm?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/GitVersionCheckCJM.pm (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/GitVersionCheckCJM.pm Thu Nov 18 12:13:36 2010
@@ -17,10 +17,11 @@
# ABSTRACT: Ensure version numbers are up-to-date
#---------------------------------------------------------------------
-our $VERSION = '0.08';
-# This file is part of Dist-Zilla-Plugins-CJM 3.01 (August 9, 2010)
-
-
+our $VERSION = '3.02';
+# This file is part of Dist-Zilla-Plugins-CJM 3.02 (November 11, 2010)
+
+
+use version 0.77 ();
use Moose;
use Moose::Autobox;
with(
@@ -32,7 +33,21 @@
);
-use Git ();
+use Git::Wrapper ();
+
+#---------------------------------------------------------------------
+# Helper sub to run a git command and split on NULs:
+
+sub _git0
+{
+ my ($git, $command, @args) = @_;
+
+ my ($result) = do { local $/; $git->$command(@args) };
+
+ return unless defined $result;
+
+ split(/\0/, $result);
+} # end _git0
#---------------------------------------------------------------------
# Main entry point:
@@ -41,16 +56,16 @@
my ($self) = @_;
# Get the released versions:
- my $git = Git->repository( $self->zilla->root );
-
- my %released = map { /^v?([\d._]+)$/ ? ($1, 1) : () } $git->command('tag');
+ my $git = Git::Wrapper->new( $self->zilla->root );
+
+ my %released = map { /^v?([\d._]+)$/ ? ($1, 1) : () } $git->tag;
# Get the list of modified but not-checked-in files:
my %modified = map { $_ => 1 } (
# Files that need to be committed:
- split(/\0/, scalar $git->command(qw( diff-index -z HEAD --name-only ))),
+ _git0($git, qw( diff_index -z HEAD --name-only )),
# Files that are not tracked by git yet:
- split(/\0/, scalar $git->command(qw( ls-files -oz --exclude-standard ))),
+ _git0($git, qw( ls_files -oz --exclude-standard )),
);
# Get the list of modules:
@@ -79,16 +94,28 @@
my $version = $pm_info->version
or $self->log_fatal("ERROR: Can't find version in $pmFile");
+ my $distver = version->parse($self->zilla->version);
+
# If module version matches dist version, it's current:
# (unless that dist has already been released)
- if ($version eq $self->zilla->version) {
+ if ($version == $distver) {
return unless $releasedRef->{$version};
+ }
+
+ # If the module version is greater than the dist version, that's a problem:
+ if ($version > $distver) {
+ $self->log("ERROR: $pmFile: $version exceeds dist version $distver");
+ return 1;
}
# If the module hasn't been committed yet, it needs updating:
# (since it doesn't match the dist version)
if ($modifiedRef->{$pmFile}) {
- $self->log("ERROR: $pmFile: $version needs to be updated");
+ if ($version == $distver) {
+ $self->log("ERROR: $pmFile: dist version $version needs to be updated");
+ } else {
+ $self->log("ERROR: $pmFile: $version needs to be updated");
+ }
return 1;
}
@@ -100,19 +127,21 @@
}
# See if we checked in the module without updating the version:
- my $lastChangedRev = $git->command_oneline(
- qw(rev-list -n1 HEAD --) => $pmFile
- );
-
- my $inRelease = $git->command_oneline(
- qw(name-rev --refs), "refs/tags/$version",
+ my ($lastChangedRev) = $git->rev_list(qw(-n1 HEAD --) => $pmFile);
+
+ my ($inRelease) = $git->name_rev(
+ qw(--refs), "refs/tags/$version",
$lastChangedRev
);
# We're ok if the last change was part of the indicated release:
return if $inRelease =~ m! tags/\Q$version\E!;
- $self->log("ERROR: $pmFile: $version needs to be updated");
+ if ($version == $distver) {
+ $self->log("ERROR: $pmFile: dist version $version needs to be updated");
+ } else {
+ $self->log("ERROR: $pmFile: $version needs to be updated");
+ }
return 1;
} # end munge_file
@@ -129,9 +158,9 @@
=head1 VERSION
-This document describes version 0.08 of
-Dist::Zilla::Plugin::GitVersionCheckCJM, released August 9, 2010
-as part of Dist-Zilla-Plugins-CJM version 3.01.
+This document describes version 3.02 of
+Dist::Zilla::Plugin::GitVersionCheckCJM, released November 11, 2010
+as part of Dist-Zilla-Plugins-CJM version 3.02.
=head1 SYNOPSIS
@@ -183,8 +212,9 @@
=head1 DEPENDENCIES
GitVersionCheckCJM requires L<Dist::Zilla> (3 or later).
-It also requires L<Git>, which is not on CPAN, but is distributed as
-part of C<git>.
+It also requires L<Git::Wrapper>, although it
+is only listed as a recommended dependency for the distribution (to
+allow people who don't use Git to use the other plugins.)
=head1 INCOMPATIBILITIES
@@ -204,7 +234,7 @@
L<http://rt.cpan.org/Public/Bug/Report.html?Queue=Dist-Zilla-Plugins-CJM>
You can follow or contribute to Dist-Zilla-Plugins-CJM's development at
-L<< http://github.com/madsen/dist-zilla-plugins-cjm >>.
+git://github.com/madsen/dist-zilla-plugins-cjm.git.
=head1 COPYRIGHT AND LICENSE
Modified: trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ModuleBuild/Custom.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ModuleBuild/Custom.pm?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ModuleBuild/Custom.pm (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ModuleBuild/Custom.pm Thu Nov 18 12:13:36 2010
@@ -18,7 +18,7 @@
#---------------------------------------------------------------------
our $VERSION = '3.01';
-# This file is part of Dist-Zilla-Plugins-CJM 3.01 (August 9, 2010)
+# This file is part of Dist-Zilla-Plugins-CJM 3.02 (November 11, 2010)
use Moose;
@@ -166,8 +166,8 @@
=head1 VERSION
This document describes version 3.01 of
-Dist::Zilla::Plugin::ModuleBuild::Custom, released August 9, 2010
-as part of Dist-Zilla-Plugins-CJM version 3.01.
+Dist::Zilla::Plugin::ModuleBuild::Custom, released November 11, 2010
+as part of Dist-Zilla-Plugins-CJM version 3.02.
=head1 SYNOPSIS
@@ -299,7 +299,7 @@
L<http://rt.cpan.org/Public/Bug/Report.html?Queue=Dist-Zilla-Plugins-CJM>
You can follow or contribute to Dist-Zilla-Plugins-CJM's development at
-L<< http://github.com/madsen/dist-zilla-plugins-cjm >>.
+git://github.com/madsen/dist-zilla-plugins-cjm.git.
=head1 COPYRIGHT AND LICENSE
Modified: trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/TemplateCJM.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/TemplateCJM.pm?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/TemplateCJM.pm (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/TemplateCJM.pm Thu Nov 18 12:13:36 2010
@@ -18,7 +18,7 @@
#---------------------------------------------------------------------
our $VERSION = '3.00';
-# This file is part of Dist-Zilla-Plugins-CJM 3.01 (August 9, 2010)
+# This file is part of Dist-Zilla-Plugins-CJM 3.02 (November 11, 2010)
use Moose;
@@ -367,8 +367,8 @@
=head1 VERSION
This document describes version 3.00 of
-Dist::Zilla::Plugin::TemplateCJM, released August 9, 2010
-as part of Dist-Zilla-Plugins-CJM version 3.01.
+Dist::Zilla::Plugin::TemplateCJM, released November 11, 2010
+as part of Dist-Zilla-Plugins-CJM version 3.02.
=head1 SYNOPSIS
@@ -601,7 +601,7 @@
L<http://rt.cpan.org/Public/Bug/Report.html?Queue=Dist-Zilla-Plugins-CJM>
You can follow or contribute to Dist-Zilla-Plugins-CJM's development at
-L<< http://github.com/madsen/dist-zilla-plugins-cjm >>.
+git://github.com/madsen/dist-zilla-plugins-cjm.git.
=head1 COPYRIGHT AND LICENSE
Modified: trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/VersionFromModule.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/VersionFromModule.pm?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/VersionFromModule.pm (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/VersionFromModule.pm Thu Nov 18 12:13:36 2010
@@ -18,7 +18,7 @@
#---------------------------------------------------------------------
our $VERSION = '0.08';
-# This file is part of Dist-Zilla-Plugins-CJM 3.01 (August 9, 2010)
+# This file is part of Dist-Zilla-Plugins-CJM 3.02 (November 11, 2010)
use Moose;
with 'Dist::Zilla::Role::VersionProvider';
@@ -57,8 +57,8 @@
=head1 VERSION
This document describes version 0.08 of
-Dist::Zilla::Plugin::VersionFromModule, released August 9, 2010
-as part of Dist-Zilla-Plugins-CJM version 3.01.
+Dist::Zilla::Plugin::VersionFromModule, released November 11, 2010
+as part of Dist-Zilla-Plugins-CJM version 3.02.
=head1 SYNOPSIS
@@ -95,7 +95,7 @@
L<http://rt.cpan.org/Public/Bug/Report.html?Queue=Dist-Zilla-Plugins-CJM>
You can follow or contribute to Dist-Zilla-Plugins-CJM's development at
-L<< http://github.com/madsen/dist-zilla-plugins-cjm >>.
+git://github.com/madsen/dist-zilla-plugins-cjm.git.
=head1 COPYRIGHT AND LICENSE
Modified: trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Role/ModuleInfo.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Role/ModuleInfo.pm?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Role/ModuleInfo.pm (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Role/ModuleInfo.pm Thu Nov 18 12:13:36 2010
@@ -18,7 +18,7 @@
#---------------------------------------------------------------------
our $VERSION = '0.08';
-# This file is part of Dist-Zilla-Plugins-CJM 3.01 (August 9, 2010)
+# This file is part of Dist-Zilla-Plugins-CJM 3.02 (November 11, 2010)
use Moose::Role;
@@ -64,8 +64,8 @@
=head1 VERSION
This document describes version 0.08 of
-Dist::Zilla::Role::ModuleInfo, released August 9, 2010
-as part of Dist-Zilla-Plugins-CJM version 3.01.
+Dist::Zilla::Role::ModuleInfo, released November 11, 2010
+as part of Dist-Zilla-Plugins-CJM version 3.02.
=head1 DESCRIPTION
@@ -104,7 +104,7 @@
L<http://rt.cpan.org/Public/Bug/Report.html?Queue=Dist-Zilla-Plugins-CJM>
You can follow or contribute to Dist-Zilla-Plugins-CJM's development at
-L<< http://github.com/madsen/dist-zilla-plugins-cjm >>.
+git://github.com/madsen/dist-zilla-plugins-cjm.git.
=head1 COPYRIGHT AND LICENSE
Modified: trunk/libdist-zilla-plugins-cjm-perl/t/00-compile.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/t/00-compile.t?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/t/00-compile.t (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/t/00-compile.t Thu Nov 18 12:13:36 2010
@@ -1,6 +1,6 @@
use Test::More tests => 6;
-diag("Testing Dist-Zilla-Plugins-CJM 3.01");
+diag("Testing Dist-Zilla-Plugins-CJM 3.02");
use_ok('Dist::Zilla::Plugin::ArchiveRelease');
use_ok('Dist::Zilla::Plugin::ModuleBuild::Custom');
@@ -9,7 +9,7 @@
use_ok('Dist::Zilla::Role::ModuleInfo');
SKIP: {
- skip 'Git not installed', 1 unless eval "use Git; 1";
+ skip 'Git::Wrapper not installed', 1 unless eval "use Git::Wrapper; 1";
use_ok('Dist::Zilla::Plugin::GitVersionCheckCJM');
}
Modified: trunk/libdist-zilla-plugins-cjm-perl/t/mb_custom.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/t/mb_custom.t?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/t/mb_custom.t (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/t/mb_custom.t Thu Nov 18 12:13:36 2010
@@ -30,7 +30,7 @@
copyright_holder = E. Xavier Ample
version = 0.04
-[Prereq]
+[Prereqs]
Foo::Bar = 1.00
Bloofle = 0
Modified: trunk/libdist-zilla-plugins-cjm-perl/t/template.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/t/template.t?rev=65018&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/t/template.t (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/t/template.t Thu Nov 18 12:13:36 2010
@@ -18,7 +18,7 @@
license = Perl_5
copyright_holder = E. Xavier Ample
-[Prereq]
+[Prereqs]
Foo::Bar = 1.00
Bloofle = 0
END START
More information about the Pkg-perl-cvs-commits
mailing list