sfn 1.1.16 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58e8684eee245ada64046f2a15637e4e7bf41e8a
-  data.tar.gz: 7819639664f3329ba2d8abf97a4a0ed41dc97d5a
+  metadata.gz: eb52f9ec870e82eaf0e32aaba64f4c4ea05badf8
+  data.tar.gz: 54939ef76128913964444beb09d72d8c4c4b1447
 SHA512:
-  metadata.gz: aedaee01c2ef802348a5767be88302246bf08905899e471d65ddbb178f1dc0a2f1b9a48a4ae2a7b87bca9397e68060b19c07df6a42f4b2c75c86dc260ccc5e0d
-  data.tar.gz: d43a1d391fe8611851273e219bf78813622b5620eae3eda9bdd6fa49991465411c2c150356d71a883446311d6ac6109114d78e2b5a809a0f2f49258a35a6e945
+  metadata.gz: 6727eeb62882084fab9f4207f2ccea58160155a16410c6051ff1970e35a70702af087020c972c1c5d40941a5c5917a4fe0b3f5e8351f11aa70574b85ba1d830e
+  data.tar.gz: c7390a1b826f92b231e0b2d6df9f97258a9381824d5e6826d58496ee5044b7c5e9d322f77da7f8c0e878c98ffcfb72c888ef73186826453ad8419628823832ca

data/CHANGELOG.md

@@ -1,52 +1,58 @@
-## v1.1.16
+# v1.2.0
+* [fix] Always require packs when loading
+* [fix] Prevent stale output display on update
+* [enhancement] Coerce hash type configurations consistently
+* [enhancement] Force short flags to prevent change
+
+# v1.1.16
 * [fix] Duplicate template when dereferencing within planner
 
-## v1.1.14
+# v1.1.14
 * [fix] Use correct name part for building callback name
 
-## v1.1.12
+# v1.1.12
 * [enhancement] Include updated time information on stack list
 * [enhancement] Support pseudo-parameters in update planning
   * AWS only as it is currently the only implementation
 
