naturalsorter 2.0.10 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1efceba12767b1736d4ef3c9cea338fcb28acb1
-  data.tar.gz: f0ff0e2df2e64f6ddac53edeffeade414c088221
+  metadata.gz: 92e0886e8c42c1ba9393d8f9cd9dde1689c84f6c
+  data.tar.gz: 5accede726dcb7a76064895723e5b5af74840914
 SHA512:
-  metadata.gz: 21c3ecc8e3113c476ef677f1a3d8992bc859821f8ff96b46ce1deef9e321e26bb675c2cb0fd154fd503d5c7a4889683d657e703a9599e5c70a8ee1aa224994f6
-  data.tar.gz: 7baa67121d6bc657f6bfcdaaab14949323f17971d370227185d8ee004c728870abcbc1567a0487a2a7835780352cb21adcd357f1294e3d7423cef1b55a1a0884
+  metadata.gz: 8d6951fa1be0d7397c3bf982517b705e88dfe5145600d2a40d9e4eb85d204ad9eafd2efd97f7ee64afbccb7213307e4e295ee59b069cebeacdc66968754ce749
+  data.tar.gz: 8674ce8e672a03ee2ad2cccf17877218b8e008f6ac1599ba543e481bffdcd6a18bddf02ff30f9f790cd2adbba36af327adb39afa8b7485d3832c3ce9b5ae49fd

data/lib/naturalsorter/version.rb

@@ -1,3 +1,3 @@
 module Naturalsorter
-  VERSION = "2.0.10"
+  VERSION = "3.0.0"
 end

data/lib/version_tag_recognizer.rb

@@ -7,6 +7,7 @@ class VersionTagRecognizer
   A_STABILITY_ALPHA = "alpha"
   A_STABILITY_SNAPSHOT = "SNAPSHOT"
   A_STABILITY_DEV = "dev"
+  A_STABILITY_BUILD = "BUILD"
 
   def self.value_for( value )
     return 0  if self.dev? value
@@ -20,25 +21,25 @@ class VersionTagRecognizer
   end
 
   def self.compare_tags( a, b)
-    a_val = self.value_for a 
+    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
   end
 
-  def self.tagged? value 
-    return true if self.alpha?(value) 
+  def self.tagged? value
+    return true if self.alpha?(value)
     return true if self.beta?(value)
-    return true if self.dev?(value) 
-    return true if self.rc?(value) 
-    return true if self.snapshot?(value) 
-    return true if self.pre?(value) 
+    return true if self.dev?(value)
+    return true if self.rc?(value)
+    return true if self.snapshot?(value)
+    return true if self.pre?(value)
     return true if self.jbossorg?(value)
-    return false 
+    return false
   end
 
-  def self.remove_tag value 
+  def self.remove_tag value
     if self.alpha? value
       new_value = value.gsub(/\.[\w-]*alpha.*$/i, "")
       return new_value.gsub(/\.[\w-]*a.*$/i, "")
@@ -57,7 +58,7 @@ class VersionTagRecognizer
     return value
   end
 
-  def self.remove_minimum_stability val 
+  def self.remove_minimum_stability val
     val.gsub!(/@.*$/, "") if val.match(/@.*$/)
   end
 
@@ -67,23 +68,23 @@ class VersionTagRecognizer
     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 ) 
+    snapshot = alpha  || self.pre?( version_number ) || self.snapshot?( version_number )
 
     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_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
     return true if (stability.casecmp( A_STABILITY_SNAPSHOT ) == 0) && snapshot
-    return true if (stability.casecmp( A_STABILITY_DEV )      == 0) 
-    return false 
+    return true if (stability.casecmp( A_STABILITY_DEV )      == 0)
+    return false
   end
 
   def self.stability_tag_for( version )
     if version.match(/@.*$/)
       spliti = version.split("@")
       return spliti[1]
-    else 
+    else
       if self.stable? version
         return A_STABILITY_STABLE
       elsif self.pre? version
@@ -99,52 +100,56 @@ class VersionTagRecognizer
       else
         return A_STABILITY_DEV
       end
-    end 
+    end
   end
 
   def self.release? value
-    self.stable? value 
+    self.stable? value
   end
 
   def self.stable? value
-    return true if value.match(/.+RELEASE.*/i) 
-    return true if value.match(/.+BUILD.*/i) 
-    return true if value.match(/.+FINAL.*/i) 
-    return true if value.match(/.+SP.*/i) 
-    return true if value.match(/.+GA.*/i) 
-    
-    !self.alpha?(value)    and !self.beta?(value)       and 
+    return true if value.match(/.+RELEASE.*/i)
+    return true if value.match(/.+FINAL.*/i)
+    return true if value.match(/.+SP.*/i)
+    return true if value.match(/.+GA.*/i)
+
+    !self.alpha?(value)    and !self.beta?(value)       and
     !self.dev?(value)      and !self.pre?(value)        and
-    !self.rc?(value)       and !value.match(/.+SEC.*/i) and 
-    !self.snapshot?(value) and !value.match(/.+M.+/i)
+    !self.rc?(value)       and !value.match(/.+SEC.*/i) and
+    !self.snapshot?(value) and !value.match(/.+M.+/i)   and
+    !self.build?(value)
   end
 
-  def self.alpha? value 
+  def self.alpha? value
     return false if self.beta? value
     value.match(/.*alpha.*/i) or value.match(/.+a.*/i)
   end
 
-  def self.beta? value 
+  def self.beta? value
     value.match(/.*beta.*/i) or value.match(/.+b.*/i)
   end
 
-  def self.dev? value 
+  def self.dev? value
     value.match(/.*dev.*/i)
   end
 
-  def self.rc? value 
-    value.match(/.*rc.*/i) 
+  def self.rc? value
+    value.match(/.*rc.*/i)
   end
 
-  def self.snapshot? value 
+  def self.snapshot? value
     value.match(/.+SNAPSHOT.*/i)
   end
 
-  def self.pre? value 
+  def self.build? value
+    value.match(/.+build.*/i)
+  end
+
+  def self.pre? value
     value.match(/.*pre.*$/i)
   end
 
-  def self.jbossorg? value 
+  def self.jbossorg? value
     value.match(/.*jbossorg.*$/i)
   end
 

data/spec/version_tag_recognizer_spec.rb

@@ -1,7 +1,7 @@
 require "naturalsorter"
 
 describe VersionTagRecognizer do
-  
+
   it "release? is true" do
     VersionTagRecognizer.release?("1.1").should be_true
   end
@@ -27,11 +27,11 @@ describe VersionTagRecognizer do
   end
 
   it "release? is true" do
-    VersionTagRecognizer.release?("3.2.0.BUILD").should be_true
+    VersionTagRecognizer.release?("3.2.0.BUILD").should be_false
   end
 
   it "release? is true" do
-    VersionTagRecognizer.release?("3.2.0buiLd").should be_true
+    VersionTagRecognizer.release?("3.2.0buiLd").should be_false
   end
 
   it "release? is true" do
@@ -100,7 +100,7 @@ describe VersionTagRecognizer do
 
   it "release? is false" do
     VersionTagRecognizer.release?("1.1.3a").should be_false
-  end  
+  end
 
   it "release? is false" do
     VersionTagRecognizer.release?("1.1.3A").should be_false
@@ -117,7 +117,7 @@ describe VersionTagRecognizer do
   it "release? is false" do
     VersionTagRecognizer.release?("1.M1").should be_false
   end
-  
+
   it "release? is false" do
     VersionTagRecognizer.release?("2.0-m4").should be_false
   end
@@ -144,7 +144,7 @@ describe VersionTagRecognizer do
     VersionTagRecognizer.tagged?("2.1.0alpha").should be_true
   end
 
-  
+
 
   it "remove_tag is right" do
     VersionTagRecognizer.remove_tag("2.1.0alpha").should eql("2.1")
@@ -188,7 +188,7 @@ describe VersionTagRecognizer do
   it "remove_tag is right" do
     VersionTagRecognizer.remove_tag("2.1.0-BETA1").should eql("2.1")
   end
-  
+
 
 
   it "is dev? is true" do
@@ -248,92 +248,92 @@ describe VersionTagRecognizer do
   end
 
 
-  it "returns the right value for dev" do 
+  it "returns the right value for dev" do
     VersionTagRecognizer.value_for("1.1.1-dev").should eql(0)
-  end 
-  it "returns the right value for snapshot" do 
+  end
+  it "returns the right value for snapshot" do
     VersionTagRecognizer.value_for("1.1.1-SNAPSHOT").should eql(2)
-  end 
-  it "returns the right value for alpha" do 
+  end
+  it "returns the right value for alpha" do
     VersionTagRecognizer.value_for("1.1.1-alpha").should eql(3)
-  end 
-  it "returns the right value for beta" do 
+  end
+  it "returns the right value for beta" do
     VersionTagRecognizer.value_for("1.1.1-beta").should eql(4)
-  end 
-  it "returns the right value for rc" do 
+  end
+  it "returns the right value for rc" do
     VersionTagRecognizer.value_for("1.1.1-rc").should eql(5)
-  end 
-  it "returns the right value for pre" do 
+  end
+  it "returns the right value for pre" do
     VersionTagRecognizer.value_for("1.1.1-pre").should eql(6)
-  end 
-  it "returns the right value for stable" do 
+  end
+  it "returns the right value for stable" do
     VersionTagRecognizer.value_for("1.1.1").should eql(10)
-  end 
+  end
 
 
 
-  it "returns compares right for alpha and beta" do 
+  it "returns compares right for alpha and beta" do
     VersionTagRecognizer.compare_tags("1.1.1-alpha", "1.1.1-beta").should eql(-1)
-  end 
-  it "returns compares right for beta and alpha" do 
+  end
+  it "returns compares right for beta and alpha" do
     VersionTagRecognizer.compare_tags("1.1.1-beta", "1.1.1-alpha").should eql(1)
-  end 
-  it "returns compares right for alpha and alpha" do 
+  end
+  it "returns compares right for alpha and alpha" do
     VersionTagRecognizer.compare_tags("1.1.1-alpha", "1.1.1-alpha").should eql(0)
-  end 
-  it "returns compares right for RC and stable" do 
+  end
+  it "returns compares right for RC and stable" do
     VersionTagRecognizer.compare_tags("1.1.1-RC", "1.1.1").should eql(-1)
-  end 
-  it "returns compares right for stable and dev" do 
+  end
+  it "returns compares right for stable and dev" do
     VersionTagRecognizer.compare_tags("1.1.1", "1.1.x-dev").should eql(1)
-  end 
+  end
 
 
 
-  it "does fit stability" do 
+  it "does fit stability" do
     VersionTagRecognizer.does_it_fit_stability?( "2.2.1", "stable" ).should be_true
-  end 
-  it "does not fit stability" do 
+  end
+  it "does not fit stability" do
     VersionTagRecognizer.does_it_fit_stability?( "2.2.1-BETA", "stable" ).should be_false
-  end 
-  it "does fit stability" do 
+  end
+  it "does fit stability" do
     VersionTagRecognizer.does_it_fit_stability?( "2.2.1-BETA", "alpha" ).should be_true
-  end 
-  it "does fit stability" do 
+  end
+  it "does fit stability" do
     VersionTagRecognizer.does_it_fit_stability?( "2.2.1-BETA", "beta" ).should be_true
-  end 
-  it "does fit stability" do 
+  end
+  it "does fit stability" do
     VersionTagRecognizer.does_it_fit_stability?( "2.2.x-dev", "dev" ).should be_true
-  end 
-  it "does not fit stability" do 
+  end
+  it "does not fit stability" do
     VersionTagRecognizer.does_it_fit_stability?( "2.2.x-dev", "alpha" ).should be_false
-  end 
-  it "does not fit stability" do 
+  end
+  it "does not fit stability" do
     VersionTagRecognizer.does_it_fit_stability?( "2.2.x-dev", "RC" ).should be_false
-  end 
-  it "does fit stability" do 
+  end
+  it "does fit stability" do
     VersionTagRecognizer.does_it_fit_stability?( "2.2.1-RC", "RC" ).should be_true
-  end 
+  end
 
 
 
-  it "stability_tag_for returns right" do 
+  it "stability_tag_for returns right" do
     VersionTagRecognizer.stability_tag_for( "2.2.1").should eql(VersionTagRecognizer::A_STABILITY_STABLE)
   end
-  it "stability_tag_for returns right" do 
+  it "stability_tag_for returns right" do
     VersionTagRecognizer.stability_tag_for( "2.2.1-RC").should eql(VersionTagRecognizer::A_STABILITY_RC)
-  end 
-  it "stability_tag_for returns right" do 
+  end
+  it "stability_tag_for returns right" do
     VersionTagRecognizer.stability_tag_for( "2.2.1-BETA1").should eql(VersionTagRecognizer::A_STABILITY_BETA)
-  end 
-  it "stability_tag_for returns right" do 
+  end
+  it "stability_tag_for returns right" do
     VersionTagRecognizer.stability_tag_for( "2.2.1-alpha").should eql(VersionTagRecognizer::A_STABILITY_ALPHA)
-  end 
-  it "stability_tag_for returns right" do 
+  end
+  it "stability_tag_for returns right" do
     VersionTagRecognizer.stability_tag_for( "2.2.x-dev").should eql(VersionTagRecognizer::A_STABILITY_DEV)
-  end  
-  
-  
+  end
+
+
 
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naturalsorter
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 3.0.0
 platform: ruby
 authors:
 - reiz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec