semantic 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 369c17f0eac57ef46469825790c987018e7bed74
-  data.tar.gz: 4ac7181b281ffd6cb4c7cd1b1d4ae59d2f014c17
+  metadata.gz: 84157e13bb503e4643995ea3fc5e66dc0e669a14
+  data.tar.gz: d66f6977b38924ed245de6b0849c6c6a6f6e48b3
 SHA512:
-  metadata.gz: 2879e6c07bb46fe48981d44c97f78dd532ccdc77bc5f7ba5aa0fe39159ef4078a4f596cd433039e22ee780bbab16fd241f7222c713adc5383d75cf33e6731e87
-  data.tar.gz: 8225d9f89fb80d7909f26de27e4f56faa21be3532bfb5eeaca26fc201eadd4b76ac30e88615c56e4312c35393fc63336b04c638ac4770b4324a55ecf0c4a23f9
+  metadata.gz: 4a995f1776791066bbd2f46b5bdbab90e0ea53477ea3143ea28d874e41524cdcfa2522a6593f5097f08370b0358b7701a90184f177318596a618fe386400201d
+  data.tar.gz: 6cbe7c9c57700057f807386f6d5df01f51cabcd7197dbb21794614c398bfacb84d041616522f8e90dc7bf608d97d5960781bb81a5321e1717e2171f903adf1c9

data/lib/semantic.rb

@@ -1,5 +1,5 @@
 module Semantic
-  GEM_VERSION = '1.2.1'
+  GEM_VERSION = '1.3.0'
   autoload :Version, 'semantic/version'
 end
 

data/lib/semantic/version.rb

@@ -17,7 +17,7 @@ module Semantic
       end
 
 
-      @major, @minor, @patch = version.split('.').map &:to_i
+      @major, @minor, @patch = version.split('.').map(&:to_i)
     end
 
     def to_a
@@ -76,8 +76,48 @@ module Semantic
       (self <=> other_version) == 0
     end
 
+    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
+
+      begin
+        Version.new other_version_string
+        comparator.empty? && comparator = '=='
+        satisfies_comparator? comparator, other_version_string
+      rescue ArgumentError
+        if ['<', '>', '<=', '>='].include?(comparator)
+          satisfies_comparator? comparator, pad_version_string(other_version_string)
+        else
+          tilde_matches? other_version_string
+        end
+      end
+    end
+
     private
 
+    def pad_version_string version_string
+      parts = version_string.split('.').reject {|x| x == '*'}
+      while parts.length < 3
+        parts << '0'
+      end
+      parts.join '.'
+    end
+
+    def tilde_matches? other_version_string
+      this_parts = to_a.collect &:to_s
+      other_parts = other_version_string.split('.').reject {|x| x == '*'}
+      other_parts == this_parts[0..other_parts.length-1]
+    end
+
+    def satisfies_comparator? comparator, other_version_string
+      if comparator == '~'
+        tilde_matches? other_version_string
+      else
+        self.send comparator, other_version_string
+      end
+    end
+
     def compare_recursively ary1, ary2
       # Short-circuit the recursion entirely if they're just equal
       return 0 if ary1 == ary2
@@ -105,4 +145,3 @@ module Semantic
     end
   end
 end
-

data/spec/version_spec.rb

@@ -146,6 +146,33 @@ describe Semantic::Version do
       @v1_5_9_pre_1_build_4352.should == @v1_5_9_pre_1_build_5127
       @v1_5_9_pre_1_build_4352.should == @v1_5_9_pre_1
     end
+
+    it "determines whether it satisfies >= style specifications" do
+      @v1_6_0.satisfies('>=1.6.0').should be_true
+      @v1_6_0.satisfies('<=1.6.0').should be_true
+      @v1_6_0.satisfies('>=1.5.0').should be_true
+      @v1_6_0.satisfies('<=1.5.0').should_not be_true
+
+      # partial / non-semver numbers after comparator are extremely common in
+      # version specifications in the wild
+
+      @v1_6_0.satisfies('>1.5').should be_true
+      @v1_6_0.satisfies('<1').should_not be_true
+    end
+
+    it "determines whether it satisfies * style specifications" do
+      @v1_6_0.satisfies('1.*').should be_true
+      @v1_6_0.satisfies('1.6.*').should be_true
+      @v1_6_0.satisfies('2.*').should_not be_true
+      @v1_6_0.satisfies('1.5.*').should_not be_true
+    end
+
+    it "determines whether it satisfies ~ style specifications" do
+      @v1_6_0.satisfies('~1.6').should be_true
+      @v1_5_9_pre_1.satisfies('~1.5').should be_true
+      @v1_6_0.satisfies('~1.5').should_not be_true
+    end
+
   end
 
   context "type coercions" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Josh Lindsey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Semantic Version utility class