-## v1.1.10
+# v1.1.10
 * [enhancement] Better configuration related errors
 * [fix] Planning display on stack removal (#75)
 * [fix] Remove stack properties on update request (#76)
 * [enhancement] Add `retries` config alias for `retry` (#77)
 
-## v1.1.8
+# v1.1.8
 * [fix] Disable knife config mashing to get expected values (#72)
 * [feature] Add new `conf` command (#72)
 * [feature] Add planning support for stack updates (#69)
 
-## v1.1.6
+# v1.1.6
 * [fix] set proper parameter hash on apply stack (#67)
 
-## v1.1.4
+# v1.1.4
 * [feature] Add new `diff` command
 
-## v1.1.2
+# v1.1.2
 * [fix] stack update when extracting compile time state
 * [fix] remove use of `root_path` method when shallow nesting is in use
 
-## v1.1.0
+# v1.1.0
 * Add support for compile time parameters
 * Fix valid stack type check on child stack connections
 * Provide output context for template location when prompting parameters
 * Use full stack path naming for bucket file names when storing
 
-## v1.0.4
+# v1.0.4
 * [fix] Set template prior to apply on update to find new parameters
 * Disable parameter validation warning on deep nesting
 * Update parameter detection on updates when using deep nesting
 
-## v1.0.2
+# v1.0.2
 * [fix] Properly detect local pack directory if available
 * Add `print` command for printing generated templates
 * Add support for custom stack resource types
 
-## v1.0.0
+# v1.0.0
 
 _NOTE: This release contains breaking changes! Please review the
 	changes in this release and test your configuration and
@@ -66,28 +72,28 @@ _NOTE: This release contains breaking changes! Please review the
 * Add support for AWS stack policies via optional callback
 * And lots of internal refactors!
 
-## v0.4.12
+# v0.4.12
 * Fix transient uninitialized constant error for update command
 
-## v0.4.10
+# v0.4.10
 * Fix error when no options are provided within config (#18)
 * Fix error when parameters originate from config only (#20)
 
-## v0.4.8
+# v0.4.8
 * Disable delimiter on `:multiple` options (must specify multiple flags)
 * Update types allowed by inspect for instance failure option
 * Parameter hash is now always fully set based on template parameters
 
-## v0.4.6
+# v0.4.6
 * Fix parameter generation from CLI
 
-## v0.4.4
+# v0.4.4
 * Add a few more config fixes to properly validate
 
-## v0.4.2
+# v0.4.2
 * Fix config types defined
 
-## v0.4.0
+# v0.4.0
 * Fix parameters passed on CLI (#11)
 * Fix credential overrides from the CLI (#14)
 * Properly process CLI options through custom config classes
@@ -98,18 +104,18 @@ _NOTE: This release contains breaking changes! Please review the
 	consistent now and into the future. Please refer to the help
 	output for a given command to view short flags.
 
-## v0.3.8
+# v0.3.8
 * Fix result output from `update` command (#9)
 * Fix `inspect` command to properly support multiple attribute flags
 * Only output JSON when using `--print-only` flag with `create` command (#10)
 
-## v0.3.6
+# v0.3.6
 * Set options correctly on `sfn` executable (#7)
 * Update cli library dependency to provide better error messages (#6)
 * Update cloud library dependencies to support new options (:on_failure and :tags)
 * Cloud library update also adds support for aws credentials file
 
-## v0.3.4
+# v0.3.4
 * Default column widths when no output is available
 * Display stack tags on `describe` command
 * Fix apply stack reference to access via hash
@@ -117,115 +123,115 @@ _NOTE: This release contains breaking changes! Please review the
 * Fix path prompting (#5 thanks @JonathanSerafini)
 * Update minimum CLI lib dependency to provide correct configuration merging (#4)
 
-## v0.3.2
+# v0.3.2
 * Validate stack name prior to discovery on apply
 * Update configuration usage to allow runtime modification
 * Allow `create` command to print-only without requiring API credentials
 
-## v0.3.0
+# v0.3.0
 * Conversion from `knife-cloudformation` to `sfn`
 * Add knife subcommand alias `sparkleformation`
 * Remove implementation dependency on Chef tooling
 
-## v0.2.20
+# v0.2.20
 * Add automatic support for outputs in nested stacks to `--apply-stack`
 
-## v0.2.18
+# v0.2.18
 * Fix nested stack URL generation
 
-## v0.2.16
+# v0.2.16
 * Fix broken validation command (#12 thanks @JonathanSerafini)
 * Pad stack name indexes when unpacked
 
-## v0.2.14
+# v0.2.14
 * Pass command configuration through when unpacking
 * Force stack list reload prior to polling to prevent lookup errors
 * Add glob support on name arguments provided for `destroy`
 * Add unpacked stack support to `--apply-stack` flag
 * Retry events polling when started from different command
 
-## v0.2.12
+# v0.2.12
 * Use template to provide logical parameter ordering on stack update
 * Only set parameters when not the default template value
 * Do not save nested stacks to remote bucket when in print-only mode
 * Add initial support for un-nested stack create and update
 * Fix nested stack flagging usage
 
-## v0.2.10
+# v0.2.10
 * Add initial nested stack support
 
-## v0.2.8
+# v0.2.8
 * Update stack lookup implementation to make faster from CLI
 * Prevent constant error on exception when Redis is not in use
 * Provide better error messages on request failures
 
-## v0.2.6
+# v0.2.6
 * Update to parameter re-defaults to use correct hash instance
 
-## v0.2.4
+# v0.2.4
 * Fix apply stack parameter processing
 
-## v0.2.2
+# v0.2.2
 * Fix redis-objects loading in cache helper
 
-## v0.2.0
+# v0.2.0
 * This release should be considered "breaking"
 * Underlying cloud API has been changed from fog to miasma
 * The `inspect` command has been fully reworked to support `--attribute`
 * Lots and lots of other changes. See commit log.
 
-## v0.1.22
+# v0.1.22
 * Prevent full stack list loading in knife commands
 * Default logger to INFO level and allow DEBUG level via `ENV['DEBUG']`
 * Fix assumption of type when accessing cached data (cannot assume availability)
 
-## v0.1.20
+# v0.1.20
 * Update some caching behavior
 * Add more logging especially around remote calls
 * Add support for request throttling
 * Disable local caching when stack is in `in_progress` state
 
-## v0.1.18
+# v0.1.18
 * Replace constant with inline value to prevent warnings
 * Explicitly load file to ensure proper load ordering
 
-## v0.1.16
+# v0.1.16
 * Fix exit code on stack destroy
 * Update stack loading for single stack requests
 * Add import and export functionality
 
-## v0.1.14
+# v0.1.14
 * Extract template building tools
 * Add support for custom CF locations and prompting
 * Updates in fetching and caching behavior
 
-## v0.1.12
+# v0.1.12
 * Use the split value when re-joining parameters
 
-## v0.1.10
+# v0.1.10
 * Fix parameter passing via the CLI (data loss issue when value contained ':')
 
-## v0.1.8
+# v0.1.8
 * Update event cache handling
 * Allow multiple users for node connect attempts
 
-## v0.1.6
+# v0.1.6
 * Adds inspect action
 * Updates to commons
 * Allow multiple stack destroys at once
 * Updates to options to make consistent
 
-## v0.1.4
+# v0.1.4
 * Support outputs on stack creation
 * Poll on destroy by default
 * Add inspection helper for failed node inspection
 * Refactor AWS interactions to common library
 
-## v0.1.2
+# v0.1.2
 * Update dependency restriction to get later version
 
-## v0.1.0
+# v0.1.0
 * Stable-ish release
 
-## v0.0.1
+# v0.0.1
 * Initial release

data/docs/configuration.md

@@ -73,6 +73,14 @@ $ knife sparkleformation --help
 |                            | Valid         | `String`
 |                            | Default       | none
 |----------------------------|---------------|---------------------------------------------------------------
+| `sparkle_pack`             | Description   | SparklePacks to load
+|                            | Valid         | `Array<String>`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+| `parameters`               | Description   | Stack runtime parameters
+|                            | Valid         | `Hash`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
 | `credentials`              | Description   | API credentials for target orchestration API
 |                            | Valid         | `Hash`
 |                            | Default       | none

data/lib/sfn/command/update.rb

@@ -122,6 +122,7 @@ module Sfn
                 poll_stack(stack.name)
                 if(stack.reload.state == :update_complete)
                   ui.info "Stack update complete: #{ui.color('SUCCESS', :green)}"
+                  stack.resources.reload
                   namespace.const_get(:Describe).new({:outputs => true}, [name]).execute!
                 else
                   ui.fatal "Update of stack #{ui.color(name, :bold)}: #{ui.color('FAILED', :red, :bold)}"
@@ -167,7 +168,7 @@ module Sfn
         said_any_things = false
         unless(info[:stacks].empty?)
           info[:stacks].each do |s_name, s_info|
-            said_things = print_plan_result(s_info, [*names, s_name].compact)
+            said_any_things ||= print_plan_result(s_info, [*names, s_name].compact)
           end
         end
         unless(names.flatten.compact.empty?)
@@ -213,6 +214,7 @@ module Sfn
           unless(said_things)
             ui.puts "    #{ui.color('No resource lifecycle changes detected!', :green)}"
             ui.puts
+            said_any_things = true
           end
         end
         said_any_things

data/lib/sfn/command_module/template.rb

@@ -80,8 +80,19 @@ module Sfn
         # @return [Array<SparkleFormation::SparklePack>]
         def sparkle_packs
           memoize(:sparkle_packs) do
-            config.fetch(:sparkle_pack, []).map do |sparkle_name|
-              SparkleFormation::Sparkle.new(:name => sparkle_name)
+            [config.fetch(:sparkle_pack, [])].flatten.compact.map do |sparkle_name|
+              begin
+                require sparkle_name
+              rescue LoadError
+                ui.fatal "Failed to locate sparkle pack `#{sparkle_name}` for loading!"
+                raise
+              end
+              begin
+                SparkleFormation::Sparkle.new(:name => sparkle_name)
+              rescue ArgumentError
+                ui.fatal "Failed to properly setup sparkle pack `#{sparkle_pack}`. Check implementation."
+                raise
+              end
             end
           end
         end

data/lib/sfn/config.rb

@@ -6,6 +6,33 @@ module Sfn
   # Top level configuration
   class Config < Bogo::Config
 
+    # Override attribute helper to detect Hash types and automatically
+    # add type conversion for CLI provided values + description update
+    #
+    # @param name [String, Symbol] name of attribute
+    # @param type [Class, Array<Class>] valid types
+    # @param info [Hash] attribute information
+    # @return [Hash]
+    def self.attribute(name, type, info=Smash.new)
+      if([type].flatten.any?{|t| t.ancestors.include?(Hash)})
+        unless(info[:coerce])
+          info[:coerce] = lambda do |v|
+            case v
+            when String
+              Smash[v.split(',').map{|x| v.split(/[=:]/, 2)}]
+            when Hash
+              v.to_smash
+            else
+              v
+            end
+          end
+          info[:description] ||= ''
+          info[:description] << ' (Key:Value[,Key:Value,...])'
+        end
+      end
+      super(name, type, info)
+    end
+
     # Only values allowed designating bool type
     BOOLEAN_VALUES = [TrueClass, FalseClass]
 
@@ -27,45 +54,42 @@ module Sfn
 
     attribute(
       :config, String,
-      :description => 'Configuration file path'
+      :description => 'Configuration file path',
+      :short_flag => 'c'
     )
 
     attribute(
       :credentials, Smash,
-      :coerce => proc{|v|
-        case v
-        when String
-          Smash[v.split(',').map{|x| v.split(/[=:]/, 2)}]
-        when Hash
-          v.to_smash
-        else
-          v
-        end
-      },
-      :description => 'Provider credentials'
+      :description => 'Provider credentials',
+      :short_flag => 'C'
     )
     attribute(
       :ignore_parameters, String,
       :multiple => true,
-      :description => 'Parameters to ignore during modifications'
+      :description => 'Parameters to ignore during modifications',
+      :short_flag => 'i'
     )
     attribute(
       :interactive_parameters, [TrueClass, FalseClass],
       :default => true,
-      :description => 'Prompt for template parameters'
+      :description => 'Prompt for template parameters',
+      :short_flag => 'I'
     )
     attribute(
       :poll, [TrueClass, FalseClass],
       :default => true,
-      :description => 'Poll stack events on modification actions'
+      :description => 'Poll stack events on modification actions',
+      :short_flag => 'p'
     )
     attribute(
       :defaults, [TrueClass, FalseClass],
-      :description => 'Automatically accept default values'
+      :description => 'Automatically accept default values',
+      :short_flag => 'd'
     )
     attribute(
       :yes, [TrueClass, FalseClass],
-      :description => 'Automatically accept any requests for confirmation'
+      :description => 'Automatically accept any requests for confirmation',
+      :short_flag => 'y'
     )
 
     attribute :conf, Conf, :coerce => proc{|v| Conf.new(v)}
@@ -103,8 +127,9 @@ module Sfn
           end
         end.compact.reverse.inject(Smash.new){|m, n| m.deep_merge(n)}.map do |name, info|
           next unless info[:description]
-          short = name.chars.zip(name.chars.map(&:upcase)).flatten.detect do |c|
-            !shorts.include?(c)
+          short = info[:short_flag]
+          if(!short.to_s.empty? && shorts.include?(short))
+            raise ArgumentError.new "Short flag already in use! (`#{short}` not available for `#{klass}`)"
           end
           shorts << short
           info[:short] = short

data/lib/sfn/config/conf.rb

@@ -7,7 +7,8 @@ module Sfn
 
       attribute(
         :generate, [TrueClass, FalseClass],
-        :description => 'Generate a basic configuration file'
+        :description => 'Generate a basic configuration file',
+        :short_flag => 'g'
       )
 
     end

data/lib/sfn/config/create.rb

@@ -8,29 +8,30 @@ module Sfn
       attribute(
         :timeout, Integer,
         :coerce => proc{|v| v.to_i},
-        :description => 'Seconds to wait for stack to complete'
+        :description => 'Seconds to wait for stack to complete',
+        :short_flag => 'M'
       )
       attribute(
         :rollback, [TrueClass, FalseClass],
-        :description => 'Rollback stack on failure'
+        :description => 'Rollback stack on failure',
+        :short_flag => 'O'
       )
       attribute(
         :capabilities, String,
         :multiple => true,
-        :description => 'Capabilities to allow the stack'
+        :description => 'Capabilities to allow the stack',
+        :short_flag => 'B'
       )
       attribute(
         :options, Smash,
-        :description => 'Extra options to apply to the API call'
+        :description => 'Extra options to apply to the API call',
+        :short_flag => 'S'
       )
       attribute(
-        :notifications, String,
+        :notification_topics, String,
         :multiple => true,
-        :description => 'Notification endpoints for stack events'
-      )
-      attribute(
-        :plan, FalseClass,
-        :default => false
+        :description => 'Notification endpoints for stack events',
+        :short_flag => 'z'
       )
 
     end

data/lib/sfn/config/describe.rb

@@ -6,17 +6,20 @@ module Sfn
 
       attribute(
         :resources, [TrueClass, FalseClass],
-        :description => 'Display stack resource list'
+        :description => 'Display stack resource list',
+        :short_flag => 'r'
       )
 
       attribute(
         :outputs, [TrueClass, FalseClass],
-        :description => 'Display stack outputs'
+        :description => 'Display stack outputs',
+        :short_flag => 'o'
       )
 
       attribute(
         :tags, [TrueClass, FalseClass],
-        :description => 'Display stack tags'
+        :description => 'Display stack tags',
+        :short_flag => 't'
       )
 
     end

data/lib/sfn/config/diff.rb

@@ -7,7 +7,8 @@ module Sfn
       attribute(
         :raw_diff, [TrueClass, FalseClass],
         :default => false,
-        :description => 'Display raw diff information'
+        :description => 'Display raw diff information',
+        :short_flag => 'w'
       )
     end
   end

data/lib/sfn/config/events.rb

@@ -8,17 +8,20 @@ module Sfn
       attribute(
         :attribute, String,
         :multiple => true,
-        :description => 'Event attribute to display'
+        :description => 'Event attribute to display',
+        :short_flag => 'a'
       )
       attribute(
         :poll_delay, Integer,
         :default => 20,
         :description => 'Seconds to pause between each event poll',
-        :coerce => lambda{|v| v.to_i}
+        :coerce => lambda{|v| v.to_i},
+        :short_flag => 'P'
       )
       attribute(
         :all_attributes, [TrueClass, FalseClass],
-        :description => 'Display all event attributes'
+        :description => 'Display all event attributes',
+        :short_flag => 'A'
       )
 
     end

data/lib/sfn/config/inspect.rb

@@ -8,28 +8,34 @@ module Sfn
       attribute(
         :attribute, String,
         :multiple => true,
-        :description => 'Dot delimited attribute to view'
+        :description => 'Dot delimited attribute to view',
+        :short_flag => 'a'
       )
       attribute(
         :nodes, [TrueClass, FalseClass],
-        :description => 'Locate all instances and display addresses'
+        :description => 'Locate all instances and display addresses',
+        :short_flag => 'n'
       )
       attribute(
         :instance_failure, [TrueClass, FalseClass],
         :description => 'Display log file error from failed not if possible',
+        :short_flag => 'N'
       )
       attribute(
         :failure_log_path, String,
         :description => 'Path to remote log file for display on failure',
-        :default => '/var/log/chef/client.log'
+        :default => '/var/log/chef/client.log',
+        :short_flag => 'f'
       )
       attribute(
         :identity_file, String,
-        :description => 'SSH identity file for authentication'
+        :description => 'SSH identity file for authentication',
+        :short_flag => 'D'
       )
       attribute(
         :ssh_user, String,
-        :description => 'SSH username for inspection connect'
+        :description => 'SSH username for inspection connect',
+        :short_flag => 's'
       )
 
     end

data/lib/sfn/config/list.rb

@@ -8,16 +8,19 @@ module Sfn
       attribute(
         :attribute, String,
         :multiple => true,
-        :description => 'Attribute of stack to print'
+        :description => 'Attribute of stack to print',
+        :short_flag => 'a'
       )
       attribute(
         :all_attributes, [TrueClass, FalseClass],
-        :description => 'Print all available attributes'
+        :description => 'Print all available attributes',
+        :short_flag => 'A'
       )
       attribute(
         :status, String,
         :multiple => true,
-        :description => 'Match stacks with given status. Use "none" to disable.'
+        :description => 'Match stacks with given status. Use "none" to disable.',
+        :short_flag => 's'
       )
 
     end

data/lib/sfn/config/update.rb

@@ -8,20 +8,42 @@ module Sfn
       attribute(
         :apply_stack, String,
         :multiple => true,
-        :description => 'Apply outputs from stack to input parameters'
+        :description => 'Apply outputs from stack to input parameters',
+        :short_flag => 'A'
       )
       attribute(
         :parameter, Smash,
         :multiple => true,
-        :description => 'Pass template parameters directly (ParamName:ParamValue)',
-        :coerce => lambda{|v|
-          v.is_a?(String) ? Smash[*v.split(/[=:]/, 2)] : v
-        }
+        :description => '[DEPRECATED - use `parameters`] Pass template parameters directly (ParamName:ParamValue)',
+        :coerce => lambda{|v, inst|
+          result = inst.data[:parameter] || Array.new
+          case v
+          when String
+            v.split(',').each do |item|
+              result.push(Smash[*item.split(/[=:]/, 2)])
+            end
+          else
+            result.push(v.to_smash)
+          end
+          {:bogo_multiple => result}
+        },
+        :short_flag => 'R'
+      )
+      attribute(
+        :parameters, Smash,
+        :description => 'Pass template parameters directly',
+        :short_flag => 'm'
       )
       attribute(
         :plan, [TrueClass, FalseClass],
         :default => true,
-        :description => 'Provide planning information prior to update'
+        :description => 'Provide planning information prior to update',
+        :short_flag => 'l'
+      )
+      attribute(
+        :compile_parameters, Smash,
+        :description => 'Pass template compile time parameters directly',
+        :short_flag => 'o'
       )
 
     end

data/lib/sfn/config/validate.rb

@@ -8,53 +8,64 @@ module Sfn
       attribute(
         :processing, [TrueClass, FalseClass],
         :description => 'Call the unicorns and explode the glitter bombs',
-        :default => true
+        :default => true,
+        :short_flag => 'P'
       )
       attribute(
         :file, String,
         :description => 'Path to template file',
-        :default => nil
+        :default => nil,
+        :short_flag => 'f'
       )
       attribute(
         :file_path_prompt, [TrueClass, FalseClass],
         :default => true,
-        :description => 'Enable interactive prompt for template path discovery'
+        :description => 'Enable interactive prompt for template path discovery',
+        :short_flag => 'F'
       )
       attribute(
         :base_directory, String,
-        :description => 'Path to root of of templates directory'
+        :description => 'Path to root of of templates directory',
+        :short_flag => 'b'
       )
       attribute(
         :no_base_directory, [TrueClass, FalseClass],
-        :description => 'Unset any value used for the template root directory path'
+        :description => 'Unset any value used for the template root directory path',
+        :short_flag => 'n'
       )
       attribute(
         :translate, String,
-        :description => 'Translate generated template to given prodiver'
+        :description => 'Translate generated template to given provider',
+        :short_flag => 't'
       )
       attribute(
         :translate_chunk, Integer,
         :description => 'Chunk length for serialization',
-        :coerce => lambda{|v| v.to_i}
+        :coerce => lambda{|v| v.to_i},
+        :short_flag => 'T'
       )
       attribute(
         :apply_nesting, [String, Symbol],
         :default => 'deep',
-        :description => 'Apply stack nesting'
+        :description => 'Apply stack nesting',
+        :short_flag => 'a'
       )
       attribute(
         :nesting_bucket, String,
-        :description => 'Bucket to use for storing nested stack templates'
+        :description => 'Bucket to use for storing nested stack templates',
+        :short_flag => 'N'
       )
       attribute(
         :print_only, [TrueClass, FalseClass],
-        :description => 'Print the resulting stack template'
+        :description => 'Print the resulting stack template',
+        :short_flag => 'r'
       )
       attribute(
         :sparkle_pack, String,
         :multiple => true,
         :description => 'Load SparklePack gem',
-        :coerce => lambda{|s| require s; s}
+        :coerce => lambda{|s| s.to_s},
+        :short_flag => 's'
       )
 
     end

data/lib/sfn/planner/aws.rb

@@ -240,10 +240,12 @@ module Sfn
         translator = translator_for(t_key)
 
         new_parameters = new_parameters.dup
-        stack.parameters.each do |k,v|
-          if(new_parameters[k].is_a?(Hash))
-            val = translator.dereference(new_parameters[k])
-            new_parameters[k] = val == new_parameters[k] ? v : val
+        if(stack.parameters)
+          stack.parameters.each do |k,v|
+            if(new_parameters[k].is_a?(Hash))
+              val = translator.dereference(new_parameters[k])
+              new_parameters[k] = val == new_parameters[k] ? v : val
+            end
           end
         end
 
@@ -251,10 +253,10 @@ module Sfn
 
         new_template_hash = new_template.to_smash
 
-        o_nested_stacks = origin_template['Resources'].find_all do |s_name, s_val|
+        o_nested_stacks = origin_template.fetch('Resources', {}).find_all do |s_name, s_val|
           is_stack?(s_val['Type'])
         end.map(&:first)
-        n_nested_stacks = new_template_hash['Resources'].find_all do |s_name, s_val|
+        n_nested_stacks = new_template_hash.fetch('Resources', {}).find_all do |s_name, s_val|
           is_stack?(s_val['Type'])
         end.map(&:first)
         [o_nested_stacks + n_nested_stacks].flatten.compact.uniq.each do |n_name|
@@ -334,7 +336,7 @@ module Sfn
               property_name = p_path[3].sub(/\[\d+\]$/, '')
               type = templates[:origin]['Resources'][resource_name]['Type']
               info = SfnAws.registry[type]
-              effect = info[:full_properties].fetch(property_name, {}).fetch(:update_causes, :unknown)
+              effect = info[:full_properties].fetch(property_name, {}).fetch(:update_causes, :unknown).to_sym
               resource = Smash.new(
                 :name => resource_name,
                 :type => type,
@@ -367,7 +369,13 @@ module Sfn
             end
           end
         elsif(path.start_with?('Outputs'))
-          set_resource(:outputs, results, path.split('.')[1], {:properties => []})
+          o_resource_name = path.split('.')[1]
+          if(o_resource_name)
+            set_resource(
+              :outputs, results, o_resource_name,
+              :properties => []
+            )
+          end
         end
       end
 
@@ -403,11 +411,21 @@ module Sfn
         end
         template.keys.each do |t_key|
           next if ['Outputs', 'Resources'].include?(t_key)
-          template[t_key] = translator.dereference_processor(template[t_key], ['Ref', 'Fn', 'DEREF', 'Fn::FindInMap'])
+          template[t_key] = translator.dereference_processor(
+            template[t_key], ['Ref', 'Fn', 'DEREF', 'Fn::FindInMap']
+          )
         end
         translator.original.replace(template)
-        template['Resources'] = translator.dereference_processor(template['Resources'], ['Ref', 'Fn', 'DEREF', 'Fn::FindInMap'])
-        template['Outputs'] = translator.dereference_processor(template['Outputs'], ['Ref', 'Fn', 'DEREF', 'Fn::FindInMap'])
+        if(template['Resources'])
+          template['Resources'] = translator.dereference_processor(
+            template['Resources'], ['Ref', 'Fn', 'DEREF', 'Fn::FindInMap']
+          )
+        end
+        if(template['Outputs'])
+          template['Outputs'] = translator.dereference_processor(
+            template['Outputs'], ['Ref', 'Fn', 'DEREF', 'Fn::FindInMap']
+          )
+        end
         translator.original.replace({})
         template
       end

data/lib/sfn/version.rb

@@ -1,4 +1,4 @@
 module Sfn
   # Current library version
-  VERSION = Gem::Version.new('1.1.16')
+  VERSION = Gem::Version.new('1.2.0')
 end

data/sfn.gemspec

@@ -16,6 +16,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'net-ssh'
   s.add_dependency 'sparkle_formation', '~> 1.1'
   s.add_dependency 'hashdiff', '~> 0.2.2'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'mocha'
   s.executables << 'sfn'
   s.files = Dir['{lib,bin,docs}/**/*'] + %w(sfn.gemspec README.md CHANGELOG.md LICENSE)
   s.post_install_message = <<-EOF

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 1.1.16
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli
@@ -94,6 +94,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: SparkleFormation CLI
 email: code@chrisroberts.org
 executables: