naturalsorter 3.0.19 → 3.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 842fac0c8a6456189c21ff91b5a5b297d1af062e
-  data.tar.gz: 942e788e64f51c95a7052c4bdf83cd8ae5ec3ce3
+SHA256:
+  metadata.gz: cbe569276e185fc5cdc6baf92059c88772b15f511b9d4a06103cbc696c7e7d8f
+  data.tar.gz: 819a0f43d6c7d0f211086f023523833b0a8e50c468ea7f23757d57631eb1dbc0
 SHA512:
-  metadata.gz: 855652f170d372a653a4851309ef6e9fb860130cc87ba576d6fae304838292c5b234d006f930a5a85486b5af0dd8105ddeba19419264be05738043a91e4d6edb
-  data.tar.gz: f6f5544efb8bbc286db2d7ed68441fd95567d75d67cb24dcd4b80f215f6befa7116ef5ab9fa94566406627207b339cf1e5e426d26365da7efb8ca0029e90a5bf
+  metadata.gz: fb16130e9dd899f1100eb902bda58b0e47c19120593ec17f3c5b7f656677089f334653ecad88cbecc831dc64c9a9284596a37d09308b1e3b99162391402deb2b
+  data.tar.gz: 7995777d57c560a268b79ee53a43330326a13267175925f30fea6c852f16ba6893a533788f4f4877e8531d115f67e2f5f68789ae786c59119461a6c52cade709

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.19'`
+`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.19"
+  VERSION = "3.0.24"
 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("@")
@@ -121,6 +141,7 @@ class VersionTagRecognizer
   end
 
   def self.stable? value
+    return true if value.to_s.empty?
     return false if value.match(/\Adev-/i) || value.match(/-dev\z/i)
     return false if self.preview?( value )
 

data/lib/versioncmp.rb

@@ -287,7 +287,7 @@ class Versioncmp
 
   def self.replace_x_dev val
     new_val = String.new(val)
-    if val.eql?("dev-master")
+    if ['dev-master', 'master', 'trunk'].include?( val )
       new_val = "99999999999"
     elsif val.eql?("dev-develop")
       new_val = "9999999999"

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

@@ -3,6 +3,11 @@ require "naturalsorter"
 
 describe VersionTagRecognizer do
 
+  it "release? is true for nil" do
+    # if nill we assume the latest stable version.
+    expect( VersionTagRecognizer.release?(nil)).to be_truthy
+  end
+
   it "release? is true" do
     expect( VersionTagRecognizer.release?("1.1")).to be_truthy
   end
@@ -297,6 +302,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 +364,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

@@ -95,6 +95,14 @@ describe Versioncmp do
     expect( Versioncmp.compare("dev-master", "10.10.999")).to eql(1)
   end
 
+  it "master is bigger than 10.10.999" do
+    expect( Versioncmp.compare("master", "10.10.999")).to eql(1)
+  end
+
+  it "trunk is bigger than 10.10.999" do
+    expect( Versioncmp.compare("trunk", "10.10.999")).to eql(1)
+  end
+
   it "2.2.x-dev is bigger than 2.2.1" do
     expect( Versioncmp.compare("2.2.x-dev", "2.2.1")).to eql(1)
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 3.0.19
+  version: 3.0.24
 platform: ruby
 authors:
 - reiz
 - versioneye
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-25 00:00:00.000000000 Z
+date: 2020-07-09 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
@@ -84,7 +85,7 @@ homepage: https://github.com/versioneye/naturalsorter
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -99,9 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: naturalsorter
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Sorting arrays in natural order
 test_files: