build-cloud 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11460ad753382b58275400b8ab414640e7fecde6
-  data.tar.gz: 15aa9df500e9794122e4f4fa00b041740b3e4cab
+  metadata.gz: fd4a20e8b7908bb629714238bea43885797a144d
+  data.tar.gz: f135d4406e2aa8f7e3577b420ad094371c493623
 SHA512:
-  metadata.gz: 062ddc2ccd009d56c7ef25da14662318c958727f6fb47f1b009a2e288609c693bf799661506138a51da35b2eee45cc2040606fa940daf7b24bc318476c3b0f0b
-  data.tar.gz: e19393aa5abe4a85021e67e105a5c8c86801df37af398043d58e4c5bca4a205fc31c6c7182bdd49cb54092dce14f7076f77b26b1a304a27349eed3913b41024d
+  metadata.gz: 049623b921bbe636b52a4db50db8b4d1a3f16ea7ead93afe6b987ecf5d5fb5ef017c1eec9e2b54e372acb30aa07f61daca7f64fe475c255ee7976d56978e5e7e
+  data.tar.gz: 66fb3c83ea5eec6490805e900fe59a2bda165d36c5d67c2304e2e08c974b214a9930486e1e7343c8f3ccd8148010d0bc2cf687ce130090703d7d1140b81a4072

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 The Scale Factory
+Copyright (c) 2014, 2015 The Scale Factory Ltd
 
 MIT License
 

data/README.md

@@ -22,6 +22,8 @@ See the command line help for `build-cloud`.
 
 ## Changelog
 
+2015-10-12 - version 0.0.14 - now allows defaults in interpolated variables, if the variable doesn't exist. Format is `%{variablename||default}` eg. `%{node_instance_type||t2.large}`
+
 2015-09-02 - version 0.0.13 - use the same environment variables as AWS SDKs for credentials
 
 2015-08-24 - version 0.0.12 - adds support for tagging network interfaces, permits multiple config files to be passed on the commandline, fixes a bug with S3 buckets named to contain dots.

data/build-cloud.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "build-cloud"
-  spec.version       = "0.0.13"
+  spec.version       = "0.0.14"
   spec.authors       = ["The Scale Factory"]
   spec.email         = ["info@scalefactory.com"]
   spec.summary       = %q{Tools for building resources in AWS}

data/lib/build-cloud.rb

@@ -207,6 +207,9 @@ class BuildCloud
         # Work through the given config replacing all strings matching
         # %{..x..} by looking up ..x.. in the existing @config hash and
         # substituting the template with the value
+        #
+        # If ..x.. is of the form variable||default, if the given key is
+        # not defined anywhere, the default will be used.
 
         case h
         when Hash
@@ -219,17 +222,15 @@ class BuildCloud
             h.map { |v| recursive_interpolate_config(v) }
         when String
 
-            while h =~ /%\{(.+?)\}/
-                var = $1
-                val = ""
+            while /%\{(?<var>[^\|\}]*)(?:\|{2}(?<default>[^\}]*))?\}/ =~ h
 
-                if @config.has_key?(var.to_sym)
-                    val = @config[var.to_sym]
-                else
-                    raise "Attempt to interpolate with non-existant key '#{var}'"
-                end
+                # $& is the whole matched expression above, $MATCH when using English
+                exp = $&
+
+                val = @config.fetch(var.to_sym, default)
+                raise "Attempt to interpolate with non-existant key '#{var}' with no default value set" if val.nil?
 
-                h.gsub!(/%\{#{var}\}/, val)
+                h.gsub!(exp, val)
 
             end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-cloud
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - The Scale Factory
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler