r49355 - in /branches/upstream/libtest-checkchanges-perl/current: Changes MANIFEST META.yml Makefile.PL README SIGNATURE lib/Test/CheckChanges.pm t/bad/multiple/CHANGES t/bad/multiple/CHanges t/bad/multiple/ChangeS t/multi.t
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Fri Dec 25 14:21:00 UTC 2009
Author: jawnsy-guest
Date: Fri Dec 25 14:20:55 2009
New Revision: 49355
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=49355
Log:
[svn-upgrade] Integrating new upstream version, libtest-checkchanges-perl (0.10)
Added:
branches/upstream/libtest-checkchanges-perl/current/t/bad/multiple/CHanges
branches/upstream/libtest-checkchanges-perl/current/t/bad/multiple/ChangeS
Modified:
branches/upstream/libtest-checkchanges-perl/current/Changes
branches/upstream/libtest-checkchanges-perl/current/MANIFEST
branches/upstream/libtest-checkchanges-perl/current/META.yml
branches/upstream/libtest-checkchanges-perl/current/Makefile.PL
branches/upstream/libtest-checkchanges-perl/current/README
branches/upstream/libtest-checkchanges-perl/current/SIGNATURE
branches/upstream/libtest-checkchanges-perl/current/lib/Test/CheckChanges.pm
branches/upstream/libtest-checkchanges-perl/current/t/bad/multiple/CHANGES
branches/upstream/libtest-checkchanges-perl/current/t/multi.t
Modified: branches/upstream/libtest-checkchanges-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-checkchanges-perl/current/Changes?rev=49355&op=diff
==============================================================================
--- branches/upstream/libtest-checkchanges-perl/current/Changes (original)
+++ branches/upstream/libtest-checkchanges-perl/current/Changes Fri Dec 25 14:20:55 2009
@@ -1,4 +1,19 @@
Revision history for Perl extension Test::CheckChanges
+
+0.10 Sun, 23 Dec 2009 19:21:01 -0400
+ - Tested on Windows XP
+ - If test8 had been in release 0.09 it would have been removed
+ in this release
+ - Once again only look for 'Changes' and 'CHANGES' filenames.
+
+0.09 Sun, 23 Dec 2009 11:50:01 -0400
+ - All files in the form of /C[Hh][Aa][Nn][Gg][Ee][Ss]/ will be considered
+ for use as the changes file. The first (in perl order) will be used.
+ - Use glob to fix bug 'caseless' filesystems
+ - The text of the "Multiple Changes files found" message was changed.
+ It no longer contains paths and has different punctuation.
+ - t/multi.t was update for the previous change.
+ - t/test8.t was added to test for more than 2 Changes files.
0.08 Sun, 02 Aug 2009 09:13:11 -0400
- Added "Version N" format
Modified: branches/upstream/libtest-checkchanges-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-checkchanges-perl/current/MANIFEST?rev=49355&op=diff
==============================================================================
--- branches/upstream/libtest-checkchanges-perl/current/MANIFEST (original)
+++ branches/upstream/libtest-checkchanges-perl/current/MANIFEST Fri Dec 25 14:20:55 2009
@@ -17,6 +17,8 @@
t/bad/mixxed/Changes
t/bad/mixxed/Makefile
t/bad/multiple/CHANGES
+t/bad/multiple/CHanges
+t/bad/multiple/ChangeS
t/bad/multiple/Changes
t/bad/multiple/Makefile
t/bad/test1a/_build/build_params
Modified: branches/upstream/libtest-checkchanges-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-checkchanges-perl/current/META.yml?rev=49355&op=diff
==============================================================================
--- branches/upstream/libtest-checkchanges-perl/current/META.yml (original)
+++ branches/upstream/libtest-checkchanges-perl/current/META.yml Fri Dec 25 14:20:55 2009
@@ -1,25 +1,27 @@
---
name: Test-CheckChanges
-version: 0.08
+version: 0.10
author:
- '"G. Allen Morris III" <gam3 at gam3.net>'
abstract: Check that the Changes file matches the distribution.
license: perl
resources:
license: http://dev.perl.org/licenses/
+build_requires:
+ Test::More: 0
requires:
perl: 5.006
-build_requires:
- Test::More: 0
recommends:
Module::Build: 0
Test::Pod: 0
Test::Pod::Coverage: 0
+configure_requires:
+ Module::Build: 0.340201
provides:
Test::CheckChanges:
file: lib/Test/CheckChanges.pm
- version: 0.08
-generated_by: Module::Build version 0.280801
+ version: 0.10
+generated_by: Module::Build version 0.340201
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.2.html
- version: 1.2
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
Modified: branches/upstream/libtest-checkchanges-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-checkchanges-perl/current/Makefile.PL?rev=49355&op=diff
==============================================================================
--- branches/upstream/libtest-checkchanges-perl/current/Makefile.PL (original)
+++ branches/upstream/libtest-checkchanges-perl/current/Makefile.PL Fri Dec 25 14:20:55 2009
@@ -1,4 +1,4 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.2808_01
+# Note: this file was auto-generated by Module::Build::Compat version 0.340201
require 5.006;
use ExtUtils::MakeMaker;
WriteMakefile
Modified: branches/upstream/libtest-checkchanges-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-checkchanges-perl/current/README?rev=49355&op=diff
==============================================================================
--- branches/upstream/libtest-checkchanges-perl/current/README (original)
+++ branches/upstream/libtest-checkchanges-perl/current/README Fri Dec 25 14:20:55 2009
@@ -3,7 +3,7 @@
distribution.
VERSION
- Version 0.08
+ Version 0.10
SYNOPSIS
use Test::CheckChanges;
Modified: branches/upstream/libtest-checkchanges-perl/current/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-checkchanges-perl/current/SIGNATURE?rev=49355&op=diff
==============================================================================
--- branches/upstream/libtest-checkchanges-perl/current/SIGNATURE (original)
+++ branches/upstream/libtest-checkchanges-perl/current/SIGNATURE Fri Dec 25 14:20:55 2009
@@ -1,5 +1,5 @@
This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.55.
+signed via the Module::Signature module, version 0.61.
To verify the content in this distribution, first make sure you have
Module::Signature installed, then type:
@@ -15,11 +15,11 @@
Hash: SHA1
SHA1 badac0e40137c1d34beb5fabea9c6a3e1f9675eb Build.PL
-SHA1 2f93cb9deaaaeed03fa7cd02e79f8e94ed655174 Changes
-SHA1 08fcb6462c77296570bea9a62e282bc6881ce316 MANIFEST
-SHA1 ec276c109ca47b4746f8d412a1ec11b5a5b90bfe META.yml
-SHA1 a1d137169191d00d4bdd204211d4a9c84647f21e Makefile.PL
-SHA1 2d8e1d8c794dd1ad5aeff967779446a9616cae47 README
+SHA1 8958f0e2ccc8c81b5c578847ebf2c1a0ca050a7a Changes
+SHA1 83bac7f25cf749cf1f46330c4617d964f482cec2 MANIFEST
+SHA1 c6112c384355b623fb9710436e1f98ef8637ef45 META.yml
+SHA1 0905e123e867e834e2f4607df2967fefd7396497 Makefile.PL
+SHA1 1c46a7fe73097da72aa8a195fd1f4e302472cc16 README
SHA1 27f9fc192c38a30171338e66520e43326ea85cb5 examples/apocal/Changes
SHA1 d099144eb6e8b85b4331e676d3a972b627e4d16b examples/apocal/Makefile
SHA1 6a677ea6f79a4604e073a4582989f81d997f202d examples/common/Changes
@@ -28,11 +28,13 @@
SHA1 5df9d5e6d83b274305c2109a287ac113f87c3e56 examples/versionN/Makefile
SHA1 5eede8ff157d5f64920965838cb23090aefd8341 examples/yaml/Changes
SHA1 9c4243cc82bea6335c6a6cba6de89647ae9c5c36 examples/yaml/Makefile
-SHA1 0a19d87b88caa605354a864aed55b96b8b464f45 lib/Test/CheckChanges.pm
+SHA1 8e96769f31a151b9f23a74d03f1d994aebfc212e lib/Test/CheckChanges.pm
SHA1 0c791db5cdce98d392b9f7446f370468b4169af1 t/bad/missing2/README
SHA1 552de64c0259d5b506cd1c73425e30b442b202b3 t/bad/mixxed/Changes
SHA1 cc2f87f5e32b9b1ca7fe27e064e1364d15a54139 t/bad/mixxed/Makefile
-SHA1 90fec68554a470af4004c47cc3e3b406446fc6f4 t/bad/multiple/CHANGES
+SHA1 3cdd32a48c727d3b0948b369e2e44bd8e243610c t/bad/multiple/CHANGES
+SHA1 5f27afbc268efe4fe7a7644cee5405c0ba62ef3d t/bad/multiple/CHanges
+SHA1 5f27afbc268efe4fe7a7644cee5405c0ba62ef3d t/bad/multiple/ChangeS
SHA1 90fec68554a470af4004c47cc3e3b406446fc6f4 t/bad/multiple/Changes
SHA1 be0b30201e33f5b412e981078aeb0b2951ffd9e2 t/bad/multiple/Makefile
SHA1 6a677ea6f79a4604e073a4582989f81d997f202d t/bad/test1a/Changes
@@ -54,7 +56,7 @@
SHA1 f5ac356d95fe7b7506fcd2b95cb3acde8cf461ce t/changes.t
SHA1 a77b6778baef53df903ad8bfa8c10a2706a44a78 t/missing.t
SHA1 03638778b066abe4e93198abe7492a6d9fa5d6b2 t/mixxed.t
-SHA1 2f7de5c0790d640362d7dc070213b5bdba9bc94f t/multi.t
+SHA1 84422223d57d38219d9d0b57e6e12edf9df843ec t/multi.t
SHA1 e3e2dfa2ee2cd40f9f0ba23dd175c649effc68c7 t/parse_apocal.t
SHA1 a31358d01470c99efcc9a70f88dc134182610795 t/parse_common.t
SHA1 2468db6554123c5d86c89cf0a1bdfa9156654fe3 t/parse_versionN.t
@@ -74,10 +76,10 @@
SHA1 533c1a692d01191902b0070d03575ad59293c4c2 t/testy.t
SHA1 2c042fe0f0d689753eb5ce2d6930ad7224e48d86 t/unit.t
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
-iGcEARECACcFAkp1t2EgGmh0dHA6Ly93d3cuZ2FtMy5uZXQvcG9saWN5Lmh0bWwA
-CgkQliSr/X1H0FzbLQCfXeJ8blbqOe2C0LEdy9KW+FWsj+0AoPhxBD03B6RLbPln
-WNFj9rs5OV8M
-=dLIE
+iGcEARECACcFAks0G4MgGmh0dHA6Ly93d3cuZ2FtMy5uZXQvcG9saWN5Lmh0bWwA
+CgkQliSr/X1H0Fys1gCaA9mTiVNe/0ZyklJfiBwfVTp5m/MAn2BYB6jzM3UiC2gM
+46ECU88Tki17
+=iTJc
-----END PGP SIGNATURE-----
Modified: branches/upstream/libtest-checkchanges-perl/current/lib/Test/CheckChanges.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-checkchanges-perl/current/lib/Test/CheckChanges.pm?rev=49355&op=diff
==============================================================================
--- branches/upstream/libtest-checkchanges-perl/current/lib/Test/CheckChanges.pm (original)
+++ branches/upstream/libtest-checkchanges-perl/current/lib/Test/CheckChanges.pm Fri Dec 25 14:20:55 2009
@@ -7,6 +7,7 @@
use Carp;
use File::Spec;
use File::Basename;
+use File::Glob "bsd_glob";
use Test::Builder;
our $test = Test::Builder->new();
@@ -17,11 +18,11 @@
=head1 VERSION
-Version 0.08
+Version 0.10
=cut
-our $VERSION = 0.08;
+our $VERSION = '0.10';
=head1 SYNOPSIS
@@ -60,6 +61,8 @@
our $order = '';
our @change_files = qw (Changes CHANGES);
+our $changes_regex = qr/(Changes|CHANGES)$/;
+our $glob = "C[Hh][Aa][Nn][Gg][Ee][Ss]";
sub import {
my $self = shift;
@@ -105,22 +108,21 @@
if (defined (my $x = $test->has_plan())) {
if ($x eq 'no_plan') {
-# warn "No plan";
- } else {
-# warn "Plan $x";
- }
+# warn "No plan";
+ } else {
+# warn "Plan $x";
+ }
} else {
- $test->plan(tests => 1);
- }
-
- my $base = Cwd::realpath(dirname(File::Spec->rel2abs($0)) . '/../' . $_base);
-
- my $bool = 1;
+ $test->plan(tests => 1);
+ }
+
+ my $base = Cwd::realpath(File::Spec->catdir(dirname($0), '..', $_base));
+
my $home = $base;
my @diag = ();
- my $makefile = Cwd::realpath($base . '/Makefile');
- my $build = Cwd::realpath($home . '/_build/build_params');
+ my $makefile = File::Spec->catdir($base, 'Makefile');
+ my $build = File::Spec->catdir($home, '_build', 'build_params');
my $extra_text;
@@ -131,24 +133,24 @@
close(IN);
my $temp = eval $data;
$version = $temp->[2]{dist_version};
- $extra_text = "Build";
+ $extra_text = "Build";
} elsif ($makefile && -r $makefile) {
open(IN, $makefile) or die "Could not open $makefile";
while (<IN>) {
chomp;
if (/^VERSION\s*=\s*(.*)\s*/) {
$version = $1;
- $extra_text = "Makefile";
+ $extra_text = "Makefile";
last;
}
}
close(IN) or die "Could not close $makefile";
}
if ($version) {
- $msg = "CheckChages $version " . $extra_text;
+ $msg = "CheckChages $version " . $extra_text;
} else {
push(@diag, "No way to determine version");
- $msg = "No Build or Makefile found";
+ $msg = "No Build or Makefile found";
}
my $ok = 0;
@@ -158,12 +160,22 @@
my $parsed = '';
my @not_found = ();
- my @change_list = map({my $file = "$home/$_"; (-r $file)?($file):();} @change_files);
-
- my $change_file = shift(@change_list);
-
- if (@change_list > 0) {
- push(@diag, qq/Multiple 'Changes' files found (@change_list) using $change_file./);
+ # glob for the changes file and then filter if needed
+ # this is sorted here so the filesystem is not in control of
+ # the order of the files.
+
+ my $glob_path = File::Spec->catdir($home, $glob);
+ my @change_list = sort { $b cmp $a } grep(m|$changes_regex|, bsd_glob($glob_path));
+
+ my $change_file = $change_list[0];
+
+ if (@change_list > 1) {
+ for (@change_list) {
+ s|^$home/||;
+ }
+ push(@diag, qq/Multiple Changes files found (/ .
+ join(', ', map({'"' . $_ . '"'} @change_list)) .
+ qq/) using "$change_list[0]"./);
}
if ($change_file and $version) {
@@ -209,7 +221,7 @@
# Plain "Version N"
$mixed++ if $type and $type != 3;
$type = 4;
- if ($version eq $1) {
+ if ($version eq $1 || $version eq $1) {
$found = $_;
last;
} else {
@@ -218,25 +230,25 @@
}
}
close(IN) or die "Could not close ($change_file) file";
- if ($found) {
- $ok = 1;
- } else {
- $ok = 0;
- $msg .= " Not Found.";
+ if ($found) {
+ $ok = 1;
+ } else {
+ $ok = 0;
+ $msg .= " Not Found.";
if (@not_found) {
push(@diag, qq(expecting version $version, found versions: ). join(', ', @not_found));
} else {
push(@diag, qq(expecting version $version, But no versions where found in the Changes file.));
}
- }
+ }
}
if (!$change_file) {
- push(@diag, q(No 'Changes' file found));
+ push(@diag, q(No 'Changes' file found));
}
$test->ok($ok, $msg);
for my $diag (@diag) {
- $test->diag($diag);
+ $test->diag($diag);
}
}
Modified: branches/upstream/libtest-checkchanges-perl/current/t/bad/multiple/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-checkchanges-perl/current/t/bad/multiple/CHANGES?rev=49355&op=diff
==============================================================================
--- branches/upstream/libtest-checkchanges-perl/current/t/bad/multiple/CHANGES (original)
+++ branches/upstream/libtest-checkchanges-perl/current/t/bad/multiple/CHANGES Fri Dec 25 14:20:55 2009
@@ -1,1 +1,4 @@
-1.11 - bob
+
+1.10 - bob
+
+1.09 - bob
Added: branches/upstream/libtest-checkchanges-perl/current/t/bad/multiple/CHanges
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-checkchanges-perl/current/t/bad/multiple/CHanges?rev=49355&op=file
==============================================================================
--- branches/upstream/libtest-checkchanges-perl/current/t/bad/multiple/CHanges (added)
+++ branches/upstream/libtest-checkchanges-perl/current/t/bad/multiple/CHanges Fri Dec 25 14:20:55 2009
@@ -1,0 +1,8 @@
+Revision history for Perl extension Data::Miscellany.
+
+1.02 Do Okt 18 10:09:39 CEST 2007
+ - fixed version requirement of Test::More
+
+1.01 Do Okt 4 19:16:00 CEST 2007
+ - original version
+
Added: branches/upstream/libtest-checkchanges-perl/current/t/bad/multiple/ChangeS
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-checkchanges-perl/current/t/bad/multiple/ChangeS?rev=49355&op=file
==============================================================================
--- branches/upstream/libtest-checkchanges-perl/current/t/bad/multiple/ChangeS (added)
+++ branches/upstream/libtest-checkchanges-perl/current/t/bad/multiple/ChangeS Fri Dec 25 14:20:55 2009
@@ -1,0 +1,8 @@
+Revision history for Perl extension Data::Miscellany.
+
+1.02 Do Okt 18 10:09:39 CEST 2007
+ - fixed version requirement of Test::More
+
+1.01 Do Okt 4 19:16:00 CEST 2007
+ - original version
+
Modified: branches/upstream/libtest-checkchanges-perl/current/t/multi.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-checkchanges-perl/current/t/multi.t?rev=49355&op=diff
==============================================================================
--- branches/upstream/libtest-checkchanges-perl/current/t/multi.t (original)
+++ branches/upstream/libtest-checkchanges-perl/current/t/multi.t Fri Dec 25 14:20:55 2009
@@ -5,7 +5,7 @@
our $x = $Test::CheckChanges::test;
our @q = (
-qr/Multiple 'Changes' files found.*/,
+ qr/Multiple Changes files found \("Changes", "CHANGES"\) using "Changes"./,
);
our $count = 0;
More information about the Pkg-perl-cvs-commits
mailing list