semantic_range 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec95fe31851133a57a3c90992bb3124739ce82c0
-  data.tar.gz: 3a137c6d5e47ab85b4845bb4162d8c5f9253a180
+  metadata.gz: 7bc94bd09732c4890fab1c01af561c7211be2334
+  data.tar.gz: 9c5cf0e2692244711a88b44135567dc37805a2bd
 SHA512:
-  metadata.gz: f50a2b6cdd8dafbc675b0e43b7f6dd74cbdb6f70b88d51350b9c2e1977ca9c6192533863a7c48170ef0f4db580afa9d1de3c7d2810b855d97d497ecc41c44f3a
-  data.tar.gz: '07929eadc26321cdb53da674de931e7449dba9a264e9b8ba007ed47a1cd1469755c4b39ecab0fce43edf61aaf6c28c15c3ab93f9d343904c1797518dcde37bca'
+  metadata.gz: 4680d6cbe31ffb6e9a431a81ae9d50a765180fb9b2e82922d437564e509a076b866b4fa06c9266ddac5bb4d1c9d2f60d2089f30449449f27611e1138141c99d8
+  data.tar.gz: afe0038b4961eceeea34ff9d24184739dff228bbc30f6f2a4f280a34d471cc33bb6273d13a2391b6075a39ac3fc9144ee47d84d50f749534dcefb28009b659d4

data/README.md

@@ -24,9 +24,9 @@ Or install it yourself as:
 SemanticRange.valid('1.2.3') # '1.2.3'
 SemanticRange.valid('a.b.c') # nil
 SemanticRange.clean('  =v1.2.3   ') # '1.2.3'
-SemanticRange.satisfies('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') # true
-SemanticRange.gt('1.2.3', '9.8.7') # false
-SemanticRange.lt('1.2.3', '9.8.7') # true
+SemanticRange.satisfies?('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') # true
+SemanticRange.gt?('1.2.3', '9.8.7') # false
+SemanticRange.lt?('1.2.3', '9.8.7') # true
 ```
 
 ## Development

data/lib/semantic_range.rb

@@ -50,12 +50,12 @@ module SemanticRange
   class InvalidComparator < StandardError; end
   class InvalidRange < StandardError; end
 
-  def self.ltr(version, range, loose = false, platform = nil)
-    outside(version, range, '<', loose, platform)
+  def self.ltr?(version, range, loose = false, platform = nil)
+    outside?(version, range, '<', loose, platform)
   end
 
-  def self.gtr(version, range, loose = false, platform = nil)
-    outside(version, range, '>', loose, platform)
+  def self.gtr?(version, range, loose = false, platform = nil)
+    outside?(version, range, '>', loose, platform)
   end
 
   def self.cmp(a, op, b, loose = false)
@@ -69,27 +69,27 @@ module SemanticRange
       b = b.version if !b.is_a?(String)
       a != b
     when '', '=', '=='
-      eq(a, b, loose)
+      eq?(a, b, loose)
     when '!='
-      neq(a, b, loose)
+      neq?(a, b, loose)
     when '>'
-      gt(a, b, loose)
+      gt?(a, b, loose)
     when '>='
-      gte(a, b, loose)
+      gte?(a, b, loose)
     when '<'
-      lt(a, b, loose)
+      lt?(a, b, loose)
     when '<='
-      lte(a, b, loose)
+      lte?(a, b, loose)
     else
       raise 'Invalid operator: ' + op
     end
   end
 
-  def self.outside(version, range, hilo, loose = false, platform = nil)
+  def self.outside?(version, range, hilo, loose = false, platform = nil)
     version = Version.new(version, loose)
     range = Range.new(range, loose, platform)
 
-    return false if satisfies(version, range, loose, platform)
+    return false if satisfies?(version, range, loose, platform)
 
     case hilo
     when '>'
@@ -114,15 +114,15 @@ module SemanticRange
 
         case hilo
         when '>'
-          if gt(comparator.semver, high.semver, loose)
+          if gt?(comparator.semver, high.semver, loose)
             high = comparator
-          elsif lt(comparator.semver, low.semver, loose)
+          elsif lt?(comparator.semver, low.semver, loose)
             low = comparator
           end
         when '<'
-          if lt(comparator.semver, high.semver, loose)
+          if lt?(comparator.semver, high.semver, loose)
             high = comparator
-          elsif gt(comparator.semver, low.semver, loose)
+          elsif gt?(comparator.semver, low.semver, loose)
             low = comparator
           end
         end
@@ -132,15 +132,15 @@ module SemanticRange
 
       case hilo
       when '>'
-        if (low.operator.empty? || low.operator == comp) && lte(version, low.semver, loose)
+        if (low.operator.empty? || low.operator == comp) && lte?(version, low.semver, loose)
           return false;
-        elsif (low.operator == ecomp && lt(version, low.semver, loose))
+        elsif (low.operator == ecomp && lt?(version, low.semver, loose))
           return false;
         end
       when '<'
-        if (low.operator.empty? || low.operator == comp) && gte(version, low.semver, loose)
+        if (low.operator.empty? || low.operator == comp) && gte?(version, low.semver, loose)
           return false;
-        elsif low.operator == ecomp && gt(version, low.semver, loose)
+        elsif low.operator == ecomp && gt?(version, low.semver, loose)
           return false;
         end
       end
@@ -148,14 +148,14 @@ module SemanticRange
     true
   end
 
-  def self.satisfies(version, range, loose = false, platform = nil)
+  def self.satisfies?(version, range, loose = false, platform = nil)
     return false if !valid_range(range, loose, platform)
     Range.new(range, loose, platform).test(version)
   end
 
   def self.max_satisfying(versions, range, loose = false, platform = nil)
     versions.select { |version|
-      satisfies(version, range, loose, platform)
+      satisfies?(version, range, loose, platform)
     }.sort { |a, b|
       rcompare(a, b, loose)
     }[0] || nil
@@ -191,27 +191,27 @@ module SemanticRange
     # TODO
   end
 
-  def self.lt(a, b, loose = false)
+  def self.lt?(a, b, loose = false)
     compare(a, b, loose) < 0
   end
 
-  def self.gt(a, b, loose = false)
+  def self.gt?(a, b, loose = false)
     compare(a, b, loose) > 0
   end
 
-  def self.eq(a, b, loose = false)
+  def self.eq?(a, b, loose = false)
     compare(a, b, loose) == 0
   end
 
-  def self.neq(a, b, loose = false)
+  def self.neq?(a, b, loose = false)
     compare(a, b, loose) != 0
   end
 
-  def self.gte(a, b, loose = false)
+  def self.gte?(a, b, loose = false)
     compare(a, b, loose) >= 0
   end
 
-  def self.lte(a, b, loose = false)
+  def self.lte?(a, b, loose = false)
     compare(a, b, loose) <= 0
   end
 
@@ -267,4 +267,18 @@ module SemanticRange
       comp.map(&:to_s)
     end
   end
+
+  class << self
+    # Support for older non-inquisitive method versions
+    alias_method :gt, :gt?
+    alias_method :gtr, :gtr?
+    alias_method :gte, :gte?
+    alias_method :lt, :lt?
+    alias_method :ltr, :ltr?
+    alias_method :lte, :lte?
+    alias_method :eq, :eq?
+    alias_method :neq, :neq?
+    alias_method :outside, :outside?
+    alias_method :satisfies, :satisfies?
+  end
 end

data/lib/semantic_range/comparator.rb

@@ -30,15 +30,15 @@ module SemanticRange
       @semver = !m[2] ? ANY : Version.new(m[2], @loose)
     end
 
-    def intersects(comp, loose = false, platform = nil)
+    def intersects?(comp, loose = false, platform = nil)
       comp = Comparator.new(comp, loose)
 
       if @operator == ''
         range_b = Range.new(comp.value, loose, platform)
-        SemanticRange.satisfies(@value, range_b, loose, platform)
+        SemanticRange.satisfies?(@value, range_b, loose, platform)
       elsif comp.operator == ''
         range_a = Range.new(@value, loose, platform)
-        SemanticRange.satisfies(comp.semver, range_a, loose, platform)
+        SemanticRange.satisfies?(comp.semver, range_a, loose, platform)
       else
         same_direction_increasing      = (@operator == '>=' || @operator == '>') && (comp.operator == '>=' || comp.operator == '>')
         same_direction_decreasing      = (@operator == '<=' || @operator == '<') && (comp.operator == '<=' || comp.operator == '<')
@@ -54,14 +54,18 @@ module SemanticRange
       end
     end
 
-    def satisfies_range(range, loose = false, platform = nil)
+    def satisfies_range?(range, loose = false, platform = nil)
       range = Range.new(range, loose, platform)
 
       range.set.any? do |comparators|
         comparators.all? do |comparator|
-          intersects(comparator, loose, platform)
+          intersects?(comparator, loose, platform)
         end
       end
     end
+
+    # Support for older non-inquisitive method versions
+    alias_method :intersects, :intersects?
+    alias_method :satisfies_range, :satisfies_range?
   end
 end

data/lib/semantic_range/version.rb

@@ -1,5 +1,5 @@
 module SemanticRange
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 
   class Version
     attr_reader :major, :minor, :patch, :prerelease

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic_range
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler