stackup 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8add9be3778b3deaf928effd033d335ee3b3f183
-  data.tar.gz: 99e392f73dd644e4a857d8df667bbaba69ab3123
+  metadata.gz: a685003b83032534f9b6c8201d658d72b97ba984
+  data.tar.gz: 29337a550911b7a812693206cca7b6a7e3a9933f
 SHA512:
-  metadata.gz: 2220e80312bb824b45c4a851a02e6cfca1bfe0b0c6edddba9a59ea17f66c9383a18d7b718a95f70dd1d48896b280fc2f6d5737bd127d140c63b80345e1ab0699
-  data.tar.gz: b692c66ac627adbfae34d70b7996769a90fc00ec91c79904b1d6f3279a9b39ddc144cfd270760d05880c8a0cd8d957a36314be40c7f34ff1b0caf5a63aa00274
+  metadata.gz: 9ef3c38343086e98db0a29d8ed8e4362502a3428a6dfd81dfb68a285c01278e75f7660fe6f3706e810d98c70f4b47dd5a11b9f06e191342981c30c20fde91302
+  data.tar.gz: 33176851b2506904a937a3fbe391c9316fba67ca3b7a6b0c9e11243a7ab65ba99271adea564fb3fc73b07f329e20e45fb33d0623da48c123cae3269a2e7147ac

data/CHANGES.md

@@ -1,3 +1,13 @@
+## 0.8.2 (2016-05-31)
+
+* CLI catches and reports any `Aws::Errors::ServiceError`.
+* Add `--retry-limit` option.
+* Normalize templates (sort by key) before diff-ing them.
+
+## 0.8.1 (2016-04-13)
+
+* Add "outputs" rake task.
+
 ## 0.8.0 (2016-03-15)
 
 * Add support for stack tags.

data/bin/stackup

@@ -30,6 +30,13 @@ Clamp do
     arg
   end
 
+  option ["--retry-limit"], "N", "maximum number of retries for API calls",
+    :environment_variable => "AWS_API_RETRY_LIMIT" do |arg|
+    Integer(arg).tap do |value|
+      Aws.config.update(:retry_limit => value)
+    end
+  end
+
   option "--debug", :flag, "enable debugging"
 
   option ["--version"], :flag, "display version" do
@@ -45,7 +52,7 @@ Clamp do
     signal_error e.message
   rescue Aws::Errors::MissingCredentialsError
     signal_error "no credentials provided"
-  rescue Aws::CloudFormation::Errors::ExpiredToken => e
+  rescue Aws::Errors::ServiceError => e
     signal_error e.message
   end
 

data/lib/stackup/differ.rb

@@ -1,4 +1,5 @@
 require "diffy"
+require "stackup/utils"
 require "yaml"
 
 module Stackup
@@ -14,9 +15,11 @@ module Stackup
 
     attr_reader :diff_style
 
+    include Utils
+
     def diff(existing_data, pending_data)
-      existing = format(existing_data) + "\n"
-      pending = format(pending_data) + "\n"
+      existing = format(normalize_data(existing_data)) + "\n"
+      pending = format(normalize_data(pending_data)) + "\n"
       diff = Diffy::Diff.new(existing, pending).to_s(diff_style)
       diff unless diff =~ /\A\s*\Z/
     end

data/lib/stackup/utils.rb

@@ -0,0 +1,21 @@
+module Stackup
+
+  # Generates diffs of data.
+  #
+  module Utils
+
+    def normalize_data(data)
+      case data
+      when Hash
+        pairs = data.sort.map { |k,v| [k, normalize_data(v)] }
+        Hash[pairs]
+      when Array
+        pairs = data.map { |x| normalize_data(x) }
+      else
+        data
+      end
+    end
+
+  end
+
+end

data/lib/stackup/version.rb

@@ -1,5 +1,5 @@
 module Stackup
 
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 
 end

data/spec/stackup/utils_spec.rb

@@ -0,0 +1,76 @@
+require "spec_helper"
+
+require "stackup/utils"
+
+describe Stackup::Utils do
+
+  include Stackup::Utils
+
+  describe ".normalize_data" do
+
+    context "with a scalar" do
+
+      it "returns the input" do
+        expect(normalize_data(123)).to eql(123)
+      end
+
+    end
+
+    context "with a Hash" do
+
+      it "sorts the Hash" do
+        input = {
+          "foo" => 1,
+          "bar" => 2
+        }
+        expected_output = {
+          "bar" => 2,
+          "foo" => 1
+        }
+        expect(normalize_data(input)).to eql(expected_output)
+      end
+
+    end
+
+    context "with a nested Hash" do
+
+      it "sorts the Hash" do
+        input = {
+          "stuff" => {
+            "foo" => 1,
+            "bar" => 2
+          }
+        }
+        expected_output = {
+          "stuff" => {
+            "bar" => 2,
+            "foo" => 1
+          }
+        }
+        expect(normalize_data(input)).to eql(expected_output)
+      end
+
+    end
+
+    context "with an array of Hashes" do
+
+      it "sorts the all" do
+        input = [
+          {
+            "foo" => 1,
+            "bar" => 2
+          }
+        ]
+        expected_output = [
+          {
+            "bar" => 2,
+            "foo" => 1
+          }
+        ]
+        expect(normalize_data(input)).to eql(expected_output)
+      end
+
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackup
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Mike Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-resources
@@ -102,11 +102,13 @@ files:
 - lib/stackup/service.rb
 - lib/stackup/stack.rb
 - lib/stackup/stack_watcher.rb
+- lib/stackup/utils.rb
 - lib/stackup/version.rb
 - spec/spec_helper.rb
 - spec/stackup/parameters_spec.rb
 - spec/stackup/stack_spec.rb
 - spec/stackup/stack_watcher_spec.rb
+- spec/stackup/utils_spec.rb
 homepage: https://github.com/realestate-com-au/stackup
 licenses:
 - MIT
@@ -136,3 +138,4 @@ test_files:
 - spec/stackup/parameters_spec.rb
 - spec/stackup/stack_spec.rb
 - spec/stackup/stack_watcher_spec.rb
+- spec/stackup/utils_spec.rb