Upgrade version from version 0.9916 to 0.9917

11 files changed, 20 insertions, 12 deletions

diff --git a/cpan/version/lib/version.pm b/cpan/version/lib/version.pm
index 201561877e..36d130f2dc 100644
--- a/cpan/version/lib/version.pm
+++ b/cpan/version/lib/version.pm
@@ -10,7 +10,7 @@ if ($] >= 5.015) {
 
 use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv);
 
-$VERSION = 0.9916;
+$VERSION = 0.9917;
 $CLASS = 'version';
 
 # avoid using Exporter
diff --git a/cpan/version/lib/version/regex.pm b/cpan/version/lib/version/regex.pm
index 62c1f227d2..d635c38d4b 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.9916;
+$VERSION = 0.9917;
 
 #--------------------------------------------------------------------------#
 # Version regexp components
@@ -81,7 +81,7 @@ $STRICT =
 # decimal-point
 
 my $LAX_DECIMAL_VERSION =
-    qr/ $LAX_INTEGER_PART (?: \. | $FRACTION_PART $LAX_ALPHA_PART? )?
+    qr/ $LAX_INTEGER_PART (?: $FRACTION_PART | \. )? $LAX_ALPHA_PART?
 	|
 	$FRACTION_PART $LAX_ALPHA_PART?
     /x;
@@ -106,7 +106,7 @@ my $LAX_DOTTED_DECIMAL_VERSION =
 # of return values from ExtUtils::MM->parse_version
 
 $LAX =
-    qr/ undef | $LAX_DECIMAL_VERSION | $LAX_DOTTED_DECIMAL_VERSION /x;
+    qr/ undef | $LAX_DOTTED_DECIMAL_VERSION | $LAX_DECIMAL_VERSION /x;
 
 #--------------------------------------------------------------------------#
 
diff --git a/cpan/version/t/01base.t b/cpan/version/t/01base.t
index 08e7ad1506..8e5ab71ce8 100644
--- a/cpan/version/t/01base.t
+++ b/cpan/version/t/01base.t
@@ -12,7 +12,7 @@ BEGIN {
         (File::Spec->splitpath($0))[0,1], 'coretests.pm'
     );
     require $coretests;
-    use_ok('version', 0.9916);
+    use_ok('version', 0.9917);
 }
 
 BaseTests("version","new","qv");
diff --git a/cpan/version/t/02derived.t b/cpan/version/t/02derived.t
index b2678e8bc5..fb77270342 100644
--- a/cpan/version/t/02derived.t
+++ b/cpan/version/t/02derived.t
@@ -13,7 +13,7 @@ BEGIN {
         (File::Spec->splitpath($0))[0,1], 'coretests.pm'
     );
     require $coretests;
-    use_ok("version", 0.9916);
+    use_ok("version", 0.9917);
     # If we made it this far, we are ok.
 }
 
diff --git a/cpan/version/t/03require.t b/cpan/version/t/03require.t
index da1f02e1ad..6a968a5324 100644
--- a/cpan/version/t/03require.t
+++ b/cpan/version/t/03require.t
@@ -17,7 +17,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.9916, "Make sure we have the correct class";
+is $version::VERSION, 0.9917, "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 25c1ddea27..298fcf7f6f 100644
--- a/cpan/version/t/04strict_lax.t
+++ b/cpan/version/t/04strict_lax.t
@@ -13,6 +13,14 @@ SKIP: {
     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;
+    { # https://rt.cpan.org/Ticket/Display.html?id=114712
+        my ($v) = ( "snapshot-1.2.3ga-001-432" =~ /($version::LAX)/ );
+        is $v, '1.2.3', "Extract just the version: $v";
+        ($v) = ( "snapshot-1.2ga-001-432" =~ /($version::LAX)/ );
+        is $v, '1.2', "Extract just the version: $v";
+        ($v) = ( "snapshot-v1.2.3ga-001-432" =~ /($version::STRICT)/ );
+        is $v, 'v1.2.3', "Extract just the version: $v";
+    }
 }
 
 
diff --git a/cpan/version/t/05sigdie.t b/cpan/version/t/05sigdie.t
index 330ab1a812..6776adc164 100644
--- a/cpan/version/t/05sigdie.t
+++ b/cpan/version/t/05sigdie.t
@@ -14,7 +14,7 @@ BEGIN {
 }
 
 BEGIN {
-    use version 0.9916;
+    use version 0.9917;
 }
 
 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 4d5a7fbe6a..f118786ffc 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.9916);
+    use_ok('version', 0.9917);
 }
 
 my $v1 = version->new('1.2');
diff --git a/cpan/version/t/07locale.t b/cpan/version/t/07locale.t
index 1a4dadf35b..1dcc6db31a 100644
--- a/cpan/version/t/07locale.t
+++ b/cpan/version/t/07locale.t
@@ -11,7 +11,7 @@ use Test::More tests => 8;
 use Config;
 
 BEGIN {
-    use_ok('version', 0.9916);
+    use_ok('version', 0.9917);
 }
 
 SKIP: {
diff --git a/cpan/version/t/08_corelist.t b/cpan/version/t/08_corelist.t
index 3cc8889cb9..4678c14926 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.9916);
+use_ok("version", 0.9917);
 
 # 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 232a9c0c3d..6e94839ab8 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.9916);
+use_ok("version", 0.9917);
 use Test::More;
 
 BEGIN {