naturalsorter 3.0.16 → 3.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8f548a085d5594758633be73af1a728ef5c8dc60
-  data.tar.gz: 57c3674fd60409962dfbc2d2226078a4f5e242dd
+SHA256:
+  metadata.gz: ab1f05afaca4d011db3ad1d1238b9669c330b48a16bbaa334be0f0b09bd53729
+  data.tar.gz: 34b3348f206adad23c86044180038c39d849d54bc0c072766b50cf882a4fe685
 SHA512:
-  metadata.gz: 2b694d5c2775b1564563651c26d60598045ff969071222777f4f6ade6d4a67f21bc3bbf1dc6727a89822d21964f8608b5503e78f44268652ebd686d4328beacb
-  data.tar.gz: c3ef52d4b829131567b3c3aea73c609fe8ade23be01cb38aa6808bcc062fdbebcc6acd17b5909aadda19cfd65c731ec7489f6a12cafaa9a33b5cfeb892f51dc7
+  metadata.gz: 635bef8758a11ef53c8c8d876c0ce9e2e3d4326f0c52a4a868004daa4929a9844a98fc93cce882790a24f65b27cd399a5adc8da32879fa559fa0174c3d8fc4f8
+  data.tar.gz: 4fe4e73b1f4a819711c443e7cbaf259aca84705e869c9dd36985b1baa034ec0ca2eb0be4b25af175fb923bbc897c7ba39273865b2ce8f521e3ae5174f501ad70

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.19'`
 
 and run this command in your app root directory
 

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "3.0.16"
+  VERSION = "3.0.21"
 end

data/lib/version_tag_recognizer.rb

@@ -9,6 +9,7 @@ class VersionTagRecognizer
   A_STABILITY_DEV = "dev"
   A_STABILITY_BUILD = "BUILD"
   A_STABILITY_PATCH = "patch"
+  A_STABILITY_PREVIEW = "preview"
 
 
   def self.value_for( value )
@@ -23,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
@@ -68,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("@")
@@ -121,6 +142,7 @@ class VersionTagRecognizer
 
   def self.stable? value
     return false if value.match(/\Adev-/i) || value.match(/-dev\z/i)
+    return false if self.preview?( value )
 
     return true if value.match(/.+RELEASE.*/i)
     return true if value.match(/.+FINAL.*/i)
@@ -172,4 +194,8 @@ class VersionTagRecognizer
     value.match(/.*jbossorg.*$/i)
   end
 
+  def self.preview? value
+    value.match(/-preview\d+-/i) || value.match(/-preview-/i)
+  end
+
 end

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

@@ -135,6 +135,14 @@ describe VersionTagRecognizer do
     expect( VersionTagRecognizer.release?("garbage-collection-configuration-dev")).to be_falsey
   end
 
+  it "release? is false" do
+    expect( VersionTagRecognizer.release?("2.0.0-preview-final")).to be_falsey
+  end
+
+  it "release? is false" do
+    expect( VersionTagRecognizer.release?("2.0.0-preview2-final")).to be_falsey
+  end
+
 
 
   it "is alpha? is true" do
@@ -289,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)
@@ -326,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
@@ -301,4 +317,8 @@ describe Versioncmp do
     expect( Versioncmp.compare("dev-something", "1.0.0")).to eql(1)
   end
 
+  it "3.21.0-GA is bigger than 3.22.0-CR1" do
+    expect( Versioncmp.compare("3.21.0-GA", "3.21.0-CR1")).to eql(1)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 3.0.16
+  version: 3.0.21
 platform: ruby
 authors:
 - reiz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 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