vaporware 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c8dd20bc503251f0a2db40374f6509711e35ae2
-  data.tar.gz: 81483a099efb4c1c0a07db426c242a0f5b2441fa
+  metadata.gz: bd07f1737f07e7d1936f8774cb0808b4d063ff8a
+  data.tar.gz: f479a682b5c19453796eccaa5854f8c91b2cfd7b
 SHA512:
-  metadata.gz: bd3f0412f1cfb62407e58bea88684f5ec96739ae6995b6cb55526150a545d5fe1ff1b7a2a6b1547d54db209059b208fbadb9ceb959e77f7baa72912a9108b1d6
-  data.tar.gz: ba8a5132753e15c666f5d910490f24866cbbaa3103eca9d6cf9927e78c1a28cc93c9da420cf4bf8c777deb3911b921066819b947ca4c9c5ae8e71f312cc95b61
+  metadata.gz: 7e97833be8c224dccf8c0eb77ff3346c4c7fb57bbfca15c1a4e7efb7aad78536f63a28d5eb59d9b93fa7c4fa67f1d4d79d4cc97c3e269a3564df43cf35c88989
+  data.tar.gz: 0e268b06cac64fa88c184171cd9e3181e380468f27c72b588fd8dc6ffe86e24f1908b92f7ca974cbee8c1bb50b54a9df8c7b0c9f1157492b3484559a96328610

data/lib/vaporware.rb

@@ -10,8 +10,8 @@ class Vaporware
       timeout: 40, # minutes
       tags: {},
       on_failure: "ROLLBACK", # or: DO_NOTHING, DELETE
-      status_max_attempts: 360,
-      status_delay: 10
+      status_max_attempts: 720,
+      status_delay: 5
     }.merge opts
     fail "You must specify a template filename!" unless options[:template_filename]
 
@@ -31,32 +31,20 @@ class Vaporware
   end
 
   def create_stack
-    with_progress "creation" do
+    wait_for "creation", :stack_create_complete do
       @client.create_stack(stack_create_params)
-      @client.wait_until(:stack_create_complete, stack_name: @stack_name) do |w|
-        w.max_attempts = @status_max_attempts
-        w.delay = @status_delay
-      end
     end
   end
 
   def update_stack
-    with_progress "update" do
+    wait_for "update", :stack_update_complete do
       @client.update_stack(stack_update_params)
-      @client.wait_until(:stack_update_complete, stack_name: @stack_name) do |w|
-        w.max_attempts = @status_max_attempts
-        w.delay = @status_delay
-      end
     end
   end
 
   def delete_stack
-    with_progress "deletion" do
+    wait_for "deletion", :stack_delete_complete do
       @client.delete_stack(stack_name: @stack_name)
-      @client.wait_until(:stack_delete_complete, stack_name: @stack_name) do |w|
-        w.max_attempts = @status_max_attempts
-        w.delay = @status_delay
-      end
     end
   end
 
@@ -138,21 +126,27 @@ class Vaporware
     new_events.reverse
   end
 
-  def with_progress goal
+  def format_events events
+    return "." if events.size == 0
+    events.reduce("") do |acc, event|
+      acc << "[#{event.timestamp}] #{event.logical_resource_id} (#{event.resource_type}): #{event.resource_status}\n"
+    end
+  end
+
+  def wait_for goal, event_type
     @old_events = -1
     new_stack_events
-    progress_thread = Thread.new do
-      loop do
-        puts "Waiting for stack #{goal}..."
-        sleep 5
+    puts "Waiting for stack #{goal}..."
+    yield
+    @client.wait_until(event_type, stack_name: @stack_name) do |w|
+      w.max_attempts = @status_max_attempts
+      w.delay = @status_delay
+      w.before_wait do
         new_events = new_stack_events
-        new_events.each do |event|
-          puts "[#{event.timestamp}] #{event.logical_resource_id} (#{event.resource_type}): #{event.resource_status}"
-        end
+        puts format_events new_events
       end
     end
-    yield
-    progress_thread.exit
+    puts format_events new_stack_events
     puts "Stack #{goal} complete!"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vaporware
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Audrey Schwarz