Fix Cargo native ranges and add include_prerelease flag

lib/vers.rb

@@ -119,15 +119,15 @@ def self.to_vers_string(version_range, scheme)
   #   Vers.satisfies?("1.5.0", "vers:npm/>=1.0.0|<2.0.0")  # => true
   #   Vers.satisfies?("1.5.0", "^1.2.3", "npm")            # => true
   #
-  def self.satisfies?(version, constraint, scheme = nil)
+  def self.satisfies?(version, constraint, scheme = nil, include_prerelease: false)
     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) || false
+      range&.contains?(version, include_prerelease: include_prerelease) || false
     end
   end
 

lib/vers/parser.rb

@@ -133,7 +133,7 @@ def parse_native(range_string, scheme)
       when "maven"
         parse_maven_range(range_string)
       when "cargo"
-        parse_npm_range(range_string, scheme: "cargo")
+        parse_cargo_range(range_string)
       when "nuget"
         parse_nuget_range(range_string)
       when "hex"
@@ -817,6 +817,10 @@ def parse_nginx_range(range_string)
       parse_constraints(constraint, "nginx")
     end
 
+    def parse_cargo_range(range_string)
+      parse_npm_range(range_string.to_s.tr(",", " "), scheme: "cargo")
+    end
+
     # NPM range parsing (^, ~, -, ||, etc.)
     def parse_npm_range(range_string, scheme: "npm")
       constraint = range_string.to_s.strip
@@ -855,6 +859,9 @@ def parse_npm_range(range_string, scheme: "npm")
 
     def parse_npm_single_range(range_string, scheme: "npm")
       constraint = range_string.to_s.strip
+      if scheme == "cargo" && !constraint.match?(/\A[~^><=!]/)
+        return parse_caret_range(constraint, scheme: scheme)
+      end
       return parse_caret_range(constraint.delete_prefix("^").strip, scheme: scheme) if constraint.start_with?("^")
       return parse_tilde_range(constraint.delete_prefix("~>").strip, scheme: scheme) if constraint.start_with?("~>")
       return parse_tilde_range(constraint.delete_prefix("~").strip, scheme: scheme) if constraint.start_with?("~")

lib/vers/version_range.rb

@@ -56,7 +56,7 @@ def unbounded?
       exclusions.empty? && intervals.length == 1 && intervals.first.unbounded?
     end
 
-    def contains?(version)
+    def contains?(version, include_prerelease: false)
       if VALIDATED_CONTAINMENT_SCHEMES.include?(scheme) && !Version.valid?(version, scheme)
         return false
       end
@@ -70,7 +70,7 @@ def contains?(version)
                    else
                      interval.contains?(version)
                    end
-        contains && prerelease_allowed?(interval, version)
+        contains && (include_prerelease || prerelease_allowed?(interval, version))
       end
     end
 

test/test_parser.rb

@@ -711,6 +711,42 @@ def test_parse_native_cargo_space_separated_and
     refute range.contains?("2.0.0")
   end
 
+  def test_parse_native_cargo_comma_separated_and
+    range = @parser.parse_native(">= 2.1.0, < 2.41.0", "cargo")
+    assert range.contains?("2.1.0")
+    assert range.contains?("2.40.0")
+    refute range.contains?("2.0.0")
+    refute range.contains?("2.41.0")
+  end
+
+  def test_parse_native_cargo_comma_without_spaces
+    range = @parser.parse_native(">=1.0.0,<2.0.0", "cargo")
+    assert range.contains?("1.5.0")
+    refute range.contains?("2.0.0")
+  end
+
+  def test_parse_native_cargo_bare_version_is_caret
+    range = @parser.parse_native("1.2.3", "cargo")
+    assert range.contains?("1.2.3")
+    assert range.contains?("1.9.0")
+    refute range.contains?("2.0.0")
+    refute range.contains?("1.2.2")
+  end
+
+  def test_parse_native_cargo_bare_partial_version_is_caret
+    range = @parser.parse_native("1.2", "cargo")
+    assert range.contains?("1.2.0")
+    assert range.contains?("1.9.0")
+    refute range.contains?("2.0.0")
+  end
+
+  def test_parse_native_cargo_bare_zero_major
+    range = @parser.parse_native("0.2.3", "cargo")
+    assert range.contains?("0.2.3")
+    assert range.contains?("0.2.9")
+    refute range.contains?("0.3.0")
+  end
+
   # Go module tests
 
   def test_parse_native_go_comma_separated

test/test_vers.rb

@@ -48,6 +48,28 @@ def test_satisfies_with_native_format
     refute Vers.satisfies?("2.0.0", "^1.2.3", "npm")
   end
 
+  def test_satisfies_excludes_prerelease_by_default
+    refute Vers.satisfies?("1.7.0-alpha.2", "< 3.0.0", "npm")
+    refute Vers.satisfies?("1.7.0-alpha.2", "^1.0.0", "cargo")
+  end
+
+  def test_satisfies_include_prerelease
+    assert Vers.satisfies?("1.7.0-alpha.2", "< 3.0.0", "npm", include_prerelease: true)
+    assert Vers.satisfies?("1.7.0-alpha.2", "^1.0.0", "cargo", include_prerelease: true)
+    refute Vers.satisfies?("3.1.0-alpha.1", "< 3.0.0", "npm", include_prerelease: true)
+  end
+
+  def test_contains_include_prerelease
+    range = Vers.parse_native("^1.0.0", "npm")
+    refute range.contains?("1.7.0-alpha.2")
+    assert range.contains?("1.7.0-alpha.2", include_prerelease: true)
+  end
+
+  def test_satisfies_cargo_comma_separated_and
+    assert Vers.satisfies?("2.1.0", ">= 2.1.0, < 2.41.0", "cargo")
+    refute Vers.satisfies?("2.41.0", ">= 2.1.0, < 2.41.0", "cargo")
+  end
+
   def test_compare_versions
     assert_equal(-1, Vers.compare("1.2.3", "1.2.4"))
     assert_equal(1, Vers.compare("2.0.0", "1.9.9"))