beaker-hostgenerator 0.7.4 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmYzMjRkMWE1ZGRiNjY2YjRlMjkwMTBiNmNlNzI3ZWY3ZmU1MjgwOA==
+    YmEzODIwYWViMGE3YWQyNWZkNWRmZjNlMzdmMTA4MTVhZTVkNzY3Zg==
   data.tar.gz: !binary |-
-    ZTZhZTg5ODkzNmMyZWU5YjczZDg1ZGU2NDkzM2RmOGFkYTU1NDQ2OA==
+    ZjNjY2JmOTU1ZDY4M2U2ZDE2MTE4OTlhNzIyMGI0ZWM3ZmJhNGJhZg==
 SHA512:
   metadata.gz: !binary |-
-    ZjVkODg1NjNhZjNmYmRmMWQ4YTY2ZDBiNTNjZDMyZjdlYTZhOWZjOTFmZmIx
-    OTUwMmM0MTliOTM2MWRmZDQ3NTM0ODRlMTc3OTAwM2YzYjczOTRhZDM4OGRl
-    NWY3MjdkMmQxNzIzOTZhZjk1MWU0NTYzMGRmODk4YzUxNmE4NWI=
+    NTAxOGZiM2ZjOGYwYTNjOGVlMzcxYWUyODliOTNlMTg1ZDU3ZTAwMWFlNTk1
+    NTg1YjhhYzY5MWNmYjdhODZjMTlmOTczYzU2ODk1NTNkODhjNjdhMzhhYmY0
+    ZmQ1YzI4MDA2MGEyNzAxOGQ1MTU1MjAzNzdhNGM2MDYxMmQ5NGE=
   data.tar.gz: !binary |-
-    YzIzMWQzMzc3OWJlODc5NzQwNDFlZDI3ZjZlNTUwYTU3OTM4YTFhMmUwYWQy
-    ODhmZTViMWVhOGNkMTI3Mjg4MDRhNmNhOTcxN2JlZTA3MWY3Nzk4M2M2ODYz
-    MmRiYmMwNGRjZTM1Yjc3YTFhN2Q5YjczMzlmOGE0YmIyYTZhNmI=
+    NmU0ZDk4YmE1OTBkMTYyZmEzZGFhOTI2ZDcyYzVkMmJkYThmZTNlZDE5MGNh
+    OWJhOWM1YmE3YTgwNjNiODY4OGUyYzIwNDY0YjU5Yzg0YWVlZWMzYjg3Nzg0
+    OWY4N2Q1MDAwOGYwYjcyOWVmNTg0MmNiYzFkMWRjOTJmZmNhNTY=

data/CHANGELOG.md

@@ -5,7 +5,10 @@ This project makes a strong effort to adhere to [Semantic
 Versioning](http://semver.org).
 
 ## [Unreleased][unreleased]
-### Changed
+
+## [0.8.0] - 2016-10-4
+- Improved whitespace support in global and host settings. Spaces are no longer
+  removed, so input must be quoted, escaped, or URL-encoded appropriately.
 
 ## [0.7.4] - 2016-9-26
 - Add platforms:

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 26 Sep, 2016 (09c62ae1)](#LATEST)
+* [LATEST - 4 Oct, 2016 (291854ec)](#LATEST)
+* [0.7.4 - 26 Sep, 2016 (1e102ccd)](#0.7.4)
 * [0.7.3 - 11 Aug, 2016 (87c75523)](#0.7.3)
 * [0.7.2 - 13 Jul, 2016 (cee53bcc)](#0.7.2)
 * [0.7.1 - 29 Jun, 2016 (be332325)](#0.7.1)
@@ -17,7 +18,44 @@
 * [0.0.1 - 7 Oct, 2015 (d99251e6)](#0.0.1)
 
 ## Details
-### <a name = "LATEST">LATEST - 26 Sep, 2016 (09c62ae1)
+### <a name = "LATEST">LATEST - 4 Oct, 2016 (291854ec)
+
+* (GEM) update beaker-hostgenerator version to 0.8.0 (291854ec)
+
+* Merge pull request #58 from puppetlabs/maint (82d9fc2a)
+
+
+```
+Merge pull request #58 from puppetlabs/maint
+
+(MAINT) Prepare for 0.8.0 release
+```
+* (MAINT) Prepare for 0.8.0 release (a6346c24)
+
+* Merge pull request #57 from puppetlabs/bk934/support-whitespace (93abe32c)
+
+
+```
+Merge pull request #57 from puppetlabs/bk934/support-whitespace
+
+(BKR-934) Allow for whitespace in settings
+```
+* (BKR-934) Allow for whitespace in settings (487f3f65)
+
+
+```
+(BKR-934) Allow for whitespace in settings
+
+Previously all whitespace was automatically removed from all input. This
+commit removes that behavior, allowing for values with whitespace in
+them to be properly generated.
+
+This change means users are responsible for properly quoting, escaping,
+or URL-encoding the whitespace as necessary.
+```
+### <a name = "0.7.4">0.7.4 - 26 Sep, 2016 (1e102ccd)
+
+* (HISTORY) update beaker-hostgenerator history for gem release 0.7.4 (1e102ccd)
 
 * (GEM) update beaker-hostgenerator version to 0.7.4 (09c62ae1)
 

data/README.md

@@ -227,11 +227,12 @@ It may be necessary to URL-encode the input in order for it to properly be used
 in certain contexts, such as Jenkins.
 
 In most cases it will only be necessary to escape the characters that support
-arbitrary settings, which means the following three characters:
+arbitrary settings, which means the following four characters:
 
 - `{` is `%7B`
 - `,` is `%2C`
 - `}` is `%7D`
+- ` ` is `%20`
 
 For a full URL encoding reference see: http://www.w3schools.com/tags/ref_urlencode.asp
 

data/lib/beaker-hostgenerator/generator.rb

@@ -20,7 +20,7 @@ module BeakerHostGenerator
     # @returns [Hash] A complete Ruby map as defining the HOSTS and CONFIG
     #                 sections as required by Beaker.
     def generate(layout, options)
-      layout = prepare_layout(layout)
+      layout = prepare(layout)
       tokens = tokenize_layout(layout)
       config = {}.deep_merge(BASE_CONFIG)
       nodeid = Hash.new(1)
@@ -29,7 +29,8 @@ module BeakerHostGenerator
 
       # Merge in global configuration settings
       if options[:global_config]
-        global_config = settings_string_to_map(options[:global_config])
+        decoded = prepare(options[:global_config])
+        global_config = settings_string_to_map(decoded)
         config['CONFIG'].deep_merge!(global_config)
       end
 

data/lib/beaker-hostgenerator/parser.rb

@@ -11,9 +11,9 @@ module BeakerHostGenerator
   # further by other functions in this module.
   #
   # For example, given the raw user input string that defines the host layout,
-  # you would first prepare it for tokenization via `prepare_layout`, then split
-  # it into tokens via `tokenize_layout`, and then for each token you would
-  # call `is_ostype_token?` and/or `parse_node_info_token`.
+  # you would first prepare it for tokenization via `prepare`, then split it
+  # into tokens via `tokenize_layout`, and then for each token you would call
+  # `is_ostype_token?` and/or `parse_node_info_token`.
   module Parser
 
     # Parses a single node definition into the following components:
@@ -69,13 +69,13 @@ module BeakerHostGenerator
 
     # Prepares the host input string for tokenization, such as URL-decoding.
     #
-    # @param layout_spec [String] Raw user input; well-formatted string
-    #                             specification of the hosts to generate.
-    #                             For example `"aix53-POWERfa%7Bhypervisor=aix%7D"`.
+    # @param spec [String] Raw user input; well-formatted string specification
+    #                      of the hosts to generate.
+    #                      For example `"aix53-POWERfa%7Bhypervisor=aix%7D"`.
     # @returns [String] Input string with transformations necessary for
     #                   tokenization.
-    def prepare_layout(layout_spec)
-      URI.decode(layout_spec)
+    def prepare(spec)
+      URI.decode(spec)
     end
 
     # Breaks apart the host input string into chunks suitable for processing
@@ -198,7 +198,8 @@ module BeakerHostGenerator
     # configuration.
     #
     # The string is expected to be of the form "{key1=value1,key2=value2,...}".
-    # Any whitespace found in the string will be stripped and ignored.
+    # Whitespace is expected to be properly quoted as it will not be treated
+    # any different than non-whitespace characters.
     #
     # Throws an exception of the string is malformed in any way.
     #
@@ -211,7 +212,6 @@ module BeakerHostGenerator
       settings_pairs =
         host_settings.
         delete('{}').
-        gsub(' ', '').
         split(',').
         map { |keyvalue| keyvalue.split('=') }
 

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '0.7.4'
+    STRING = '0.8.0'
   end
 end

data/spec/beaker-hostgenerator/parser_spec.rb

@@ -4,9 +4,9 @@ module BeakerHostGenerator
   describe Parser do
     include BeakerHostGenerator::Parser
 
-    describe 'prepare_layout' do
+    describe 'prepare' do
       it 'Supports URL-encoded input' do
-        expect( prepare_layout('centos6-64m%7Bfoo=bar-baz,this=that%7D-32a') ).
+        expect( prepare('centos6-64m%7Bfoo=bar-baz,this=that%7D-32a') ).
           to eq('centos6-64m{foo=bar-baz,this=that}-32a')
       end
     end
@@ -113,17 +113,16 @@ module BeakerHostGenerator
       end
 
       context 'When using arbitrary host settings' do
-        it 'Supports arbitrary whitespace' do
-          expect( parse_node_info_token("64{ k1=v1, k2=v2,  k3 = v3 ,  k4  =v4  }") ).
+        it 'Supports arbitrary whitespace in values' do
+          expect( parse_node_info_token("64{k1=value 1,k2=v2,k3=  v3  }") ).
             to eq({
                     "roles" => "",
                     "arbitrary_roles" => [],
                     "bits" => "64",
                     "host_settings" => {
-                      "k1" => "v1",
+                      "k1" => "value 1",
                       "k2" => "v2",
-                      "k3" => "v3",
-                      "k4" => "v4"
+                      "k3" => "  v3  "
                     }
                   })
         end

data/test/fixtures/per-host-settings/with-global-settings.yaml

@@ -1,5 +1,5 @@
 ---
-arguments_string: "--global-config {masterless=true,number=1234} redhat7-64c{type=o-negative}"
+arguments_string: "--global-config {masterless=true,number=1234,key=url%20encoded%20%20white%20space} redhat7-64c{type=o-negative}"
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -20,5 +20,6 @@ expected_hash:
     consoleport: 443
     masterless: true
     number: 1234
+    key: url encoded  white space
     pooling_api: http://vmpooler.delivery.puppetlabs.net/
 expected_exception:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec