semantic 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d064086ebe8f746d56e7f03e1897210d3ffbebd
-  data.tar.gz: d3ca4b76c52dc700d6ffeec7a0fe2feda43d4e73
+  metadata.gz: 25912a3ae732b9bee108db7982c3c32a8970579c
+  data.tar.gz: fcd186042df03126f0318442f62e8eccc0b726d6
 SHA512:
-  metadata.gz: be0225ee57be527639197377e7f97872166f5fb34d931d2fd56044fbb390c180e26116f266f94f61603e89bb76d94380242bb2998125ab80b913036a92e1f4d9
-  data.tar.gz: 53a92041fd0d46b7820c86156524d09693fa992c55826d040b1876b132851c1f47e4e639f87f13f4a580b74a89fceeb64ab701a542437fbd817e004217e68d3d
+  metadata.gz: b3bf5332d05f69d77d1e04889d2782b201c8c8e1215854abcf5c695cf46793bcf013f5c901707683429989585c155f1111bcd0ad55504db3f865ffbdc1de6636
+  data.tar.gz: 3bedeefba2d4579b5bc262f9b09efa2b7ab625b4b715feb6059f93fced4661632ca037d62686da05c4f2f0527f07bbefd80ee2ae47cb835c0675ccf37b3637d1

data/lib/semantic.rb

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

data/lib/semantic/version.rb

@@ -1,29 +1,54 @@
 # See: http://semver.org
 module Semantic
   class Version
-    SemVerRegexp = /\A(\d+\.\d+\.\d+)(-([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?(\+([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?\Z/
-    attr_accessor :major, :minor, :patch, :pre, :build
+    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/
 
-    def initialize version_str
-      raise ArgumentError.new("#{version_str} is not a valid SemVer Version (http://semver.org)") unless version_str =~ SemVerRegexp
 
-      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
-      end
+    attr_accessor :major, :minor, :patch, :pre, :build
 
+    def initialize version_str
+      v = version_str.match(SemVerRegexp)
 
-      @major, @minor, @patch = version.split('.').map(&:to_i)
+      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
 
+
     def build=(b)
       @build = (!b.nil? && b.empty?) ? nil : b
     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 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
+
     def to_a
       [@major, @minor, @patch, @pre, @build]
     end
@@ -32,7 +57,6 @@ module Semantic
       str = [@major, @minor, @patch].join '.'
       str << '-' << @pre unless @pre.nil?
       str << '+' << @build unless @build.nil?
-
       str
     end
 
@@ -45,19 +69,23 @@ module Semantic
     alias to_array to_a
     alias to_string to_s
 
-    def <=> other_version
-      other_version = Version.new(other_version) if other_version.is_a? String
-
-      v1 = self.dup
-      v2 = other_version.dup
+    def hash
+      to_a.hash
+    end
 
-      # The build must be excluded from the comparison, so that e.g. 1.2.3+foo and 1.2.3+bar are semantically equal.
-      # "Build metadata SHOULD be ignored when determining version precedence".
-      # (SemVer 2.0.0-rc.2, paragraph 10 - http://www.semver.org)
-      v1.build = nil
-      v2.build = nil
+    def eql? other_version
+      self.hash == other_version.hash
+    end
 
-      compare_recursively(v1.to_a, v2.to_a)
+    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 > other_version
@@ -103,6 +131,7 @@ module Semantic
     end
 
     def increment!(term)
+      term = term.to_sym
       new_version = clone
       new_value = send(term) + 1
 
@@ -138,30 +167,5 @@ module Semantic
       end
     end
 
-    def compare_recursively ary1, ary2
-      # Short-circuit the recursion entirely if they're just equal
-      return 0 if ary1 == ary2
-
-      a = ary1.shift; b = ary2.shift
-
-      # Reached the end of the arrays, equal all the way down
-      return 0 if a.nil? and b.nil?
-
-      # Mismatched types (ie. one has a pre and the other doesn't)
-      if a.nil? and not b.nil?
-        return 1
-      elsif not a.nil? and b.nil?
-        return -1
-      end
-
-      if a < b
-        return -1
-      elsif a > b
-        return 1
-      end
-
-      # Versions are equal thus far, so recurse down to the next part.
-      compare_recursively ary1, ary2
-    end
   end
 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,23 @@ 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()
-        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()
+        expect { v.to_version }.to raise_error(
+          ArgumentError,
+          /not a valid SemVer/
+        )
       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 = [
@@ -22,63 +22,66 @@ describe Semantic::Version do
     ]
   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()
+        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()
+        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'
-    end
-    
-    it "provides round-trip fidelity for an empty build parameter" do
-      v = Semantic::Version.new("1.2.3")
-      v.build = ""
+      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")
+    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
       # These three are all semantically equivalent, according to the spec.
       @v1_5_9_pre_1 = Semantic::Version.new '1.5.9-pre.1'
@@ -87,159 +90,211 @@ describe Semantic::Version do
 
       @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.
-      (@v1_5_9_pre_1 <=> @v1_5_9_pre_1.to_s).should == 0
+    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)
 
-      (@v1_5_9_pre_1 <=> @v1_5_9_pre_1_build_5127).should == 0
-      (@v1_5_9_pre_1 <=> @v1_5_9).should == -1
-      (@v1_5_9_pre_1_build_5127 <=> @v1_5_9).should == -1
+      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)
 
-      @v1_5_9_pre_1_build_5127.build.should == 'build.5127'
+      expect(@v1_5_9_pre_1_build_5127.build).to eq('build.5127')
 
-      (@v1_5_9 <=> @v1_5_9).should == 0
+      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)
 
-      (@v1_5_9 <=> @v1_6_0).should == -1
-      (@v1_6_0 <=> @v1_5_9).should == 1
-      (@v1_6_0 <=> @v1_5_9_pre_1).should == 1
-      (@v1_5_9_pre_1 <=> @v1_6_0).should == -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
 
-      [@v1_5_9_pre_1, @v1_5_9_pre_1_build_5127, @v1_5_9, @v1_6_0]
-        .reverse
-        .sort
-        .should == [@v1_5_9_pre_1, @v1_5_9_pre_1_build_5127, @v1_5_9, @v1_6_0]
+    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 "determines whether it is greater than another instance" do
-      # These should be equal, since "Build metadata SHOULD be ignored when determining version precedence".
+    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)
-      @v1_5_9_pre_1.should_not > @v1_5_9_pre_1_build_5127
-      @v1_5_9_pre_1.should_not < @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_5_9_pre_1).not_to be < @v1_5_9_pre_1_build_5127
 
-      @v1_6_0.should > @v1_5_9
-      @v1_5_9.should_not > @v1_6_0
-      @v1_5_9.should > @v1_5_9_pre_1_build_5127
-      @v1_5_9.should > @v1_5_9_pre_1
+      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
-      @v1_5_9_pre_1.should_not < @v1_5_9_pre_1_build_5127
-      @v1_5_9_pre_1_build_5127.should_not < @v1_5_9_pre_1
-      @v1_5_9_pre_1.should < @v1_5_9
-      @v1_5_9_pre_1.should < @v1_6_0
-      @v1_5_9_pre_1_build_5127.should < @v1_6_0
-      @v1_5_9.should < @v1_6_0
+    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
-      @v1_5_9_pre_1.should >= @v1_5_9_pre_1
-      @v1_5_9_pre_1.should >= @v1_5_9_pre_1_build_5127
-      @v1_5_9_pre_1_build_5127.should >= @v1_5_9_pre_1
-      @v1_5_9.should >= @v1_5_9_pre_1
-      @v1_6_0.should >= @v1_5_9
-      @v1_5_9_pre_1_build_5127.should_not >= @v1_6_0
+    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
-      @v1_5_9_pre_1.should <= @v1_5_9_pre_1_build_5127
-      @v1_6_0.should_not <= @v1_5_9
-      @v1_5_9_pre_1_build_5127.should <= @v1_5_9_pre_1_build_5127
-      @v1_5_9.should_not <= @v1_5_9_pre_1
+    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
-      @v1_5_9_pre_1.should == @v1_5_9_pre_1.dup
-      @v1_5_9_pre_1_build_5127.should == @v1_5_9_pre_1_build_5127.dup
+    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
+      # "Semantically equal" is the keyword here; these are by definition
+      # not "equal" (different build), but should be treated as
       # equal according to the spec.
-      @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
+      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 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
+    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
 
-      @v1_6_0.satisfies('>1.5').should be true
-      @v1_6_0.satisfies('<1').should_not 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
-      @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
+    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
 
-    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
+    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
-
   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
-        subject.major!.should == '2.0.0'
+        expect(subject.major!).to eq('2.0.0')
       end
     end
   end
 
-  describe '#minor' do
+  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
-        subject.minor!.should == '1.3.0'
+        expect(subject.minor!).to eq('1.3.0')
       end
     end
   end
 
-  describe '#patch' do
+  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
-        subject.patch!.should == '1.2.4'
+        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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Josh Lindsey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3'
 description: 'Semantic Version utility class for parsing, storing, and comparing versions.
   See: http://semver.org'
 email:
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Semantic Version utility class