vers 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b7aa0b15219b0734ba33605567d7f6283c51b06afeb66d65f6b6893ada38b95
-  data.tar.gz: 79f6860358cba90b4d744af1af5c4198328f14a1bd555373018c3943b591c1ea
+  metadata.gz: 8ad669b5ca951e8a64ddd205d39e083b3a9836a67ca9ff25d99872a57658a560
+  data.tar.gz: d1aefb9f16a5a842ad05d4e427b538a565240cf3c21969542bf614199e8e1955
 SHA512:
-  metadata.gz: 27d9b7fc130fc8a70f738114c5566d4cefbe092259c9a181d006322aecf6f2dc656474c99ee610b2ffc5fe58a9b84410c2b322813c213f63473d929e21286e4d
-  data.tar.gz: 58035172c00bbbd2d8e8e9a96aa22bbae5eff4f0de8c8e2dbfe4c5340cc4267c0e28c8766705d527a0b387a788dd12841bad6a31ebb399c4f4a0663975f641c0
+  metadata.gz: 6b87591c17a303bf820c2667f25ac802569173737c8bd63d13c86bc5aedf6e606cc50d3906c08d526dd8c9e934559f0cdc7717e8e6c4cfbd8ae5473ebc53bb9c
+  data.tar.gz: 9a6cafa4929f8a71b699d6ce1171e574bb6c99aca17b89850e7bf232d1269727d00f6a15f1b9a870f8319913e77b0ec865fc5633866161cb989425c9eefc76ce

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "test/vers-spec"]
+	path = test/vers-spec
+	url = https://github.com/package-url/vers-spec.git

data/lib/vers/parser.rb

@@ -109,16 +109,26 @@ module Vers
     # @return [String] The vers URI string
     #
     def to_vers_string(version_range, scheme)
-      return "*" if version_range.unbounded?
+      return "vers:#{scheme}/*" if version_range.unbounded?
       return "vers:#{scheme}/" if version_range.empty?
 
       intervals = version_range.raw_constraints || version_range.intervals
       constraints = []
 
+      # Detect != pattern: two intervals (-∞,V) ∪ (V,+∞)
+      if intervals.length == 2
+        a, b = intervals
+        if a.min.nil? && !a.max_inclusive && b.max.nil? && !b.min_inclusive && a.max == b.min
+          constraints << "!=#{a.max}"
+          constraints.sort_by! { |c| sort_key_for_constraint(c) }
+          return "vers:#{scheme}/#{constraints.join('|')}"
+        end
+      end
+
       intervals.each do |interval|
         if interval.min == interval.max && interval.min_inclusive && interval.max_inclusive
           # Exact version
-          constraints << "=#{interval.min}"
+          constraints << interval.min.to_s
         else
           # Range constraints
           if interval.min
@@ -134,7 +144,6 @@ module Vers
       end
 
       constraints.sort_by! { |c| sort_key_for_constraint(c) }
-      constraints.uniq!
 
       "vers:#{scheme}/#{constraints.join('|')}"
     end
@@ -144,7 +153,7 @@ module Vers
     def sort_key_for_constraint(constraint)
       version = constraint.sub(/\A[><=!]+/, '')
       v = Version.cached_new(version)
-      [v.major || 0, v.minor || 0, v.patch || 0, constraint]
+      [v, constraint]
     end
 
     def parse_constraints(constraints_string, scheme)
@@ -164,8 +173,14 @@ module Vers
         end
       end
 
-      # Start with the union of all positive constraints
-      range = VersionRange.new(intervals, scheme: interval_scheme)
+      # Start with the union of all positive constraints, or unbounded if only exclusions
+      range = if intervals.any?
+                VersionRange.new(intervals, scheme: interval_scheme)
+              elsif exclusions.any?
+                VersionRange.unbounded
+              else
+                VersionRange.new([], scheme: interval_scheme)
+              end
 
       # Apply exclusions
       exclusions.each do |version|
@@ -185,7 +200,7 @@ module Vers
       # Handle || (OR) operator
       if range_string.include?('||')
         or_parts = range_string.split('||').map(&:strip)
-        ranges = or_parts.map { |part| parse_npm_single_range(part) }
+        ranges = or_parts.map { |part| parse_npm_range(part) }
         return ranges.reduce { |acc, range| acc.union(range) }
       end
 
@@ -206,7 +221,13 @@ module Vers
         end
       end
       ranges = merged.map { |part| parse_npm_single_range(part) }
-      ranges.reduce { |acc, range| acc.intersect(range) }
+      # If all parts are bare versions (no operators), treat as union
+      all_exact = merged.all? { |part| part.match?(/\A\d/) }
+      if all_exact
+        ranges.reduce { |acc, range| acc.union(range) }
+      else
+        ranges.reduce { |acc, range| acc.intersect(range) }
+      end
     end
 
     def parse_npm_single_range(range_string)
@@ -256,8 +277,25 @@ module Vers
                  # Invalid patterns that should raise errors
                  raise ArgumentError, "Invalid NPM range format: #{range_string}"
                else
+                 # Check for operator + x-range (e.g. ">=2.2.x", ">=1.x")
+                 if range_string.match(/\A[><=]+(\d+)\.[xX*]\z/)
+                   major = $1.to_i
+                   return VersionRange.new([
+                     Interval.new(min: "#{major}.0.0", max: "#{major + 1}.0.0", min_inclusive: true, max_inclusive: false)
+                   ])
+                 end
+                 if range_string.match(/\A[><=]+(\d+)\.(\d+)\.[xX*]\z/)
+                   major = $1.to_i
+                   minor = $2.to_i
+                   return VersionRange.new([
+                     Interval.new(min: "#{major}.#{minor}.0", max: "#{major}.#{minor + 1}.0", min_inclusive: true, max_inclusive: false)
+                   ])
+                 end
                  # Standard constraint
                  constraint = Constraint.parse(range_string)
+                 # Normalize version to semver (npm always uses 3 segments)
+                 normalized_version = Version.cached_new(constraint.version).to_s
+                 constraint = Constraint.new(constraint.operator, normalized_version)
                  if constraint.exclusion?
                    VersionRange.unbounded.exclude(constraint.version)
                  else
@@ -289,9 +327,27 @@ module Vers
 
     def parse_tilde_range(version)
       v = Version.cached_new(version)
-      upper_version = if v.minor
+
+      if v.prerelease
+        # ~0.8.0-pre := >=0.8.0-pre <0.8.0 OR >=0.8.0 <0.8.1
+        # Prereleases only match their own major.minor.patch
+        base = "#{v.major}.#{v.minor || 0}.#{v.patch || 0}"
+        next_patch = "#{v.major}.#{v.minor || 0}.#{(v.patch || 0) + 1}"
+        pre_range = VersionRange.new([
+          Interval.new(min: version, max: base, min_inclusive: true, max_inclusive: false)
+        ])
+        release_range = VersionRange.new([
+          Interval.new(min: base, max: next_patch, min_inclusive: true, max_inclusive: false)
+        ])
+        return pre_range.union(release_range)
+      end
+
+      upper_version = if v.patch
                         # ~1.2.3 := >=1.2.3 <1.3.0
                         "#{v.major}.#{v.minor + 1}.0"
+                      elsif v.minor
+                        # ~1.2 := >=1.2.0 <1.3.0
+                        "#{v.major}.#{v.minor + 1}.0"
                       else
                         # ~1 := >=1.0.0 <2.0.0
                         "#{v.major + 1}.0.0"
@@ -318,14 +374,14 @@ module Vers
     def parse_pessimistic_range(version)
       v = Version.cached_new(version)
       upper_version = if v.patch
-                        # ~> 1.2.3 := >= 1.2.3, < 1.3.0
-                        "#{v.major}.#{v.minor + 1}.0"
+                        # ~> 1.2.3 := >= 1.2.3, < 1.3
+                        "#{v.major}.#{v.minor + 1}"
                       elsif v.minor
-                        # ~> 1.2 := >= 1.2.0, < 2.0.0
-                        "#{v.major + 1}.0.0"
+                        # ~> 1.2 := >= 1.2.0, < 2
+                        "#{v.major + 1}"
                       else
-                        # ~> 1 := >= 1.0.0, < 2.0.0
-                        "#{v.major + 1}.0.0"
+                        # ~> 1 := >= 1.0.0, < 2
+                        "#{v.major + 1}"
                       end
 
       VersionRange.new([
@@ -550,9 +606,9 @@ module Vers
     end
 
     def parse_hex_single_range(range_string)
-      # Handle "and" conjunction
-      if range_string.include?(" and ")
-        and_parts = range_string.split(" and ").map(&:strip)
+      # Handle "and" conjunction and comma-separated AND constraints
+      if range_string.include?(" and ") || range_string.include?(",")
+        and_parts = range_string.split(/\s+and\s+|,/).map(&:strip).reject(&:empty?)
         ranges = and_parts.map { |part| parse_hex_constraint(part) }
         return ranges.reduce { |acc, range| acc.intersect(range) }
       end

data/lib/vers/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Vers
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 
   ##
   # Handles version comparison and normalization across different package ecosystems.
@@ -104,10 +104,12 @@ module Vers
     # @return [Boolean] true if the version is valid
     #
     def self.valid?(version_string)
-      cached_new(version_string)
-      true
-    rescue ArgumentError
-      false
+      version_string.to_s.match?(/\Av?\d+\.\d+\.\d+/)
+    end
+
+    def self.clean(version_string)
+      return nil unless valid?(version_string)
+      version_string.to_s.sub(/\Av/, '')
     end
 
     ##

data/lib/vers.rb

@@ -119,13 +119,15 @@ module Vers
   #   Vers.satisfies?("1.5.0", "^1.2.3", "npm")            # => true
   #
   def self.satisfies?(version, constraint, scheme = nil)
-    range = if scheme
-              parse_native(constraint, scheme)
-            else
-              parse(constraint)
-            end
-    
-    range.contains?(version)
+    sub_ranges = constraint.split('||').map(&:strip).reject(&:empty?)
+    sub_ranges.any? do |sub_range|
+      range = if scheme
+                parse_native(sub_range, scheme)
+              else
+                parse(sub_range)
+              end
+      range.contains?(version)
+    end
   end
 
   ##
@@ -177,6 +179,10 @@ module Vers
     Version.valid?(version_string)
   end
 
+  def self.clean(version_string)
+    Version.clean(version_string)
+  end
+
   ##
   # Creates an exact version range
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vers
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrew Nesbitt
@@ -18,6 +18,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitmodules"
 - ".ruby-version"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md