naturalsorter 3.0.17 → 3.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e2ec83d8210db705bf9b0c42f6f1598deb776234
-  data.tar.gz: d57432047a53d3eaf16062bc6c450a3b5959dbf1
+SHA256:
+  metadata.gz: 925db38882f2e866dba2a09ec31b09aa5040e09d4859a7960ec53dbb0094167a
+  data.tar.gz: b139ed21d035cbcc6845e7258d827b624980207ffe1782b6684467c09c3eb1ab
 SHA512:
-  metadata.gz: 0adf8b4b9d9da01e93dc534f46dfbd2dcc38ea2dea1daa09e6ebc0904d5769c4fb93b581a14c41404d61ad21c46e1f377464118567470de3996c07635983912d
-  data.tar.gz: 2681419afd96462a8c7854390e63dead3e6f4dbf2d755782469fd1880730ac135e99c2bd6c05ff4835cc4eccb2e667b3dac6b674d9654b3408d9934ffff6fcd9
+  metadata.gz: 149a0b39161d753e6152d07a85bbd97341d8a0934dab9a3c6205a74ffc8ea8df441ad910ffcf7b34b4a001d7bd4e9514ded94e365d7eeced281bb50b5244aa9b
+  data.tar.gz: 9014d778f9c6860168e4986ca3091632fbe0d47d73d019fe65c7e9db375fb2bd5cc0ad826526d5e312212f0c068edb780047b7e4e9dd87bf2bea8c758a92280b

data/.ruby-gemset

@@ -0,0 +1 @@
+ve-ns

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.5.8

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.16'`
+`gem 'naturalsorter', '3.0.22'`
 
 and run this command in your app root directory
 

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "3.0.17"
+  VERSION = "3.0.22"
 end

data/lib/version_tag_recognizer.rb

@@ -24,12 +24,24 @@ class VersionTagRecognizer
     return 1
   end
 
+  def self.value_for_key( value )
+    return 0  if A_STABILITY_DEV.eql? value
+    return 2  if A_STABILITY_SNAPSHOT.eql? value
+    return 3  if A_STABILITY_ALPHA.eql? value
+    return 4  if A_STABILITY_BETA.eql? value
+    return 5  if A_STABILITY_RC.eql? value
+    return 6  if A_STABILITY_PRE.eql? value
+    return 10 if A_STABILITY_STABLE.eql? value
+    return 11 if A_STABILITY_PATCH.eql? value
+    return 1
+  end
+
   def self.compare_tags( a, b)
     a_val = self.value_for a
     b_val = self.value_for b
     return -1 if a_val < b_val
     return  1 if a_val > b_val
-    return 0
+    return  0
   end
 
   def self.tagged? value
@@ -69,26 +81,34 @@ class VersionTagRecognizer
     val.gsub!(/@.*$/, "") if val.match(/@.*$/)
   end
 
+
   def self.does_it_fit_stability?( version_number, stability )
-    patch    = self.patch?( version_number )
-    stable   = self.stable?( version_number )
-    pre      = stable || self.pre?( version_number )
-    rc       = stable || self.rc?( version_number )
-    beta     = rc     || self.beta?( version_number )
-    alpha    = beta   || self.alpha?( version_number )
-    snapshot = alpha  || self.pre?( version_number ) || self.snapshot?( version_number )
-
-    return true if (stability.casecmp( A_STABILITY_PATCH )    == 0) && patch
-    return true if (stability.casecmp( A_STABILITY_STABLE )   == 0) && stable
-    return true if (stability.casecmp( A_STABILITY_PRE )      == 0) && pre
-    return true if (stability.casecmp( A_STABILITY_RC )       == 0) && rc
-    return true if (stability.casecmp( A_STABILITY_BETA )     == 0) && beta
-    return true if (stability.casecmp( A_STABILITY_ALPHA )    == 0) && alpha
+    patch = self.patch?( version_number )
+    return true if (stability.casecmp( A_STABILITY_PATCH ) == 0) && patch
+
+    stable = self.stable?( version_number )
+    return true if (stability.casecmp( A_STABILITY_STABLE ) == 0) && stable
+
+    pre = stable || self.pre?( version_number )
+    return true if (stability.casecmp( A_STABILITY_PRE ) == 0) && pre
+
+    rc = stable || self.rc?( version_number )
+    return true if (stability.casecmp( A_STABILITY_RC ) == 0) && rc
+
+    beta = rc || self.beta?( version_number )
+    return true if (stability.casecmp( A_STABILITY_BETA ) == 0) && beta
+
+    alpha = beta || self.alpha?( version_number )
+    return true if (stability.casecmp( A_STABILITY_ALPHA ) == 0) && alpha
+
+    snapshot = alpha || self.pre?( version_number ) || self.snapshot?( version_number )
     return true if (stability.casecmp( A_STABILITY_SNAPSHOT ) == 0) && snapshot
     return true if (stability.casecmp( A_STABILITY_DEV )      == 0)
+    
     return false
   end
 
+
   def self.stability_tag_for( version )
     if version.match(/@.*$/)
       spliti = version.split("@")

data/lib/versioncmp.rb

@@ -222,7 +222,7 @@ class Versioncmp
 
   def self.timestamp? part
     return false if part.to_s.empty?
-    return part.length() == 8 && part.match(/^[0-9]+$/) != nil
+    return part.length() == 9 && part.match(/^[0-9]+$/) != nil
   end
 
 
@@ -234,6 +234,7 @@ class Versioncmp
     replace_99_does_not_exist cleaned_version
     replace_timestamps cleaned_version
     replace_groovy cleaned_version
+    replace_redhatx cleaned_version
     VersionTagRecognizer.remove_minimum_stability cleaned_version
     cleaned_version
   end
@@ -257,6 +258,12 @@ class Versioncmp
     end
   end
 
+  def self.replace_redhatx val
+    if val.match(/\-redhat\-[0-9]+$/i)
+      val.gsub!(/\-redhat\-[0-9]+$/i, "")
+    end
+  end
+
 
   # Some glory Java Devs used the timestamp as version string
   # http://www.versioneye.com/package/commons-beanutils--commons-beanutils

data/naturalsorter.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
-  s.add_development_dependency "rspec", "3.2.0"
-  s.add_development_dependency "coveralls", "0.8.3"
-  s.add_development_dependency "simplecov", "0.10.0"
+  s.add_development_dependency "rspec", "3.9.0"
+  s.add_development_dependency "coveralls", "0.8.23"
+  s.add_development_dependency "simplecov", "0.16.1"
 end

data/spec/naturalsorter/version_tag_recognizer_spec.rb

@@ -297,6 +297,31 @@ describe VersionTagRecognizer do
   end
 
 
+  it "returns the right value for stable" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_STABLE)).to eql(10)
+  end
+  it "returns the right value for patch" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_PATCH)).to eql(11)
+  end
+  it "returns the right value for pre" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_PRE)).to eql(6)
+  end
+  it "returns the right value for rc" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_RC)).to eql(5)
+  end
+  it "returns the right value for beta" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_BETA)).to eql(4)
+  end
+  it "returns the right value for alpha" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_ALPHA)).to eql(3)
+  end
+  it "returns the right value for snapshot" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_SNAPSHOT)).to eql(2)
+  end
+  it "returns the right value for dev" do
+    expect( VersionTagRecognizer.value_for_key(VersionTagRecognizer::A_STABILITY_DEV)).to eql(0)
+  end
+
 
   it "returns compares right for alpha and beta" do
     expect( VersionTagRecognizer.compare_tags("1.1.1-alpha", "1.1.1-beta")).to eql(-1)
@@ -334,6 +359,9 @@ describe VersionTagRecognizer do
   it "does fit stability" do
     expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.1-BETA", "beta" )).to be_truthy
   end
+  it "does fit stability" do
+    expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.1-alpha", "beta" )).to be_falsey
+  end
   it "does fit stability" do
     expect( VersionTagRecognizer.does_it_fit_stability?( "2.2.x-dev", "dev" )).to be_truthy
   end

data/spec/naturalsorter/versioncmp_spec.rb

@@ -23,6 +23,10 @@ describe Versioncmp do
     expect( Versioncmp.compare("0.6-groovy-1.8-rc1", "0.6-groovy-1.8")).to eql(-1)
   end
 
+  it "smaler" do
+    expect( Versioncmp.compare("0.5.25", "0.5.20170404")).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
@@ -79,6 +83,10 @@ describe Versioncmp do
     expect( Versioncmp.compare("2.3", "2.0-beta-1")).to eql(1)
   end
 
+  it "bigger" do
+    expect( Versioncmp.compare("0.5.20170404", "0.5.25")).to eql(1)
+  end
+
   it "1.1.1 is bigger than 1.1" do
     expect( Versioncmp.compare("1.1.1", "1.1")).to eql(1)
   end
@@ -133,6 +141,14 @@ describe Versioncmp do
     expect( Versioncmp.compare("1.0", "1.0.0")).to eql(0)
   end
 
+  it "equal" do
+    expect( Versioncmp.compare("3.3.1.Final", "3.3.1.Final-redhat-1")).to eql(0)
+  end
+
+  it "equal" do
+    expect( Versioncmp.compare("3.3.1.Final", "3.3.1.Final-RedHat-33")).to eql(0)
+  end
+
   it "1.0.0 is smaller than 1.0.*" do
     expect( Versioncmp.compare("1.0.0", "1.0.*")).to eql(-1)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 3.0.17
+  version: 3.0.22
 platform: ruby
 authors:
 - reiz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.23
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.16.1
 description: This GEM is sorting Arrays in a natural order. a2 < a10. Beside that
   this GEM has some methods to sort version strings. It even recognises alpha, beta,
   RC, dev and stable versions.
@@ -64,6 +64,7 @@ extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
+- ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
@@ -99,8 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: naturalsorter
-rubygems_version: 2.4.8
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Sorting arrays in natural order