beaker-hostgenerator 0.9.0 → 0.10.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODVjZTk2ZjQxN2JkMDlkYTMyNDQ3OTU2YTNkNTcyMjQ3MzYyNGQ4Nw==
+    OGJmOWNmNjhmMDYwZTBmNjJlMzgxYzk1MjgwNDZmZGVlNDFkZjcxMw==
   data.tar.gz: !binary |-
-    MmYzZjJhNWEwYmViZTU2MjY3YmM3MDFjZDE1ODA4OGIwY2ZmMWQxNg==
+    MmY3ZGU0MzczN2EyODJlYzgyYzUzMzFmZDIyZmJmNTNiZmE3NjNkNA==
 SHA512:
   metadata.gz: !binary |-
-    YWM2ZjI2MGQ2ODI4MTc1YWY2OTNkZDYxN2E5ZjkwZmQ3NmZlMGUwNjk0Yzg1
-    YWJjOTc4MWRkYmJiNzA3MGQyNDBmMDE3OGMyN2UzYWUwZWM3NTc5MGE2OWIx
-    NzJhMmJmYzU4NjYwNmZjYjU0ZGI0ZWJkNWRhNmE1ZGEwODIzNjE=
+    NmUxMGVjZTdkODM3ZjM4MDVkMmFkMDlkMjM3Mjk4MTg2ZTY5MDc1NWIxMWI5
+    M2ViNGJiMGYwMGNhOTc0MjE1N2MwOWE1NzEwZTU0NGJkZTZmYTRmYmJiZGNk
+    MjhiNDZhYmJjOTk4ODcxODk0M2MyMmQ5NTE4ODQ5MjJlMTI5OTk=
   data.tar.gz: !binary |-
-    NDIzMzJiZjE2ZDEyNTQxNDIyZDI5MGE4ZThhMGNhNDY2OTc3OWYwYTNkY2Qw
-    ZDFjYzBkMDlkYTkxMWQwOWFjNWE4MWEwMTVlODk2NjIxYzY0MzI4ZmNjOWQ0
-    YWUxYjVmY2NkZDFlZjU1YzNlYzkwZjI1NmQzMDQzZGU0ZGEyZWE=
+    OTIyNWM4OWFmZTY5N2U4OWI2ZWYzZGMyODY2MWIxOGY0NDMzYmExOGUyZDcy
+    NTI4M2Q3YmNkMjdkYzQyN2IwNDExMjNhZDIwN2U4M2Y0NjM0NWZmNjBhMDI4
+    NDVhZDk0OTA5MGI3MTk1OWIxN2FhZGI0NjQ0NjI2NDAzOGU2NDI=

data/CHANGELOG.md

@@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file.
 This project makes a strong effort to adhere to [Semantic
 Versioning](http://semver.org).
 
-## [Unreleased][unreleased]
+## [0.10.0] - 2017-7-7
+- Add map data structure support to arbitrary settings, which previously only
+  supported lists and primitives. Maps and lists can be combined.
 
 ## [0.9.0] - 2017-6-7
 - Add list data structure support to arbitrary settings, which previously only

data/README.md

@@ -13,6 +13,7 @@ host config files using a compact command line SUT specification.
         - [Single host with Arbitrary Roles](#single-host-with-arbitrary-roles)
         - [Two hosts with multiple hypervisors and arbitrary host settings](#two-hosts-with-multiple-hypervisors-and-arbitrary-host-settings)
         - [Two hosts with arbitrary host settings with arbitrary lists](#two-hosts-with-arbitrary-host-settings-with-arbitrary-lists)
+        - [Arbitrary nested hashes and arrays](#arbitrary-nested-hashes-and-arrays)
         - [Arbitrary global configuration settings](#arbitrary-global-configuration-settings)
         - [Custom hypervisor](#custom-hypervisor)
         - [URL-encoded input](#url-encoded-input)
@@ -161,7 +162,7 @@ CONFIG:
 ### Two hosts with arbitrary host settings with arbitrary lists
 
 ```
-$ beaker-hostgenerator centos6-64m{disks=\[16\]-redhat7-64a{disks=\[8\,16\]}
+$ beaker-hostgenerator centos6-64m{disks=\[16\]}-redhat7-64a{disks=\[8\,16\]}
 ```
 
 Will generate
@@ -200,6 +201,41 @@ CONFIG:
   pooling_api: http://vmpooler.delivery.puppetlabs.net/
 ```
 
+### Arbitrary nested hashes and arrays
+
+```
+$ beaker-hostgenerator --global-config {host_tags={lifetime=4h}\,list=[{listkey=listvalue}]\} redhat7-64m{hostlist=\[string\,{key=value}\,1234\]}
+```
+
+Will generate
+
+```yaml
+---
+HOSTS:
+  redhat7-64-1:
+    pe_dir:
+    pe_ver:
+    pe_upgrade_dir:
+    pe_upgrade_ver:
+    hypervisor: vmpooler
+    platform: el-7-x86_64
+    template: redhat-7-x86_64
+    hostlist:
+    - string
+    - key: value
+    - 1234
+    roles:
+    - agent
+    - master
+CONFIG:
+  nfs_server: none
+  consoleport: 443
+  pooling_api: http://vmpooler.delivery.puppetlabs.net/
+  host_tags:
+    lifetime: 4h
+  list:
+  - listkey: listvalue
+```
 
 ### Arbitrary global configuration settings
 

data/lib/beaker-hostgenerator/generator.rb

@@ -74,6 +74,11 @@ module BeakerHostGenerator
       # Merge in global configuration settings after the hypervisor defaults
       if options[:global_config]
         decoded = prepare(options[:global_config])
+        # Support for strings without '{}' was introduced, so just double
+        # check here to ensure that we pass in values surrounded by '{}'.
+        if !decoded.start_with?('{')
+          decoded = "{#{decoded}}"
+        end
         global_config = settings_string_to_map(decoded)
         config['CONFIG'].deep_merge!(global_config)
       end

data/lib/beaker-hostgenerator/parser.rb

@@ -195,9 +195,10 @@ module BeakerHostGenerator
 
     # Transforms the arbitrary host settings map from a string representation
     # to a proper hash map data structure for merging into the host
-    # configuration.
+    # configuration. Supports arbitrary nested hashes and arrays.
     #
     # The string is expected to be of the form "{key1=value1,key2=[v2,v3],...}".
+    # Nesting looks like "{key1={nested_key=nested_value},list=[[list1, list2]]}".
     # Whitespace is expected to be properly quoted as it will not be treated
     # any different than non-whitespace characters.
     #
@@ -206,38 +207,120 @@ module BeakerHostGenerator
     # @param host_settings [String] Non-nil user input string that defines host
     #                               specific settings.
     #
-    # @returns [Hash{String=>String|Array}] The host_settings string as a map.
+    # @returns [Hash{String=>String|Array|Hash}] The host_settings string as a map.
     def settings_string_to_map(host_settings)
-      # Strip it down to a list of pairs
-      # Splitting on all commas except inside `[]`
-      settings_pairs =
-        host_settings.
-        delete('{}').
-        split(/,(?=[^\]]*(?:\[|$))/).
-        map { |keyvalue| keyvalue.split('=') }
-
-      # Validate they're actually pairs, and that all keys are non-empty
-      settings_pairs.each do |pair|
-        if pair.length != 2
-          raise BeakerHostGenerator::Exceptions::InvalidNodeSpecError,
-                "Malformed host settings: #{host_settings}"
+
+      stringscan = StringScanner.new(host_settings)
+      object = nil
+      object_depth = []
+      current_depth = 0
+
+      # This loop scans until the next delimiter character is found. When
+      # the next delimiter is recognized, there is enough context in the
+      # substring to determine a course of action to modify the primary
+      # object. The `object_depth` object tracks which current object is
+      # being modified, and pops it off the end of the array when that
+      # data structure is completed.
+      #
+      # This algorithm would also support a base array, but since there
+      # is no need for that functionality, we just assume the string is
+      # always a representation of a hash.
+      loop do
+        blob = stringscan.scan_until(/\[|{|}|\]|,/)
+
+        break if blob.nil?
+
+        if stringscan.pos() == 1
+          object = {}
+          object_depth.push(object)
+          next
         end
-        if pair.first.nil? || pair.first.empty?
-          raise BeakerHostGenerator::Exceptions::InvalidNodeSpecError,
-                "Malformed host settings: #{host_settings}"
+
+        current_type = object_depth[current_depth].class
+        current_object = object_depth[current_depth]
+
+        if blob == '['
+          current_object.push([])
+          object_depth.push(current_object.last)
+          current_depth = current_depth.next
+          next
         end
-      end
 
-      # Replace the remaining `,` to make array for arbitrary list if brackets exist
-      settings_pairs.each do |pair|
-        if pair[1].include?("[")
-          pair[1] = pair[1].
-            delete('[]').
-            split(',')
+        if blob.start_with?('{')
+          current_object.push({})
+          object_depth.push(current_object.last)
+          current_depth = current_depth.next
+          next
+        end
+
+
+
+        if blob == ']' or blob == '}'
+          object_depth.pop
+          current_depth = current_depth.pred
+          next
+        end
+        
+        # When there is assignment happening, we need to create a new
+        # corresponding data structure, add it to the object depth, and
+        # then change the current depth
+        if blob[-2] == '='
+          raise Beaker::HostGenerator::Exceptions::InvalidNodeSpecError unless blob.end_with?('{','[')
+          if blob[-1] == '{'
+            current_object[blob[0..-3]] = {}
+          else
+            current_object[blob[0..-3]] = []
+          end
+          object_depth.push(current_object[blob[0..-3]])
+          current_depth = current_depth.next
+          next
+        end
+
+        if blob[-1] == '}'
+          raise Beaker::HostGenerator::Exceptions::InvalidNodeSpecError if blob.count('=') != 1
+          key_pair = blob[0..-2].split('=')
+          raise Beaker::HostGenerator::Exceptions::InvalidNodeSpecError if key_pair.size != 2
+          key_pair.each do |element|
+            raise Beaker::HostGenerator::Exceptions::InvalidNodeSpecError if element.empty?
+          end
+          current_object[key_pair[0]] = key_pair[1]
+          object_depth.pop
+          current_depth = current_depth.pred
+          next
+        end
+
+        if blob == ','
+          next
+        end
+
+        if blob[-1] == ','
+          if current_type == Hash
+            key_pair = blob[0..-2].split('=')
+            raise Beaker::HostGenerator::Exceptions::InvalidNodeSpecError if key_pair.size != 2
+            key_pair.each do |element|
+              raise Beaker::HostGenerator::Exceptions::InvalidNodeSpecError if element.empty?
+            end
+            current_object[key_pair[0]] = key_pair[1]
+            next
+          elsif current_type == Array
+            current_object.push(blob[0..-2])
+            next
+          end
+        end
+
+        if blob[-1] == ']'
+          current_object.push(blob[0..-2])
+          object_depth.pop
+          current_depth = current_depth.pred
+          next
         end
       end
 
-      Hash[settings_pairs]
+      object
+    rescue Exception => e
+      raise BeakerHostGenerator::Exceptions::InvalidNodeSpecError,
+        "Malformed host settings: #{host_settings}"
     end
+
   end
 end

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '0.9.0'
+    STRING = '0.10.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -197,7 +197,6 @@ files:
 - Gemfile
 - HISTORY.md
 - LICENSE
-- MAINTAINERS
 - README.md
 - Rakefile
 - beaker-hostgenerator.gemspec

data/MAINTAINERS

@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "file_format": "This MAINTAINERS file format is described at http://pup.pt/maintainers",
-  "issues": "https://tickets.puppetlabs.com/browse/QENG",
-  "internal_list": "https://groups.google.com/a/puppet.com/forum/?hl=en#!forum/discuss-quality-engineering",
-  "people": [
-    {
-      "github": "nwolfe",
-      "email": "nwolfe@puppet.com",
-      "name": "Nate Wolfe"
-    },
-    {
-      "github": "waynr",
-      "email": "wayne@puppet.com",
-      "name": "Wayne Warren"
-    }
-  ]
-}