CI test before release

Author: lizmat

Changes

@@ -1,6 +1,8 @@
 Revision history for PURL
 
 {{$NEXT}}
+    - Disallowed simultaneous @version and ?vers=vers:...
+    - Bumped dependency on VERS to get correct canonicalization
     - Changed qualifier key "sw_vers" to "vers", as that
       appears to be canon now
 

META6.json

@@ -11,7 +11,7 @@
         "Identity::Utils:ver<0.0.25+>:auth<zef:lizmat>",
         "JSON::Fast:ver<0.19+>:auth<cpan:TIMOTIMO>",
         "URI::Encode:ver<1.0+>:auth<zef:raku-community-modules>",
-        "VERS:ver<0.0.1+>:auth<zef:lizmat>"
+        "VERS:ver<0.0.2+>:auth<zef:lizmat>"
       ]
     }
   },
@@ -41,5 +41,5 @@
   ],
   "test-depends": [
   ],
-  "version": "0.0.12"
+  "version": "0.0.13"
 }

lib/PURL.rakumod

@@ -3,9 +3,9 @@ use Identity::Utils:ver<0.0.25+>:auth<zef:lizmat> <
 >;
 use JSON::Fast:ver<0.19+>:auth<cpan:TIMOTIMO>;
 use URI::Encode:ver<1.0+>:auth<zef:raku-community-modules>;
-use VERS:ver<0.0.1+>:auth<zef:lizmat>;
+use VERS:ver<0.0.2+>:auth<zef:lizmat>;
 
-use PURL::Type:ver<0.0.12>:auth<zef:lizmat>;
+use PURL::Type:ver<0.0.13>:auth<zef:lizmat>;
 
 #- helper subroutines ----------------------------------------------------------
 
@@ -18,7 +18,7 @@ my sub is-identifier($_) {
 my sub trim-slashes(Str:D $_) { .subst(/^ '/'+ /).subst(/ '/'+ $/) }
 
 #- PURL ------------------------------------------------------------------------
-class PURL:ver<0.0.12>:auth<zef:lizmat> {
+class PURL:ver<0.0.13>:auth<zef:lizmat> {
     has Str $.scheme = 'pkg';
     has Str $.type is required;
     has Str $.name;
@@ -103,6 +103,9 @@ class PURL:ver<0.0.12>:auth<zef:lizmat> {
         with $remainder.rindex("@") -> $index {
             %args<version> = uri_decode $remainder.substr($index + 1);
 
+            die "Cannot have a version (%args<version>) and a VERS ($_)"
+              with %args<qualifiers> andthen .<vers>;
+
             $remainder .= substr(0, $index);
         }
 

lib/PURL/Type.rakumod

@@ -36,7 +36,7 @@ my %examples := BEGIN {
 }
 
 #- PURL::Type ------------------------------------------------------------------
-class PURL::Type:ver<0.0.12>:auth<zef:lizmat> {
+class PURL::Type:ver<0.0.13>:auth<zef:lizmat> {
     method default-repository() { "" }
 
     method check-identity($name, $, $ --> Nil) {

t/01-basic.rakutest

@@ -10,7 +10,7 @@ my @identities = <
   Cro::RPC::JSON:ver<0.1.6>:auth<zef:vrurg>:api<2>
 >;
 
-plan 25 + @identities;
+plan 26 + @identities;
 
 my $purl = PURL.new("pkg:maven/org.apache.commons/io@1.3.4");
 isa-ok $purl, PURL;
@@ -68,12 +68,14 @@ is PURL.from-identity("PURL:api<2>"), 'pkg:raku/PURL@*:2',
 
 dies-ok { PURL.from-identity("PURL", :must-be-pinned) },
   'throws when an unpinned identity is given, and it must be pinned';
+dies-ok { PURL.new("pkg:raku/zef:foo/Bar@1?vers=vers:raku/1") },
+  'throws when a version and a VERS are specified';
 
-$purl = PURL.new("pkg:raku/zef:lizmat/PURL?vers=vers:raku/<2.0|>=1.0");
+$purl = PURL.new("pkg:raku/zef:lizmat/PURL?vers=vers:raku/<2.0 | >=1.0");
 is $purl,
-  "pkg:raku/zef:lizmat/PURL?vers=vers:raku/%3E=1.0%20%7C%20%3C2.0",
+  "pkg:raku/zef:lizmat/PURL?vers=vers:raku/%3E=1.0%7C%3C2.0",
   "did the software version get canonicalized correctly";
-is $purl.VERS, "vers:raku/>=1.0 | <2.0", 'is the VERS correct';
+is $purl.VERS, "vers:raku/>=1.0|<2.0", 'is the VERS correct';
 
 is-deeply PURL("pkg:raku/zef:lizmat/PURL?vers=foo"), False,
   "does an illegal vers value invalidate a PURL";