semver_dialects 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d29656d2bd4bdc5bb1cd50c3cf3853e192fbb7de944b4495c816f424d710648
-  data.tar.gz: adbbb1f25f05a91ac195a6e8becb823b4f412a40476a26697547d06556253868
+  metadata.gz: f1f8032a4c9d878a2d87171d58bcd60d34d23797e7a190bd4f71983ece8631d4
+  data.tar.gz: f14c6e7ffc8782d8c4c3c8a439cb4cf807470157e6cd86b420cf2b8aa32b9322
 SHA512:
-  metadata.gz: 585e0ad23e05cbd4bade3aaf925bd38b07af390de78a7a28446cb6dad50b05a99155d8744d497fcbf6377e2013bb5740fc4bb140425f52217f5bb35312af3c53
-  data.tar.gz: d17f636215c7c9d338819ab56ed8bbdc6f1349bfadb34c15a860d9398d2afb3a41f4c6bc521807e3e23ee36a19f9370c295c12485d9e7de5db95fef5af3b2c22
+  metadata.gz: e36e7b55574b064ac14c2a1bbe0e8d2bd9fcf5a22a155b42a1623029f939e54fdac6ac76ef19a6d391de0a0a4fa0801383b72627a583a2520b6cc94de72f55cb
+  data.tar.gz: af976bec11fc7bc8eba97c7afa17a207713ed22d386a8ae9701826cfd53c23ad86fb246fbebb84e77dca9c693422939ca639a5859ecabb3e5825fd9137bd8af9

data/lib/semver_dialects/rpm.rb

@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+require 'strscan'
+
+module SemverDialects
+  module Rpm
+    module TokenPairComparison
+      # Token can be either alphabets, integers or tilde.
+      # Caret is currently not supported. More details here https://gitlab.com/gitlab-org/gitlab/-/issues/428941#note_1882343489
+      # Precedence: numeric token > string token > no token > tilda (~)
+      def compare_token_pair(a, b)
+        return 1 if a != '~' && b == '~'
+        return -1 if a == '~' && b != '~'
+
+        return 1 if !a.nil? && b.nil?
+        return -1 if a.nil? && !b.nil?
+
+        return 1 if a.is_a?(Integer) && b.is_a?(String)
+        return -1 if a.is_a?(String) && b.is_a?(Integer)
+
+        # Remaining scenario are tokens of the same type ie Integer or String. Use <=> to compare
+        a <=> b
+      end
+    end
+
+    # This implementation references `go-rpm-version` https://github.com/knqyf263/go-rpm-version
+    # Which is based on the official `rpmvercmp` https://github.com/rpm-software-management/rpm/blob/master/rpmio/rpmvercmp.c implementation
+    # rpm versioning schema can be found here https://github.com/rpm-software-management/rpm/blob/master/docs/manual/dependencies.md#versioning
+    # Details on how the caret and tilde symbols are handled can be found here https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_handling_non_sorting_versions_with_tilde_dot_and_caret
+    class Version < BaseVersion
+      include TokenPairComparison
+
+      attr_reader :tokens, :addition, :epoch
+
+      def initialize(tokens, epoch: nil, release_tag: nil)
+        @tokens = tokens
+        @addition = release_tag
+        @epoch = epoch
+      end
+
+      def <=>(other)
+        # Compare epoch first
+        epoch_cmp = compare_epochs(epoch, other.epoch)
+        return epoch_cmp unless epoch_cmp.zero?
+
+        # Then compare version
+        cmp = compare_tokens(tokens, other.tokens)
+        return cmp unless cmp.zero?
+
+        # And finally compare release tags
+        compare_additions(addition, other.addition)
+      end
+
+      # Note that to_s does not accurately recreate the version string.
+      # More details here https://gitlab.com/gitlab-org/gitlab/-/issues/428941#note_1882343489
+      def to_s
+        main = if !epoch.nil?
+                 "#{epoch}:" + tokens.join('.')
+               else
+                 tokens.join('.')
+               end
+        main += "-#{addition.tokens.join('.')}" unless addition.nil?
+
+        # Remove . around ~
+        main.gsub(/\.~\./, '~')
+      end
+
+      private
+
+      def compare_epochs(a, b)
+        (a || 0) <=> (b || 0)
+      end
+    end
+
+    class ReleaseTag < BaseVersion
+      include TokenPairComparison
+
+      def initialize(tokens)
+        @tokens = tokens
+      end
+    end
+
+    class VersionParser
+      DASH = /-/
+      ALPHABET = /([a-zA-Z]+)/
+      TILDE = /~/
+      DIGIT = /([0-9]+)/
+      COLON = /:/
+      NON_ALPHANUMERIC_DASH_AND_TILDE = /[^a-zA-Z0-9~]+/
+
+      def self.parse(input)
+        new(input).parse
+      end
+    
+      def initialize(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+:/)
+          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
+
+        raise IncompleteScanError, scanner.rest if scanner.rest?
+        
+        Version.new(tokens, epoch: epoch, release_tag: release_tag)
+      end
+    
+      private
+    
+      attr_reader :scanner
+
+      def parse_tokens(stop_at_release_tag)
+        tokens = []
+
+        until scanner.eos?
+          case
+          when (s = scanner.scan(DASH))
+            if !stop_at_release_tag
+              return tokens
+            end
+            # If release tag has been encountered, ignore subsequent dashes
+          when (s = scanner.scan(ALPHABET))
+            tokens << s
+          when (s = scanner.scan(TILDE))
+            tokens << s
+          when (s = scanner.scan(DIGIT))
+            tokens << s.to_i
+          when (s = scanner.scan(NON_ALPHANUMERIC_DASH_AND_TILDE))
+            # 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
+          else
+            raise SemverDialects::IncompleteScanError, scanner.rest
+          end
+        end
+        tokens
+      end
+    end
+    
+  end
+end

data/lib/semver_dialects/version.rb

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

data/lib/semver_dialects.rb

@@ -3,6 +3,7 @@
 require 'semver_dialects/version'
 require 'semver_dialects/base_version'
 require 'semver_dialects/maven'
+require 'semver_dialects/rpm'
 require 'semver_dialects/semver2'
 require 'semver_dialects/semantic_version'
 require 'semver_dialects/boundary'
@@ -85,15 +86,23 @@ module SemverDialects
   end
 
   def self.os_pkg_version_satisfies?(typ, raw_ver, raw_constraint)
-    return unless typ == 'deb'
+    return unless %w[deb rpm].include?(typ)
     # we only support the less than operator, because that's the only one currently output
     # by the advisory exporter for operating system packages.
     raise SemverDialects::InvalidConstraintError, raw_constraint unless raw_constraint[0] == '<'
 
-    v1 = DebVersion.new(raw_ver)
-    v2 = DebVersion.new(raw_constraint[1..])
+    case typ
+    when 'deb'
+      v1 = DebVersion.new(raw_ver)
+      v2 = DebVersion.new(raw_constraint[1..])
+
+      v1 < v2
+    when 'rpm'
+      v1 = Rpm::VersionParser.parse(raw_ver)
+      v2 = Rpm::VersionParser.parse(raw_constraint[1..])
 
-    v1 < v2
+      v1 < v2
+    end
   end
 
   # Parse a version according to the syntax type.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semver_dialects
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Julian Thome
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -187,6 +187,7 @@ files:
 - lib/semver_dialects/interval_set.rb
 - lib/semver_dialects/interval_set_parser.rb
 - lib/semver_dialects/maven.rb
+- lib/semver_dialects/rpm.rb
 - lib/semver_dialects/semantic_version.rb
 - lib/semver_dialects/semver2.rb
 - lib/semver_dialects/version.rb