semver_dialects 1.6.2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39857e9e764ee20baf0fbc554b45189634fc792e026f8fe1ba6ff9a9bae2b742
-  data.tar.gz: 5dcc13405766bf8fe25e4456dac42dcafe945e456e22d08d6063be59e977c80d
+  metadata.gz: 8f1e84f683c8e94cd71e65819cd9953ec91333b1286fe6d9c01ac9fbf2843d4c
+  data.tar.gz: 11ce3dbcdd748af0a5364d1ceb9569161a787cd4a6337056da60e1b73aa8d6dd
 SHA512:
-  metadata.gz: 3b13a73b8fa16b037c7c7b224b8ce8ba3996fab09b98e0f979ae26f095537c19c459a061cf41ca9721ee6d0cd733dbbd9deaaf86210916507a57f57d7ed5c6a9
-  data.tar.gz: 4b3967d51c1b9a61fee9dd31b88804268c142df322eaf08e731342aa672a5f37e1ad40847b1f70385de6dd1769cd58fdfea75a55c777a4f1072061a974c64ade
+  metadata.gz: e5b3b90ee346eb5649acab265702e1c4e563f53f4a539b95d2a84682c3d05507bc00c8b27399e43de3e00782d60c5264f2822a8370fc6b2ccd30bf7b11e364d3
+  data.tar.gz: 0e6b4ee40e4260a8a2cc0700379d0982a3029b58a76220f3ca89fd64ac3d3b3fe7e39227b660f5e8ce4220a6f15bd2dea26c4957b49479fa1aa9f1ff7d325eea

data/lib/semver_dialects/semantic_version/semantic_version.rb

@@ -5,12 +5,26 @@ require_relative '../../utils.rb'
 class SemanticVersion
   attr_reader :version_string, :prefix_delimiter, :prefix_segments, :suffix_segments, :segments
 
+  # String to build a regexp that matches a version.
+  #
+  # A version might start with a leading "v", then it must have a digit,
+  # then it might have any sequence made of alphanumerical characters,
+  # underscores, dots, dashes, and wildcards.
+  VERSION_PATTERN = "v?[0-9][a-zA-Z0-9_.*+-]*"
+
+  # Regexp for a string that only contains a single version string.
+  VERSION_ONLY_REGEXP = Regexp.new("\\A#{VERSION_PATTERN}\\z").freeze
+
   def initialize(version_string, segments = nil)
+    unless VERSION_ONLY_REGEXP.match version_string
+      raise SemverDialects::InvalidVersionError, version_string
+    end
+
     @version_string = version_string
     @prefix_segments = []
     @suffix_segments = []
     @prefix_delimiter = 0
-    version, _ = version_string.split('+')
+    version, _ = version_string.delete_prefix('v').split('+')
     if segments.nil?
       @segments = split_version_string!(version)
     else

data/lib/semver_dialects/semantic_version/version_parser.rb

@@ -2,6 +2,9 @@ require_relative "version_cut"
 require_relative "version_interval"
 
 module VersionParser
+  # A constraint is made of an operator followed by a version string.
+  CONSTRAINT_REGEXP = Regexp.new("(?<op>[><=]+) *(?<version>#{SemanticVersion::VERSION_PATTERN})").freeze
+
   def self.parse(versionstring)
     if (versionstring == "=*")
       # special case = All Versions
@@ -10,9 +13,9 @@ module VersionParser
 
     version_items = versionstring.split(" ")
     interval = VersionInterval.new(IntervalType::LEFT_OPEN | IntervalType::RIGHT_OPEN, BelowAll.new(), AboveAll.new())
-    version_items.each do
-      |version_item|
-      matches = version_item.match /(?<op>[><=]+) *(?<version>[a-zA-Z0-9\-_\.\*]+)/
+    version_items.each do |version_item|
+      matches = version_item.match CONSTRAINT_REGEXP
+      raise SemverDialects::InvalidConstraintError, versionstring if matches.nil?
       version_string = matches[:version]
       case matches[:op]
       when ">="

data/lib/semver_dialects/version.rb

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

data/lib/semver_dialects.rb

@@ -14,6 +14,36 @@ module SemverDialects
     end
   end
 
+  class UnsupportedPackageTypeError < Error
+    def initialize(pkgType)
+      @pkgType = pkgType
+    end
+
+    def message
+      "unsupported package type '#{@pkgType}'"
+    end
+  end
+
+  class InvalidVersionError < Error
+    def initialize(raw_version)
+      @raw_version = raw_version
+    end
+
+    def message
+      "invalid version '#{@raw_version}'"
+    end
+  end
+
+  class InvalidConstraintError < Error
+    def initialize(raw_constraint)
+      @raw_constraint = raw_constraint
+    end
+
+    def message
+      "invalid constraint '#{@raw_constraint}'"
+    end
+  end
+
   # A utiltity module that helps with version matching
   module VersionChecker
     def self.version_translate(typ, version_string)
@@ -35,26 +65,32 @@ module SemverDialects
       when 'packagist'
         VersionTranslator.translate_packagist(version_string)
       else
-        raise SemverDialects::Error, "unsupported package type '#{typ}'"
+        raise UnsupportedPackageTypeError, typ
       end
     end
 
+    # Determines if a version of a given package type satisfies a constraint.
+    #
+    # On normal execution, this method might raise the following exceptions:
+    #
+    # - UnsupportedPackageTypeError if the package type is not supported
+    # - InvalidVersionError if the version is invalid
+    # - InvalidConstraintError if the constraint is invalid or contains invalid versions
+    #
     def self.version_sat?(typ, raw_ver, raw_constraint)
       # os package versions are handled very differently from application package versions
       return os_pkg_version_sat?(typ, raw_ver, raw_constraint) if os_purl_type?(typ)
 
-      version_constraint = version_translate(typ, raw_constraint)
-      raise SemverDialects::Error, 'malformed constraint' if version_constraint.nil? || version_constraint.empty?
-
-      version = VersionParser.parse('=' + raw_ver)
-      raise SemverDialects::Error, 'malformed constraint' if version.nil? || version.empty?
+      # build an interval that only contains the version
+      version = VersionCut.new(raw_ver)
+      version_as_interval = VersionInterval.new(IntervalType::LEFT_CLOSED | IntervalType::RIGHT_CLOSED, version, version)
 
       constraint = VersionRange.new
-      version_constraint.each do |version_interval_str|
+      version_translate(typ, raw_constraint).each do |version_interval_str|
         constraint << VersionParser.parse(version_interval_str)
       end
 
-      constraint.overlaps_with?(version)
+      constraint.overlaps_with?(version_as_interval)
     end
 
     def self.os_purl_type?(typ)
@@ -65,7 +101,7 @@ module SemverDialects
       if typ == 'deb'
         # 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::Error, 'malformed constraint' unless raw_constraint[0] == '<'
+        raise SemverDialects::InvalidConstraintError, raw_constraint unless raw_constraint[0] == '<'
 
         v1 = DebVersion.new(raw_ver)
         v2 = DebVersion.new(raw_constraint[1..-1])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semver_dialects
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 2.0.1
 platform: ruby
 authors:
 - Julian Thome
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.9
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.9
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement