hostlist_expression 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 80ed12d4cf8f0d716de3c766de55a1cb052da4ce
-  data.tar.gz: ba61a29b097eae918d2623207d5e6824b7227211
+SHA256:
+  metadata.gz: d8b842060fa14e03dcd4a646d4305df1288c5b77891b3a7917192d0ed1ebea3b
+  data.tar.gz: 27f65117b4e7307ebf734c97caac3872d85b1b7ada0c1c07c697e21e687f4749
 SHA512:
-  metadata.gz: f92ce87db337993ab0dc0cc298bc9da0e2cb43dd2f44381c3d4890a4aac77e45756f953f5d77c713993acf983629f5c86de1db0e073bb7b21889f0e936e32db6
-  data.tar.gz: 64c2e257fc51eaa15d4095b9e73c604fc260f90339d6676e9122751d666b37de932c3a93a1997454e1c52130ca98b3f01b8b94ece8a93010822b32eaa7fd030a
+  metadata.gz: 8bfa2df39099d32a1ca7c126aff098fef0ca3f67ec8baac61c046638db353e9f8377d90329dc5d76a23498d2d147b5e13056a0ae4dcd35c60504ce1be3bfb628
+  data.tar.gz: 6646f9aa7bb1decd99e9deb296f5e4b194ec672d6eda80501770b4725651c445a2f2e8d4a6bd6baa6cfd2847078c9d98a78516b8a3d87e9e5e04440fdfdfbe44

data/lib/hostlist_expression.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Author: Daniel Schroeder
 # License: MIT
 # Home: https://github.com/udondan/hostlist_expression-ruby
@@ -15,83 +17,66 @@
 #
 # @since 0.1.0
 def hostlist_expression(expression, separator = [":", "-"])
-  
   # Validate range separator
-  if separator.class == Array
-    separator = separator.join("")
-  end
-  if not separator.class == String
+  separator = separator.join if separator.is_a?(Array)
+  if !separator.is_a?(String)
     raise "Error: Range separator must be either of type String or Array. given: #{separator.class}"
-  elsif separator.length == 0
+  elsif separator.empty?
     raise "Error: Range separator is empty"
   end
-  
-  # Prepeare separator for use in regular expressions
+
+  # Prepare separator for use in regular expressions
   separator = Regexp.escape(separator)
-  
-  # Return input, if this is not a hostlist expression
-  return expression if not expression.match(/\[(?:[\da-z]+(?:[#{separator}][\da-z]+)?,?)+\]/i)
-  
-  # hosts array will hold all expanded results, it as well is the working array where partially resolved results are stored
-  hosts = Array.new
-  hosts.push(expression)
-  
+
+  # Return input as single host, if this is not a hostlist expression
+  return [expression] unless expression.match(/\[(?:[\da-z]+(?:[#{separator}][\da-z]+)?,?)+\]/i)
+
+  # hosts array will hold all expanded results,
+  # it as well is the working array where partially resolved results are stored
+  hosts = [expression]
+
   # Iterate over all range definitions, e.g. [0:10] or [A:Z]
-  expression.scan(/\[([\da-z#{separator},]+)\]/i).each do|match|
-    
+  expression.scan(/\[([\da-z#{separator},]+)\]/i).each do |match|
     # Will hold replacements for each match
-    replacements = Array.new
-    
+    replacements = []
+
     # The pattern may be a sequence with multiple ranges. Split...
     match[0].split(",").each do |range|
-      
       # Split ranges by range separator
       range_items = range.split(/[#{separator}]/)
-      
+
       # If it's not really a range, duplicate the single item
-      if range_items.length == 1
-        range_items.push(range_items[0])
-      end
-      
-      # Get lower and higher value of range
-      if range_items[0] < range_items[1]
-        from = range_items[0]
-        to = range_items[1]
-      else
-        from = range_items[1]
-        to = range_items[0]
-      end
-      
+      range_items.push(range_items[0]) if range_items.length == 1
+
       # Numeric range
-      if from.match(/^[0-9]+$/) and to.match(/^[0-9]+$/)
+      if range_items.all? { |item| item.match(/^[0-9]+$/) }
         isnum = true
-        from = from.to_i
-        to = to.to_i
-      
+        from, to = range_items.map(&:to_i).sort
+
       # Uppercase alphabetic range
-      elsif from.length == 1 and to.length == 1 and /^[[:upper:]]+$/.match(from) and /^[[:upper:]]+$/.match(to)
-        alphabet = ('A'..'Z').to_a
-        from = alphabet.index(from)
-        to = alphabet.index(to)
-      
+      elsif range_items.all? { |item| item.match(/^[A-Z]$/) }
+        alphabet = ("A".."Z").to_a
+        from, to = range_items.map { |item| alphabet.index(item) }.sort
+
       # Lowercase alphabetic range
-      elsif from.length == 1 and to.length == 1 and /^[[:lower:]]+$/.match(from) and /^[[:lower:]]+$/.match(to)
-        alphabet = ('a'..'z').to_a
-        from = alphabet.index(from)
-        to = alphabet.index(to)
-      
+      elsif range_items.all? { |item| item.match(/^[a-z]$/) }
+        alphabet = ("a".."z").to_a
+        from, to = range_items.map { |item| alphabet.index(item) }.sort
+
       else
         raise "Error: Invalid host range definition #{expression}"
       end
-      
+
+      # Pad numbers only if a bound has leading zeros, to the width of the longest bound
+      padding = range_items.any? { |item| item.match(/^0[0-9]/) } ? range_items.map(&:length).max : 0
+
       # Iterate over all hosts and store the resolved patterns in "replacements"
-      hosts.each do |host|
-        
+      hosts.each do |_host|
         # Iterate over the range
         (from..to).each do |i|
           if isnum
             # Formatting number with leading zeros
-            replacements.push("#{i}".rjust(range_items[0].length, "0"))
+            replacements.push(i.to_s.rjust(padding, "0"))
           else
             # Select correct letter from alphabet
             replacements.push(alphabet[i])
@@ -99,22 +84,21 @@ def hostlist_expression(expression, separator = [":", "-"])
         end
       end
     end
-    
-    # We clone the hosts array, because we can't modify it while iterating over its elements. So we iterate over the clone instead
+
+    # 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 |host|
-      
       # Remove the original element
       hosts.delete(host)
-      
+
       # Iterate over previously stored replacements
-      replacements.each do|replacement|
-        
+      replacements.each do |replacement|
         # Adding replacement to hosts array
         hosts.push(host.sub(/\[#{match[0]}\]/, replacement))
       end
     end
   end
-  
-  # Return uniqe results
-  return hosts.uniq
+
+  # Return unique results
+  hosts.uniq
 end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: hostlist_expression
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Daniel Schroeder
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
-description: "Expand hostlist expression like those defined in pdsh or Ansible inventory
-  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"
+description: |
+  Expand hostlist expression like those defined in pdsh or Ansible inventory files.
+
+  An expression like "host-[1-3].com" will expand into an array containing the elements host-1.com, host-2.com and host-3.com
+
+  See https://github.com/udondan/hostlist_expression-ruby for documentation
 email: daniel@phatthanan.com
 executables: []
 extensions: []
@@ -23,25 +24,24 @@ files:
 homepage: https://github.com/udondan/hostlist_expression-ruby
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  source_code_uri: https://github.com/udondan/hostlist_expression-ruby
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
-signing_key: 
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Expand hostlist expression
 test_files: []