build-cloud 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWQ3ZDk5MGU0MmI1YTQ4YWZhYTM0MGU2MDgzNzY2ODVjZDNiOGIzMA==
+    ZTBkMTNmNzg0OTkyNjViOTZkNWQxOGM0NjNlNmI5MDZiZWM4Yjg4Mw==
   data.tar.gz: !binary |-
-    MDJhMDE2ZDUzYWQ4MTEzNDA5OTU1MTY3ZGNkMjNkNDk3ZDdiN2I1Mw==
+    YWQ2YTBkZTdlZjAxYTUxMWQwNDg4NzY5YTM1N2MyYTI4YzQ0MDk4Mg==
 SHA512:
   metadata.gz: !binary |-
-    OGI5NjBlNTcxOTBhNzUzZmU3OWNkNzQyZWY5ODZiZDNkZWEzZGI0ZDc2NjE1
-    MWRmMTdjMTI2MDk5YWUyMWI4ZmFiMGZkNzM3YjQyNzk2Y2NiODQ3YjRhNmRl
-    MWVmYjRlZjA3ODZjYzcxMWVkZThhZGYxYjRiNWMyYWQyNWVmY2Y=
+    OTVhZjUxYTQ1MDY4OGEzZmI3MzFmZDI1OTBhOTNhNGZlN2Q3NTk3NWIyZTA5
+    ZDUwNDViOGFjNmJmYTE3NjViNzA4ODAyMjcwNjhmMDhiYmQyMzJmMGIzZDlk
+    OTRlMTViMGJlZDhiNzVlNGJjNjdlZGM2ZjNmOTNhMDUxMWU4MGI=
   data.tar.gz: !binary |-
-    ZDcyZWZkMjQxMTEwZTFmMDJmYmIzMDg2ZmE0ZjNhOGYwODUwYmZhNGU5ZTMz
-    NTNkMDMxODVmYTMwMmI0YTUzZWRmZGU1OWY3OThhOTE4ZWVjYmE5YTJkZTI2
-    MDZmODkyMGRiMDYzNTIzMTliNjIzMGIwNjRkMTM3MjY2YTczNjQ=
+    ZDFiNDU2MjVjM2U1NjVhZDg2NWEwMGY4MzYzOTFmOTAwODA0NDQ0ZjNmNmY5
+    MTc2OWYzMmEzZWE3NmExMDY5ZWNhMDZhYTVjZWJkNWE2NTgwODZlMDIwZmZj
+    Nzc0ODhlODMyYWI3YjBlOWQwNDVmYThlNzFjMDMxNDlkYTgyMmQ=

data/README.md

@@ -22,6 +22,8 @@ See the command line help for `build-cloud`.
 
 ## Changelog
 
+2014-12-01 - version 0.0.8 - when multiple files are passed to `--config`, any top-level elements in the second and subsequent files which are arrays are merged into the arrays from previously read in files. This means, for examples, that you can have lists of instances or security groups in multiple files, and they will all be read in. Previously, subsequent files overwrote what was in previous files. Note that this only applies for top level elements of YAML files which are arrays - the previous overwriting behaviour applies still to strings.
+
 2014-10-03 - version 0.0.7 - instance creation previously had a 30 second wait to transition from pending to running state. This was insufficient, and has been increased to 60 seconds.
 
 2014-09-23 - version 0.0.6 - correctly name tags VPCs, and now allows you to refer to the public IP of a network interface (via `:network_interface_public_ip` in a Route 53 record set.

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.7"
+  spec.version       = "0.0.8"
   spec.authors       = ["The Scale Factory"]
   spec.email         = ["info@scalefactory.com"]
   spec.summary       = %q{Tools for building resources in AWS}

data/lib/build-cloud.rb

@@ -3,6 +3,7 @@ require 'yaml'
 require 'pry'
 require 'logger'
 require 'pp'
+require 'pathname'
 
 class BuildCloud
 
@@ -31,17 +32,15 @@ class BuildCloud
         
         include_files.each do |include_file|
 
-            include_path = ''
-            if include_file.include? '/'
-                include_path = include_file
-            else
-                include_path = File.join( File.dirname( first_config_file ), include_file)
-            end
+            include_path = Pathname.new(File.join( File.dirname( first_config_file ), include_file)).realpath
 
             if File.exists?( include_path )
                 @log.info( "Including YAML file #{include_path}" )
                 included_conf = YAML::load( File.open( include_path ) )
-                @config = @config.merge( included_conf )
+                @config = @config.merge(included_conf) do |keys, oldval, newval|
+                    (newval.is_a?(Array) ? (oldval + newval) : (oldval << newval)).uniq
+                end
+
             end
 
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-cloud
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - The Scale Factory
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler