semantic 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25912a3ae732b9bee108db7982c3c32a8970579c
-  data.tar.gz: fcd186042df03126f0318442f62e8eccc0b726d6
+  metadata.gz: 6b0d05c7bf684f53e2868af8b7ef4d10b4e32147
+  data.tar.gz: 2b056bdd6e59fd70c009ec240a486eecc1be6ce4
 SHA512:
-  metadata.gz: b3bf5332d05f69d77d1e04889d2782b201c8c8e1215854abcf5c695cf46793bcf013f5c901707683429989585c155f1111bcd0ad55504db3f865ffbdc1de6636
-  data.tar.gz: 3bedeefba2d4579b5bc262f9b09efa2b7ab625b4b715feb6059f93fced4661632ca037d62686da05c4f2f0527f07bbefd80ee2ae47cb835c0675ccf37b3637d1
+  metadata.gz: 20af7df4c207994a636249361d917e84cd63429c1e2423a53899632bc8fcd65ebdc89c6f785ab2476260db2bac94f35cdb7809687af0b2bd76705fb9a955398e
+  data.tar.gz: 442ba8444462357df0fe5e40baef7225de789da8c518c1309d521e89f5d83b0eb5890871828f859945695c1ec77c77d0b00b456c6249a252260c4c244d402211

data/lib/semantic.rb

@@ -1,4 +1,4 @@
 module Semantic
-  GEM_VERSION = '1.5.0'
+  GEM_VERSION = '1.6.0'
   autoload :Version, 'semantic/version'
 end

data/lib/semantic/version.rb

@@ -1,6 +1,8 @@
 # See: http://semver.org
 module Semantic
   class Version
+    include Comparable
+
     SemVerRegexp = /\A(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][a-zA-Z0-9-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][a-zA-Z0-9-]*))*))?(?:\+([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?\Z/
 
 
@@ -88,27 +90,7 @@ module Semantic
       return compare_pre(self.pre, other_version.pre)
     end
 
-    def > other_version
-      (self <=> other_version) == 1
-    end
-
-    def < other_version
-      (self <=> other_version) == -1
-    end
-
-    def >= other_version
-      (self <=> other_version) >= 0
-    end
-
-    def <= other_version
-      (self <=> other_version) <= 0
-    end
-
-    def == other_version
-      (self <=> other_version) == 0
-    end
-
-    def satisfies other_version
+    def satisfies? other_version
       return true if other_version.strip == '*'
       parts = other_version.split(/(\d(.+)?)/, 2)
       comparator, other_version_string = parts[0].strip, parts[1].strip
@@ -120,12 +102,19 @@ module Semantic
       rescue ArgumentError
         if ['<', '>', '<=', '>='].include?(comparator)
           satisfies_comparator? comparator, pad_version_string(other_version_string)
+        elsif comparator == '~>'
+          pessimistic_match? other_version_string
         else
           tilde_matches? other_version_string
         end
       end
     end
 
+    def satisfied_by? versions
+      raise ArgumentError.new("Versions #{versions} should be an array of versions") unless versions.is_a? Array
+      versions.all? { |version| satisfies?(version) }
+    end
+
     [:major, :minor, :patch].each do |term|
       define_method("#{term}!") { increment!(term) }
     end
@@ -159,13 +148,32 @@ module Semantic
       other_parts == this_parts[0..other_parts.length-1]
     end
 
+    def pessimistic_match? other_version_string
+      other_parts = other_version_string.split('.')
+      unless other_parts.size == 2 || other_parts.size == 3
+        raise ArgumentError.new("Version #{other_version_string} should not be applied with a pessimistic operator")
+      end
+      other_parts.pop
+      other_parts << (other_parts.pop.to_i + 1).to_s
+      satisfies_comparator?('>=', semverified(other_version_string)) && satisfies_comparator?('<', semverified(other_parts.join('.')))
+    end
+
     def satisfies_comparator? comparator, other_version_string
       if comparator == '~'
         tilde_matches? other_version_string
+      elsif comparator == '~>'
+        pessimistic_match? other_version_string
       else
         self.send comparator, other_version_string
       end
     end
 
+    def semverified version_string
+      parts = version_string.split('.')
+      raise ArgumentError.new("Version #{version_string} not supported by semverified") if parts.size > 3
+      (3 - parts.size).times { parts << '0' }
+      parts.join('.')
+    end
+
   end
 end

data/spec/version_spec.rb

@@ -181,30 +181,76 @@ describe Semantic::Version do
       expect(@v1_5_9_pre_1_build_4352).to eq(@v1_5_9_pre_1)
     end
 
+    it 'determines whether it is between two others instance' do
+      expect(@v1_5_9).to be_between @v1_5_9_pre_1, @v1_6_0
+      expect(@v1_5_9).to_not be_between @v1_6_0, @v1_6_0_beta
+    end
+
     it 'determines whether it satisfies >= style specifications' do
-      expect(@v1_6_0.satisfies('>=1.6.0')).to be true
-      expect(@v1_6_0.satisfies('<=1.6.0')).to be true
-      expect(@v1_6_0.satisfies('>=1.5.0')).to be true
-      expect(@v1_6_0.satisfies('<=1.5.0')).not_to be true
+      expect(@v1_6_0.satisfies?('>=1.6.0')).to be true
+      expect(@v1_6_0.satisfies?('<=1.6.0')).to be true
+      expect(@v1_6_0.satisfies?('>=1.5.0')).to be true
+      expect(@v1_6_0.satisfies?('<=1.5.0')).not_to be true
 
       # partial / non-semver numbers after comparator are extremely common in
       # version specifications in the wild
 
-      expect(@v1_6_0.satisfies('>1.5')).to be true
-      expect(@v1_6_0.satisfies('<1')).not_to be true
+      expect(@v1_6_0.satisfies?('>1.5')).to be true
+      expect(@v1_6_0.satisfies?('<1')).not_to be true
     end
 
     it 'determines whether it satisfies * style specifications' do
-      expect(@v1_6_0.satisfies('1.*')).to be true
-      expect(@v1_6_0.satisfies('1.6.*')).to be true
-      expect(@v1_6_0.satisfies('2.*')).not_to be true
-      expect(@v1_6_0.satisfies('1.5.*')).not_to be true
+      expect(@v1_6_0.satisfies?('1.*')).to be true
+      expect(@v1_6_0.satisfies?('1.6.*')).to be true
+      expect(@v1_6_0.satisfies?('2.*')).not_to be true
+      expect(@v1_6_0.satisfies?('1.5.*')).not_to be true
     end
 
     it 'determines whether it satisfies ~ style specifications' do
-      expect(@v1_6_0.satisfies('~1.6')).to be true
-      expect(@v1_5_9_pre_1.satisfies('~1.5')).to be true
-      expect(@v1_6_0.satisfies('~1.5')).not_to be true
+      expect(@v1_6_0.satisfies?('~1.6')).to be true
+      expect(@v1_5_9_pre_1.satisfies?('~1.5')).to be true
+      expect(@v1_6_0.satisfies?('~1.5')).not_to be true
+    end
+
+    it 'determines whether it satisfies ~> style specifications' do
+      expect(@v1_5_9_pre_1_build_5127.satisfies?('~> 1.4')).to be true
+      expect(@v1_5_9_pre_1_build_4352.satisfies?('~> 1.5.2')).to be true
+      expect(@v1_6_0_alpha_1.satisfies?('~> 1.4')).to be true
+
+      expect(@v1_5_9.satisfies?('~> 1.0')).to be true
+      expect(@v1_5_9.satisfies?('~> 1.4')).to be true
+      expect(Semantic::Version.new('1.99.1').satisfies?('~> 1.5')).to be true
+      expect(@v1_5_9.satisfies?('~> 1.5')).to be true
+      expect(@v1_5_9.satisfies?('~> 1.5.0')).to be true
+      expect(@v1_5_9.satisfies?('~> 1.5.8')).to be true
+      expect(@v1_5_9.satisfies?('~> 1.5.9')).to be true
+      expect(Semantic::Version.new('1.5.99').satisfies?('~> 1.5.9')).to be true
+      expect(@v1_5_9.satisfies?('~> 1.6.0')).to be false
+      expect(@v1_5_9.satisfies?('~> 1.6')).to be false
+      expect(@v1_5_9.satisfies?('~> 1.7')).to be false
+    end
+
+    it 'determines whether version is satisfies by range of bound versions' do
+      v5_2_1 = Semantic::Version.new('5.2.1')
+      v5_3_0 = Semantic::Version.new('5.3.0')
+      v6_0_1 = Semantic::Version.new('6.0.1')
+      range = [
+        ">= 5.2.1",
+        "<= 6.0.0"
+      ]
+
+      expect(v5_2_1.satisfied_by?(range)).to be true
+      expect(v5_3_0.satisfied_by?(range)).to be true
+      expect(v6_0_1.satisfied_by?(range)).to be false
+    end
+
+    it 'raises error if the input is not an array of versions' do
+      v5_2_1 = Semantic::Version.new('5.2.1')
+      range = ">= 5.2.1 <= 6.0.0"
+      expect { v5_2_1.satisfied_by?(range) }.to raise_error(
+        ArgumentError,
+        /should be an array of versions/
+      )
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Josh Lindsey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -41,7 +41,7 @@ dependencies:
 description: 'Semantic Version utility class for parsing, storing, and comparing versions.
   See: http://semver.org'
 email:
-- josh@core-apps.com
+- joshua.s.lindsey@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []