naturalsorter 3.0.13 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15cab37f9f3a0893043acaa9a9eda71e647895b8
-  data.tar.gz: 4f18b69b08800dfc853dfb7957a9cf9634c05831
+  metadata.gz: 99cf7219e287435ad7d1f71da79bd53727a1017e
+  data.tar.gz: 5d72f5b05da3d87fa50d7e15182421120189e77b
 SHA512:
-  metadata.gz: 5d41201fb10c574f33d537c17863512f98722fc559d77dc077d2cc36c82190a35f038187f4a2e32d45a15de38eaaf53bfdfa982d71876e0a258018f1ef06e517
-  data.tar.gz: 9d76fa451ff3a21597bedd0c435b11ece6626c41d7bc19d68220024377ac0ac7cc1898a16b6c6750839ba7e5ad117d205307217d0de6d18d4bf26994e76794c3
+  metadata.gz: 2f1e54e6f62b500f482c98e07ad523f2aabe929f9458b974a224ae876d9e17bf6f6a296282d13032cc2900bed6a624f6730d592f943a8a23197a8fbcee3150b2
+  data.tar.gz: b59d4a2c2487a80e0cc383e15c623652d4b6b305ec4d2a7363e068c516fcc88e0a99ed702d7ece1dc4552d5ac01fbd5c113d11f109eedaeb0098fed4f1c57375

data/README.markdown

@@ -27,7 +27,7 @@ Because the default sort method does not recognize the numbers in the string. Th
 
 You should add this line to your Gemfile
 
-`gem 'naturalsorter', '3.0.13'`
+`gem 'naturalsorter', '3.0.14'`
 
 and run this command in your app root directory
 

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "3.0.13"
+  VERSION = "3.0.14"
 end

data/lib/versioncmp.rb

@@ -29,14 +29,26 @@ class Versioncmp
   #
   def self.compare(a_val, b_val)
 
-    a_empty = a_val.nil? || a_val.empty?
-    b_empty = b_val.nil? || b_val.empty?
+    a_empty = a_val.to_s.empty?
+    b_empty = b_val.to_s.empty?
 
     return  0 if  a_empty && b_empty
     return  0 if  a_val.eql?( b_val )
     return  1 if (a_empty == false) && (b_empty == true )
     return -1 if (b_empty == false) && (a_empty == true )
 
+    return  1 if b_val.length > a_val.length && b_val.match(/\A#{a_val}-SNAPSHOT/i)
+    return -1 if a_val.length > b_val.length && a_val.match(/\A#{a_val}-SNAPSHOT/i)
+
+    return  1 if b_val.length > a_val.length && b_val.match(/\A#{a_val}-BETA.*/i)
+    return -1 if a_val.length > b_val.length && a_val.match(/\A#{a_val}-BETA.*/i)
+
+    return  1 if b_val.length > a_val.length && b_val.match(/\A#{a_val}-alpha.*/i)
+    return -1 if a_val.length > b_val.length && a_val.match(/\A#{a_val}-alpha.*/i)
+
+    return  1 if b_val.length > a_val.length && b_val.match(/\A#{a_val}-rc.*/i)
+    return -1 if a_val.length > b_val.length && a_val.match(/\A#{a_val}-rc.*/i)
+
     a = pre_process a_val
     b = pre_process b_val
 

data/spec/naturalsorter/naturalsorter_spec.rb

@@ -5,38 +5,38 @@ describe Naturalsorter::Sorter do
 
   describe "sort" do
     it "cba is abc" do
-      Naturalsorter::Sorter.sort(["c", "b", "a"], true).should eql(["a", "b", "c"])
+      expect( Naturalsorter::Sorter.sort(["c", "b", "a"], true)).to eql(["a", "b", "c"])
     end
     it "is 2.2, 2.2.1-b03" do
-      Naturalsorter::Sorter.sort(["2.2.1-b03", "2.2"], true).should eql(["2.2", "2.2.1-b03"])
+      expect( Naturalsorter::Sorter.sort(["2.2.1-b03", "2.2"], true)).to eql(["2.2", "2.2.1-b03"])
     end
     it "c400b5a1 is a1b5c400" do
-      Naturalsorter::Sorter.sort(["a400", "a5", "a1"], true).should eql(["a1", "a5", "a400"])
+      expect( Naturalsorter::Sorter.sort(["a400", "a5", "a1"], true)).to eql(["a1", "a5", "a400"])
     end
     it "1.5.2 is lower than 1.5.2-patch" do
-      Naturalsorter::Sorter.sort(["1.5.2", "1.4.4", "1.5.2-patch"], true).should eql(["1.4.4", "1.5.2", "1.5.2-patch"])
+      expect( Naturalsorter::Sorter.sort(["1.5.2", "1.4.4", "1.5.2-patch"], true)).to eql(["1.4.4", "1.5.2", "1.5.2-patch"])
     end
   end
   describe "sort_desc" do
     it "cba is abc" do
-      Naturalsorter::Sorter.sort(["c", "b", "a"],      true, false).should eql(["c", "b", "a"])
+      expect( Naturalsorter::Sorter.sort(["c", "b", "a"],      true, false)).to eql(["c", "b", "a"])
     end
     it "c400b5a1 is a1b5c400" do
-      Naturalsorter::Sorter.sort(["a5", "a400", "a1"], true, false).should eql(["a400", "a5", "a1"])
+      expect( Naturalsorter::Sorter.sort(["a5", "a400", "a1"], true, false)).to eql(["a400", "a5", "a1"])
     end
   end
 
   describe  "sort_by_method" do
     it "c400b5a1 is a1b5c400" do
-      Naturalsorter::Sorter.sort_by_method(["a400", "a5", "a1"], "to_s", true).should eql(["a1", "a5", "a400"])
+      expect( Naturalsorter::Sorter.sort_by_method(["a400", "a5", "a1"], "to_s", true)).to eql(["a1", "a5", "a400"])
     end
     it "1.5.2 is lower than 1.5.2-patch" do
-      Naturalsorter::Sorter.sort_by_method(["1.5.2-patch", "1.5.2", "1.4.4"], "to_s", true).should eql(["1.4.4", "1.5.2", "1.5.2-patch"])
+      expect( Naturalsorter::Sorter.sort_by_method(["1.5.2-patch", "1.5.2", "1.4.4"], "to_s", true)).to eql(["1.4.4", "1.5.2", "1.5.2-patch"])
     end
   end
   describe  "sort_by_method_desc" do
     it "a5 a400 a1 is a400 a5 a1" do
-      Naturalsorter::Sorter.sort_by_method(["a5", "a400", "a1"], "to_s", true, false).should eql(["a400", "a5", "a1"])
+      expect( Naturalsorter::Sorter.sort_by_method(["a5", "a400", "a1"], "to_s", true, false)).to eql(["a400", "a5", "a1"])
     end
   end
 
@@ -44,154 +44,154 @@ describe Naturalsorter::Sorter do
   describe "sort_version" do
 
     it "1.1 is 1.1" do
-      Naturalsorter::Sorter.sort_version(["1.1"]).should eql(["1.1"])
+      expect( Naturalsorter::Sorter.sort_version(["1.1"])).to eql(["1.1"])
     end
 
     it "1.1 is bigger than 20030211.134440" do
-      Naturalsorter::Sorter.sort_version(["1.1", "20030211.134440"]).should eql(["20030211.134440", "1.1"])
+      expect( Naturalsorter::Sorter.sort_version(["1.1", "20030211.134440"])).to eql(["20030211.134440", "1.1"])
     end
 
     it "is 2.2.0, 2.2.1-b03" do
-      Naturalsorter::Sorter.sort_version(["2.2.1-b03", "2.2.0", ]).should eql(["2.2.0", "2.2.1-b03"])
+      expect( Naturalsorter::Sorter.sort_version(["2.2.1-b03", "2.2.0", ])).to eql(["2.2.0", "2.2.1-b03"])
     end
 
     it "is 2.2, 2.2.1-b03" do
-      Naturalsorter::Sorter.sort_version(["2.2.1-b03", "2.2", ]).should eql(["2.2", "2.2.1-b03"])
+      expect( Naturalsorter::Sorter.sort_version(["2.2.1-b03", "2.2", ])).to eql(["2.2", "2.2.1-b03"])
     end
 
     it "is 2.2.0-b03, 2.2.1-b03" do
-      Naturalsorter::Sorter.sort_version(["2.2.1-b03", "2.2.0-b03", ]).should eql(["2.2.0-b03", "2.2.1-b03"])
+      expect( Naturalsorter::Sorter.sort_version(["2.2.1-b03", "2.2.0-b03", ])).to eql(["2.2.0-b03", "2.2.1-b03"])
     end
 
     it "1.1, 1.0 is 1.0, 1.1" do
-      Naturalsorter::Sorter.sort_version(["1.1", "1.0"]).should eql(["1.0", "1.1"])
+      expect( Naturalsorter::Sorter.sort_version(["1.1", "1.0"])).to eql(["1.0", "1.1"])
     end
 
     it "1.0, 1.1 is 1.0, 1.1" do
-      Naturalsorter::Sorter.sort_version(["1.0", "1.1"]).should eql(["1.0", "1.1"])
+      expect( Naturalsorter::Sorter.sort_version(["1.0", "1.1"])).to eql(["1.0", "1.1"])
     end
 
     it "4.5, 1.0 is 1.0, 4.5" do
-      Naturalsorter::Sorter.sort_version(["4.5", "1.0"]).should eql(["1.0", "4.5"])
+      expect( Naturalsorter::Sorter.sort_version(["4.5", "1.0"])).to eql(["1.0", "4.5"])
     end
 
     it "1.0, 4.5 is 1.0, 4.5" do
-      Naturalsorter::Sorter.sort_version(["1.0", "4.5"]).should eql(["1.0", "4.5"])
+      expect( Naturalsorter::Sorter.sort_version(["1.0", "4.5"])).to eql(["1.0", "4.5"])
     end
 
     it "1.2, 1.1 is 1.1, 1.2" do
-      Naturalsorter::Sorter.sort_version(["0.4", "0.1", "1.1", "1.2", "1.0"]).should eql(["0.1", "0.4", "1.0", "1.1", "1.2"])
+      expect( Naturalsorter::Sorter.sort_version(["0.4", "0.1", "1.1", "1.2", "1.0"])).to eql(["0.1", "0.4", "1.0", "1.1", "1.2"])
     end
 
     it "1.2, 1.1 is 1.1, 1.2" do
-      Naturalsorter::Sorter.sort_version(     ["0.4", "0.1", "1.1", "1.2", "1.0", "1.0.RC1"]).should eql(["0.1", "0.4", "1.0.RC1", "1.0", "1.1", "1.2"])
+      expect( Naturalsorter::Sorter.sort_version(     ["0.4", "0.1", "1.1", "1.2", "1.0", "1.0.RC1"])).to eql(["0.1", "0.4", "1.0.RC1", "1.0", "1.1", "1.2"])
     end
 
     it "1.2, 1.1 is 1.1, 1.2" do
-      Naturalsorter::Sorter.sort_version(["0.4", "0.1", "1.1", "1.2", "1.0", "1.0.RC1"], false).should eql(["1.2", "1.1", "1.0", "1.0.RC1", "0.4", "0.1"])
+      expect( Naturalsorter::Sorter.sort_version(["0.4", "0.1", "1.1", "1.2", "1.0", "1.0.RC1"], false)).to eql(["1.2", "1.1", "1.0", "1.0.RC1", "0.4", "0.1"])
     end
 
     it "1.2, 1.1 is 1.1, 1.2" do
-      Naturalsorter::Sorter.sort_version(["0.4", "0.1", "1.1", "1.1.1", "1.2", "1.2.1", "1.0", "1.0.RC1"], false).should eql(["1.2.1", "1.2", "1.1.1", "1.1", "1.0", "1.0.RC1", "0.4", "0.1"])
+      expect( Naturalsorter::Sorter.sort_version(["0.4", "0.1", "1.1", "1.1.1", "1.2", "1.2.1", "1.0", "1.0.RC1"], false)).to eql(["1.2.1", "1.2", "1.1.1", "1.1", "1.0", "1.0.RC1", "0.4", "0.1"])
     end
 
     it "sorts this to the end 20040121.140929" do
-      Naturalsorter::Sorter.sort_version(["0.4", "0.1", "20040121.140929", "1.1.1", "1.2", "1.2.1", "1.0", "1.0.RC1"], false).should eql(["1.2.1", "1.2", "1.1.1", "1.0", "1.0.RC1", "0.4", "0.1", "20040121.140929"])
+      expect( Naturalsorter::Sorter.sort_version(["0.4", "0.1", "20040121.140929", "1.1.1", "1.2", "1.2.1", "1.0", "1.0.RC1"], false)).to eql(["1.2.1", "1.2", "1.1.1", "1.0", "1.0.RC1", "0.4", "0.1", "20040121.140929"])
     end
 
     it "1.2, 1.1 is 1.1, 1.2" do
-      Naturalsorter::Sorter.sort_version(["1.1", "1.2", "1.0"]).should eql(["1.0", "1.1", "1.2"])
+      expect( Naturalsorter::Sorter.sort_version(["1.1", "1.2", "1.0"])).to eql(["1.0", "1.1", "1.2"])
     end
 
     it "sort alphas and betas" do
-      Naturalsorter::Sorter.sort_version(["1.0.2", "1.0.1-b", "1.0.1-a"]).should eql(["1.0.1-a", "1.0.1-b", "1.0.2"])
+      expect( Naturalsorter::Sorter.sort_version(["1.0.2", "1.0.1-b", "1.0.1-a"])).to eql(["1.0.1-a", "1.0.1-b", "1.0.2"])
     end
 
     it "sort with RC" do
-      Naturalsorter::Sorter.sort_version(["1.1", "1.1.RC1"]).should eql(["1.1.RC1", "1.1"])
+      expect( Naturalsorter::Sorter.sort_version(["1.1", "1.1.RC1"])).to eql(["1.1.RC1", "1.1"])
     end
 
     it "sort with RC" do
-      Naturalsorter::Sorter.sort_version(["1.1.RC1", "1.1", "1.0"]).should eql(["1.0", "1.1.RC1", "1.1"])
+      expect( Naturalsorter::Sorter.sort_version(["1.1.RC1", "1.1", "1.0"])).to eql(["1.0", "1.1.RC1", "1.1"])
     end
 
     it "sorts 2.1.0-beta11 higher than 2.1.0-beta9" do
-      Naturalsorter::Sorter.sort_version(["2.1.0-beta11", "2.1.0-beta9"]).should eql(["2.1.0-beta9", "2.1.0-beta11"])
+      expect( Naturalsorter::Sorter.sort_version(["2.1.0-beta11", "2.1.0-beta9"])).to eql(["2.1.0-beta9", "2.1.0-beta11"])
     end
 
     it "1.5.2-patch is bigger than 1.5.2" do
-      Naturalsorter::Sorter.sort_version(["1.5.2", "1.4.4", "1.5.2-patch"]).should eql(["1.4.4", "1.5.2", "1.5.2-patch"])
+      expect( Naturalsorter::Sorter.sort_version(["1.5.2", "1.4.4", "1.5.2-patch"])).to eql(["1.4.4", "1.5.2", "1.5.2-patch"])
     end
 
   end
 
   describe "sort_version_by_method" do
     it "1.5.2-patch is bigger than 1.5.2" do
-      Naturalsorter::Sorter.sort_version_by_method(["1.5.2", "1.4.4", "1.4.2", "1.5.2-patch2", "1.5.2-patch1"], 'to_s').should eql(["1.4.2", "1.4.4", "1.5.2", "1.5.2-patch1", "1.5.2-patch2"])
+      expect( Naturalsorter::Sorter.sort_version_by_method(["1.5.2", "1.4.4", "1.4.2", "1.5.2-patch2", "1.5.2-patch1"], 'to_s')).to eql(["1.4.2", "1.4.4", "1.5.2", "1.5.2-patch1", "1.5.2-patch2"])
     end
   end
 
   describe "is_version_current?" do
     it "returns true" do
-      Naturalsorter::Sorter.is_version_current?("1.1.1", "1.1.9").should be_truthy
+      expect( Naturalsorter::Sorter.is_version_current?("1.1.1", "1.1.9")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.is_version_current?("1.1.1", "1.1.2").should be_truthy
+      expect( Naturalsorter::Sorter.is_version_current?("1.1.1", "1.1.2")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.is_version_current?("1.1.1", "1.1.12").should be_truthy
+      expect( Naturalsorter::Sorter.is_version_current?("1.1.1", "1.1.12")).to be_truthy
     end
     it "returns false" do
-      Naturalsorter::Sorter.is_version_current?("1.1.1", "1.2.0").should be_falsey
+      expect( Naturalsorter::Sorter.is_version_current?("1.1.1", "1.2.0")).to be_falsey
     end
     it "returns false" do
-      Naturalsorter::Sorter.is_version_current?("1.1.1", "1.2").should be_falsey
+      expect( Naturalsorter::Sorter.is_version_current?("1.1.1", "1.2")).to be_falsey
     end
     it "returns false" do
-      Naturalsorter::Sorter.is_version_current?("1.1.1", "2.0").should be_falsey
+      expect( Naturalsorter::Sorter.is_version_current?("1.1.1", "2.0")).to be_falsey
     end
     it "returns false" do
-      Naturalsorter::Sorter.is_version_current?("1.1.1", "2").should be_falsey
+      expect( Naturalsorter::Sorter.is_version_current?("1.1.1", "2")).to be_falsey
     end
     it "returns false" do
-      Naturalsorter::Sorter.is_version_current?("1.1", "2.0").should be_falsey
+      expect( Naturalsorter::Sorter.is_version_current?("1.1", "2.0")).to be_falsey
     end
   end
 
   describe "get_newest_version" do
 
     it "returns 2.0" do
-      Naturalsorter::Sorter.get_newest_version("1.1", "2.0").should eql("2.0")
+      expect( Naturalsorter::Sorter.get_newest_version("1.1", "2.0")).to eql("2.0")
     end
     it "returns 1.1" do
-      Naturalsorter::Sorter.get_newest_version("1.1", "1.0").should eql("1.1")
+      expect( Naturalsorter::Sorter.get_newest_version("1.1", "1.0")).to eql("1.1")
     end
     it "returns 4.5" do
-      Naturalsorter::Sorter.get_newest_version("4.5", "1.0").should eql("4.5")
+      expect( Naturalsorter::Sorter.get_newest_version("4.5", "1.0")).to eql("4.5")
     end
     it "returns 1.0" do
-      Naturalsorter::Sorter.get_newest_version("1.0", "1.0").should eql("1.0")
+      expect( Naturalsorter::Sorter.get_newest_version("1.0", "1.0")).to eql("1.0")
     end
     it "returns 1.10" do
-      Naturalsorter::Sorter.get_newest_version("1.10", "1.8").should eql("1.10")
+      expect( Naturalsorter::Sorter.get_newest_version("1.10", "1.8")).to eql("1.10")
     end
     it "returns 1.10" do
-      Naturalsorter::Sorter.get_newest_version("1.10", "v1.0").should eql("1.10")
+      expect( Naturalsorter::Sorter.get_newest_version("1.10", "v1.0")).to eql("1.10")
     end
     it "returns v1.10" do
-      Naturalsorter::Sorter.get_newest_version("v1.10", "v1.0").should eql("v1.10")
+      expect( Naturalsorter::Sorter.get_newest_version("v1.10", "v1.0")).to eql("v1.10")
     end
     it "returns v1.10" do
-      Naturalsorter::Sorter.get_newest_version("v1.10", "1.0").should eql("v1.10")
+      expect( Naturalsorter::Sorter.get_newest_version("v1.10", "1.0")).to eql("v1.10")
     end
     it "returns 1.10.x-dev" do
-      Naturalsorter::Sorter.get_newest_version("1.10.x-dev", "1.10.1").should eql("1.10.x-dev")
+      expect( Naturalsorter::Sorter.get_newest_version("1.10.x-dev", "1.10.1")).to eql("1.10.x-dev")
     end
     it "returns still 1.10.x-dev" do
-      Naturalsorter::Sorter.get_newest_version("1.10.x-dev", "1.10.99").should eql("1.10.x-dev")
+      expect( Naturalsorter::Sorter.get_newest_version("1.10.x-dev", "1.10.99")).to eql("1.10.x-dev")
     end
     it "returns still 1.11.1" do
-      Naturalsorter::Sorter.get_newest_version("1.10.x-dev", "1.11.1").should eql("1.11.1")
+      expect( Naturalsorter::Sorter.get_newest_version("1.10.x-dev", "1.11.1")).to eql("1.11.1")
     end
 
   end
@@ -199,25 +199,25 @@ describe Naturalsorter::Sorter do
   describe "bigger?" do
 
     it "returns true" do
-      Naturalsorter::Sorter.bigger?("1.1", "1.0").should be_truthy
+      expect( Naturalsorter::Sorter.bigger?("1.1", "1.0")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.bigger?("1.1", "20030211.134440").should be_truthy
+      expect( Naturalsorter::Sorter.bigger?("1.1", "20030211.134440")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.bigger?("1.1", "20030211").should be_truthy
+      expect( Naturalsorter::Sorter.bigger?("1.1", "20030211")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.bigger?("2.0", "1.0").should be_truthy
+      expect( Naturalsorter::Sorter.bigger?("2.0", "1.0")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.bigger?("2.20", "2.9").should be_truthy
+      expect( Naturalsorter::Sorter.bigger?("2.20", "2.9")).to be_truthy
     end
     it "returns false" do
-      Naturalsorter::Sorter.bigger?("2.20", "2.20").should be_falsey
+      expect( Naturalsorter::Sorter.bigger?("2.20", "2.20")).to be_falsey
     end
     it "returns false" do
-      Naturalsorter::Sorter.bigger?("2.20", "3.0").should be_falsey
+      expect( Naturalsorter::Sorter.bigger?("2.20", "3.0")).to be_falsey
     end
 
   end
@@ -225,31 +225,31 @@ describe Naturalsorter::Sorter do
   describe "bigger_or_equal?" do
 
     it "returns true" do
-      Naturalsorter::Sorter.bigger_or_equal?("1.1", "1.0").should be_truthy
+      expect( Naturalsorter::Sorter.bigger_or_equal?("1.1", "1.0")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.bigger_or_equal?("2.0", "1.0").should be_truthy
+      expect( Naturalsorter::Sorter.bigger_or_equal?("2.0", "1.0")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.bigger_or_equal?("2.20", "2.9").should be_truthy
+      expect( Naturalsorter::Sorter.bigger_or_equal?("2.20", "2.9")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.bigger_or_equal?("2.20", "2.20").should be_truthy
+      expect( Naturalsorter::Sorter.bigger_or_equal?("2.20", "2.20")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.bigger_or_equal?("2.20", "2.20.0").should be_truthy
+      expect( Naturalsorter::Sorter.bigger_or_equal?("2.20", "2.20.0")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.bigger_or_equal?("2.20", "2.20").should be_truthy
+      expect( Naturalsorter::Sorter.bigger_or_equal?("2.20", "2.20")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.bigger_or_equal?("v3.2.0", "3.2.0").should be_truthy
+      expect( Naturalsorter::Sorter.bigger_or_equal?("v3.2.0", "3.2.0")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.bigger_or_equal?("v3.2.0", "3.1.0").should be_truthy
+      expect( Naturalsorter::Sorter.bigger_or_equal?("v3.2.0", "3.1.0")).to be_truthy
     end
     it "returns false" do
-      Naturalsorter::Sorter.bigger_or_equal?("2.20", "3.0").should be_falsey
+      expect( Naturalsorter::Sorter.bigger_or_equal?("2.20", "3.0")).to be_falsey
     end
 
   end
@@ -257,25 +257,25 @@ describe Naturalsorter::Sorter do
   describe "smaller?" do
 
     it "returns false" do
-      Naturalsorter::Sorter.smaller?("1.1", "1.0").should be_falsey
+      expect( Naturalsorter::Sorter.smaller?("1.1", "1.0")).to be_falsey
     end
     it "returns false" do
-      Naturalsorter::Sorter.smaller?("2.0", "1.0").should be_falsey
+      expect( Naturalsorter::Sorter.smaller?("2.0", "1.0")).to be_falsey
     end
     it "returns false" do
-      Naturalsorter::Sorter.smaller?("2.20", "2.9").should be_falsey
+      expect( Naturalsorter::Sorter.smaller?("2.20", "2.9")).to be_falsey
     end
     it "returns false" do
-      Naturalsorter::Sorter.smaller?("2.20", "2.20").should be_falsey
+      expect( Naturalsorter::Sorter.smaller?("2.20", "2.20")).to be_falsey
     end
     it "returns true" do
-      Naturalsorter::Sorter.smaller?("2.20", "3.0").should be_truthy
+      expect( Naturalsorter::Sorter.smaller?("2.20", "3.0")).to be_truthy
     end
     it "returns false" do
-      Naturalsorter::Sorter.smaller?("2.0", "2.0").should be_falsey
+      expect( Naturalsorter::Sorter.smaller?("2.0", "2.0")).to be_falsey
     end
     it "returns false" do
-      Naturalsorter::Sorter.smaller?("2.0", "2.0.0").should be_falsey
+      expect( Naturalsorter::Sorter.smaller?("2.0", "2.0.0")).to be_falsey
     end
 
   end
@@ -283,28 +283,28 @@ describe Naturalsorter::Sorter do
   describe "smaller_or_equal?" do
 
     it "returns false" do
-      Naturalsorter::Sorter.smaller_or_equal?("1.1", "1.0").should be_falsey
+      expect( Naturalsorter::Sorter.smaller_or_equal?("1.1", "1.0")).to be_falsey
     end
     it "returns false" do
-      Naturalsorter::Sorter.smaller_or_equal?("2.0", "1.0").should be_falsey
+      expect( Naturalsorter::Sorter.smaller_or_equal?("2.0", "1.0")).to be_falsey
     end
     it "returns false" do
-      Naturalsorter::Sorter.smaller_or_equal?("2.20", "2.9").should be_falsey
+      expect( Naturalsorter::Sorter.smaller_or_equal?("2.20", "2.9")).to be_falsey
     end
     it "returns false" do
-      Naturalsorter::Sorter.smaller_or_equal?("2.20", "2.20").should be_truthy
+      expect( Naturalsorter::Sorter.smaller_or_equal?("2.20", "2.20")).to be_truthy
     end
     it "returns false" do
-      Naturalsorter::Sorter.smaller_or_equal?("2.20.0", "2.20").should be_truthy
+      expect( Naturalsorter::Sorter.smaller_or_equal?("2.20.0", "2.20")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.smaller_or_equal?("2.20", "2.20").should be_truthy
+      expect( Naturalsorter::Sorter.smaller_or_equal?("2.20", "2.20")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.smaller_or_equal?("2.20", "3.0").should be_truthy
+      expect( Naturalsorter::Sorter.smaller_or_equal?("2.20", "3.0")).to be_truthy
     end
     it "returns true" do
-      Naturalsorter::Sorter.smaller_or_equal?("2.20", "v3.0").should be_truthy
+      expect( Naturalsorter::Sorter.smaller_or_equal?("2.20", "v3.0")).to be_truthy
     end
 
   end

data/spec/naturalsorter/version_tag_recognizer_spec.rb

@@ -4,358 +4,358 @@ require "naturalsorter"
 describe VersionTagRecognizer do
 
   it "release? is true" do
-    VersionTagRecognizer.release?("1.1").should be_truthy
+    expect( VersionTagRecognizer.release?("1.1")).to be_truthy
   end
 
   it "release? is true" do
-    VersionTagRecognizer.release?("1.0.0").should be_truthy
+    expect( VersionTagRecognizer.release?("1.0.0")).to be_truthy
   end
 
   it "release? is true" do
-    VersionTagRecognizer.release?("1").should be_truthy
+    expect( VersionTagRecognizer.release?("1")).to be_truthy
   end
 
   it "release? is true" do
-    VersionTagRecognizer.release?("3.3.2.GA").should be_truthy
+    expect( VersionTagRecognizer.release?("3.3.2.GA")).to be_truthy
   end
 
   it "release? is true" do
-    VersionTagRecognizer.release?("4.1.5.SP1").should be_truthy
+    expect( VersionTagRecognizer.release?("4.1.5.SP1")).to be_truthy
   end
 
   it "release? is true" do
-    VersionTagRecognizer.release?("3.1.0.RELEASE").should be_truthy
+    expect( VersionTagRecognizer.release?("3.1.0.RELEASE")).to be_truthy
   end
 
   it "release? is true" do
-    VersionTagRecognizer.release?("3.2.0.BUILD").should be_falsey
+    expect( VersionTagRecognizer.release?("3.2.0.BUILD")).to be_falsey
   end
 
   it "release? is true" do
-    VersionTagRecognizer.release?("3.2.0buiLd").should be_falsey
+    expect( VersionTagRecognizer.release?("3.2.0buiLd")).to be_falsey
   end
 
   it "release? is true" do
-    VersionTagRecognizer.release?("3.2.0.Final").should be_truthy
+    expect( VersionTagRecognizer.release?("3.2.0.Final")).to be_truthy
   end
 
   it "release? is true" do
-    VersionTagRecognizer.release?("3.2.0FINAL").should be_truthy
+    expect( VersionTagRecognizer.release?("3.2.0FINAL")).to be_truthy
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("1.1.pre").should be_falsey
+    expect( VersionTagRecognizer.release?("1.1.pre")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("2.5.6.SEC03").should be_falsey
+    expect( VersionTagRecognizer.release?("2.5.6.SEC03")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("2.3.8.pre1").should be_falsey
+    expect( VersionTagRecognizer.release?("2.3.8.pre1")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("2.3.9.pre").should be_falsey
+    expect( VersionTagRecognizer.release?("2.3.9.pre")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("3.0.0.beta4").should be_falsey
+    expect( VersionTagRecognizer.release?("3.0.0.beta4")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("3.0.0.BETA4").should be_falsey
+    expect( VersionTagRecognizer.release?("3.0.0.BETA4")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("3.0.0.beta").should be_falsey
+    expect( VersionTagRecognizer.release?("3.0.0.beta")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("3.0.0.rc").should be_falsey
+    expect( VersionTagRecognizer.release?("3.0.0.rc")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("3.0.0.rc2").should be_falsey
+    expect( VersionTagRecognizer.release?("3.0.0.rc2")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("3.0.0.RC2").should be_falsey
+    expect( VersionTagRecognizer.release?("3.0.0.RC2")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("2.0.x-dev").should be_falsey
+    expect( VersionTagRecognizer.release?("2.0.x-dev")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("2.0.x-DEV").should be_falsey
+    expect( VersionTagRecognizer.release?("2.0.x-DEV")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("1.8b1").should be_falsey
+    expect( VersionTagRecognizer.release?("1.8b1")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("1.8B1").should be_falsey
+    expect( VersionTagRecognizer.release?("1.8B1")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("1.1.3a").should be_falsey
+    expect( VersionTagRecognizer.release?("1.1.3a")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("1.1.3A").should be_falsey
+    expect( VersionTagRecognizer.release?("1.1.3A")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("1.SNAPSHOT").should be_falsey
+    expect( VersionTagRecognizer.release?("1.SNAPSHOT")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("1.snapshot").should be_falsey
+    expect( VersionTagRecognizer.release?("1.snapshot")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("1.M1").should be_falsey
+    expect( VersionTagRecognizer.release?("1.M1")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("2.0-m4").should be_falsey
+    expect( VersionTagRecognizer.release?("2.0-m4")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("dev-garbage-collection-configuration").should be_falsey
+    expect( VersionTagRecognizer.release?("dev-garbage-collection-configuration")).to be_falsey
   end
 
   it "release? is false" do
-    VersionTagRecognizer.release?("garbage-collection-configuration-dev").should be_falsey
+    expect( VersionTagRecognizer.release?("garbage-collection-configuration-dev")).to be_falsey
   end
 
 
 
   it "is alpha? is true" do
-    VersionTagRecognizer.alpha?("2.0.alpha").should be_truthy
+    expect( VersionTagRecognizer.alpha?("2.0.alpha")).to be_truthy
   end
 
   it "is alpha? is true" do
-    VersionTagRecognizer.alpha?("2.1.0alpha").should be_truthy
+    expect( VersionTagRecognizer.alpha?("2.1.0alpha")).to be_truthy
   end
 
   it "is alpha? is false" do
-    VersionTagRecognizer.alpha?("2.0.1").should be_falsey
+    expect( VersionTagRecognizer.alpha?("2.0.1")).to be_falsey
   end
 
   it "is alpha? is false" do
-    VersionTagRecognizer.alpha?("2.1.0-BETA1").should be_falsey
+    expect( VersionTagRecognizer.alpha?("2.1.0-BETA1")).to be_falsey
   end
 
   it "is tagged? is true" do
-    VersionTagRecognizer.tagged?("2.1.0alpha").should be_truthy
+    expect( VersionTagRecognizer.tagged?("2.1.0alpha")).to be_truthy
   end
 
 
 
   it "remove_tag is right" do
-    VersionTagRecognizer.remove_tag("2.1.0alpha").should eql("2.1")
+    expect( VersionTagRecognizer.remove_tag("2.1.0alpha")).to eql("2.1")
   end
   it "remove_tag is right" do
-    VersionTagRecognizer.remove_tag("2.1.1-BETA").should eql("2.1")
+    expect( VersionTagRecognizer.remove_tag("2.1.1-BETA")).to eql("2.1")
   end
   it "remove_tag is right" do
-    VersionTagRecognizer.remove_tag("2.1.1-RC").should eql("2.1")
+    expect( VersionTagRecognizer.remove_tag("2.1.1-RC")).to eql("2.1")
   end
   it "remove_tag is right" do
-    VersionTagRecognizer.remove_tag("2.1.1-PRE").should eql("2.1")
+    expect( VersionTagRecognizer.remove_tag("2.1.1-PRE")).to eql("2.1")
   end
 
 
 
   it "is beta? is true" do
-    VersionTagRecognizer.beta?("2.0.beta").should be_truthy
+    expect( VersionTagRecognizer.beta?("2.0.beta")).to be_truthy
   end
 
   it "is beta? is true" do
-    VersionTagRecognizer.beta?("2.1.0beta").should be_truthy
+    expect( VersionTagRecognizer.beta?("2.1.0beta")).to be_truthy
   end
 
   it "is beta? is false" do
-    VersionTagRecognizer.beta?("2.0.1").should be_falsey
+    expect( VersionTagRecognizer.beta?("2.0.1")).to be_falsey
   end
 
   it "is beta? is true" do
-    VersionTagRecognizer.beta?("2.2.0-BETA2").should be_truthy
+    expect( VersionTagRecognizer.beta?("2.2.0-BETA2")).to be_truthy
   end
 
   it "is beta? is true" do
-    VersionTagRecognizer.beta?("2.1.0-BETA1").should be_truthy
+    expect( VersionTagRecognizer.beta?("2.1.0-BETA1")).to be_truthy
   end
 
   it "is tagged? is true" do
-    VersionTagRecognizer.tagged?("2.1.0-BETA1").should be_truthy
+    expect( VersionTagRecognizer.tagged?("2.1.0-BETA1")).to be_truthy
   end
 
   it "remove_tag is right" do
-    VersionTagRecognizer.remove_tag("2.1.0-BETA1").should eql("2.1")
+    expect( VersionTagRecognizer.remove_tag("2.1.0-BETA1")).to eql("2.1")
   end
 
 
 
   it "is dev? is true" do
-    VersionTagRecognizer.dev?("dev-master").should be_truthy
+    expect( VersionTagRecognizer.dev?("dev-master")).to be_truthy
   end
 
   it "is dev? is true" do
-    VersionTagRecognizer.dev?("dev-progress-helper").should be_truthy
+    expect( VersionTagRecognizer.dev?("dev-progress-helper")).to be_truthy
   end
 
   it "is dev? is true" do
-    VersionTagRecognizer.dev?("dev-deprecated").should be_truthy
+    expect( VersionTagRecognizer.dev?("dev-deprecated")).to be_truthy
   end
 
   it "is dev? is true" do
-    VersionTagRecognizer.dev?("2.2.x-dev").should be_truthy
+    expect( VersionTagRecognizer.dev?("2.2.x-dev")).to be_truthy
   end
 
   it "is dev? is false" do
-    VersionTagRecognizer.dev?("2.0.1").should be_falsey
+    expect( VersionTagRecognizer.dev?("2.0.1")).to be_falsey
   end
 
 
 
   it "is rc? is true" do
-    VersionTagRecognizer.rc?("2.0.rc").should be_truthy
+    expect( VersionTagRecognizer.rc?("2.0.rc")).to be_truthy
   end
 
   it "is rc? is true" do
-    VersionTagRecognizer.rc?("2.1.0rc").should be_truthy
+    expect( VersionTagRecognizer.rc?("2.1.0rc")).to be_truthy
   end
 
   it "is rc? is true" do
-    VersionTagRecognizer.rc?("2.2.0-RC3").should be_truthy
+    expect( VersionTagRecognizer.rc?("2.2.0-RC3")).to be_truthy
   end
 
   it "is rc? is false" do
-    VersionTagRecognizer.rc?("2.0.1").should be_falsey
+    expect( VersionTagRecognizer.rc?("2.0.1")).to be_falsey
   end
 
 
 
   it "is snapshot? is true" do
-    VersionTagRecognizer.snapshot?("2.0.snapshot").should be_truthy
+    expect( VersionTagRecognizer.snapshot?("2.0.snapshot")).to be_truthy
   end
 
   it "is snapshot? is true" do
-    VersionTagRecognizer.snapshot?("2.1.0snapshot").should be_truthy
+    expect( VersionTagRecognizer.snapshot?("2.1.0snapshot")).to be_truthy
   end
 
   it "is snapshot? is true" do
-    VersionTagRecognizer.snapshot?("2.2.0-snapshot3").should be_truthy
+    expect( VersionTagRecognizer.snapshot?("2.2.0-snapshot3")).to be_truthy
   end
 
   it "is snapshot? is false" do
-    VersionTagRecognizer.snapshot?("2.0.1").should be_falsey
+    expect( VersionTagRecognizer.snapshot?("2.0.1")).to be_falsey
   end
 
 
   it 'is a build' do
-    VersionTagRecognizer.build?("1.3.0-build.2921+sha.02c0ed2").should be_truthy
+    expect( VersionTagRecognizer.build?("1.3.0-build.2921+sha.02c0ed2")).to be_truthy
   end
 
 
   it "returns the right value for dev" do
-    VersionTagRecognizer.value_for("1.1.1-dev").should eql(0)
+    expect( VersionTagRecognizer.value_for("1.1.1-dev")).to eql(0)
   end
   it "returns the right value for snapshot" do
-    VersionTagRecognizer.value_for("1.1.1-SNAPSHOT").should eql(2)
+    expect( VersionTagRecognizer.value_for("1.1.1-SNAPSHOT")).to eql(2)
   end
   it "returns the right value for alpha" do
-    VersionTagRecognizer.value_for("1.1.1-alpha").should eql(3)
+    expect( VersionTagRecognizer.value_for("1.1.1-alpha")).to eql(3)
   end
   it "returns the right value for beta" do
-    VersionTagRecognizer.value_for("1.1.1-beta").should eql(4)
+    expect( VersionTagRecognizer.value_for("1.1.1-beta")).to eql(4)
   end
   it "returns the right value for rc" do
-    VersionTagRecognizer.value_for("1.1.1-rc").should eql(5)
+    expect( VersionTagRecognizer.value_for("1.1.1-rc")).to eql(5)
   end
   it "returns the right value for pre" do
-    VersionTagRecognizer.value_for("1.1.1-pre").should eql(6)
+    expect( VersionTagRecognizer.value_for("1.1.1-pre")).to eql(6)
   end
   it "returns the right value for stable" do
-    VersionTagRecognizer.value_for("1.1.1").should eql(10)
+    expect( VersionTagRecognizer.value_for("1.1.1")).to eql(10)
   end
 
 
 
   it "returns compares right for alpha and beta" do
-    VersionTagRecognizer.compare_tags("1.1.1-alpha", "1.1.1-beta").should eql(-1)
+    expect( VersionTagRecognizer.compare_tags("1.1.1-alpha", "1.1.1-beta")).to eql(-1)
   end
   it "returns compares right for beta and alpha" do
-    VersionTagRecognizer.compare_tags("1.1.1-beta", "1.1.1-alpha").should eql(1)
+    expect( VersionTagRecognizer.compare_tags("1.1.1-beta", "1.1.1-alpha")).to eql(1)
   end
   it "returns compares right for alpha and alpha" do
-    VersionTagRecognizer.compare_tags("1.1.1-alpha", "1.1.1-alpha").should eql(0)
+    expect( VersionTagRecognizer.compare_tags("1.1.1-alpha", "1.1.1-alpha")).to eql(0)
   end
   it "returns compares right for RC and stable" do
-    VersionTagRecognizer.compare_tags("1.1.1-RC", "1.1.1").should eql(-1)
+    expect( VersionTagRecognizer.compare_tags("1.1.1-RC", "1.1.1")).to eql(-1)
   end
   it "returns compares right for stable and dev" do
-    VersionTagRecognizer.compare_tags("1.1.1", "1.1.x-dev").should eql(1)
+    expect( VersionTagRecognizer.compare_tags("1.1.1", "1.1.x-dev")).to eql(1)
   end
 
 
 
   it "does fit stability" do
-    VersionTagRecognizer.does_it_fit_stability?( "2.2.1", "stable" ).should be_truthy
+    expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.1", "stable" )).to be_truthy
   end
   it "does not fit stability" do
-    VersionTagRecognizer.does_it_fit_stability?( "2.2.1-BETA", "stable" ).should be_falsey
+    expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.1-BETA", "stable" )).to be_falsey
   end
   it "does not fit stability" do
-    VersionTagRecognizer.does_it_fit_stability?( "1.3.0-build.2921+sha.02c0ed2", "stable" ).should be_falsey
+    expect( VersionTagRecognizer.does_it_fit_stability?( "1.3.0-build.2921+sha.02c0ed2", "stable" )).to be_falsey
   end
   it "does not fit stability" do
-    VersionTagRecognizer.does_it_fit_stability?( "1.3.0-build.2809+sha.94bcc03", "stable" ).should be_falsey
+    expect( VersionTagRecognizer.does_it_fit_stability?( "1.3.0-build.2809+sha.94bcc03", "stable" )).to be_falsey
   end
   it "does fit stability" do
-    VersionTagRecognizer.does_it_fit_stability?( "2.2.1-BETA", "alpha" ).should be_truthy
+    expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.1-BETA", "alpha" )).to be_truthy
   end
   it "does fit stability" do
-    VersionTagRecognizer.does_it_fit_stability?( "2.2.1-BETA", "beta" ).should be_truthy
+    expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.1-BETA", "beta" )).to be_truthy
   end
   it "does fit stability" do
-    VersionTagRecognizer.does_it_fit_stability?( "2.2.x-dev", "dev" ).should be_truthy
+    expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.x-dev", "dev" )).to be_truthy
   end
   it "does not fit stability" do
-    VersionTagRecognizer.does_it_fit_stability?( "2.2.x-dev", "alpha" ).should be_falsey
+    expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.x-dev", "alpha" )).to be_falsey
   end
   it "does not fit stability" do
-    VersionTagRecognizer.does_it_fit_stability?( "2.2.x-dev", "RC" ).should be_falsey
+    expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.x-dev", "RC" )).to be_falsey
   end
   it "does fit stability" do
-    VersionTagRecognizer.does_it_fit_stability?( "2.2.1-RC", "RC" ).should be_truthy
+    expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.1-RC", "RC" )).to be_truthy
   end
 
 
 
   it "stability_tag_for returns right" do
-    VersionTagRecognizer.stability_tag_for( "2.2.1").should eql(VersionTagRecognizer::A_STABILITY_STABLE)
+    expect( VersionTagRecognizer.stability_tag_for( "2.2.1")).to eql(VersionTagRecognizer::A_STABILITY_STABLE)
   end
   it "stability_tag_for returns right" do
-    VersionTagRecognizer.stability_tag_for( "2.2.1-RC").should eql(VersionTagRecognizer::A_STABILITY_RC)
+    expect( VersionTagRecognizer.stability_tag_for( "2.2.1-RC")).to eql(VersionTagRecognizer::A_STABILITY_RC)
   end
   it "stability_tag_for returns right" do
-    VersionTagRecognizer.stability_tag_for( "2.2.1-BETA1").should eql(VersionTagRecognizer::A_STABILITY_BETA)
+    expect( VersionTagRecognizer.stability_tag_for( "2.2.1-BETA1")).to eql(VersionTagRecognizer::A_STABILITY_BETA)
   end
   it "stability_tag_for returns right" do
-    VersionTagRecognizer.stability_tag_for( "2.2.1-alpha").should eql(VersionTagRecognizer::A_STABILITY_ALPHA)
+    expect( VersionTagRecognizer.stability_tag_for( "2.2.1-alpha")).to eql(VersionTagRecognizer::A_STABILITY_ALPHA)
   end
   it "stability_tag_for returns right" do
-    VersionTagRecognizer.stability_tag_for( "2.2.x-dev").should eql(VersionTagRecognizer::A_STABILITY_DEV)
+    expect( VersionTagRecognizer.stability_tag_for( "2.2.x-dev")).to eql(VersionTagRecognizer::A_STABILITY_DEV)
   end
 
 
   it "stability_tag_for returns false" do
-    VersionTagRecognizer.stability_tag_for( "dev-garbage-collection-configuration").should eql(VersionTagRecognizer::A_STABILITY_DEV)
+    expect( VersionTagRecognizer.stability_tag_for( "dev-garbage-collection-configuration")).to eql(VersionTagRecognizer::A_STABILITY_DEV)
   end
 
 

data/spec/naturalsorter/versioncmp_spec.rb

@@ -4,245 +4,301 @@ require "naturalsorter"
 describe Versioncmp do
 
   it "smaler" do
-    Versioncmp.compare("1.1", "1.2").should eql(-1)
+    expect( Versioncmp.compare("1.1", "1.2")).to eql(-1)
   end
 
   it "smaler" do
-    Versioncmp.compare("1.1.5", "1.1.x-dev").should eql(-1)
+    expect( Versioncmp.compare("1.1.5", "1.1.x-dev")).to eql(-1)
   end
 
   it "smaler" do
-    Versioncmp.compare("1.1.5", "1.1-dev").should eql(-1)
+    expect( Versioncmp.compare("1.1.5", "1.1-dev")).to eql(-1)
   end
 
   it "smaler" do
-    Versioncmp.compare("0.3", "0.7-groovy-2.0").should eql(-1)
+    expect( Versioncmp.compare("0.3", "0.7-groovy-2.0")).to eql(-1)
+  end
+
+  it "smaler" do
+    expect( Versioncmp.compare("0.6-groovy-1.8-rc1", "0.6-groovy-1.8")).to eql(-1)
+  end
+
+  it "bigger" do
+    expect( Versioncmp.compare("0.6-groovy-1.7", "0.6-groovy-1.7-rc1")).to eql(1)
+  end
+
+  it "bigger" do
+    expect( Versioncmp.compare("5.0.1", "5.0.1-BETA")).to eql(1)
+  end
+
+  it "bigger" do
+    expect( Versioncmp.compare("5.0.1", "5.0.1-SNAPSHOT")).to eql(1)
+  end
+
+  it "bigger" do
+    expect( Versioncmp.compare("5.0.1", "5.0.1-beta")).to eql(1)
+  end
+
+  it "bigger" do
+    expect( Versioncmp.compare("5.0.1", "5.0.1-alpha")).to eql(1)
+  end
+
+  it "bigger" do
+    expect( Versioncmp.compare("5.0.1", "5.0.1-RC1")).to eql(1)
+  end
+
+  it "bigger" do
+    expect( Versioncmp.compare("5.0.1", "5.0.1-RC-1")).to eql(1)
+  end
+
+  it "bigger" do
+    expect( Versioncmp.compare("5.0.1", "5.0.1-alpha-1")).to eql(1)
+  end
+
+  it "bigger" do
+    expect( Versioncmp.compare("3.10-beta2", "3.9")).to eql(1)
+  end
+
+  it "bigger" do
+    expect( Versioncmp.compare("3.10-beta2", "3.10-beta1")).to eql(1)
+  end
+
+  it "bigger" do
+    expect( Versioncmp.compare("3.0.2-FINAL", "3.0.1-FINAL")).to eql(1)
+  end
+
+  it "bigger" do
+    expect( Versioncmp.compare("1.1", "1.0")).to eql(1)
+  end
+
+  it "bigger" do
+    expect( Versioncmp.compare("2.5", "2.0-beta-1")).to eql(1)
   end
 
   it "bigger" do
-    Versioncmp.compare("1.1", "1.0").should eql(1)
+    expect( Versioncmp.compare("2.3", "2.0-beta-1")).to eql(1)
   end
 
   it "1.1.1 is bigger than 1.1" do
-    Versioncmp.compare("1.1.1", "1.1").should eql(1)
+    expect( Versioncmp.compare("1.1.1", "1.1")).to eql(1)
   end
 
   it "dev-master is bigger than 10.10.999" do
-    Versioncmp.compare("dev-master", "10.10.999").should eql(1)
+    expect( Versioncmp.compare("dev-master", "10.10.999")).to eql(1)
   end
 
   it "2.2.x-dev is bigger than 2.2.1" do
-    Versioncmp.compare("2.2.x-dev", "2.2.1").should eql(1)
+    expect( Versioncmp.compare("2.2.x-dev", "2.2.1")).to eql(1)
   end
 
   it "3.5.5-1 is bigger than 3.5.5" do
-    Versioncmp.compare("3.5.5-1", "3.5.5").should eql(1)
+    expect( Versioncmp.compare("3.5.5-1", "3.5.5")).to eql(1)
   end
 
   it "3.5.5 is smaller than 3.5.5-1 " do
-    Versioncmp.compare("3.5.5", "3.5.5-1").should eql(-1)
+    expect( Versioncmp.compare("3.5.5", "3.5.5-1")).to eql(-1)
   end
 
   it "2.3.1-b01 is bigger than 2.3.1" do
-    Versioncmp.compare("2.3.1-b01", "2.3.1").should eql(1)
+    expect( Versioncmp.compare("2.3.1-b01", "2.3.1")).to eql(1)
   end
 
   it "2.3.2-b01 is bigger than 2.3.1" do
-    Versioncmp.compare("2.3.2-b01", "2.3.1").should eql(1)
+    expect( Versioncmp.compare("2.3.2-b01", "2.3.1")).to eql(1)
   end
 
   it "2.3.d-b01 is smaller than 2.3.1" do
-    Versioncmp.compare("2.3.d-b01", "2.3.1").should eql(-1)
+    expect( Versioncmp.compare("2.3.d-b01", "2.3.1")).to eql(-1)
   end
 
 
   it "2.18.1 is bigger than 2.18-20141019" do
-    Versioncmp.compare("2.18.1", "2.18-20141019").should eql(1)
+    expect( Versioncmp.compare("2.18.1", "2.18-20141019")).to eql(1)
   end
 
   it "2.18-20141019 is smaller than 2.18.1" do
-    Versioncmp.compare("2.18-20141019", "2.18.1").should eql(-1)
+    expect( Versioncmp.compare("2.18-20141019", "2.18.1")).to eql(-1)
   end
 
 
   it "1.1 is smaller than 1.1.1" do
-    Versioncmp.compare("1.1", "1.1.1").should eql(-1)
+    expect( Versioncmp.compare("1.1", "1.1.1")).to eql(-1)
   end
 
   it "equal" do
-    Versioncmp.compare("1.1", "1.1").should eql(0)
+    expect( Versioncmp.compare("1.1", "1.1")).to eql(0)
   end
 
   it "equal" do
-    Versioncmp.compare("1.0", "1.0.0").should eql(0)
+    expect( Versioncmp.compare("1.0", "1.0.0")).to eql(0)
   end
 
   it "1.0.0 is smaller than 1.0.*" do
-    Versioncmp.compare("1.0.0", "1.0.*").should eql(-1)
+    expect( Versioncmp.compare("1.0.0", "1.0.*")).to eql(-1)
   end
 
   it "1.0 is smaller than 1.0.*" do
-    Versioncmp.compare("1.0.0", "1.0.*").should eql(-1)
+    expect( Versioncmp.compare("1.0.0", "1.0.*")).to eql(-1)
   end
 
   it "equal RC" do
-    Versioncmp.compare("1.1.RC1", "1.1.RC1").should eql(0)
+    expect( Versioncmp.compare("1.1.RC1", "1.1.RC1")).to eql(0)
   end
 
   it "smaller RC" do
-    Versioncmp.compare("1.1.RC1", "1.1").should eql(-1)
+    expect( Versioncmp.compare("1.1.RC1", "1.1")).to eql(-1)
   end
 
   it "smaller RC" do
-    Versioncmp.compare("1.1.rc1", "1.1").should eql(-1)
+    expect( Versioncmp.compare("1.1.rc1", "1.1")).to eql(-1)
   end
 
   it "smaller RC" do
-    Versioncmp.compare("1.1.rc1", "2.0").should eql(-1)
+    expect( Versioncmp.compare("1.1.rc1", "2.0")).to eql(-1)
   end
 
   it "smaller RC" do
-    Versioncmp.compare("1.1-rc1", "1.1").should eql(-1)
+    expect( Versioncmp.compare("1.1-rc1", "1.1")).to eql(-1)
   end
 
   it "smaller alpha" do
-    Versioncmp.compare("1.1-alpha1", "1.1").should eql(-1)
+    expect( Versioncmp.compare("1.1-alpha1", "1.1")).to eql(-1)
   end
 
   it "alpha is smaller than BETA" do
-    Versioncmp.compare("2.1.0alpha", "2.1.0-BETA1").should eql(-1)
+    expect( Versioncmp.compare("2.1.0alpha", "2.1.0-BETA1")).to eql(-1)
   end
 
   it "smaller alpha-1" do
-    Versioncmp.compare("1.1-alpha-1", "1.1").should eql(-1)
+    expect( Versioncmp.compare("1.1-alpha-1", "1.1")).to eql(-1)
   end
 
   it "smaller alpha" do
-    Versioncmp.compare("1.1", "1.1-alpha-1").should eql(1)
+    expect( Versioncmp.compare("1.1", "1.1-alpha-1")).to eql(1)
   end
 
   it "smaller beta" do
-    Versioncmp.compare("3.1-beta1", "3.1").should eql(-1)
+    expect( Versioncmp.compare("3.1-beta1", "3.1")).to eql(-1)
   end
 
   it "smaller beta" do
-    Versioncmp.compare("3.1-beta-1", "3.1").should eql(-1)
+    expect( Versioncmp.compare("3.1-beta-1", "3.1")).to eql(-1)
   end
 
   it "smaller 3.0-rc4-negotiate" do
-    Versioncmp.compare("3.0-rc4-negotiate", "3.0").should eql(-1)
+    expect( Versioncmp.compare("3.0-rc4-negotiate", "3.0")).to eql(-1)
   end
 
   it "smaller 3.1-jbossorg-1" do
-    Versioncmp.compare("3.1-jbossorg-1", "3.1").should eql(-1)
+    expect( Versioncmp.compare("3.1-jbossorg-1", "3.1")).to eql(-1)
   end
 
   it "smaller 3.1-pre1" do
-    Versioncmp.compare("3.1-pre1", "3.1").should eql(-1)
+    expect( Versioncmp.compare("3.1-pre1", "3.1")).to eql(-1)
   end
 
   it "bigger RC" do
-    Versioncmp.compare("1.1.rc3", "1.1.rc2").should eql(1)
+    expect( Versioncmp.compare("1.1.rc3", "1.1.rc2")).to eql(1)
   end
 
   it "bigger RC than 1.0" do
-    Versioncmp.compare("1.1.RC1", "1.0").should eql(1)
+    expect( Versioncmp.compare("1.1.RC1", "1.0")).to eql(1)
   end
 
   it "bigger RC than 1.0" do
-    Versioncmp.compare("1.1.RC1", "1.1").should eql(-1)
+    expect( Versioncmp.compare("1.1.RC1", "1.1")).to eql(-1)
   end
 
   it "20040121.140929 is smaller than 1.1" do
-    Versioncmp.compare("20040121.140929", "1.1").should eql(-1)
+    expect( Versioncmp.compare("20040121.140929", "1.1")).to eql(-1)
   end
 
   it "1.1 is bigger than 20040121.140929" do
-    Versioncmp.compare("1.1", "20040121.140929").should eql(1)
+    expect( Versioncmp.compare("1.1", "20040121.140929")).to eql(1)
   end
 
   it "1.7b2 is smaller than 1.7" do
-    Versioncmp.compare("1.7b2", "1.7").should eql(-1)
+    expect( Versioncmp.compare("1.7b2", "1.7")).to eql(-1)
   end
 
   it "1.7 is bigger than 1.7b2" do
-    Versioncmp.compare("1.7", "1.7b2").should eql(1)
+    expect( Versioncmp.compare("1.7", "1.7b2")).to eql(1)
   end
 
   it "1.7 is bigger than 1.7rc2" do
-    Versioncmp.compare("1.7", "1.7rc2").should eql(1)
+    expect( Versioncmp.compare("1.7", "1.7rc2")).to eql(1)
   end
 
   it "1.7 is bigger than 1.7RC2" do
-    Versioncmp.compare("1.7", "1.7RC2").should eql(1)
+    expect( Versioncmp.compare("1.7", "1.7RC2")).to eql(1)
   end
 
   it "1.7 is bigger than 1.7a" do
-    Versioncmp.compare("1.7", "1.7a").should eql(1)
+    expect( Versioncmp.compare("1.7", "1.7a")).to eql(1)
   end
 
   it "1.7 is bigger than 1.7b" do
-    Versioncmp.compare("1.7", "1.7b").should eql(1)
+    expect( Versioncmp.compare("1.7", "1.7b")).to eql(1)
   end
 
   it "1.7b is bigger than 1.7a" do
-    Versioncmp.compare("1.7b", "1.7a").should eql(1)
+    expect( Versioncmp.compare("1.7b", "1.7a")).to eql(1)
   end
 
   it "1.7.1rc1 is smaller than 1.7.2" do
-    Versioncmp.compare("1.7.1rc1", "1.7.2").should eql(-1)
+    expect( Versioncmp.compare("1.7.1rc1", "1.7.2")).to eql(-1)
   end
 
   it "1.7.2 is bigger than 1.7.1rc1" do
-    Versioncmp.compare("1.7.2", "1.7.1rc1").should eql(1)
+    expect( Versioncmp.compare("1.7.2", "1.7.1rc1")).to eql(1)
   end
 
   it "99.0-does-not-exist is smaller than 1.7.1" do
-    Versioncmp.compare("99.0-does-not-exist", "1.7.1").should eql(-1)
+    expect( Versioncmp.compare("99.0-does-not-exist", "1.7.1")).to eql(-1)
   end
 
   it "2.2.1-b03 is bigger then 2.2" do
-    Versioncmp.compare("2.2.1-b03", "2.2").should eql(1)
+    expect( Versioncmp.compare("2.2.1-b03", "2.2")).to eql(1)
   end
 
   it "3.0.0 is equal to 3.0" do
-    Versioncmp.compare("3.0.0", "3.0").should eql(0)
+    expect( Versioncmp.compare("3.0.0", "3.0")).to eql(0)
   end
 
   it "3.0 is equal to 3.0.0" do
-    Versioncmp.compare("3.0", "3.0.0").should eql(0)
+    expect( Versioncmp.compare("3.0", "3.0.0")).to eql(0)
   end
 
   it "3.1-SNAPSHOT is equal to 3.1-SNAPSHOT" do
-    Versioncmp.compare("3.1-SNAPSHOT", "3.1-SNAPSHOT").should eql(0)
+    expect( Versioncmp.compare("3.1-SNAPSHOT", "3.1-SNAPSHOT")).to eql(0)
   end
 
   it "3.1-SNAPSHOT is smaller than 3.2-SNAPSHOT" do
-    Versioncmp.compare("3.1-SNAPSHOT", "3.2-SNAPSHOT").should eql(-1)
+    expect( Versioncmp.compare("3.1-SNAPSHOT", "3.2-SNAPSHOT")).to eql(-1)
   end
 
   it "3.1 is smaller than 3.2-SNAPSHOT" do
-    Versioncmp.compare("3.1", "3.2-SNAPSHOT").should eql(-1)
+    expect( Versioncmp.compare("3.1", "3.2-SNAPSHOT")).to eql(-1)
   end
 
   it "1.5.2 is smaller than 1.5.2-patch1" do
-    Versioncmp.compare("1.5.2", "1.5.2-patch1").should eql(-1)
+    expect( Versioncmp.compare("1.5.2", "1.5.2-patch1")).to eql(-1)
   end
 
   it "dev-master is bigger than 1.0.0" do
-    Versioncmp.compare("dev-master", "1.0.0").should eql(1)
+    expect( Versioncmp.compare("dev-master", "1.0.0")).to eql(1)
   end
 
   it "dev-master is bigger than dev-support_old" do
-    Versioncmp.compare("dev-master", "dev-support_old").should eql(1)
+    expect( Versioncmp.compare("dev-master", "dev-support_old")).to eql(1)
   end
 
   it "dev-develop is bigger than 1.0.0" do
-    Versioncmp.compare("dev-develop", "1.0.0").should eql(1)
+    expect( Versioncmp.compare("dev-develop", "1.0.0")).to eql(1)
   end
 
   it "dev-something is bigger than 1.0.0" do
-    Versioncmp.compare("dev-something", "1.0.0").should eql(1)
+    expect( Versioncmp.compare("dev-something", "1.0.0")).to eql(1)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 3.0.13
+  version: 3.0.14
 platform: ruby
 authors:
 - reiz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec