In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/db9cb8483f3d2ac7f4fe573c8623e33721ea6139?hp=c8f77a9147a316e5b355e134b9cbff371ceb2f4b>
- Log ----------------------------------------------------------------- commit db9cb8483f3d2ac7f4fe573c8623e33721ea6139 Author: John Peacock <[email protected]> Date: Sat Jan 4 15:42:14 2014 -0500 Fix regression with $version::LAX and bump release When I created a standalone version::regex class, I forgot that the $version::LAX and $version::STRICT regex's were documented as available (though not exported). Resolves CPAN ticket: https://rt.cpan.org/Ticket/Display.html?id=91858 (Committer also ran porting/customized.t --regen) ----------------------------------------------------------------------- Summary of changes: cpan/version/lib/version.pm | 4 +++- cpan/version/lib/version/Internals.pod | 2 +- cpan/version/lib/version/regex.pm | 2 +- cpan/version/lib/version/vpp.pm | 6 ++++-- cpan/version/t/00impl-pp.t | 2 +- cpan/version/t/01base.t | 2 +- cpan/version/t/02derived.t | 2 +- cpan/version/t/03require.t | 2 +- cpan/version/t/04strict_lax.t | 5 ++++- cpan/version/t/05sigdie.t | 2 +- cpan/version/t/06noop.t | 2 +- cpan/version/t/07locale.t | 2 +- cpan/version/t/08_corelist.t | 2 +- cpan/version/t/09_list_util.t | 2 +- t/porting/customized.dat | 6 +++--- 15 files changed, 25 insertions(+), 18 deletions(-) diff --git a/cpan/version/lib/version.pm b/cpan/version/lib/version.pm index dfdee5e..e20fb6e 100644 --- a/cpan/version/lib/version.pm +++ b/cpan/version/lib/version.pm @@ -6,13 +6,15 @@ use strict; use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv); -$VERSION = 0.9905; +$VERSION = 0.9906; $CLASS = 'version'; # avoid using Exporter require version::regex; *version::is_lax = \&version::regex::is_lax; *version::is_strict = \&version::regex::is_strict; +*LAX = \$version::regex::LAX; +*STRICT = \$version::regex::STRICT; sub import { no strict 'refs'; diff --git a/cpan/version/lib/version/Internals.pod b/cpan/version/lib/version/Internals.pod index d0b2c13..95be844 100644 --- a/cpan/version/lib/version/Internals.pod +++ b/cpan/version/lib/version/Internals.pod @@ -129,7 +129,7 @@ was used to initialize the version object. =head2 Regular Expressions for Version Parsing A formalized definition of the legal forms for version strings is -included in the main F<version.pm> file. Primitives are included for +included in the C<version::regex> class. Primitives are included for common elements, although they are scoped to the file so they are useful for reference purposes only. There are two publicly accessible scalars that can be used in other code (not exported): diff --git a/cpan/version/lib/version/regex.pm b/cpan/version/lib/version/regex.pm index 7370b5b..341902e 100644 --- a/cpan/version/lib/version/regex.pm +++ b/cpan/version/lib/version/regex.pm @@ -4,7 +4,7 @@ use strict; use vars qw($VERSION $CLASS $STRICT $LAX); -$VERSION = 0.9905; +$VERSION = 0.9906; #--------------------------------------------------------------------------# # Version regexp components diff --git a/cpan/version/lib/version/vpp.pm b/cpan/version/lib/version/vpp.pm index 79e74c3..13e5a7e 100644 --- a/cpan/version/lib/version/vpp.pm +++ b/cpan/version/lib/version/vpp.pm @@ -122,13 +122,15 @@ use strict; use POSIX qw/locale_h/; use locale; -use vars qw($VERSION $CLASS @ISA); -$VERSION = 0.9905; +use vars qw($VERSION $CLASS @ISA $LAX $STRICT); +$VERSION = 0.9906; $CLASS = 'version::vpp'; require version::regex; *version::vpp::is_strict = \&version::regex::is_strict; *version::vpp::is_lax = \&version::regex::is_lax; +*LAX = \$version::regex::LAX; +*STRICT = \$version::regex::STRICT; use overload ( '""' => \&stringify, diff --git a/cpan/version/t/00impl-pp.t b/cpan/version/t/00impl-pp.t index 36026aa..c62889f 100644 --- a/cpan/version/t/00impl-pp.t +++ b/cpan/version/t/00impl-pp.t @@ -9,7 +9,7 @@ use Test::More qw/no_plan/; BEGIN { (my $coretests = $0) =~ s'[^/]+\.t'coretests.pm'; require $coretests; - use_ok('version::vpp', 0.9905); + use_ok('version::vpp', 0.9906); } BaseTests("version::vpp","new","qv"); diff --git a/cpan/version/t/01base.t b/cpan/version/t/01base.t index 681a0ff..41ba0f6 100644 --- a/cpan/version/t/01base.t +++ b/cpan/version/t/01base.t @@ -9,7 +9,7 @@ use Test::More qw/no_plan/; BEGIN { (my $coretests = $0) =~ s'[^/]+\.t'coretests.pm'; require $coretests; - use_ok('version', 0.9905); + use_ok('version', 0.9906); } BaseTests("version","new","qv"); diff --git a/cpan/version/t/02derived.t b/cpan/version/t/02derived.t index 8cf2743..9f2f97e 100644 --- a/cpan/version/t/02derived.t +++ b/cpan/version/t/02derived.t @@ -10,7 +10,7 @@ use File::Temp qw/tempfile/; BEGIN { (my $coretests = $0) =~ s'[^/]+\.t'coretests.pm'; require $coretests; - use_ok("version", 0.9905); + use_ok("version", 0.9906); # If we made it this far, we are ok. } diff --git a/cpan/version/t/03require.t b/cpan/version/t/03require.t index 873fada..d480c88 100644 --- a/cpan/version/t/03require.t +++ b/cpan/version/t/03require.t @@ -14,7 +14,7 @@ BEGIN { # Don't want to use, because we need to make sure that the import doesn't # fire just yet (some code does this to avoid importing qv() and delare()). require_ok("version"); -is $version::VERSION, 0.9905, "Make sure we have the correct class"; +is $version::VERSION, 0.9906, "Make sure we have the correct class"; ok(!"main"->can("qv"), "We don't have the imported qv()"); ok(!"main"->can("declare"), "We don't have the imported declare()"); diff --git a/cpan/version/t/04strict_lax.t b/cpan/version/t/04strict_lax.t index 24a7215..25c1dde 100644 --- a/cpan/version/t/04strict_lax.t +++ b/cpan/version/t/04strict_lax.t @@ -8,11 +8,14 @@ use Test::More qw/no_plan/; # do strict lax tests in a sub to isolate a package to test importing SKIP: { - skip 'No extended regexes Perl < 5.006', 172 + skip 'No extended regexes Perl < 5.006', 174 if $] < 5.006_000; strict_lax_tests(); + is ref($version::LAX), 'Regexp', 'Can see $version::LAX '.$version::LAX ; + is ref($version::STRICT), 'Regexp', 'Can see $version::STRICT '.$version::STRICT; } + sub strict_lax_tests { package temp12345; # copied from perl core test t/op/packagev.t diff --git a/cpan/version/t/05sigdie.t b/cpan/version/t/05sigdie.t index 3496f57..5fe5210 100644 --- a/cpan/version/t/05sigdie.t +++ b/cpan/version/t/05sigdie.t @@ -14,7 +14,7 @@ BEGIN { } BEGIN { - use version 0.9905; + use version 0.9906; } pass "Didn't get caught by the wrong DIE handler, which is a good thing"; diff --git a/cpan/version/t/06noop.t b/cpan/version/t/06noop.t index 74e7251..8db4c75 100644 --- a/cpan/version/t/06noop.t +++ b/cpan/version/t/06noop.t @@ -7,7 +7,7 @@ use Test::More qw/no_plan/; BEGIN { - use_ok('version', 0.9905); + use_ok('version', 0.9906); } my $v1 = version->new('1.2'); diff --git a/cpan/version/t/07locale.t b/cpan/version/t/07locale.t index a3c75c0..3503b6f 100644 --- a/cpan/version/t/07locale.t +++ b/cpan/version/t/07locale.t @@ -11,7 +11,7 @@ use Test::More tests => 7; use Config; BEGIN { - use_ok('version', 0.9905); + use_ok('version', 0.9906); } SKIP: { diff --git a/cpan/version/t/08_corelist.t b/cpan/version/t/08_corelist.t index 9a8e474..8cd2e14 100644 --- a/cpan/version/t/08_corelist.t +++ b/cpan/version/t/08_corelist.t @@ -5,7 +5,7 @@ ######################### use Test::More tests => 3; -use_ok("version", 0.9905); +use_ok("version", 0.9906); # do strict lax tests in a sub to isolate a package to test importing SKIP: { diff --git a/cpan/version/t/09_list_util.t b/cpan/version/t/09_list_util.t index 4882ee9..6348f9d 100644 --- a/cpan/version/t/09_list_util.t +++ b/cpan/version/t/09_list_util.t @@ -4,7 +4,7 @@ ######################### use strict; -use_ok("version", 0.9905); +use_ok("version", 0.9906); use Test::More; BEGIN { diff --git a/t/porting/customized.dat b/t/porting/customized.dat index e4786e8..bbd5040 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -16,6 +16,6 @@ autodie cpan/autodie/t/utf8_open.t 5295851351c49f939008c5aca6a798742b1e503d libnet cpan/libnet/Makefile.PL 6b10ac98e672bfebb8f49b9720a93442645208b3 podlators cpan/podlators/scripts/pod2man.PL f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6 podlators cpan/podlators/scripts/pod2text.PL b4693fcfe4a0a1b38a215cfb8985a65d5d025d69 -version cpan/version/lib/version.pm 881dee6f24fc887c5650b9c9a8aeed4d4923cc16 -version cpan/version/t/07locale.t bbc7f94bc2ad633978aedb5732b8b4ad6b3247fb -version cpan/version/t/08_corelist.t 1c10cc05162c99b02cd45f9b9fb9a310aa2bff10 +version cpan/version/lib/version.pm 3934bcc033f1f15aed2ba78017f71d2e5482deca +version cpan/version/t/07locale.t 9ec512b4ef9cd6d6ab26c4215692048925fd0179 +version cpan/version/t/08_corelist.t 3094fab78b4e8a5471d0c3bcca2402317c6562d0 -- Perl5 Master Repository
