sfn 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b1f3461b27bf1c87ba2df3efdab30924e49c223
-  data.tar.gz: cfa6e7d5956057c6057829cbe4b14c34556c45e8
+  metadata.gz: 57c0b106d6e595a6ccae1b8242e1b57dbf1418db
+  data.tar.gz: b5aaa5b140fc279e39edcaa83bfd3a004e3b3208
 SHA512:
-  metadata.gz: 46e00694b00f305fcce7e91611150fd7c4238386d72f91faca0c94d3e69825087b06b25aa174e6a7e23433bbe20882e86135bbcd8e7e252392875616fdd4b18b
-  data.tar.gz: fd89743647dd0fcd317e9141d9b63e65b9d6e4c29488be71f6c87edf622e46f4d6c762dc56081c963178b18fa5566240f6b11f6efb086bec4e8c70fcd1146dfb
+  metadata.gz: 8d8e5a5bd254e7112df68538b644663b678797ca64dc78f971b252ae42fb7599a0207050d45f97ee333a18dd739e0ead80e58bd466b6f7794d7793826417acc7
+  data.tar.gz: 63983740fed1f8fb70317410da8a1e844181de88115f2c745ce8be1091636ec8310ca44099125fe8af52cf4d7339706e7b46d37b5a65ca5d9efa5caaa5f15ffd

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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
 * Add support for compile time parameters
 * Fix valid stack type check on child stack connections

data/lib/sfn/cache.rb

@@ -265,7 +265,7 @@ module Sfn
           yield
         end
       rescue => e
-        if(e.class.to_s == 'Redis::Lock::LockTimeout')
+        if(e.class.to_s.end_with?('Timeout'))
           raise if raise_on_locked
         else
           raise
@@ -285,6 +285,9 @@ module Sfn
     # Simple lock for memory cache
     class LocalLock
 
+      class LocalLockTimeout < RuntimeError
+      end
+
       # @return [Symbol] key name
       attr_reader :_key
       # @return [Numeric] timeout
@@ -320,7 +323,11 @@ module Sfn
             _lock.unlock if _lock.locked?
           end
         else
-          raise Redis::Lock::LockTimeout.new "Timeout on lock #{_key} exceeded #{_timeout} sec"
+          if(defined?(Redis))
+            raise Redis::Lock::LockTimeout.new "Timeout on lock #{_key} exceeded #{_timeout} sec"
+          else
+            raise LocalLockTimeout.new "Timeout on lock #{_key} exceeded #{_timeout} sec"
+          end
         end
       end
 

data/lib/sfn/command/update.rb

@@ -35,7 +35,7 @@ module Sfn
               c_current = config[:compile_parameters].fetch(s_name.join('_'), Smash.new)
               config[:compile_parameters][s_name.join('_')] = compile_params.merge(c_current)
             end
-            stack.nested_stacks(false).each do |n_stack|
+            c_stack.nested_stacks(false).each do |n_stack|
               s_name.push(n_stack.name)
               c_setter.call(n_stack)
               s_name.pop

data/lib/sfn/command_module/stack.rb

@@ -123,7 +123,11 @@ module Sfn
             stack_parameters = sparkle.fetch('Parameters', Smash.new)
           end
           unless(stack_parameters.empty?)
-            ui.info "#{ui.color('Stack runtime parameters:', :bold)} - template: #{ui.color(sparkle.root_path.map(&:name).map(&:to_s).join(' > '), :green, :bold)}"
+            if(sparkle.is_a?(SparkleFormation))
+              ui.info "#{ui.color('Stack runtime parameters:', :bold)} - template: #{ui.color(sparkle.root_path.map(&:name).map(&:to_s).join(' > '), :green, :bold)}"
+            else
+              ui.info ui.color('Stack runtime parameters:', :bold)
+            end
             if(config.get(:parameter).is_a?(Array))
               config[:parameter] = Smash[
                 *config.get(:parameter).map(&:to_a).flatten

data/lib/sfn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli