stackup 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7968636aea4da953ab3902af33236e0705ad4d26
-  data.tar.gz: 7c1f9ad8bc8f02f9a59e0a74692c4c54548d171f
+  metadata.gz: 23c1e4e4d9403ef28b55daf9ee4f21fd55dabd57
+  data.tar.gz: 9ac49da0f9c055a4b8b0809d8f6a47da32c78238
 SHA512:
-  metadata.gz: 2d7cfc30af2ada8982ccdb9fda1b438da8add5f759c20767304d8f5a1a71b857e5c44bb9b3084e73104990b7ea39e1e2e672db5dc606e5b2fbac345a159bd99f
-  data.tar.gz: 62dd4d15cf71214870ff0b5ba1234b9d4c7f3f22e58724de38789c91817d4f8f8dda04cfc954f81a66b3f9a6c6d14d3cfb96fbb9fd64c0ee7f8965e02209629d
+  metadata.gz: 0cce0bf0091f7c66ffe43c56d4037070873b24f492f8668e33258d90a2087e56f44be1df0c875e8e8b6f9dd07c4aa20a5d56d343214a9c41ac7e43d44a1f1c5c
+  data.tar.gz: e7a295ae3e2f60ac369bdde9a2dad410fb033488f914218f8c973a9b2c636c1f016d2a0e1aeaaf81234157d95dec44e4f6554f67b8b5b19b46b6bbd0ffac367b

data/README.md

@@ -15,8 +15,9 @@ Stackup provides some advantages over using `awscli` or `aws-sdk` directly:
   - A `Stack#up` facade for `create`/`update` frees you from having to know
     whether your stack already exists or not.
 
-  - "No-op" operations - deleting a stack that doesn't exist, or updating
-    without a template change - are handled gracefully (i.e. without error).
+  - Changes are (mostly) idempotent: "no-op" operations - e.g. deleting a
+    stack that doesn't exist, or updating without a template change - are
+    handled gracefully (i.e. without error).
 
 ## Installation
 

data/bin/stackup

@@ -71,8 +71,8 @@ Clamp do
   end
 
   def report_change
-    change = yield
-    puts "Stack #{change}" unless change.nil?
+    final_status = yield
+    puts final_status unless final_status.nil?
   end
 
   def load_data(file)
@@ -141,8 +141,10 @@ Clamp do
         diff_data(stack.template, template)
       end
       if parameters_file
-        parameters = hashify_parameters(load_data(parameters_file))
-        diff_data(stack.parameters, parameters)
+        new_parameters = hashify_parameters(load_data(parameters_file))
+        existing_parameters = stack.parameters
+        new_parameters = existing_parameters.merge(new_parameters)
+        diff_data(existing_parameters.sort.to_h, new_parameters.sort.to_h)
       end
     end
 
@@ -160,7 +162,9 @@ Clamp do
       return parameters unless parameters.is_a?(Array)
       {}.tap do |result|
         parameters.each do |p|
-          result[p["parameter_key"]] = p["parameter_value"]
+          key = p.fetch("ParameterKey") { p.fetch("parameter_key") }
+          value = p.fetch("ParameterValue") { p.fetch("parameter_value") }
+          result[key] = value
         end
       end
     end

data/examples/parameters.json

@@ -1,6 +1,6 @@
 [
   {
-    "parameter_key": "IndexDoc",
-    "parameter_value": "default.htm"
+    "ParameterKey": "IndexDoc",
+    "ParameterValue": "default.htm"
   }
 ]

data/lib/stackup/stack.rb

@@ -138,7 +138,7 @@ module Stackup
         cf_stack.delete
       end
       fail StackUpdateError, "stack delete failed" unless status == "DELETE_COMPLETE"
-      :deleted
+      status
     ensure
       @stack_id = nil
     end
@@ -155,7 +155,7 @@ module Stackup
         cf_stack.cancel_update
       end
       fail StackUpdateError, "update cancel failed" unless status =~ /_COMPLETE$/
-      :update_cancelled
+      status
     rescue InvalidStateError
       nil
     end
@@ -255,7 +255,7 @@ module Stackup
         cf.create_stack(options)
       end
       fail StackUpdateError, "stack creation failed" unless status == "CREATE_COMPLETE"
-      :created
+      status
     end
 
     def update(options)
@@ -266,7 +266,7 @@ module Stackup
         cf_stack.update(options)
       end
       fail StackUpdateError, "stack update failed" unless status == "UPDATE_COMPLETE"
-      :updated
+      status
     rescue NoUpdateRequired
       nil
     end
@@ -303,15 +303,32 @@ module Stackup
     end
 
     def normalise_parameters(arg)
-      return arg unless arg.is_a?(Hash)
-      arg.map do |key, value|
-        {
-          :parameter_key => key,
-          :parameter_value => value
-        }
+      if arg.is_a?(Hash)
+        return arg.map do |key, value|
+          {
+            :parameter_key => key,
+            :parameter_value => value
+          }
+        end
+      end
+      arg.map do |parameter|
+        normalise_parameter_keys(parameter)
       end
     end
 
+    def normalise_parameter_keys(input)
+      {}.tap do |output|
+        input.each do |key, value|
+          output[normalise_parameter_key(key)] = value
+        end
+      end
+    end
+
+    def normalise_parameter_key(s)
+      return s if s.is_a?(Symbol)
+      s.gsub(/([a-z])([A-Z])/, '\1_\2').downcase
+    end
+
   end
 
 end

data/lib/stackup/version.rb

@@ -1,5 +1,5 @@
 module Stackup
 
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 
 end

data/spec/stackup/stack_spec.rb

@@ -105,8 +105,8 @@ describe Stackup::Stack do
             .with(hash_including(expected_args))
         end
 
-        it "returns :created" do
-          expect(create_or_update).to eq(:created)
+        it "returns status" do
+          expect(create_or_update).to eq("CREATE_COMPLETE")
         end
 
       end
@@ -157,6 +157,30 @@ describe Stackup::Stack do
 
       end
 
+      context "with :parameters in awscli form" do
+
+        before do
+          options[:parameters] = [{
+            "ParameterKey" => "foo",
+            "ParameterValue" => "bar"
+          }]
+        end
+
+        it "converts them to an Array" do
+          expected_parameters = [
+            {
+              "parameter_key" => "foo",
+              "parameter_value" => "bar"
+            }
+          ]
+          create_or_update
+          expect(cf_client).to have_received(:create_stack) do |options|
+            expect(options[:parameters]).to eq(expected_parameters)
+          end
+        end
+
+      end
+
     end
 
   end
@@ -200,8 +224,8 @@ describe Stackup::Stack do
             .with(hash_including(:stack_name => unique_stack_id))
         end
 
-        it "returns :deleted" do
-          expect(stack.delete).to eq(:deleted)
+        it "returns status" do
+          expect(stack.delete).to eq("DELETE_COMPLETE")
         end
 
       end
@@ -256,8 +280,8 @@ describe Stackup::Stack do
 
       context "successful" do
 
-        it "returns :updated" do
-          expect(create_or_update).to eq(:updated)
+        it "returns status" do
+          expect(create_or_update).to eq(final_status)
         end
 
         context "if no updates are required" do
@@ -384,8 +408,8 @@ describe Stackup::Stack do
             .with(hash_including(expected_args))
         end
 
-        it "returns :update_cancelled" do
-          expect(stack.cancel_update).to eq(:update_cancelled)
+        it "returns status" do
+          expect(stack.cancel_update).to eq("UPDATE_ROLLBACK_COMPLETE")
         end
 
       end

data/stackup.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.bindir = "bin"
   spec.executables << "stackup"
 
-  spec.add_dependency "aws-sdk", "~> 2.0"
+  spec.add_dependency "aws-sdk-resources", "~> 2.0"
   spec.add_dependency "clamp", "~> 1.0"
   spec.add_dependency "console_logger"
   spec.add_dependency "diffy", "~> 3.0.5"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackup
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Mike Williams
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Manage CloudFormation stacks