r53796 - in /trunk/libtest-checkchanges-perl: ./ debian/ examples/common3/ examples/mixxed/ lib/Test/ t/ t/bad/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sun Mar 7 01:38:56 UTC 2010
Author: jawnsy-guest
Date: Sun Mar 7 01:38:48 2010
New Revision: 53796
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53796
Log:
* New upstream release
* Rewrite control description
* Standards-Version 3.8.4 (no changes)
Added:
trunk/libtest-checkchanges-perl/examples/common3/
- copied from r53795, branches/upstream/libtest-checkchanges-perl/current/examples/common3/
trunk/libtest-checkchanges-perl/examples/mixxed/
- copied from r53795, branches/upstream/libtest-checkchanges-perl/current/examples/mixxed/
trunk/libtest-checkchanges-perl/t/bad/CHANGES
- copied unchanged from r53795, branches/upstream/libtest-checkchanges-perl/current/t/bad/CHANGES
trunk/libtest-checkchanges-perl/t/bad/Changes
- copied unchanged from r53795, branches/upstream/libtest-checkchanges-perl/current/t/bad/Changes
trunk/libtest-checkchanges-perl/t/bad/Makefile
- copied unchanged from r53795, branches/upstream/libtest-checkchanges-perl/current/t/bad/Makefile
trunk/libtest-checkchanges-perl/t/parse_all.t
- copied unchanged from r53795, branches/upstream/libtest-checkchanges-perl/current/t/parse_all.t
trunk/libtest-checkchanges-perl/t/parse_common3.t
- copied unchanged from r53795, branches/upstream/libtest-checkchanges-perl/current/t/parse_common3.t
trunk/libtest-checkchanges-perl/t/perlcriticrc
- copied unchanged from r53795, branches/upstream/libtest-checkchanges-perl/current/t/perlcriticrc
trunk/libtest-checkchanges-perl/t/testz.t
- copied unchanged from r53795, branches/upstream/libtest-checkchanges-perl/current/t/testz.t
trunk/libtest-checkchanges-perl/t/tpcp.t
- copied unchanged from r53795, branches/upstream/libtest-checkchanges-perl/current/t/tpcp.t
Modified:
trunk/libtest-checkchanges-perl/Changes
trunk/libtest-checkchanges-perl/MANIFEST
trunk/libtest-checkchanges-perl/META.yml
trunk/libtest-checkchanges-perl/Makefile.PL
trunk/libtest-checkchanges-perl/README
trunk/libtest-checkchanges-perl/SIGNATURE
trunk/libtest-checkchanges-perl/debian/changelog
trunk/libtest-checkchanges-perl/debian/control
trunk/libtest-checkchanges-perl/lib/Test/CheckChanges.pm
trunk/libtest-checkchanges-perl/t/changes.t
trunk/libtest-checkchanges-perl/t/missing.t
trunk/libtest-checkchanges-perl/t/mixxed.t
trunk/libtest-checkchanges-perl/t/multi.t
trunk/libtest-checkchanges-perl/t/parse_apocal.t
trunk/libtest-checkchanges-perl/t/parse_common.t
trunk/libtest-checkchanges-perl/t/pod.t
trunk/libtest-checkchanges-perl/t/pod_coverage.t
trunk/libtest-checkchanges-perl/t/test1a.t
trunk/libtest-checkchanges-perl/t/test1b.t
trunk/libtest-checkchanges-perl/t/test1c.t
trunk/libtest-checkchanges-perl/t/test2.t
trunk/libtest-checkchanges-perl/t/test3.t
trunk/libtest-checkchanges-perl/t/test4.t
trunk/libtest-checkchanges-perl/t/test5.t
trunk/libtest-checkchanges-perl/t/test6.t
trunk/libtest-checkchanges-perl/t/test7.t
trunk/libtest-checkchanges-perl/t/testx.t
trunk/libtest-checkchanges-perl/t/testy.t
trunk/libtest-checkchanges-perl/t/unit.t
Modified: trunk/libtest-checkchanges-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/Changes?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/Changes (original)
+++ trunk/libtest-checkchanges-perl/Changes Sun Mar 7 01:38:48 2010
@@ -1,4 +1,13 @@
Revision history for Perl extension Test::CheckChanges
+
+0.14 Sat, 06 Mar 2010 17:03:29 -0500
+ - Recognize developer releases / Bug #54856
+ - Recognize v0.0.0 format
+
+0.12 Wed, 06 Jan 2010 21:24:58 -0500
+ - added more tests
+ - will work with done_testing();
+ - added test for done_testing();
0.11 Sun, 23 Dec 2009 19:21:01 -0400
- Now works on Windows XP
Modified: trunk/libtest-checkchanges-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/MANIFEST?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/MANIFEST (original)
+++ trunk/libtest-checkchanges-perl/MANIFEST Sun Mar 7 01:38:48 2010
@@ -4,15 +4,22 @@
examples/apocal/Makefile
examples/common/Changes
examples/common/Makefile
+examples/common3/Changes
+examples/common3/Makefile
+examples/versionN/Changes
+examples/versionN/Makefile
examples/yaml/Changes
examples/yaml/Makefile
-examples/versionN/Makefile
-examples/versionN/Changes
+examples/mixxed/Changes
+examples/mixxed/Makefile
lib/Test/CheckChanges.pm
Makefile.PL
MANIFEST This list of files
META.yml
README
+t/bad/CHANGES
+t/bad/Changes
+t/bad/Makefile
t/bad/missing2/README
t/bad/mixxed/Changes
t/bad/mixxed/Makefile
@@ -40,8 +47,10 @@
t/multi.t
t/parse_apocal.t
t/parse_common.t
+t/parse_common3.t
+t/parse_all.t
+t/parse_versionN.t
t/parse_yaml.t
-t/parse_versionN.t
t/pod.t
t/pod_coverage.t
t/test1a.t
@@ -55,5 +64,8 @@
t/test7.t
t/testx.t
t/testy.t
+t/testz.t
+t/tpcp.t
t/unit.t
+t/perlcriticrc
SIGNATURE Added here by Module::Build
Modified: trunk/libtest-checkchanges-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/META.yml?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/META.yml (original)
+++ trunk/libtest-checkchanges-perl/META.yml Sun Mar 7 01:38:48 2010
@@ -1,27 +1,27 @@
---
-name: Test-CheckChanges
-version: 0.11
+abstract: 'Check that the Changes file matches the distribution.'
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/
+ - "\"G. Allen Morris III\" <gam3 at gam3.net>"
build_requires:
Test::More: 0
-requires:
- perl: 5.006
+configure_requires:
+ Module::Build: 0.36
+generated_by: 'Module::Build version 0.3601'
+license: perl
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
+name: Test-CheckChanges
+provides:
+ Test::CheckChanges:
+ file: lib/Test/CheckChanges.pm
+ version: 0.14
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.11
-generated_by: Module::Build version 0.340201
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+requires:
+ perl: 5.006
+resources:
+ license: http://dev.perl.org/licenses/
+version: 0.14
Modified: trunk/libtest-checkchanges-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/Makefile.PL?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/Makefile.PL (original)
+++ trunk/libtest-checkchanges-perl/Makefile.PL Sun Mar 7 01:38:48 2010
@@ -1,4 +1,4 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.340201
+# Note: this file was auto-generated by Module::Build::Compat version 0.3601
require 5.006;
use ExtUtils::MakeMaker;
WriteMakefile
Modified: trunk/libtest-checkchanges-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/README?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/README (original)
+++ trunk/libtest-checkchanges-perl/README Sun Mar 7 01:38:48 2010
@@ -3,7 +3,7 @@
distribution.
VERSION
- Version 0.11
+ Version 0.14
SYNOPSIS
use Test::CheckChanges;
@@ -12,7 +12,8 @@
You can make the test optional with
use Test::More;
- eval 'use Test::CheckChanges;';
+ eval { require Test::CheckChanges };
+
if ($@) {
plan skip_all => 'Test::CheckChanges required for testing the Changes file';
}
@@ -45,12 +46,12 @@
The ok_changes method takes no arguments and returns no value.
CHANGES FILE FORMAT
- Currently this package parses 4 different types of "Changes" files. The
- first is the common, free style, "Changes" file where the version is
+ Currently this package parses 4 different types of `Changes' files. The
+ first is the common, free style, `Changes' file where the version is
first item on an unindented line:
0.01 Fri May 2 15:56:25 EDT 2008
- - more info
+ - more info
The second type of file parsed is the Module::Changes::YAML format
changes file.
@@ -76,19 +77,19 @@
Create an RT if you need a different format file supported. If it is not
horrid, I will add it.
- The Debian style "Changes" file will likely be the first new format
+ The Debian style `Changes' file will likely be the first new format
added.
BUGS
Please open an RT if you find a bug.
- <http://rt.cpan.org/Public/Dist/Display.html?Name=Test-CheckChanges>
+ http://rt.cpan.org/Public/Dist/Display.html?Name=Test-CheckChanges
AUTHOR
"G. Allen Morris III" <gam3 at gam3.net>
COPYRIGHT & LICENSE
- Copyright (C) 2008 G. Allen Morris III, all rights reserved.
+ Copyright (C) 2008-2010 G. Allen Morris III, all rights reserved.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libtest-checkchanges-perl/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/SIGNATURE?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/SIGNATURE (original)
+++ trunk/libtest-checkchanges-perl/SIGNATURE Sun Mar 7 01:38:48 2010
@@ -15,20 +15,27 @@
Hash: SHA1
SHA1 badac0e40137c1d34beb5fabea9c6a3e1f9675eb Build.PL
-SHA1 3952d22d9aa1ea967cd19e95903aa7b4fec14436 Changes
-SHA1 99e4f7465ce094e2fb78f9018b489c39959e10b7 MANIFEST
-SHA1 903f6c77643c4973659d8d4284714d5d7af4d14e META.yml
-SHA1 0905e123e867e834e2f4607df2967fefd7396497 Makefile.PL
-SHA1 1e502c11a0c8fb56dcadfb9effceb63d30ad146e README
+SHA1 439bd86476628382cafcbe728b6541a89ef97fba Changes
+SHA1 ffa0d7fd471d649d094e4b98c981681f105ea8aa MANIFEST
+SHA1 a0427dd82187bd16a766d5d1237dcf4844e7a118 META.yml
+SHA1 312f7214ac0aede4096967f0c26758229ae8b1dd Makefile.PL
+SHA1 76f30d9becbe3abc7a91769480ddaaa8d3379ac2 README
SHA1 27f9fc192c38a30171338e66520e43326ea85cb5 examples/apocal/Changes
SHA1 d099144eb6e8b85b4331e676d3a972b627e4d16b examples/apocal/Makefile
SHA1 6a677ea6f79a4604e073a4582989f81d997f202d examples/common/Changes
SHA1 5c084c50fe44844576993233cda1c749fd7a389f examples/common/Makefile
+SHA1 d7effcace6ff246057c12bd159ff293370da6a83 examples/common3/Changes
+SHA1 26c3641562979af892ef014c65ab8e1d4efe9f3a examples/common3/Makefile
+SHA1 a428b40e5f1d28e057ea6da641977f67bc3f1623 examples/mixxed/Changes
+SHA1 5df9d5e6d83b274305c2109a287ac113f87c3e56 examples/mixxed/Makefile
SHA1 cf9f1185e01f970797669d1dc52f11590063bd7a examples/versionN/Changes
SHA1 5df9d5e6d83b274305c2109a287ac113f87c3e56 examples/versionN/Makefile
SHA1 5eede8ff157d5f64920965838cb23090aefd8341 examples/yaml/Changes
SHA1 9c4243cc82bea6335c6a6cba6de89647ae9c5c36 examples/yaml/Makefile
-SHA1 1b86034756151d9af0342b36ff2c0eb57aee9b79 lib/Test/CheckChanges.pm
+SHA1 874f7f2f29b9085cda05ca0331e43f143336611e lib/Test/CheckChanges.pm
+SHA1 90fec68554a470af4004c47cc3e3b406446fc6f4 t/bad/CHANGES
+SHA1 90fec68554a470af4004c47cc3e3b406446fc6f4 t/bad/Changes
+SHA1 be0b30201e33f5b412e981078aeb0b2951ffd9e2 t/bad/Makefile
SHA1 0c791db5cdce98d392b9f7446f370468b4169af1 t/bad/missing2/README
SHA1 552de64c0259d5b506cd1c73425e30b442b202b3 t/bad/mixxed/Changes
SHA1 cc2f87f5e32b9b1ca7fe27e064e1364d15a54139 t/bad/mixxed/Makefile
@@ -50,33 +57,38 @@
SHA1 669ab0db33db07a257eec2f7ebe1e6b6e8644ff1 t/bad/test6/Changes
SHA1 5c084c50fe44844576993233cda1c749fd7a389f t/bad/test6/Makefile
SHA1 669ab0db33db07a257eec2f7ebe1e6b6e8644ff1 t/bad/test7/Changes
-SHA1 f5ac356d95fe7b7506fcd2b95cb3acde8cf461ce t/changes.t
-SHA1 4f6567730e311f3c94e05443131f7711a15c0fe9 t/missing.t
-SHA1 c1bf2e08491e56f64bbf944d1fc03c864afc4bb7 t/mixxed.t
-SHA1 0fbb76eca340c4f91087b9e3a66c9b5addba61ce t/multi.t
-SHA1 e3e2dfa2ee2cd40f9f0ba23dd175c649effc68c7 t/parse_apocal.t
-SHA1 a31358d01470c99efcc9a70f88dc134182610795 t/parse_common.t
+SHA1 0c6a0a4ef629f458bd399dce258d34db8da10b76 t/changes.t
+SHA1 247a4e1643fb969ace18b154953208df8376a71e t/missing.t
+SHA1 bad7d77e1e930283561602b262e6f4e79815fa8f t/mixxed.t
+SHA1 1a0cb2689a2f468c78f96c2a9256129cc010f6e2 t/multi.t
+SHA1 dd833c4f5c4963b763bd00a824354b59ae472177 t/parse_all.t
+SHA1 4bb3da3ec418c5165b33ae17e4077920c16795ca t/parse_apocal.t
+SHA1 05ba809076c57dbb27a368792a88f9c3cbc6cd5e t/parse_common.t
+SHA1 b8fcbed21570daa87eadf33bfb4883728ced37e4 t/parse_common3.t
SHA1 2468db6554123c5d86c89cf0a1bdfa9156654fe3 t/parse_versionN.t
SHA1 e188b8247008aa5125f4cc6d36788635426e4c5a t/parse_yaml.t
-SHA1 9d38eb83b6fa38c6d35dc1892b5a03f108e0719f t/pod.t
-SHA1 2adc8acd2956b87972abc56ff01f46541e86165b t/pod_coverage.t
-SHA1 a6ec27156c3eeea3620ea7292399a4b6c2296e52 t/test1a.t
-SHA1 68bd6c418d9abce41ffd85f3f2c9fdbcbddd0644 t/test1b.t
-SHA1 a6f624521d329186a475ebd1d3e24dd6599383a8 t/test1c.t
-SHA1 e44fb88dec243e1e984978310787f99d5ca14226 t/test2.t
-SHA1 f0a1cb57bcb440832348314267c5ecd1c006a39e t/test3.t
-SHA1 959a041d9d1623948cf077be5df8dcc7736877c2 t/test4.t
-SHA1 b50572520fd9bcb947723b22c8dcf89f3311e21b t/test5.t
-SHA1 ca50d3fd46245cde4e98d2ab738643988f72ecf9 t/test6.t
-SHA1 b43dbe9561cf41fef75d109d1faf325c946b8479 t/test7.t
-SHA1 503fdeb964041c0ee1857ee7f334782a8bba6360 t/testx.t
-SHA1 533c1a692d01191902b0070d03575ad59293c4c2 t/testy.t
-SHA1 2c042fe0f0d689753eb5ce2d6930ad7224e48d86 t/unit.t
+SHA1 99327578069feb38cb1ab8ca655f9252bed79567 t/perlcriticrc
+SHA1 0c8758564ab0ef04e073b4df488a330a765f931d t/pod.t
+SHA1 5a01e2195c26c3adf7b7e3793468246e5fd9be0b t/pod_coverage.t
+SHA1 779cd2012bdf108864f4375ec528e17f8d25844f t/test1a.t
+SHA1 8410b336a49f89710a61d6a51e273bbdc6c8f930 t/test1b.t
+SHA1 7d3f644d976f5f8d178d9527f8f305722abc00c4 t/test1c.t
+SHA1 dc9d8f597507cf3497283c1f59998ce282f60005 t/test2.t
+SHA1 76a7ee910966271b2cdfcfce9ea0aa70def351b0 t/test3.t
+SHA1 44879848e31e8be07663bcf22c0481446ac7f030 t/test4.t
+SHA1 bd998eaaa17f8e7c300d679ee5e26058f6cef317 t/test5.t
+SHA1 8067ae24e4abc528e5534fd33c9513fa2bdbaf9d t/test6.t
+SHA1 d512dab4edc22488ae52628ae928b84605efe5bb t/test7.t
+SHA1 1d86ba7f0495b32372abf227c1ac50fb4a4cb96b t/testx.t
+SHA1 b4f39bbaae6e5b6c1be03f6a3ac09d4b56262c52 t/testy.t
+SHA1 2bde8751166233096a970602eedf71b8f79b2088 t/testz.t
+SHA1 aec22bc32799fea1fa31eec0d3f26545f64e581a t/tpcp.t
+SHA1 9b9855c618eb97b9f74c4c8d504e63610ebcdcdc t/unit.t
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
-iGcEARECACcFAks1VisgGmh0dHA6Ly93d3cuZ2FtMy5uZXQvcG9saWN5Lmh0bWwA
-CgkQliSr/X1H0FyNzwCgztL++YJEjutibF63ER9cQeO5ZpIAoJDefDRJbT3Kf8G8
-MvojdRYeeEmz
-=hTbg
+iGcEARECACcFAkuS4qEgGmh0dHA6Ly93d3cuZ2FtMy5uZXQvcG9saWN5Lmh0bWwA
+CgkQliSr/X1H0FwP5ACfddo/l33Tt6dpLlEvqHO/TIX2kCkAn0y5n6zGy2Toazxc
+2hrcqn9wR/SE
+=JKrd
-----END PGP SIGNATURE-----
Modified: trunk/libtest-checkchanges-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/debian/changelog?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/debian/changelog (original)
+++ trunk/libtest-checkchanges-perl/debian/changelog Sun Mar 7 01:38:48 2010
@@ -1,3 +1,11 @@
+libtest-checkchanges-perl (0.14-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Rewrite control description
+ * Standards-Version 3.8.4 (no changes)
+
+ -- Jonathan Yu <jawnsy at cpan.org> Sat, 06 Mar 2010 20:59:37 -0500
+
libtest-checkchanges-perl (0.11-1) unstable; urgency=low
[ Jonathan Yu ]
Modified: trunk/libtest-checkchanges-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/debian/control?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/debian/control (original)
+++ trunk/libtest-checkchanges-perl/debian/control Sun Mar 7 01:38:48 2010
@@ -6,7 +6,7 @@
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Ryan Niebur <ryan at debian.org>, Jonathan Yu <jawnsy at cpan.org>,
gregor herrmann <gregoa at debian.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://search.cpan.org/dist/Test-CheckChanges/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libtest-checkchanges-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libtest-checkchanges-perl/
@@ -14,7 +14,8 @@
Package: libtest-checkchanges-perl
Architecture: all
Depends: ${misc:Depends}, ${perl:Depends}
-Description: Perl module to validate a Changes file
- Test::CheckChanges takes the version out of the Build data or the Makefile and
- compares it to the Changes file. It currently only checks that the version in
- the changes file matches the version of the distribution.
+Description: module to validate a Changes file
+ Test::CheckChanges is a Perl module that extracts a package version number
+ from Build data or the Makefile and compares it with the latest entry in the
+ Changes file. It currently only checks that the version in the change log
+ file matches the version of the distribution.
Modified: trunk/libtest-checkchanges-perl/lib/Test/CheckChanges.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/lib/Test/CheckChanges.pm?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/lib/Test/CheckChanges.pm (original)
+++ trunk/libtest-checkchanges-perl/lib/Test/CheckChanges.pm Sun Mar 7 01:38:48 2010
@@ -1,5 +1,4 @@
package Test::CheckChanges;
-
use strict;
use warnings;
@@ -18,11 +17,11 @@
=head1 VERSION
-Version 0.11
+Version 0.14
=cut
-our $VERSION = '0.11';
+our $VERSION = '0.14';
=head1 SYNOPSIS
@@ -32,7 +31,8 @@
You can make the test optional with
use Test::More;
- eval 'use Test::CheckChanges;';
+ eval { require Test::CheckChanges };
+
if ($@) {
plan skip_all => 'Test::CheckChanges required for testing the Changes file';
}
@@ -65,9 +65,8 @@
our $glob = "C[Hh][Aa][Nn][Gg][Ee][Ss]";
sub import {
- my $self = shift;
+ my ($self, %plan) = @_;
my $caller = caller;
- my %plan = @_;
if (defined $plan{order}) {
$order = $plan{order};
@@ -75,12 +74,13 @@
}
for my $func ( qw( ok_changes ) ) {
- no strict 'refs';
+ no strict 'refs'; ## no critic
*{$caller."::".$func} = \&$func;
}
$test->exported_to($caller);
$test->plan(%plan);
+ return;
}
=head1 FUNCTIONS
@@ -96,25 +96,18 @@
=back
=cut
+
+our @not_found;
sub ok_changes
{
+ my %p;
+ %p = @_ if @_ % 2 == 0;
my $version;
my $msg = 'Unknown Error';
- my %p = @_;
my $_base = delete $p{base} || '';
- die "ok_changes takes no arguments" if keys %p;
-
- if (defined (my $x = $test->has_plan())) {
- if ($x eq 'no_plan') {
-# warn "No plan";
- } else {
-# warn "Plan $x";
- }
- } else {
- $test->plan(tests => 1);
- }
+ die "ok_changes takes no arguments" if keys %p || @_ % 2 == 1;
my $base = Cwd::realpath(File::Spec->catdir(dirname($0), '..', $_base));
@@ -128,15 +121,15 @@
if ($build && -r $build) {
require Module::Build::Version;
- open(IN, $build);
- my $data = join '', <IN>;
- close(IN);
- my $temp = eval $data;
+ open(my $in, '<', $build);
+ my $data = join '', <$in>;
+ close($in);
+ my $temp = eval $data; ## no critic
$version = $temp->[2]{dist_version};
$extra_text = "Build";
} elsif ($makefile && -r $makefile) {
- open(IN, $makefile) or die "Could not open $makefile";
- while (<IN>) {
+ open(my $in, '<', $makefile) or die "Could not open $makefile";
+ while (<$in>) {
chomp;
if (/^VERSION\s*=\s*(.*)\s*/) {
$version = $1;
@@ -144,7 +137,7 @@
last;
}
}
- close(IN) or die "Could not close $makefile";
+ close($in) or die "Could not close $makefile";
}
if ($version) {
$msg = "CheckChages $version " . $extra_text;
@@ -158,14 +151,14 @@
my $mixed = 0;
my $found = 0;
my $parsed = '';
- my @not_found = ();
+ @not_found = ();
# 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_list = sort { $b cmp $a } grep({ m|$changes_regex|} bsd_glob($glob_path));
my $change_file = $change_list[0];
@@ -179,11 +172,11 @@
}
if ($change_file and $version) {
- open(IN, $change_file) or die "Could not open ($change_file) File";
+ open(my $in, '<', $change_file) or die "Could not open ($change_file) File";
my $type = 0;
- while (<IN>) {
+ while (<$in>) {
chomp;
- if (/^\d/) {
+ if (/^(\d|v\d)/) {
# Common
my ($cvers, $date) = split(/\s+/, $_, 2);
$mixed++ if $type and $type != 1;
@@ -207,7 +200,7 @@
} else {
push(@not_found, "$1");
}
- } elsif (/^\* ([\d.]+)$/) {
+ } elsif (/^\* (v?[\d._]+)$/) {
# Apocal
$mixed++ if $type and $type != 3;
$type = 3;
@@ -217,9 +210,9 @@
} else {
push(@not_found, "$1");
}
- } elsif (/^Version ([\d.]+)($|[:,[:space:]])/) {
+ } elsif (/^Version (v?[\d._]+)($|[:,[:space:]])/) {
# Plain "Version N"
- $mixed++ if $type and $type != 3;
+ $mixed++ if $type and $type != 4;
$type = 4;
if ($version eq $1) {
$found = $_;
@@ -229,7 +222,7 @@
}
}
}
- close(IN) or die "Could not close ($change_file) file";
+ close($in) or die "Could not close ($change_file) file";
if ($found) {
$ok = 1;
} else {
@@ -250,6 +243,13 @@
for my $diag (@diag) {
$test->diag($diag);
}
+ return;
+}
+
+END {
+ if (!defined $test->has_plan()) {
+ $test->done_testing(1);
+ }
}
1;
@@ -298,7 +298,7 @@
=head1 COPYRIGHT & LICENSE
-Copyright (C) 2008 G. Allen Morris III, all rights reserved.
+Copyright (C) 2008-2010 G. Allen Morris III, all rights reserved.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libtest-checkchanges-perl/t/changes.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/changes.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/changes.t (original)
+++ trunk/libtest-checkchanges-perl/t/changes.t Sun Mar 7 01:38:48 2010
@@ -1,6 +1,9 @@
+use strict;
+use warnings;
+
use Test::More;
-eval 'use Test::CheckChanges 0.04;';
+eval 'use Test::CheckChanges 0.12;';
if ($@) {
plan skip_all => 'Test::CheckChanges required for testing the Changes file';
}
Modified: trunk/libtest-checkchanges-perl/t/missing.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/missing.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/missing.t (original)
+++ trunk/libtest-checkchanges-perl/t/missing.t Sun Mar 7 01:38:48 2010
@@ -1,4 +1,3 @@
-use Test::More;
require Test::CheckChanges;
$Test::CheckChanges::test = bless {}, 'Dummy';
@@ -13,6 +12,9 @@
{
package Dummy;
sub plan {
+ die caller;
+ }
+ sub done_testing {
print "1..3\n";
};
sub ok {
@@ -35,7 +37,6 @@
sub has_plan { undef; }
}
-
Test::CheckChanges::ok_changes(
base => File::Spec->catdir('t', 'bad', 'missing2'),
);
Modified: trunk/libtest-checkchanges-perl/t/mixxed.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/mixxed.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/mixxed.t (original)
+++ trunk/libtest-checkchanges-perl/t/mixxed.t Sun Mar 7 01:38:48 2010
@@ -1,6 +1,5 @@
use strict;
-use Test::More;
require Test::CheckChanges;
$Test::CheckChanges::test = bless {}, 'Dummy';
@@ -12,7 +11,7 @@
{
package Dummy;
- sub plan {
+ sub done_testing {
print "1.." . (@q + 1) . "\n";
};
sub ok {
Modified: trunk/libtest-checkchanges-perl/t/multi.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/multi.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/multi.t (original)
+++ trunk/libtest-checkchanges-perl/t/multi.t Sun Mar 7 01:38:48 2010
@@ -1,3 +1,6 @@
+use strict;
+use warnings;
+
use Test::More;
require Test::CheckChanges;
@@ -27,7 +30,7 @@
our $count = 0;
{
package Dummy;
- sub plan {
+ sub done_testing {
print "1..2\n";
};
sub ok {
Modified: trunk/libtest-checkchanges-perl/t/parse_apocal.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/parse_apocal.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/parse_apocal.t (original)
+++ trunk/libtest-checkchanges-perl/t/parse_apocal.t Sun Mar 7 01:38:48 2010
@@ -1,5 +1,6 @@
+use strict;
+use warnings;
-use Test::More;
require Test::CheckChanges;
Test::CheckChanges::ok_changes(
Modified: trunk/libtest-checkchanges-perl/t/parse_common.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/parse_common.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/parse_common.t (original)
+++ trunk/libtest-checkchanges-perl/t/parse_common.t Sun Mar 7 01:38:48 2010
@@ -1,6 +1,7 @@
+use strict;
+use warnings;
use Test::CheckChanges;
-use Test::More;
ok_changes(
base => 'examples/common'
Modified: trunk/libtest-checkchanges-perl/t/pod.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/pod.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/pod.t (original)
+++ trunk/libtest-checkchanges-perl/t/pod.t Sun Mar 7 01:38:48 2010
@@ -1,3 +1,6 @@
+use strict;
+use warnings;
+
use Test::More;
eval 'use Test::Pod 1.00;';
Modified: trunk/libtest-checkchanges-perl/t/pod_coverage.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/pod_coverage.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/pod_coverage.t (original)
+++ trunk/libtest-checkchanges-perl/t/pod_coverage.t Sun Mar 7 01:38:48 2010
@@ -1,3 +1,6 @@
+use strict;
+use warnings;
+
use Test::More;
eval 'use Test::Pod::Coverage 1.00;';
Modified: trunk/libtest-checkchanges-perl/t/test1a.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/test1a.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/test1a.t (original)
+++ trunk/libtest-checkchanges-perl/t/test1a.t Sun Mar 7 01:38:48 2010
@@ -1,5 +1,8 @@
+use strict;
+use warnings;
+
+use Test::More;
use Test::CheckChanges;
-use Test::More;
chmod(0, 't/bad/test1/_build/build_params');
eval 'use Module::Build;';
@@ -7,6 +10,7 @@
plan skip_all => 'Module Build needed for this test.';
}
+plan tests => 1;
use File::Basename;
our $name = basename($0, qw(.t));
Modified: trunk/libtest-checkchanges-perl/t/test1b.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/test1b.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/test1b.t (original)
+++ trunk/libtest-checkchanges-perl/t/test1b.t Sun Mar 7 01:38:48 2010
@@ -1,6 +1,6 @@
use strict;
+use warnings;
-use Test::More;
require Test::CheckChanges;
$Test::CheckChanges::test = bless {}, 'Dummy';
@@ -20,7 +20,7 @@
{
package Dummy;
- sub plan {
+ sub done_testing {
print "1.." . (@q + 1) . "\n";
};
sub ok {
Modified: trunk/libtest-checkchanges-perl/t/test1c.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/test1c.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/test1c.t (original)
+++ trunk/libtest-checkchanges-perl/t/test1c.t Sun Mar 7 01:38:48 2010
@@ -1,4 +1,5 @@
use strict;
+use warnings;
use Test::More;
require Test::CheckChanges;
@@ -24,7 +25,7 @@
{
package Dummy;
- sub plan {
+ sub done_testing {
print "1.." . (@q + 1) . "\n";
};
sub ok {
Modified: trunk/libtest-checkchanges-perl/t/test2.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/test2.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/test2.t (original)
+++ trunk/libtest-checkchanges-perl/t/test2.t Sun Mar 7 01:38:48 2010
@@ -1,4 +1,3 @@
-use Test::More;
require Test::CheckChanges;
$Test::CheckChanges::test = bless {}, 'Dummy';
@@ -11,7 +10,7 @@
our $count = 0;
{
package Dummy;
- sub plan {
+ sub done_testing {
print "1.." . (@q + 1) . "\n";
};
sub ok {
Modified: trunk/libtest-checkchanges-perl/t/test3.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/test3.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/test3.t (original)
+++ trunk/libtest-checkchanges-perl/t/test3.t Sun Mar 7 01:38:48 2010
@@ -1,6 +1,5 @@
use strict;
-use Test::More;
require Test::CheckChanges;
$Test::CheckChanges::test = bless {}, 'Dummy';
@@ -12,7 +11,7 @@
{
package Dummy;
- sub plan {
+ sub done_testing {
print "1.." . (@q + 1) . "\n";
};
sub ok {
Modified: trunk/libtest-checkchanges-perl/t/test4.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/test4.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/test4.t (original)
+++ trunk/libtest-checkchanges-perl/t/test4.t Sun Mar 7 01:38:48 2010
@@ -1,6 +1,5 @@
use strict;
-use Test::More;
require Test::CheckChanges;
$Test::CheckChanges::test = bless {}, 'Dummy';
@@ -12,7 +11,7 @@
{
package Dummy;
- sub plan {
+ sub done_testing {
print "1.." . (@q + 1) . "\n";
};
sub ok {
Modified: trunk/libtest-checkchanges-perl/t/test5.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/test5.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/test5.t (original)
+++ trunk/libtest-checkchanges-perl/t/test5.t Sun Mar 7 01:38:48 2010
@@ -1,6 +1,5 @@
use strict;
-use Test::More;
require Test::CheckChanges;
$Test::CheckChanges::test = bless {}, 'Dummy';
@@ -13,7 +12,7 @@
{
package Dummy;
- sub plan {
+ sub done_testing {
print "1.." . (@q + 1) . "\n";
};
sub ok {
Modified: trunk/libtest-checkchanges-perl/t/test6.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/test6.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/test6.t (original)
+++ trunk/libtest-checkchanges-perl/t/test6.t Sun Mar 7 01:38:48 2010
@@ -1,6 +1,5 @@
use strict;
-use Test::More;
require Test::CheckChanges;
$Test::CheckChanges::test = bless {}, 'Dummy';
@@ -14,7 +13,7 @@
{
package Dummy;
- sub plan {
+ sub done_testing {
print "1.." . (@q + 1) . "\n";
};
sub ok {
Modified: trunk/libtest-checkchanges-perl/t/test7.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/test7.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/test7.t (original)
+++ trunk/libtest-checkchanges-perl/t/test7.t Sun Mar 7 01:38:48 2010
@@ -1,6 +1,5 @@
use strict;
-use Test::More;
require Test::CheckChanges;
$Test::CheckChanges::test = bless {}, 'Dummy';
@@ -14,7 +13,7 @@
{
package Dummy;
- sub plan {
+ sub done_testing {
print "1.." . (@q + 1) . "\n";
};
sub ok {
Modified: trunk/libtest-checkchanges-perl/t/testx.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/testx.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/testx.t (original)
+++ trunk/libtest-checkchanges-perl/t/testx.t Sun Mar 7 01:38:48 2010
@@ -1,3 +1,5 @@
+use strict;
+use warnings;
use Test::More 'no_plan';
use Test::CheckChanges order => 'first';
Modified: trunk/libtest-checkchanges-perl/t/testy.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/testy.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/testy.t (original)
+++ trunk/libtest-checkchanges-perl/t/testy.t Sun Mar 7 01:38:48 2010
@@ -1,3 +1,5 @@
+use strict;
+use warnings;
use Test::More tests => 2;
use Test::CheckChanges order => 'first';
Modified: trunk/libtest-checkchanges-perl/t/unit.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkchanges-perl/t/unit.t?rev=53796&op=diff
==============================================================================
--- trunk/libtest-checkchanges-perl/t/unit.t (original)
+++ trunk/libtest-checkchanges-perl/t/unit.t Sun Mar 7 01:38:48 2010
@@ -1,10 +1,16 @@
-use Test::More tests => 2;
+use strict;
+use warnings;
-require_ok 'Test::CheckChanges';
+use Test::More;
+use Test::CheckChanges;
+
+BEGIN {
+ eval "use Test::Exception";
+ plan skip_all => "Test::Exception needed" if $@;
+}
+plan tests => 2;
-eval {
- Test::CheckChanges::ok_changes('bob' => 'bill');
-};
-ok($@);
+throws_ok { ok_changes('bob' => 'bill'); } qr/ok_changes takes no arguments .*/, 'arguments';
+throws_ok { ok_changes('bob'); } qr/ok_changes takes no arguments .*/, 'arguments';
More information about the Pkg-perl-cvs-commits
mailing list