naturalsorter 0.5.9 → 0.5.10

data/README.markdown

@@ -76,7 +76,7 @@ because '~>1.1' doesn't fit anymore the newest version.
 
 You should add this line to your Gemfile
 
-`gem 'naturalsorter', '0.5.9'`
+`gem 'naturalsorter', '0.5.10'`
 
 and run this command in your app root directory
 

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "0.5.9"
+  VERSION = "0.5.10"
 end

data/lib/versioncmp.rb

@@ -26,20 +26,30 @@
 class Versioncmp
 
   # 'Natural version order' comparison of two version strings
-  def self.compare(a, b)
+  def self.compare(a_val, b_val)
 
-    if (!a.nil? || a.eql?("") ) && b.nil?
+    if (!a_val.nil? || a_val.eql?("") ) && b_val.nil?
       return 1
     end
 
-    if (!b.nil? || b.eql?("")) && a.nil?
+    if (!b_val.nil? || b_val.eql?("")) && a_val.nil?
       return -1
     end  
 
-    if a.nil? && b.nil? 
+    if a_val.nil? && b_val.nil? 
       return -1
     end
 
+    a = String.new(a_val)
+    if a_val.match(/\.x-dev$/)
+      a = a_val.gsub("x-dev", "9999999")
+    end
+
+    b = String.new(b_val)
+    if b_val.match(/\.x-dev$/)
+      b = b_val.gsub("x-dev", "9999999")
+    end
+
 	  offset1 = 0;
     offset2 = 0;
 

data/spec/versioncmp_spec.rb

@@ -5,6 +5,10 @@ describe Versioncmp do
   it "smaler" do
     Versioncmp.compare("1.1", "1.2").should eql(-1)
   end
+
+  it "smaler" do
+    Versioncmp.compare("1.1.5", "1.1.x-dev").should eql(-1)
+  end
   
   it "bigger" do
     Versioncmp.compare("1.1", "1.0").should eql(1)

metadata

@@ -1,46 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: naturalsorter
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 9
-  version: 0.5.9
+version: !ruby/object:Gem::Version
+  version: 0.5.10
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - reiz
 - versioneye
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-04 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 description: This GEM is sorting Arrays in a natural order. a2 < a10
-email: 
+email:
 - robert.reiz@gmx.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.markdown
@@ -54,37 +48,31 @@ files:
 - spec/naturalsorter_spec.rb
 - spec/release_recognizer_spec.rb
 - spec/versioncmp_spec.rb
-has_rdoc: true
 homepage: https://github.com/versioneye/naturalsorter
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: naturalsorter
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Sorting arrays in natural order
-test_files: 
+test_files:
 - spec/naturalsorter_spec.rb
 - spec/release_recognizer_spec.rb
 - spec/versioncmp_spec.rb