sfn 3.0.2 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff21ffb339f3f1e06331e13f7766efc450968c8d
-  data.tar.gz: 80fad1d08580b2d49cd5d8b78faf863cd81675b4
+  metadata.gz: b5dbbdec8d298bd67a3aefc4165d871d263619df
+  data.tar.gz: 5170f01c227cf78fd58342c21487fa4d6793fecb
 SHA512:
-  metadata.gz: 8f292c003150464857fa0ce03605704d67a27f5d7f867d23fe9c4ac839c2797ed18e325bb85b393ce6f379b4c41087bb738ce4fa2b8f8b60256c4c7f7a34730c
-  data.tar.gz: 18c983f3de8d5319be07f723e10e7cfde201e2330b03508b3cba6af0b81f0b27f7ee0c937c64f456c7f0b48a55772e7af65802faf95126eb0b4f1c614f045329
+  metadata.gz: 00763fc81a15a13447d6b1f72088b2231801d44512445c2e4046f4b0df1ccfd48018183a3f6e6581c237cb093cf8b9a8f0ba3292788add746de39fd9c07b0a55
+  data.tar.gz: 05238e596ac34dec5ccada596e7cfae2251af646600a44c3e0a20af94892664771251376035f0bba56b09826022b27b8f7acd313c2c0bcc7e5543c5e36dc828d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v3.0.4
+* [fix] Update parameter values extraction location in planner
+* [fix] Merge compile time parameters when existing are available
+* [enhancement] Reduce response size on event polling where available
+
 # v3.0.2
 * [fix] Properly scrub nested stack pseudo property on update (#189)
 * [fix] Process nested stacks before removal within AWS planner (#190)

data/README.md

@@ -22,6 +22,7 @@ with orchestration APIs.
 
 * Repository: https://github.com/sparkleformation/sfn
 * Website: http://www.sparkleformation.io/docs/sfn/
+* Mailing List: https://groups.google.com/forum/#!forum/sparkleformation
 * IRC: Freenode @ #sparkleformation
 
 [miasma]: http://miasma-rb.github.io/miasma/

data/docs/callbacks.md

@@ -83,7 +83,7 @@ instead of during configuration. This can be done by using a special
 `:sfn` group within your bundle. For example, to load the `sfn-serverspec`
 callback immediately the Gemfile should look like:
 
-```ruby
+~~~ruby
 # Gemfile
 source 'https://rubygems.org'
 
@@ -92,7 +92,7 @@ gem 'sfn'
 group :sfn do
   gem 'sfn-serverspec'
 end
-```
+~~~
 
 ### Builtin Callbacks
 
@@ -314,7 +314,7 @@ The sfn command will output a notification to the user before a callback is
 run, and after it has completed. This may be too verbose for some callbacks.
 A callback may disable this output using the `quiet` method:
 
-```ruby
+~~~ruby
 module Sfn
   class Callback
     class MyCallback < Callback
@@ -326,7 +326,7 @@ module Sfn
     end
   end
 end
-```
+~~~
 
 ### Addon Callbacks
 
@@ -360,4 +360,4 @@ Manage stack parameters via files within the project repository.
 Define Serverspec rules directly on resources within templates
 and automatically run after success stack creation or update.
 
-* https://github.com/sparkleformation/sfn-serverspec
+* https://github.com/sparkleformation/sfn-serverspec

data/lib/sfn/command/events.rb

@@ -63,7 +63,20 @@ module Sfn
       # @return [Array<Hash>]
       def get_events(*args)
         stack_events = discover_stacks(stack).map do |i_stack|
-          i_events = i_stack.events.reload.all
+          begin
+            if(@initial_complete && i_stack.in_progress?)
+              i_events = i_stack.events.update!
+            else
+              i_events = i_stack.events.all
+            end
+          rescue => e
+            if(e.class.to_s.start_with?('Errno'))
+              ui.warn "Connection error encountered: #{e.message} (retrying)"
+              ui.debug "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
+              sleep(5)
+              retry
+            end
+          end
           i_events.map do |e|
             e.attributes.merge(:stack_name => i_stack.name).to_smash
           end

data/lib/sfn/command_module/template.rb

@@ -162,6 +162,13 @@ module Sfn
           elsif(config[:file])
             if(config[:processing])
               compile_state = config.fetch(:compile_parameters, Smash.new)
+              compile_state.keys.each do |cs_key|
+                if(cs_key.to_s.start_with?(arguments.first.to_s))
+                  cli_provided = compile_state.delete(cs_key.to_s.sub("#{arguments.first.to_s}__", ''))
+                  compile_state[cs_key].deep_merge!(cli_provided)
+                end
+              end
+              ui.debug "Merged compile parameters - #{compile_state}"
               sf = SparkleFormation.compile(config[:file], :sparkle)
               if(name_args.first)
                 sf.name = name_args.first
@@ -170,13 +177,6 @@ module Sfn
                 f_name = formation.root_path.map(&:name).map(&:to_s)
                 pathed_name = f_name.join(' > ')
                 f_name = f_name.join('__')
-                current_state = compile_state[f_name]
-                unless(current_state)
-                  f_name = f_name.split('__')
-                  f_name.shift
-                  f_name = f_name.join('__')
-                  current_state = f_name.empty? ? compile_state : compile_state[f_name]
-                end
                 if(formation.root? && compile_state[f_name].nil?)
                   current_state = compile_state
                 else

data/lib/sfn/planner/aws.rb

@@ -316,7 +316,7 @@ module Sfn
           end
           new_stack_exists = is_stack?(new_template_hash.get('Resources', stack_name, 'Type'))
           new_stack_template = new_template_hash.fetch('Resources', stack_name, 'Properties', 'Stack', Smash.new)
-          new_stack_parameters = new_stack_template.fetch('Parameters', Smash.new)
+          new_stack_parameters = new_template_hash.fetch('Resources', stack_name, 'Properties', 'Parameters', Smash.new)
           new_stack_type = new_template_hash.fetch('Resources', stack_name, 'Type',
             origin_template.get('Resources', stack_name, 'Type')
           )

data/lib/sfn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.4
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli