semver_dialects 3.1.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1f8032a4c9d878a2d87171d58bcd60d34d23797e7a190bd4f71983ece8631d4
-  data.tar.gz: f14c6e7ffc8782d8c4c3c8a439cb4cf807470157e6cd86b420cf2b8aa32b9322
+  metadata.gz: 485026a6d305008958423bb059e470b3d8c5561a6cecc1e0cb33c562df01e255
+  data.tar.gz: b9ff4d4852dbdc5a7d6356b7d4bc9691c2c3e38ba9bbd8220e1169a53b8100b7
 SHA512:
-  metadata.gz: e36e7b55574b064ac14c2a1bbe0e8d2bd9fcf5a22a155b42a1623029f939e54fdac6ac76ef19a6d391de0a0a4fa0801383b72627a583a2520b6cc94de72f55cb
-  data.tar.gz: af976bec11fc7bc8eba97c7afa17a207713ed22d386a8ae9701826cfd53c23ad86fb246fbebb84e77dca9c693422939ca639a5859ecabb3e5825fd9137bd8af9
+  metadata.gz: 29500b37adb16288fbd88e504f7b631a2137b36a0cf5a3b544662bef93f8272fdea9d7a16a637d5c9000e95f860b101149f3885185dfdf26a8e506a8763af4e3
+  data.tar.gz: 784199112df64433895f31b1a9dc0a9c73b0097d331be26fa3a1d112398e1cdc554d43bc9007b875e3e6d08f687c3e73e8e45323a48404ff59f869a04e5d19a8

data/lib/semver_dialects/interval.rb

@@ -154,6 +154,10 @@ module SemverDialects
       get_canoncial_s(',')
     end
 
+    def to_cargo_s
+      get_canoncial_s
+    end
+
     def empty?
       instance_of?(EmptyInterval)
     end

data/lib/semver_dialects/interval_set.rb

@@ -65,6 +65,10 @@ module SemverDialects
       @intervals.map(&:to_packagist_s).join('||')
     end
 
+    def to_cargo_s
+      to_npm_s
+    end
+
     def to_version_s(package_type)
       case package_type
       when 'npm'

data/lib/semver_dialects/interval_set_parser.rb

@@ -32,6 +32,8 @@ module SemverDialects
         translate_pypi(interval_set_string)
       when 'packagist'
         translate_packagist(interval_set_string)
+      when 'cargo'
+        translate_cargo(interval_set_string)
       else
         raise UnsupportedPackageTypeError, typ
       end
@@ -75,6 +77,10 @@ module SemverDialects
       lexing_maven_interval_set_string(interval_set_string).map { |item| translate_mvn_version_item(item) }
     end
 
+    def self.translate_cargo(interval_set_string)
+      translate_npm(interval_set_string)
+    end
+
     def self.add_missing_operator(interval_set_string)
       starts_with_operator?(interval_set_string) ? interval_set_string : "=#{interval_set_string}"
     end

data/lib/semver_dialects/rpm.rb

@@ -86,43 +86,43 @@ module SemverDialects
       TILDE = /~/
       DIGIT = /([0-9]+)/
       COLON = /:/
-      NON_ALPHANUMERIC_DASH_AND_TILDE = /[^a-zA-Z0-9~]+/
+      NON_ALPHANUMERIC_DASH_TILDE_AND_WHITESPACE = /[^a-zA-Z0-9~\s]+/
+      WHITE_SPACE = /\s/
 
       def self.parse(input)
         new(input).parse
       end
-    
+
       def initialize(input)
+        @input = input
         @scanner = StringScanner.new(input)
       end
-      
+
       # parse splits the input string into epoch, version and release tag Eg: <epoch>:<version>-<release_tag>
       # The version and release tag are split at the first `-` character if present
       # With the segment before the first `-` being version while the other being release tag
       # Subsequent `-` are disregarded
       def parse
         epoch = nil
-        if s = scanner.scan(/\d+:/)
+        if (s = scanner.scan(/\d+:/))
           epoch = s[..-2].to_i
         end
 
         # parse tokens until we reach the release tag, if any
         tokens = parse_tokens(false)
-        
+
         # parse release tag
         release_tag = nil
-        if scanner.rest?
-          release_tag = ReleaseTag.new(parse_tokens(true))
-        end
+        release_tag = ReleaseTag.new(parse_tokens(true)) if scanner.rest?
 
         raise IncompleteScanError, scanner.rest if scanner.rest?
-        
+
         Version.new(tokens, epoch: epoch, release_tag: release_tag)
       end
-    
+
       private
-    
-      attr_reader :scanner
+
+      attr_reader :scanner, :input
 
       def parse_tokens(stop_at_release_tag)
         tokens = []
@@ -130,9 +130,7 @@ module SemverDialects
         until scanner.eos?
           case
           when (s = scanner.scan(DASH))
-            if !stop_at_release_tag
-              return tokens
-            end
+            return tokens unless stop_at_release_tag
             # If release tag has been encountered, ignore subsequent dashes
           when (s = scanner.scan(ALPHABET))
             tokens << s
@@ -140,7 +138,11 @@ module SemverDialects
             tokens << s
           when (s = scanner.scan(DIGIT))
             tokens << s.to_i
-          when (s = scanner.scan(NON_ALPHANUMERIC_DASH_AND_TILDE))
+          when (s = scanner.scan(WHITE_SPACE))
+            # Whitespace is not permitted
+            # https://github.com/rpm-software-management/rpm/blob/4d1b7401415003720ea9bef7bda248f7de4fa025/docs/manual/dependencies.md#versioning
+            raise SemverDialects::InvalidVersionError, input
+          when (s = scanner.scan(NON_ALPHANUMERIC_DASH_TILDE_AND_WHITESPACE))
             # Non-ascii characters are considered equal
             # so they are ignored when parsing versions
             # https://github.com/rpm-software-management/rpm/blob/rpm-4.19.1.1-release/tests/rpmvercmp.at#L143
@@ -151,6 +153,5 @@ module SemverDialects
         tokens
       end
     end
-    
   end
 end

data/lib/semver_dialects/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SemverDialects
-  VERSION = '3.1.0'
+  VERSION = '3.2.1'
 end

data/lib/semver_dialects.rb

@@ -201,6 +201,10 @@ module SemverDialects
       #
       SemanticVersion.new(raw_ver)
 
+    when 'cargo'
+      # cargo follows Semver 2.0.0.
+      Semver2::VersionParser.parse(raw_ver)
+
     else
       raise UnsupportedPackageTypeError, typ
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semver_dialects
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Julian Thome
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel