semantic 1.0.0 → 1.6.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 49f4f8185e5b08f5e55c52e84b9e97514734e773
+  data.tar.gz: d0348d4f5c518868f35a68fc17730e65b6b19a41
+SHA512:
+  metadata.gz: e8b5397c167716fec08c08c156cd83adc8feaf97865311cd761bc344dfbeac4dc88aad60c2b4b771e4e69ffae217bdefd875715d05222ea6a486f01fb516419e
+  data.tar.gz: 4ac7c975674f02f07cbffbd5829532305f998ce74922866a413d6182041cf2cad3e0b8272d3546cab7793752657b1a60d026db175408f69a91411e70a290c7e3

data/README.md

@@ -1,5 +1,6 @@
 Semantic
 ========
+[![BuildStatus](https://travis-ci.org/jlindsey/semantic.svg?branch=master)](https://travis-ci.org/jlindsey/semantic)
 
 A small Ruby utility class to aid in the storage, parsing, and comparison of SemVer-style Version strings.
 
@@ -26,6 +27,21 @@ newer_version <=> version # => 1
 complex_version = Semantic::Version.new '3.7.9-pre.1+revision.15723'
 complex_version.pre       # => "pre.1"
 complex_version.build     # => "revision.15623"
+
+# semantic supports Pessimistic Operator
+version.satisfies? '~> 1.5'    # => true
+version.satisfies? '~> 1.6.0'  # => true
+
+# incrementing version numbers
+version = Semantic::Version.new('0.1.0')
+new_version = version.increment!(:major)    # 1.1.0
+new_version = version.increment!(:minor)    # 0.2.0
+new_version = version.increment!(:patch)    # 0.1.1
+
+new_version = verstion.major!               # 1.1.0
+new_version = verstion.minor!               # 0.2.0
+new_version = verstion.patch!               # 0.1.1
+# (note: increment! & friends return a copy and leave the original unchanged)
 ```
 
 There is also a set of core extensions as an optional require:
@@ -39,5 +55,5 @@ require 'semantic/core_ext'
 
 License
 -------
-Copyright (c) 2012 Josh Lindsey. See LICENSE for details.
+Copyright (c) 2012 Josh Lindsey. See [LICENSE](LICENSE) for details.
 

data/lib/semantic/core_ext.rb

@@ -2,4 +2,8 @@ class String
   def to_version
     Semantic::Version.new self
   end
+
+  def is_version?
+    (match Semantic::Version::SemVerRegexp) ? true : false
+  end
 end

data/lib/semantic/version.rb

@@ -1,85 +1,180 @@
 # See: http://semver.org
-class Semantic::Version
-  SemVerRegexp = /^(\d+\.\d+\.\d+)(-([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?(\+([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?$/
-  attr_accessor :major, :minor, :patch, :pre, :build
+module Semantic
+  class Version
+    include Comparable
 
-  def initialize version_str
-    raise ArgumentError.new("Not a valid SemVer Version (http://semver.org)") unless version_str =~ SemVerRegexp
+    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/
 
-    version, parts = version_str.split '-'
-    if not parts.nil? and parts.include? '+'
-      @pre, @build = parts.split '+'
-    elsif version.include? '+'
-      version, @build = version.split '+'
-    else
-      @pre = parts
+
+    attr_accessor :major, :minor, :patch, :pre
+    attr_reader :build
+
+    def initialize version_str
+      v = version_str.match(SemVerRegexp)
+
+      raise ArgumentError.new("#{version_str} is not a valid SemVer Version (http://semver.org)") if v.nil?
+      @major = v[1].to_i
+      @minor = v[2].to_i
+      @patch = v[3].to_i
+      @pre = v[4]
+      @build = v[5]
+      @version = version_str
     end
 
 
-    @major, @minor, @patch = version.split('.').map &:to_i
-  end
+    def build=(b)
+      @build = (!b.nil? && b.empty?) ? nil : b
+    end
 
-  def to_a
-    [@major, @minor, @patch, @pre, @build]
-  end
+    def identifiers(pre)
+      array = pre.split(/[\.\-]/)
+      array.each_with_index {|e,i| array[i] = Integer(e) if /\A\d+\z/.match(e)}
+      return array
+    end
 
-  def to_s
-    str = [@major, @minor, @patch].join '.'
-    str << '-' << @pre unless @pre.nil?
-    str << '+' << @build unless @build.nil?
+    def compare_pre(prea, preb)
+      if prea.nil? || preb.nil?
+        return 0 if prea.nil? && preb.nil?
+        return 1 if prea.nil?
+        return -1 if preb.nil?
+      end
+      a = identifiers(prea)
+      b = identifiers(preb)
+      smallest = a.size < b.size ? a : b
+      smallest.each_with_index do |e, i|
+        c = a[i] <=> b[i]
+        if c.nil?
+          return a[i].is_a?(Integer) ? -1 : 1
+        elsif c != 0
+          return c
+        end
+      end
+      return a.size <=> b.size
+    end
 
-    str
-  end
+    def to_a
+      [@major, @minor, @patch, @pre, @build]
+    end
 
-  def to_h
-    keys = [:major, :minor, :patch, :pre, :build]
-    Hash[keys.zip(self.to_a)]
-  end
+    def to_s
+      str = [@major, @minor, @patch].join '.'
+      str << '-' << @pre unless @pre.nil?
+      str << '+' << @build unless @build.nil?
+      str
+    end
 
-  alias to_hash to_h
-  alias to_array to_a
-  alias to_string to_s
+    def to_h
+      keys = [:major, :minor, :patch, :pre, :build]
+      Hash[keys.zip(self.to_a)]
+    end
 
-  def <=> other_version
-    other_version = Version.new(other_version) if other_version.is_a? String
-    compare_recursively self.to_a.dup, other_version.to_a.dup
-  end
+    alias to_hash to_h
+    alias to_array to_a
+    alias to_string to_s
 
-  def > other_version
-    if (self <=> other_version) == 1 then true else false end
-  end
+    def hash
+      to_a.hash
+    end
 
-  def < other_version
-    if (self <=> other_version) == -1 then true else false end
-  end
+    def eql? other_version
+      self.hash == other_version.hash
+    end
 
-  private
+    def <=> other_version
+      other_version = Version.new(other_version) if other_version.is_a? String
+      [:major, :minor, :patch].each do |part|
+        c = (self.send(part) <=> other_version.send(part))
+        if c != 0
+          return c
+        end
+      end
+      return compare_pre(self.pre, other_version.pre)
+    end
 
-  def compare_recursively ary1, ary2
-    # Short-circuit the recursion entirely if they're just equal
-    return 0 if ary1 == ary2
+    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)
+        elsif comparator == '~>'
+          pessimistic_match? other_version_string
+        else
+          tilde_matches? other_version_string
+        end
+      end
+    end
 
-    a = ary1.shift; b = ary2.shift
+    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
 
-    # Reached the end of the arrays, equal all the way down
-    return 0 if a.nil? and b.nil?
+    [:major, :minor, :patch].each do |term|
+      define_method("#{term}!") { increment!(term) }
+    end
 
-    # Mismatched types (ie. one has a build and the other doesn't)
-    if a.nil? and not b.nil?
-      return -1
-    elsif not a.nil? and b.nil?
-      return 1
+    def increment!(term)
+      term = term.to_sym
+      new_version = clone
+      new_value = send(term) + 1
+
+      new_version.send("#{term}=", new_value)
+      new_version.minor = 0 if term == :major
+      new_version.patch = 0 if term == :major || term == :minor
+      new_version.build = new_version.pre = nil
+
+      new_version
     end
 
-    # Less or greater than
-    if a > b
-      return 1
-    elsif a < b
-      return -1
+    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 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
 
-    # Recurse down to the next part if equal
-    compare_recursively ary1, ary2
   end
 end
-

data/lib/semantic.rb

@@ -1,5 +1,4 @@
 module Semantic
-  GEM_VERSION = '1.0.0'
+  GEM_VERSION = '1.6.1'
   autoload :Version, 'semantic/version'
 end
-

data/spec/core_ext_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
 require 'semantic/core_ext'
 
+# rubocop:disable Metrics/BlockLength
 describe 'Core Extensions' do
-  context "String#to_version" do
+  context 'String#to_version' do
     before(:each) do
       @test_versions = [
         '1.0.0',
@@ -23,20 +24,39 @@ describe 'Core Extensions' do
       ]
     end
 
-    it "extends String with a #to_version method" do
-      String.new.should respond_to(:to_version)
+    it 'extends String with a #to_version method' do
+      expect('').to respond_to(:to_version)
     end
 
-    it "converts the String into a Version object" do
+    it 'converts the String into a Version object' do
       @test_versions.each do |v|
-        expect { v.to_version }.to_not raise_error(ArgumentError)
-        v.to_version.should be_a(Semantic::Version)
+        expect { v.to_version }.to_not raise_error
+        expect(v.to_version).to be_a(Semantic::Version)
       end
     end
 
-    it "raises an error on invalid strings" do
+    it 'raises an error on invalid strings' do
       @bad_versions.each do |v|
-        expect { v.to_version }.to raise_error(ArgumentError)
+        expect { v.to_version }.to raise_error(
+          ArgumentError,
+          /not a valid SemVer/
+        )
+      end
+    end
+
+    it 'extends String with a #is_version? method' do
+      expect('').to respond_to(:is_version?)
+    end
+
+    it 'detects valid semantic version strings' do
+      @test_versions.each do |v|
+        expect(v.is_version?).to be true
+      end
+    end
+
+    it 'detects invalid semantic version strings' do
+      @bad_versions.each do |v|
+        expect(v.is_version?).to be false
       end
     end
   end

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@ RSpec.configure do |config|
   require 'semantic'
 
   config.mock_framework = :rspec
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

data/spec/version_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-
+# rubocop:disable Metrics/BlockLength, Style/VariableNumber
 describe Semantic::Version do
   before(:each) do
     @test_versions = [
@@ -17,111 +17,342 @@ describe Semantic::Version do
       '1.a.3',
       'a.3.4',
       '5.2.a',
-      'pre3-1.5.3'
+      'pre3-1.5.3',
+      "I am not a valid semver\n0.0.0\nbut I still pass"
     ]
   end
 
-  context "parsing" do
-    it "parses valid SemVer versions" do
+  context 'parsing' do
+    it 'parses valid SemVer versions' do
       @test_versions.each do |v|
-        expect { Semantic::Version.new v }.to_not raise_error(ArgumentError)
+        expect { Semantic::Version.new v }.not_to raise_error
       end
     end
 
-    it "raises an error on invalid versions" do
+    it 'raises an error on invalid versions' do
       @bad_versions.each do |v|
-        expect { Semantic::Version.new v }.to raise_error(ArgumentError)
+        expect { Semantic::Version.new v }.to raise_error(
+          ArgumentError,
+          /not a valid SemVer/
+        )
       end
     end
 
-    it "stores parsed versions in member variables" do
+    it 'stores parsed versions in member variables' do
       v1 = Semantic::Version.new '1.5.9'
-      v1.major.should == 1
-      v1.minor.should == 5
-      v1.patch.should == 9
-      v1.pre.should be_nil
-      v1.build.should be_nil
+      expect(v1.major).to eq(1)
+      expect(v1.minor).to eq(5)
+      expect(v1.patch).to eq(9)
+      expect(v1.pre).to be_nil
+      expect(v1.build).to be_nil
 
       v2 = Semantic::Version.new '0.0.1-pre.1'
-      v2.major.should == 0
-      v2.minor.should == 0
-      v2.patch.should == 1
-      v2.pre.should == 'pre.1'
-      v2.build.should be_nil
+      expect(v2.major).to eq(0)
+      expect(v2.minor).to eq(0)
+      expect(v2.patch).to eq(1)
+      expect(v2.pre).to eq('pre.1')
+      expect(v2.build).to be_nil
 
       v3 = Semantic::Version.new '1.0.1-pre.5+build.123.5'
-      v3.major.should == 1
-      v3.minor.should == 0
-      v3.patch.should == 1
-      v3.pre.should == 'pre.5'
-      v3.build.should == 'build.123.5'
+      expect(v3.major).to eq(1)
+      expect(v3.minor).to eq(0)
+      expect(v3.patch).to eq(1)
+      expect(v3.pre).to eq('pre.5')
+      expect(v3.build).to eq('build.123.5')
 
       v4 = Semantic::Version.new '0.0.0+hello'
-      v4.major.should == 0
-      v4.minor.should == 0
-      v4.patch.should == 0
-      v4.pre.should be_nil
-      v4.build.should == 'hello'
+      expect(v4.major).to eq(0)
+      expect(v4.minor).to eq(0)
+      expect(v4.patch).to eq(0)
+      expect(v4.pre).to be_nil
+      expect(v4.build).to eq('hello')
+    end
+
+    it 'provides round-trip fidelity for an empty build parameter' do
+      v = Semantic::Version.new('1.2.3')
+      v.build = ''
+      expect(Semantic::Version.new(v.to_s).build).to eq(v.build)
+    end
+
+    it 'provides round-trip fidelity for a nil build parameter' do
+      v = Semantic::Version.new('1.2.3+build')
+      v.build = nil
+      expect(Semantic::Version.new(v.to_s).build).to eq(v.build)
     end
   end
 
-  context "comparisons" do
+  context 'comparisons' do
     before(:each) do
-      @v1 = Semantic::Version.new '1.5.9'
-      @v2 = Semantic::Version.new '1.6.0'
-      @v3 = Semantic::Version.new '1.5.9-pre.1'
-      @v4 = Semantic::Version.new '1.5.9-pre.1+build.5127'
+      # These three are all semantically equivalent, according to the spec.
+      @v1_5_9_pre_1 = Semantic::Version.new '1.5.9-pre.1'
+      @v1_5_9_pre_1_build_5127 = Semantic::Version.new '1.5.9-pre.1+build.5127'
+      @v1_5_9_pre_1_build_4352 = Semantic::Version.new '1.5.9-pre.1+build.4352'
+      # more pre syntax testing: "-"
+      @v3_13_0_75_generic = Semantic::Version.new '3.13.0-75-generic'
+      @v3_13_0_141_generic = Semantic::Version.new '3.13.0-141-generic'
+
+      @v1_5_9 = Semantic::Version.new '1.5.9'
+      @v1_6_0 = Semantic::Version.new '1.6.0'
+
+      @v1_6_0_alpha = Semantic::Version.new '1.6.0-alpha'
+      @v1_6_0_alpha_1 = Semantic::Version.new '1.6.0-alpha.1'
+      @v1_6_0_alpha_beta = Semantic::Version.new '1.6.0-alpha.beta'
+      @v1_6_0_beta = Semantic::Version.new '1.6.0-beta'
+      @v1_6_0_beta_2 = Semantic::Version.new '1.6.0-beta.2'
+      @v1_6_0_beta_11 = Semantic::Version.new '1.6.0-beta.11'
+      @v1_6_0_rc_1 = Semantic::Version.new '1.6.0-rc.1'
+
+      # expected order:
+      # 1.6.0-alpha < 1.6.0-alpha.1 < 1.6.0-alpha.beta < 1.6.0-beta
+      # < 1.6.0-beta.2 < 1.6.0-beta.11 < 1.6.0-rc.1 < 1.6.0.
+    end
+
+    it 'determines sort order' do
+      # The second parameter here can be a string, so we want to ensure that
+      # this kind of comparison works also.
+      expect((@v1_5_9_pre_1 <=> @v1_5_9_pre_1.to_s)).to eq(0)
+
+      expect((@v1_5_9_pre_1 <=> @v1_5_9_pre_1_build_5127)).to eq(0)
+      expect((@v1_5_9_pre_1 <=> @v1_5_9)).to eq(-1)
+      expect((@v1_5_9_pre_1_build_5127 <=> @v1_5_9)).to eq(-1)
+
+      expect(@v1_5_9_pre_1_build_5127.build).to eq('build.5127')
+
+      expect((@v1_5_9 <=> @v1_6_0)).to eq(-1)
+      expect((@v1_6_0 <=> @v1_5_9)).to eq(1)
+      expect((@v1_6_0 <=> @v1_5_9_pre_1)).to eq(1)
+      expect((@v1_5_9_pre_1 <=> @v1_6_0)).to eq(-1)
+
+      expect([@v1_5_9_pre_1, @v1_5_9_pre_1_build_5127, @v1_5_9, @v1_6_0]
+        .reverse.sort).to \
+          eq([@v1_5_9_pre_1, @v1_5_9_pre_1_build_5127, @v1_5_9, @v1_6_0])
+    end
+
+    it 'determines sort order pre' do
+      ary = [@v1_6_0_alpha, @v1_6_0_alpha_1, @v1_6_0_alpha_beta,
+             @v1_6_0_beta, @v1_6_0_beta_2, @v1_6_0_beta_11, @v1_6_0_rc_1,
+             @v1_6_0]
+      expect(ary.shuffle.sort).to eq(ary)
+    end
+
+    it 'determine alternate char sep works in pre' do
+      expect((@v3_13_0_75_generic <=> @v3_13_0_141_generic.to_s)).to eq(-1)
+      expect((@v3_13_0_75_generic <=> @v3_13_0_141_generic)).to eq(-1)
+      expect((@v3_13_0_75_generic <=> '3.13.0-75-generic')).to eq(0)
+      expect((@v3_13_0_75_generic <=> '3.13.0-141-generic')).to eq(-1)
+      expect((@v3_13_0_141_generic <=> '3.13.0-75-generic')).to eq(1)
+    end
+
+    it 'determines whether it is greater than another instance' do
+      # These should be equal, since "Build metadata SHOULD be ignored
+      # when determining version precedence".
+      # (SemVer 2.0.0-rc.2, paragraph 10 - http://www.semver.org)
+      expect(@v1_5_9_pre_1).not_to be > @v1_5_9_pre_1_build_5127
+      expect(@v1_5_9_pre_1).not_to be < @v1_5_9_pre_1_build_5127
+
+      expect(@v1_6_0).to be > @v1_5_9
+      expect(@v1_5_9).not_to be > @v1_6_0
+      expect(@v1_5_9).to be > @v1_5_9_pre_1_build_5127
+      expect(@v1_5_9).to be > @v1_5_9_pre_1
+    end
+
+    it 'determines whether it is less than another instance' do
+      expect(@v1_5_9_pre_1).not_to be < @v1_5_9_pre_1_build_5127
+      expect(@v1_5_9_pre_1_build_5127).not_to be < @v1_5_9_pre_1
+      expect(@v1_5_9_pre_1).to be < @v1_5_9
+      expect(@v1_5_9_pre_1).to be < @v1_6_0
+      expect(@v1_5_9_pre_1_build_5127).to be < @v1_6_0
+      expect(@v1_5_9).to be < @v1_6_0
+    end
+
+    it 'determines whether it is greater than or equal to another instance' do
+      expect(@v1_5_9_pre_1).to be >= @v1_5_9_pre_1
+      expect(@v1_5_9_pre_1).to be >= @v1_5_9_pre_1_build_5127
+      expect(@v1_5_9_pre_1_build_5127).to be >= @v1_5_9_pre_1
+      expect(@v1_5_9).to be >= @v1_5_9_pre_1
+      expect(@v1_6_0).to be >= @v1_5_9
+      expect(@v1_5_9_pre_1_build_5127).not_to be >= @v1_6_0
+    end
+
+    it 'determines whether it is less than or equal to another instance' do
+      expect(@v1_5_9_pre_1).to be <= @v1_5_9_pre_1_build_5127
+      expect(@v1_6_0).not_to be <= @v1_5_9
+      expect(@v1_5_9_pre_1_build_5127).to be <= @v1_5_9_pre_1_build_5127
+      expect(@v1_5_9).not_to be <= @v1_5_9_pre_1
+    end
+
+    it 'determines whether it is semantically equal to another instance' do
+      expect(@v1_5_9_pre_1).to eq(@v1_5_9_pre_1.dup)
+      expect(@v1_5_9_pre_1_build_5127).to eq(@v1_5_9_pre_1_build_5127.dup)
+
+      # "Semantically equal" is the keyword here; these are by definition
+      # not "equal" (different build), but should be treated as
+      # equal according to the spec.
+      expect(@v1_5_9_pre_1_build_4352).to eq(@v1_5_9_pre_1_build_5127)
+      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
+
+      # 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
     end
 
-    it "determines sort order" do
-      (@v1 <=> @v2).should == -1
-      (@v3 <=> @v1).should == 1
-      (@v3 <=> @v4).should == -1
-      (@v4 <=> @v4).should == 0
-      (@v4 <=> @v1).should == 1
+    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
+    end
 
-      [@v3, @v1, @v2, @v4].sort.should == [@v1, @v3, @v4, @v2]
+    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
     end
 
-    it "determines whether it is greater than another instance" do
-      @v1.should_not > @v2
-      @v4.should > @v3
-      @v2.should > @v4
-      @v3.should_not > @v4
+    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 it is less than another insance" do
-      @v1.should < @v2
-      @v2.should_not < @v4
-      @v4.should < @v2
-      @v3.should < @v4
+    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
 
-  context "type coercions" do
-    it "converts to a string" do
+  context 'type coercions' do
+    it 'converts to a string' do
       @test_versions.each do |v|
-        Semantic::Version.new(v).to_s.should == v
+        expect(Semantic::Version.new(v).to_s).to be == v
       end
     end
 
-    it "converts to an array" do
-      Semantic::Version.new('1.0.0').to_a.should == [1, 0, 0, nil, nil]
-      Semantic::Version.new('6.1.4-pre.5').to_a.should == [6, 1, 4, 'pre.5', nil]
-      Semantic::Version.new('91.6.0+build.17').to_a.should == [91, 6, 0, nil, 'build.17']
-      Semantic::Version.new('0.1.5-pre.7+build191').to_a.should == [0, 1, 5, 'pre.7', 'build191']
+    it 'converts to an array' do
+      expect(Semantic::Version.new('1.0.0').to_a).to \
+        eq([1, 0, 0, nil, nil])
+      expect(Semantic::Version.new('6.1.4-pre.5').to_a).to \
+        eq([6, 1, 4, 'pre.5', nil])
+      expect(Semantic::Version.new('91.6.0+build.17').to_a).to \
+        eq([91, 6, 0, nil, 'build.17'])
+      expect(Semantic::Version.new('0.1.5-pre.7+build191').to_a).to \
+        eq([0, 1, 5, 'pre.7', 'build191'])
     end
 
-    it "converts to a hash" do
-      Semantic::Version.new('1.0.0').to_h.should == { major: 1, minor: 0, patch: 0, pre: nil, build: nil }
-      Semantic::Version.new('6.1.4-pre.5').to_h.should == { major: 6, minor: 1, patch: 4, pre: 'pre.5', build: nil }
-      Semantic::Version.new('91.6.0+build.17').to_h.should == { major: 91, minor: 6, patch: 0, pre: nil, build: 'build.17' }
-      Semantic::Version.new('0.1.5-pre.7+build191').to_h.should == { major: 0, minor: 1, patch: 5, pre: 'pre.7', build: 'build191' }
+    it 'converts to a hash' do
+      expect(Semantic::Version.new('1.0.0').to_h).to \
+        eq(major: 1, minor: 0, patch: 0, pre: nil, build: nil)
+      expect(Semantic::Version.new('6.1.4-pre.5').to_h).to \
+        eq(major: 6, minor: 1, patch: 4, pre: 'pre.5', build: nil)
+      expect(Semantic::Version.new('91.6.0+build.17').to_h).to \
+        eq(major: 91, minor: 6, patch: 0, pre: nil, build: 'build.17')
+      expect(Semantic::Version.new('0.1.5-pre.7+build191').to_h).to \
+        eq(major: 0, minor: 1, patch: 5, pre: 'pre.7', build: 'build191')
     end
 
-    it "aliases conversion methods" do
+    it 'aliases conversion methods' do
       v = Semantic::Version.new('0.0.0')
-      [:to_hash, :to_array, :to_string].each { |sym| v.should respond_to(sym) }
+      [:to_hash, :to_array, :to_string].each do |sym|
+        expect(v).to respond_to(sym)
+      end
+    end
+  end
+
+  it 'as hash key' do
+    hash = {}
+    hash[Semantic::Version.new('1.2.3-pre1+build2')] = 'semantic'
+    expect(hash[Semantic::Version.new('1.2.3-pre1+build2')]).to eq('semantic')
+  end
+
+  describe '#major!' do
+    subject { described_class.new('1.2.3-pre1+build2') }
+
+    context 'changing the major term' do
+      it 'changes the major version and resets the others' do
+        expect(subject.major!).to eq('2.0.0')
+      end
+    end
+  end
+
+  describe '#minor!' do
+    subject { described_class.new('1.2.3-pre1+build2') }
+
+    context 'changing the minor term' do
+      it 'changes minor term and resets patch, pre and build' do
+        expect(subject.minor!).to eq('1.3.0')
+      end
+    end
+  end
+
+  describe '#patch!' do
+    subject { described_class.new('1.2.3-pre1+build2') }
+
+    context 'changing the patch term' do
+      it 'changes the patch term and resets the pre and build' do
+        expect(subject.patch!).to eq('1.2.4')
+      end
+    end
+  end
+
+  describe '#increment!' do
+    subject { described_class.new('1.2.3-pre1+build2') }
+
+    context 'changing the minor term' do
+      context 'with a string' do
+        it 'changes the minor term and resets the path, pre and build' do
+          expect(subject.increment!('minor')).to eq('1.3.0')
+        end
+      end
+
+      context 'with a symbol' do
+        it 'changes the minor term and resets the path, pre and build' do
+          expect(subject.increment!(:minor)).to eq('1.3.0')
+        end
+      end
     end
   end
 end

metadata

@@ -1,91 +1,84 @@
 --- !ruby/object:Gem::Specification
 name: semantic
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.6.1
 platform: ruby
 authors:
 - Josh Lindsey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
-description: ! 'Semantic Version utility class for parsing, storing, and comparing
-  versions. See: http://semver.org'
+        version: '3'
+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: []
 files:
-- lib/semantic/core_ext.rb
-- lib/semantic/version.rb
-- lib/semantic.rb
 - LICENSE
 - README.md
+- lib/semantic.rb
+- lib/semantic/core_ext.rb
+- lib/semantic/version.rb
 - spec/core_ext_spec.rb
 - spec/spec_helper.rb
 - spec/version_spec.rb
 homepage: https://github.com/jlindsey/semantic
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.6.13
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Semantic Version utility class
 test_files:
 - spec/core_ext_spec.rb
 - spec/spec_helper.rb
 - spec/version_spec.rb
-has_rdoc: