stackit 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53117e180823b1415771e7d49bd02a02845e6833
-  data.tar.gz: fd84a9ad362360a4cf67bfc4e12694ed60eaf3c0
+  metadata.gz: 2ac19462fbc972cf3ecc734cb522a953cc27248e
+  data.tar.gz: df7cb50fc70fd5523d9a084b021e08a573c87999
 SHA512:
-  metadata.gz: f181521fdd80b71e6256da7f0c83229960780b6049aaca63d9b17fafe5a216896befc91498a46993b66360d0d4891a3f69fb7c7b446a32f7e26b795ad3d2824f
-  data.tar.gz: ac57d629fc7668d6f3e15b8d20b0fed180f0759ccc58055200d89a5150d182dc64c61ac02dc3f2600ab2f03c1b88e57063198e683c2f484d446707fc4b385e9c
+  metadata.gz: 8e235a10bee4875fa5ddca3d47da6317ee19cf6af78e8801d4ff091ee4941a8e65b2f4f27ee39be7d47d2b0473eddb5004c84feb9a5a9897f830980ef9fc21b4
+  data.tar.gz: 086d28aee94c798d7a6f8edde883fbcfa42a5b6fdf9c091f32f64726e3ab5b3cee3702199cd215d0eabfbd0d46753585e243f678741434dfccd407c3322a188b

data/lib/stackit/stack/managed_stack.rb

@@ -1,6 +1,8 @@
 module Stackit
   class ManagedStack < Stack
 
+    include Wait
+
     attr_accessor :template
     attr_accessor :template_path
     attr_accessor :file_parameters

data/lib/stackit/stack/managed_stack_service.rb

@@ -61,7 +61,7 @@ module Stackit
         stack_policy: options[:stack_policy],
         stack_policy_during_update: options[:stack_policy_during_update],
         depends: options[:depends],
-        user_defined_parameters: user_defined_parameters,
+        user_defined_parameters: user_defined_parameters.merge!(options[:parameters]),
         parameters_file: parameters_file,
         parameter_map: parameter_mappings,
         disable_rollback: !!options[:debug] ? true : (!!options[:disable_rollback] || disable_rollback),

data/lib/stackit/version.rb

@@ -1,3 +1,3 @@
 module Stackit
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/stackit.rb

@@ -8,6 +8,7 @@ require "stackit/version"
 require "stackit/aws"
 require "stackit/template"
 require "stackit/stack/default_notifier"
+require "stackit/wait"
 require "stackit/stack"
 require "stackit/stack/managed_stack"
 require "stackit/stack/managed_stack_service"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackit
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Jeremy Hahn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler