semver_dialects 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14c406303926f87028c24acf6be1cd3513f6e71d0f6a689e56e9543466759e5c
-  data.tar.gz: 4b557a3ff333eaf8dd554a5c97812ffc8e3c5dacd1ca69b1cd8c010ceb149205
+  metadata.gz: 1d29656d2bd4bdc5bb1cd50c3cf3853e192fbb7de944b4495c816f424d710648
+  data.tar.gz: adbbb1f25f05a91ac195a6e8becb823b4f412a40476a26697547d06556253868
 SHA512:
-  metadata.gz: c72b4302f63a5d5bec568d0de6a2cdfb466ef7372001f5b65b209a722b9303e29074c03509557627ca9e2fe8fcc987f01569fab4cfb7f8ce67cc5a310abfef49
-  data.tar.gz: 28e9f08d4442d0efbb172a85c046466bb73edb2463b7c8ee6ad36f3dcee7ff49b7806a8cc6b8f1c751a47bc884ced167ebfe1f47b35ad15581a43efa9fe935ea
+  metadata.gz: 585e0ad23e05cbd4bade3aaf925bd38b07af390de78a7a28446cb6dad50b05a99155d8744d497fcbf6377e2013bb5740fc4bb140425f52217f5bb35312af3c53
+  data.tar.gz: d17f636215c7c9d338819ab56ed8bbdc6f1349bfadb34c15a860d9398d2afb3a41f4c6bc521807e3e23ee36a19f9370c295c12485d9e7de5db95fef5af3b2c22

data/lib/semver_dialects/boundary.rb

@@ -5,6 +5,8 @@
 # below all versions (negative infinity), or any version.
 module SemverDialects
   class Boundary
+    include Comparable
+
     attr_accessor :semver
 
     def initialize(semver)
@@ -15,46 +17,12 @@ module SemverDialects
       @semver.to_s
     end
 
-    def <(other)
-      if other.instance_of?(BelowAll)
-        false
-      else
-        other.instance_of?(AboveAll) ? true : @semver < other.semver
-      end
-    end
-
-    def >(other)
-      if other.instance_of?(BelowAll)
-        true
-      else
-        other.instance_of?(AboveAll) ? false : @semver > other.semver
-      end
-    end
-
-    def <=(other)
-      self < other || self == other
-    end
-
-    def >=(other)
-      self > other || self == other
-    end
+    def <=>(other)
+      return nil unless other.is_a?(Boundary)
+      return -1 if other.instance_of?(AboveAll)
+      return 1 if other.instance_of?(BelowAll)
 
-    def ==(other)
-      # self cannot be BelowAll or AboveAll
-      if other.instance_of?(BelowAll) || other.instance_of?(AboveAll)
-        false
-      else
-        @semver == other.semver
-      end
-    end
-
-    def !=(other)
-      # self cannot be BelowAll or AboveAll
-      if other.instance_of?(BelowAll) || other.instance_of?(AboveAll)
-        false
-      else
-        @semver != other.semver
-      end
+      semver <=> other.semver
     end
 
     def is_initial_version?
@@ -76,28 +44,10 @@ module SemverDialects
       false
     end
 
-    def <(other)
-      other.instance_of?(BelowAll) ? false : true
-    end
-
-    def >(_other)
-      false
-    end
-
-    def <=(other)
-      self < other || self == other
-    end
-
-    def >=(other)
-      self > other || self == other
-    end
-
-    def ==(other)
-      (other.instance_of? BelowAll) ? true : false
-    end
+    def <=>(other)
+      return 0 if other.instance_of?(BelowAll)
 
-    def !=(other)
-      !(self == other)
+      -1 if other.is_a?(Boundary)
     end
   end
 
@@ -115,28 +65,10 @@ module SemverDialects
       false
     end
 
-    def <(_other)
-      false
-    end
-
-    def >(other)
-      other.instance_of?(AboveAll) ? false : true
-    end
-
-    def <=(other)
-      self < other || self == other
-    end
-
-    def >=(other)
-      self > other || self == other
-    end
-
-    def ==(other)
-      (other.instance_of? AboveAll) ? true : false
-    end
+    def <=>(other)
+      return 0 if other.instance_of?(AboveAll)
 
-    def !=(other)
-      !(self == other)
+      1 if other.is_a?(Boundary)
     end
   end
 end

data/lib/semver_dialects/semantic_version.rb

@@ -2,10 +2,17 @@
 
 require_relative '../utils'
 
-# SemanticVersion represents a Semver 2 version.
-# Comparison rules are the ones of Semver 2.
 module SemverDialects
+  # SemanticVersion is a generic version class.
+  # It parses and compares versions of any syntax.
+  # It can't always be accurate because a single comparison logic
+  # can't possibly handle all the supported syntaxes.
+  # Since it's generic, it doesn't validate versions.
   class SemanticVersion
+    include Comparable
+
+    ANY_NUMBER = 'x'
+
     attr_reader :version_string, :prefix_segments, :suffix_segments, :segments
 
     # String to build a regexp that matches a version.
@@ -89,25 +96,6 @@ module SemverDialects
       [first_array_prefix.concat(first_array_suffix), second_array_prefix.concat(second_array_suffix)]
     end
 
-    def get_equalized_prefix_arrays_for(semver_a, semver_b)
-      first_array_prefix = semver_a.prefix_segments.clone
-      second_array_prefix = semver_b.prefix_segments.clone
-      first_array_prefix, second_array_prefix = _get_equalized_arrays_for(first_array_prefix, second_array_prefix)
-      [first_array_prefix, second_array_prefix]
-    end
-
-    def <(other)
-      self_array, other_array = get_equalized_arrays_for(self, other)
-      (0..self_array.size - 1).each do |i|
-        if self_array[i] < other_array[i]
-          return true
-        elsif self_array[i] > other_array[i]
-          return false
-        end
-      end
-      false
-    end
-
     def is_zero?
       @prefix_segments.empty? || @prefix_segments.all?(&:is_zero?)
     end
@@ -120,47 +108,18 @@ module SemverDialects
       @suffix_segments.any?(&:is_post_release)
     end
 
-    def >(other)
-      self_array, other_array = get_equalized_arrays_for(self, other)
-      (0..self_array.size - 1).each do |i|
-        if self_array[i] > other_array[i]
-          return true
-        elsif self_array[i] < other_array[i]
-          return false
-        end
-      end
-      false
-    end
-
-    def >=(other)
-      self == other || self > other || self == other
-    end
-
-    def <=(other)
-      self == other || self < other
-    end
-
-    def ==(other)
-      segments_a = []
-      segments_b = []
-
-      segments_a += other.segments
-      segments_b += @segments
+    def <=>(other)
+      return nil unless other.is_a?(SemanticVersion)
 
-      if other.segments.size < @segments.size
-        (@segments.size - other.segments.size).times { |_| segments_a << SemanticVersionSegment.new('0') }
-      elsif other.segments.size > @segments.size
-        (other.segments.size - @segments.size).times { |_| segments_b << SemanticVersionSegment.new('0') }
-      end
+      self_array, other_array = get_equalized_arrays_for(self, other)
+      zipped_arrays = self_array.zip(other_array)
+      zipped_arrays.each do |(a, b)|
+        return 0 if a.wildcard? || b.wildcard?
 
-      (0..segments_a.size - 1).each do |i|
-        return false if segments_a[i] != segments_b[i]
+        cmp = a <=> b
+        return cmp if cmp != 0
       end
-      true
-    end
-
-    def !=(other)
-      !(self == other)
+      0
     end
 
     def to_normalized_s
@@ -185,6 +144,8 @@ module SemverDialects
   end
 
   class SemanticVersionSegment
+    include Comparable
+
     attr_accessor :normalized_group_string, :original_group_string, :is_post_release, :is_pre_release
 
     @@group_suffixes = {
@@ -227,52 +188,28 @@ module SemverDialects
       end
     end
 
-    def compare(semver_a, semver_b, ret_anr_bnonr, ret_anonr_bnr, comparator)
-      if semver_a.number? && semver_b.number?
-        semver_a.to_i.send(comparator, semver_b.to_i)
-      elsif semver_a.number? && !semver_b.number?
-        if semver_b == 'X'
-          true
-        else
-          ret_anr_bnonr
-        end
-      elsif !semver_a.number? && semver_b.number?
-        if semver_a == 'X'
-          true
-        else
-          ret_anonr_bnr
-        end
-      elsif semver_a == 'X' || semver_b == 'X' # !semantic_version_b.group_string.is_number? && !semantic_version_agrous_string.is_number?
-        true
-      else
-        semver_a.send(comparator, semver_b)
-      end
-    end
-
-    def <(other)
-      compare(normalized_group_string, other.normalized_group_string, true, false, :<)
-    end
-
-    def >(other)
-      compare(normalized_group_string, other.normalized_group_string, false, true, :>)
-    end
+    def <=>(other)
+      return nil unless other.is_a?(SemanticVersionSegment)
 
-    def >=(other)
-      self == other || compare(normalized_group_string, other.normalized_group_string, false, true,
-                               :>)
-    end
+      self_semver = normalized_group_string
+      other_semver = other.normalized_group_string
 
-    def <=(other)
-      self == other || compare(normalized_group_string, other.normalized_group_string, true, false,
-                               :<)
-    end
+      both_are_numbers = self_semver.number? && other_semver.number?
+      at_least_one_is_x = self_semver == 'X' || other_semver == 'X'
+      a_numeric_b_non_numeric = self_semver.number? && !other_semver.number?
+      b_numeric_a_non_numeric = other_semver.number? && !self_semver.number?
 
-    def ==(other)
-      normalized_group_string == other.normalized_group_string
-    end
-
-    def !=(other)
-      !(self == other)
+      if both_are_numbers
+        self_semver.to_i <=> other_semver.to_i
+      elsif at_least_one_is_x
+        0
+      elsif a_numeric_b_non_numeric
+        -1
+      elsif b_numeric_a_non_numeric
+        1
+      else
+        self_semver <=> other_semver
+      end
     end
 
     def to_normalized_s
@@ -283,6 +220,10 @@ module SemverDialects
       @version_string
     end
 
+    def wildcard?
+      normalized_group_string == 'X'
+    end
+
     def is_number?
       normalized_group_string.number?
     end

data/lib/semver_dialects/version.rb

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

metadata

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