yahsort 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1978f669d284eb853bae1d519a93a773e19b85db
-  data.tar.gz: 688a5c61af76eb40b0ab345659e07167931a5479
+  metadata.gz: 1048abd2ea5d541a2dfc241314df602378ae813a
+  data.tar.gz: a5820ffd6840dbacf45506f28161d0966ea317c1
 SHA512:
-  metadata.gz: 6017c77abb3490c2f06184fc0120d104499bf9742747c657115a8e973a6e0e98b407dbc037c408de9b75462fca7251b916a2ead0cb94440472511b4ec0b1baa9
-  data.tar.gz: 69e0d25017e37963b09977e516d4fd43c90a8f07c1361a922c3c4fd8028f3addee32ce2eb0a1c942331a1a58a9a3cf4a051576fe32929b75fda3ffef0dae031b
+  metadata.gz: 8d261adcd6c1c383de360ddaa61db2f70d81a67bd6244d5d85005419ef1aab3560475124e98f98d9d04c7aaf11ed43674446edd084e563b8eb8faf28554622e1
+  data.tar.gz: 1911b7473bd84f2f4d70e662ecfe78cc687d98c5a87d31027401ad38742acaf12bda4a8c3f7af6e68ecfd69ca9567c0baf482eb5ae7f97bc04a0eb719b356169

data/README.md

@@ -2,6 +2,8 @@
 
 Easier to read sorted list of hostnames for those who still care* :)
 
+Ofcourse you don't need this if you use zero padded hostnames - web01, web02
+
 Usually
 
 ```
@@ -35,7 +37,7 @@ Or install it yourself as:
 ```
 require 'yahsort'
 
-puts %w{ web1 web10 web11 web2 }.sort 
+puts %w{ web1 web10 web11 web2 }.sort &Yahsort.sorter
 ```
 
 ## Contributing
@@ -46,4 +48,4 @@ puts %w{ web1 web10 web11 web2 }.sort
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
 
-*[Stop worrying about prodweb001](http://www.slideshare.net/AmazonWebServices/stop-worrying-about-prodweb001-and-start-loving-i98fb9856-arc201-aws-reinvent-2013)
+*[Stop worrying about prodweb001](http://www.slideshare.net/AmazonWebServices/stop-worrying-about-prodweb001-and-start-loving-i98fb9856-arc201-aws-reinvent-2013)

data/lib/yahsort/helper.rb

@@ -0,0 +1,8 @@
+module Yahsort
+  def self.fqdn_sorter
+    pattern =  Yahsort::PATTERN + '\.'
+    regex = Regexp.new(pattern)
+    
+    self.sorter(regex=regex)
+  end
+end

data/lib/yahsort/version.rb

@@ -1,3 +1,3 @@
 module Yahsort
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/yahsort.rb

@@ -1,13 +1,15 @@
 require "yahsort/version"
+require "yahsort/helper"
 
 module Yahsort
   # dig should indicate the 'digits'
   # sec is secondary idx, number based match is done on same secondaries
   # db1 api2 ==> api2, db1
+  # prod0api1 ---> secondary = prod0api, dig = 1
+  PATTERN = '^(?<sec>\w*\D)(?<dig>\d+)'
+  REGEX = Regexp.new(PATTERN)
   
-  PATTERN = %r{(?<sec>\D)(?<dig>\d+)$}
-  
-  def self.sorter(regex=PATTERN, secondary_precedence=true)
+  def self.sorter(regex=REGEX, secondary_precedence=true)
     
     sorter = lambda do |x,y|
       reg = regex

data/spec/yahsort_spec.rb

@@ -20,5 +20,38 @@ describe Yahsort do
     expect(h.sort &Yahsort.sorter).to eq(%w{api2 api10 db1 db10})
   end
 
-  #todo match secondary & regex params
+  it 'works with padded 0s 001,002' do
+    h = %w{ web002 web001 web003}
+    expect(h.sort &Yahsort.sorter).to eq(%w{web001 web002 web003})
+  
+    h = %w{ api1 web010 web000 api10}
+    expect(h.sort &Yahsort.sorter).to eq(%w{api1 api10 web000 web010})
+  
+  end
+  
+  
+  fqdn_unsorted = %w{ web2.1domain web10.1domain web1.2domain}
+  fqdn_sorted = %w{web1.2domain web2.1domain web10.1domain}
+
+  it 'does not work with fqdn by default' do
+    expect(fqdn_unsorted.sort &Yahsort.sorter).not_to eq(fqdn_sorted)
+  end
+  
+  it 'works with fqdn using helper' do
+    expect(fqdn_unsorted.sort &Yahsort.fqdn_sorter).to eq(fqdn_sorted)
+  end
+  
+  it "works with additional digits" do
+    h = %w{stag1api10 stag1api2 stag2api10 stag2api1 stag2api2}
+    h_sorted = %w{stag1api2 stag1api10 stag2api1 stag2api2 stag2api10 }
+    expect(h.sort &Yahsort.sorter).to eq(h_sorted)
+  end
+
+  it "works with longer fqdns with additional ." do
+    h = %w{dev2xcn10.c26.tree.top.com dev2xcn11.c26.tree.top.com dev2xcn2.c26.tree.top.com}
+    h_sorted = %w{dev2xcn2.c26.tree.top.com dev2xcn10.c26.tree.top.com dev2xcn11.c26.tree.top.com}
+    expect(h.sort &Yahsort.fqdn_sorter).to eq(h_sorted)
+  end
+  
+  #todo match secondary_precedence
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yahsort
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Manas Gupta
@@ -67,6 +67,7 @@ files:
 - README.md
 - Rakefile
 - lib/yahsort.rb
+- lib/yahsort/helper.rb
 - lib/yahsort/version.rb
 - spec/spec_helper.rb
 - spec/yahsort_spec.rb