correcting specs and comparisons

Author: Bilal Al

lib/splitclient-rb/engine/matchers/greater_than_or_equal_to_semver_matcher.rb

@@ -23,7 +23,7 @@ def match?(args)
         @logger.error('stringMatcherData is required for GREATER_THAN_OR_EQUAL_TO_SEMVER matcher type')
         return false
       end
-      matches = [0, 1].include?(@semver.compare(value_to_match))
+      matches = [0, 1].include?(value_to_match.compare(@semver))
       @logger.debug("[GreaterThanOrEqualsToSemverMatcher] #{value_to_match} matches -> #{matches}")
       matches
     end

lib/splitclient-rb/engine/matchers/less_than_or_equal_to_semver_matcher.rb

@@ -23,7 +23,7 @@ def match?(args)
         @logger.error('stringMatcherData is required for LESS_THAN_OR_EQUAL_TO_SEMVER matcher type')
         return false
       end
-      matches = [0, -1].include?(@semver.compare(value_to_match))
+      matches = [0, -1].include?(value_to_match.compare(@semver))
       @logger.debug("[LessThanOrEqualsToSemverMatcher] #{value_to_match} matches -> #{matches}")
       matches
     end

lib/splitclient-rb/engine/matchers/semver.rb

@@ -63,10 +63,7 @@ def compare(to_compare)
       return compare_attributes(to_compare) if compare_attributes(to_compare) != 0
 
       # Compare pre-release versions lexically
-      return compare_pre_release(to_compare) if compare_pre_release(to_compare) != 0
-
-      # compare length of version
-      compare_vars(@version.length, to_compare.version.length)
+      compare_pre_release(to_compare)
     end
 
     private

spec/engine/matchers/matches_greater_than_or_equal_to_semver_matcher_spec.rb

@@ -27,8 +27,8 @@
 
   it 'does not match' do
     matcher = described_class.new("version", raw[:stringMatcherData], config.logger, config.split_validator)
-    expect(matcher.match?(:attributes=>{"version": "2.1.11"})).to eq(false)
-    expect(matcher.match?(:attributes=>{"version": "2.2.0"})).to eq(false)
+    expect(matcher.match?(:attributes=>{"version": "2.1.7"})).to eq(false)
+    expect(matcher.match?(:attributes=>{"version": "2.0.22"})).to eq(false)
   end
 
   it 'invalid attribute' do

spec/engine/matchers/matches_less_than_or_equal_to_semver_matcher_spec.rb

@@ -27,8 +27,8 @@
 
   it 'does not match' do
     matcher = described_class.new("version", raw[:stringMatcherData], config.logger, config.split_validator)
-    expect(matcher.match?(:attributes=>{"version": "2.1.5"})).to eq(false)
-    expect(matcher.match?(:attributes=>{"version": "2.1.5-rc1"})).to eq(false)
+    expect(matcher.match?(:attributes=>{"version": "2.1.10"})).to eq(false)
+    expect(matcher.match?(:attributes=>{"version": "2.2.0-rc1"})).to eq(false)
   end
 
   it 'invalid attribute' do

spec/engine/matchers/semver_spec.rb

@@ -45,9 +45,9 @@
       end
       for i in (1..equal_to_versions.length-1)
         if equal_to_versions[i][2]=='true'
-          expect(described_class.build(equal_to_versions[i][0], logger).compare(described_class.build(equal_to_versions[i][1], logger))).to eq(0)
+          expect(described_class.build(equal_to_versions[i][0], logger).version == described_class.build(equal_to_versions[i][1], logger).version).to eq(true)
         else
-          expect(described_class.build(equal_to_versions[i][0], logger).compare(described_class.build(equal_to_versions[i][1], logger))).not_to eq(0)
+          expect(described_class.build(equal_to_versions[i][0], logger) == described_class.build(equal_to_versions[i][1], logger)).to eq(false)
         end
       end
       for i in (1..between_versions.length-1)