hostlist_expression 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4444bb6780f552999628387b893e98e8df483562
-  data.tar.gz: 97cf032750d191be707b748bce011ea29b7d57ba
+  metadata.gz: 9850d3b38f2db45ecab5bc18bf7493188deff215
+  data.tar.gz: 2bde9da4e2e26741a6de79ecf313df1b2daa4913
 SHA512:
-  metadata.gz: 86108d43e27579172276c5c17e0c9b4922a33b4fc1bb0554325304fd50f55a4f80bd0bcfdfc76a8f9bde511d82b6f5db37ab9d65d934cd5556e2ebedaec60bea
-  data.tar.gz: 784f9d4f7ddc2e14ae4c2d2f62b57a6d927e8fbb2f3df77182451dfc093cb8ca4d2fd1165bba3da5107537d66f05d6b07456832dde395941ff7d2b833291cac5
+  metadata.gz: 888de47ff1e69726e16d4ff6a950c28d3422d659ce28dd6dd4a8478ddd64a51a68388bf58e0e9600baf691db834547b30cc417bca96db23dc703f0f6609f6a33
+  data.tar.gz: 292d045103e248d93f868288a4ddae615a251dcf77f9222bc044b3fc360d828ff99093a3b3df0467438d0c4ce4b8bdc84ad01b2126bb1af1c4d97f0b5f7c6260

data/lib/hostlist_expression.rb

@@ -1,18 +1,20 @@
 # Author: Daniel Schroeder
 # License: MIT
 # Home: https://github.com/udondan/hostlist_expression-ruby
+
+# Expand hostlist expression
 #
-# Public: Expand hostlist expression
+# @param [ String ] expression A host list expression.
+# @param [ String, Array<String> ] separator - Character(s) for separating ranges (default: [":", "-"]).
 #
-# expression  - Hostlist expression.
-# separator - Character(s) for separating ranges (default: [":", "-"]).
-#
-# Examples
+# @example
 #
 #   hostlist_expression("your-host-[1-3].com")
 #   # => ["your-host-1.com", "your-host-2.com", "your-host-3.com"]
 #
-# Returns the expanded host list as array.
+# @return [ Array<String> ] A list of expanded hosts.
+#
+# @since 0.1.0
 def hostlist_expression(expression, separator = [":", "-"])
   
   # Validate range separator
@@ -20,11 +22,9 @@ def hostlist_expression(expression, separator = [":", "-"])
     separator = separator.join("")
   end
   if not separator.class == String
-    puts "Error: Range separator must be either of type String or Array. given: #{separator.class}"
-    exit 1
+    raise "Error: Range separator must be either of type String or Array. given: #{separator.class}"
   elsif separator.length == 0
-    puts "Error: Range separator is empty"
-    exit 1
+    raise "Error: Range separator is empty"
   end
   
   # Prepeare separator for use in regular expressions
@@ -54,37 +54,39 @@ def hostlist_expression(expression, separator = [":", "-"])
         range_items.push(range_items[0])
       end
       
+      # Get lower and higher value of range
+      if range_items[0].to_i < range_items[1].to_i
+        from = range_items[0]
+        to = range_items[1]
+      else
+        from = range_items[1]
+        to = range_items[0]
+      end
+      
       # Numeric range
-      if range_items[0].match(/^[0-9]+$/) and range_items[1].match(/^[0-9]+$/)
+      if from.match(/^[0-9]+$/) and to.match(/^[0-9]+$/)
         isnum = true
-        from = range_items[0].to_i
-        to = range_items[1].to_i
+        from = from.to_i
+        to = to.to_i
       
       # Uppercase alphabetic range
-      elsif range_items[0].length == 1 and range_items[1].length == 1 and /^[[:upper:]]+$/.match(range_items[0]) and /^[[:upper:]]+$/.match(range_items[1])
+      elsif from.length == 1 and to.length == 1 and /^[[:upper:]]+$/.match(from) and /^[[:upper:]]+$/.match(to)
         alphabet = ('A'..'Z').to_a
-        from = alphabet.index(range_items[0])
-        to = alphabet.index(range_items[1])
+        from = alphabet.index(from)
+        to = alphabet.index(to)
       
       # Lowercase alphabetic range
-      elsif range_items[0].length == 1 and range_items[1].length == 1 and /^[[:lower:]]+$/.match(range_items[0]) and /^[[:lower:]]+$/.match(range_items[1])
+      elsif from.length == 1 and to.length == 1 and /^[[:lower:]]+$/.match(from) and /^[[:lower:]]+$/.match(to)
         alphabet = ('a'..'z').to_a
-        from = alphabet.index(range_items[0])
-        to = alphabet.index(range_items[1])
+        from = alphabet.index(from)
+        to = alphabet.index(to)
       
       else
-        puts "Error: Invalid host range definition #{expression}"
-        exit 1
-      end
-      
-      # Fail if "to" is higher than "from"
-      if from>to
-        puts "Error: Invalid host range definition. 'to' part must be higher than 'from' part: #{expression}"
-        exit 1
+        raise "Error: Invalid host range definition #{expression}"
       end
       
       # Iterate over all hosts and store the resolved patterns in "replacements"
-      hosts.each do |exitem|
+      hosts.each do |host|
         
         # Iterate over the range
         (from..to).each do |i|
@@ -100,18 +102,20 @@ def hostlist_expression(expression, separator = [":", "-"])
     end
     
     # We clone the hosts array, because we can't modify it while iterating over its elements. So we iterate over the clone instead
-    hosts.clone.each do |exitem|
+    hosts.clone.each do |host|
       
       # Remove the original element
-      hosts.delete(exitem)
+      hosts.delete(host)
       
       # Iterate over previously stored replacements
       replacements.each do|replacement|
+        
         # Adding replacement to hosts array
-        hosts.push(exitem.sub(/\[#{match[0]}\]/, replacement))
+        hosts.push(host.sub(/\[#{match[0]}\]/, replacement))
       end
     end
   end
   
+  # Return uniqe results
   return hosts.uniq
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: hostlist_expression
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies: []
 description: "Expand hostlist expression like those defined in pdsh or Ansible inventory
-  files.\n  \nAn expression like \"your-host-[1-3].com\" will expand into an array
-  containing the elements:\n - your-host-1.com\n - your-host-2.com\n - your-host-3.com\n\nSee
-  https://github.com/udondan/hostlist_expression-ruby for documentation\n"
+  files.\n  \nAn expression like \"host-[1-3].com\" will expand into an array containing
+  the elements host-1.com, host-2.com and host-3.com\n\nSee https://github.com/udondan/hostlist_expression-ruby
+  for documentation\n"
 email: daniel@phatthanan.com
 executables: []
 extensions: []