stackup 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd4c6df93d7764ed0219483cd60c0aa5c08a4179
-  data.tar.gz: 007f8800aa2f70426fde0d66ec449416f5b5c809
+  metadata.gz: 0417b69fa907567e0d594b25e7284aa932bcf99d
+  data.tar.gz: 88e68a2f9db98a05d06fb79c92a8ddf2120b314f
 SHA512:
-  metadata.gz: c7cedaf786303aeb459eff38b0ef5fa3df2b3801f702452ff9dd5102cc276fa4cd041949b5ae06e807a802631beb8d3a13a5d485c828bf62fbc0a32f132c7ea3
-  data.tar.gz: d8e192013ccdd968b4ec4a6153237282d9abf4e4ee00bb7bc3d8902841529b64a9f479f2c2414eb612c82cf610ec0a2982151033db334da27484139f73434317
+  metadata.gz: 7296e7ccd88e3e4b46ed560e48323ed19fddc64bcc47210ae5a7ca2c4553a30f6cac3bc5dae5dbe13ebc2ad64fd195949a8848e5517f1863773b123d5923c4d6
+  data.tar.gz: f6d1e3ec94f38f358897c4f23b21d808860202adee83717b79cfaee3be42dcad6c1f1c47dd133f30d002fb5d61fc36199ad59dbc0f4eb1e7e09bb6b06f39fe0b

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.9.4 (2016-09-03)
+
+* Support multiple parameters files.
+
 ## 0.9.3 (2016-08-21)
 
 * Specify CAPABILITY_NAMED_IAM by default, allowing creation of named IAM roles.

data/bin/stackup

@@ -105,6 +105,10 @@ Clamp do
     signal_error "no such file: #{file.inspect}"
   end
 
+  def load_parameters(file)
+    Stackup::Parameters.new(load_data(file)).to_hash
+  end
+
   subcommand "status", "Print stack status." do
 
     def execute
@@ -121,10 +125,11 @@ Clamp do
     option ["-T", "--use-previous-template"], :flag,
            "reuse the existing template"
 
-    option ["-p", "--parameters"], "FILE", "parameters file",
-           :attribute_name => :parameters_file
+    option ["-p", "--parameters"], "FILE", "parameters file (last wins)",
+           :multivalued => true,
+           :attribute_name => :parameter_file_list
 
-    option ["-o", "--override"], "PARAM=VALUE", "parameters overrides",
+    option ["-o", "--override"], "PARAM=VALUE", "parameter overrides",
            :multivalued => true,
            :attribute_name => :override_list
 
@@ -157,12 +162,9 @@ Clamp do
     private
 
     def parameters
-      parameters_from_file.merge(parameter_overrides)
-    end
-
-    def parameters_from_file
-      return {} unless parameters_file
-      Stackup::Parameters.new(load_data(parameters_file)).to_hash
+      hashes = parameter_file_list.map(&method(:load_parameters))
+      hashes << parameter_overrides
+      hashes.inject(:merge)
     end
 
     def parameter_overrides
@@ -181,8 +183,9 @@ Clamp do
     option ["-t", "--template"], "FILE", "template file",
            :attribute_name => :template_file
 
-    option ["-p", "--parameters"], "FILE", "parameters file",
-           :attribute_name => :parameters_file
+    option ["-p", "--parameters"], "FILE", "parameters file (last wins)",
+           :multivalued => true,
+           :attribute_name => :parameter_file_list
 
     option "--tags", "FILE", "stack tags file",
            :attribute_name => :tags_file
@@ -196,7 +199,7 @@ Clamp do
         current["Template"] = stack.template
         planned["Template"] = load_data(template_file)
       end
-      if parameters_file
+      unless parameter_file_list.empty?
         current["Parameters"] = existing_parameters.sort.to_h
         planned["Parameters"] = new_parameters.sort.to_h
       end
@@ -218,11 +221,12 @@ Clamp do
       @existing_parameters ||= stack.parameters
     end
 
+    def parameters_from_files
+      parameter_file_list.map(&method(:load_parameters)).inject(:merge)
+    end
+
     def new_parameters
-      result = load_data(parameters_file)
-      result = Stackup::Parameters.new(result).to_hash
-      result = existing_parameters.merge(result)
-      result.sort
+      existing_parameters.merge(parameters_from_files)
     end
 
   end

data/lib/stackup/version.rb

@@ -1,5 +1,5 @@
 module Stackup
 
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackup
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Mike Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-21 00:00:00.000000000 Z
+date: 2016-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-resources
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Manage CloudFormation stacks