naturalsorter 2.0.8 → 2.0.9

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWZlNGQxOTJiYTNmMDcwODY2ZWEwYmIyNDM1M2Y1YjEzYWRiYTgwMQ==
-  data.tar.gz: !binary |-
-    NTc2YzJjNDA5MjlhZDdmY2RjZTM5NjVkMzIzMjgwMTU0N2Q1ODEzYw==
+SHA1:
+  metadata.gz: 8e7c06f3c9ea76e81248a248f359ba9d47a19585
+  data.tar.gz: 4d61611758145d82ee30e137486c98a24ce7d176
 SHA512:
-  metadata.gz: !binary |-
-    ODk0ZjllMDY3MzUyZDUwMWFiODg1NDdkNTc2YjI0N2FjODJlNTg3YTZlMTc4
-    NTQ0NmQxZDExYzRmNTA2ZTJjYjRhZjYwYzRmNDk3M2M5ZGJkNTI2ZWEyMmNk
-    YWM1OTA5Yzk4MTNhYjRkODYwMDZjMWQ0MzlkMWZkNjVhMDFkOWE=
-  data.tar.gz: !binary |-
-    MmY4NTYyNWE3MzhmMzgxMmJjMWMyZmRmZTI4MzRhZjVkYWEwYjE3NmM2YzE4
-    MmJjNDA1NzFhNjlkYjFkMjNmYzg5ZTJiNmM2ZDVhMTY2YzcxMmQ3YmZlZjFl
-    MDgyOTFjZDBiNjM0YjFkNTJjZTk2ODA3MWE3OWQ1NDFhMjdlZjI=
+  metadata.gz: 8bed886f7de1dc8a87178ef9affcc743eabb81fb3ff845bbc9b7d6873224421463e511be1379cfeb3696a2bc3502917103714a88e13c8c261c008c224e3452e8
+  data.tar.gz: 324bd9c146b24f4824ebcca9046b8faa05618b2616fd0cd5009b0ea142b4811add5afebd6c5220832e09616bdc22e7b9511c90fdc18161a3ee52f9d2610b60b1

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p353

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
-rvm: 1.9.3
+rvm: 2.0.0-p353
 script: bundle exec rspec spec

data/Gemfile

@@ -1,7 +1,5 @@
 source 'http://rubygems.org'
-ruby "1.9.3"
+ruby "2.0.0"
 
-# Specify your gem's dependencies in naturalsorter.gemspec
+# dependencies specified in naturalsorter.gemspec
 gemspec
-
-

data/README.markdown

@@ -20,6 +20,18 @@ Because the default sort method does not recognize the numbers in the string. Th
 
 `["init20", "init30", "init200"]`
 
+
+## Installation
+
+You should add this line to your Gemfile
+
+`gem 'naturalsorter', '2.0.9'`
+
+and run this command in your app root directory
+
+`bundle install`
+
+
 ## Version Sorting
 This fork contains some special algorithms to sort version numbers in a natural order. This project is used at <https://www.versioneye.com> to show versions of selected open source projects.
 
@@ -70,16 +82,6 @@ because '~>1.1' doesn't fit anymore the newest version.
 `Naturalsorter::Sorter.is_version_current?(version, newest_version)`
 
 
-## Installation
-
-You should add this line to your Gemfile
-
-`gem 'naturalsorter', '2.0.8'`
-
-and run this command in your app root directory
-
-`bundle install`
-
 ## How To Use - Examples
 
 After the installation you can use it like this:

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "2.0.8"
+  VERSION = "2.0.9"
 end

data/lib/versioncmp.rb

@@ -34,8 +34,8 @@ class Versioncmp
 
     return  0 if  a_empty && b_empty
     return  0 if  a_val.eql?( b_val )
-    return  1 if (a_empty == false) && b_empty
-    return -1 if (b_empty == false) && a_empty
+    return  1 if (a_empty == false) && (b_empty == true )
+    return -1 if (b_empty == false) && (a_empty == true )
 
     a = pre_process a_val
     b = pre_process b_val
@@ -43,7 +43,10 @@ class Versioncmp
     ab = [a, b]
     offsets = [0, 0]
 
-    for i in 0..20
+    max_length = a_val.length
+    max_length = b_val.length if b_val.length > max_length
+
+    for i in 0..max_length
       result = self.check_the_slice ab, offsets
       next if result.nil?
       return result if result == 1 || result == -1
@@ -121,7 +124,7 @@ class Versioncmp
         return Versioncmp.compare_string_length(a, b)
       end
     end
-    self.compare_string_length_odd(a, b)
+    0
   end
 
 
@@ -141,14 +144,12 @@ class Versioncmp
     for z in 0..100
       offsetz = offset + z
       break if offsetz > cake.length()
+
       p = cake[ offset..offset + z ]
-      if ( p.match(/^\w+\.$/) != nil )
-        break
-      end
-    end
-    if z > 0
-      z = z - 1
+      break if ( p.match(/^\w+\.$/) != nil )
     end
+
+    z = z - 1 if z > 0
     piece = cake[offset..offset + z ]
     return piece
   end
@@ -161,6 +162,7 @@ class Versioncmp
 
   def self.pre_process val
     cleaned_version = replace_x_dev val
+    cleaned_version = replace_wildcards cleaned_version
     replace_leading_v cleaned_version
     replace_99_does_not_exist cleaned_version
     replace_timestamps cleaned_version
@@ -189,6 +191,13 @@ class Versioncmp
   end
 
 
+  def self.replace_wildcards val
+    new_val = String.new(val)
+    new_val = "9999999" if val.match(/\.\*$/)
+    new_val
+  end
+
+
   def self.replace_x_dev val
     new_val = String.new(val)
     if val.eql?("dev-master")
@@ -257,11 +266,4 @@ class Versioncmp
     return -1
   end
 
-
-  def self.compare_string_length_odd(a, b)
-    return  1 if a.length > b.length
-    return -1 if a.length < b.length
-    return  0
-  end
-
 end

data/naturalsorter.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
   s.authors     = ["reiz", "versioneye"]
   s.email       = ["reiz@versioneye.com"]
   s.homepage    = "https://github.com/versioneye/naturalsorter"
+  s.license     = 'MIT'
   s.summary     = %q{Sorting arrays in natural order}
   s.description = %q{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.}
 

data/spec/versioncmp_spec.rb

@@ -38,6 +38,18 @@ describe Versioncmp do
     Versioncmp.compare("1.1", "1.1").should eql(0)
   end
 
+  it "equal" do
+    Versioncmp.compare("1.0", "1.0.0").should eql(0)
+  end
+
+  it "1.0.0 is smaller than 1.0.*" do
+    Versioncmp.compare("1.0.0", "1.0.*").should eql(-1)
+  end
+
+  it "1.0 is smaller than 1.0.*" do
+    Versioncmp.compare("1.0.0", "1.0.*").should eql(-1)
+  end
+
   it "equal RC" do
     Versioncmp.compare("1.1.RC1", "1.1.RC1").should eql(0)
   end
@@ -159,7 +171,7 @@ describe Versioncmp do
   end
 
   it "3.0.0 is equal to 3.0" do
-    Versioncmp.compare("3.0.0", "3.0").should eql(1)
+    Versioncmp.compare("3.0.0", "3.0").should eql(0)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - reiz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,8 +34,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.markdown
@@ -50,7 +51,8 @@ files:
 - spec/version_tag_recognizer_spec.rb
 - spec/versioncmp_spec.rb
 homepage: https://github.com/versioneye/naturalsorter
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -58,17 +60,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: naturalsorter
-rubygems_version: 2.1.10
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Sorting arrays in natural order