kumogata 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8397ce5ba88d4176308efe41d403a0ff42df2dd
-  data.tar.gz: c1250a2e9c5e40620136ae46ce09bdaa2058578d
+  metadata.gz: 58914196d1e874c6e7d2634c98acc1ab3e0fb6f3
+  data.tar.gz: 386325c6bcbe4915ad1020f1a38ba4073087d28a
 SHA512:
-  metadata.gz: e7746ac2ff2e1fa7e1b69d436e89550e84e22efb3ee62aaf875e4b29f730b7abcef5b6d5fb97af3872d3556db383d5ce5fea46aabad94fab362a92920e58971b
-  data.tar.gz: c413ed695774054393d168f62cd53a4f6cfdd3ac1a6115ee2a979b8089e98af74c8f6227cfbfde386413a2c2e0523493e2eb3bbfa0eeaf2e0c7f0c4b422edcdc
+  metadata.gz: e5ae37b29e89a0122e3a352cb082a6635102eaccf890a82d07dd68aef2e69988ceda1d942ee117bb9904feb7e23b22b37f4f26c4f05c853bf3058a7e15fdb666
+  data.tar.gz: e4fc3e29b20fbc2808cfed21be5d0dd0b6107e1d16fc3d3b890f6c8d46c1d38359b8e545e89b8efc77da2d431090b73c3467c85e6bfdd114b3d229cc490be0c8

data/README.md

@@ -5,8 +5,8 @@
 
 Kumogata is a tool for [AWS CloudFormation](https://aws.amazon.com/cloudformation/).
 
-[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403091746)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403091746)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403091822)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403091822)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 
@@ -280,6 +280,8 @@ end # Resources
   * https://asciinema.org/a/7979
 * Convert a template
   * https://asciinema.org/a/7980
+* Create a stack while outputting the event log
+  * https://asciinema.org/a/8075
 
 ## Contributing
 

data/lib/kumogata/client.rb

@@ -220,8 +220,9 @@ class Kumogata::Client
 
     Kumogata.logger.info("Creating stack: #{stack_name}".cyan)
     stack = @cloud_formation.stacks.create(stack_name, template.to_json, build_create_options)
+    event_log = {}
 
-    unless while_in_progress(stack, 'CREATE_COMPLETE')
+    unless while_in_progress(stack, 'CREATE_COMPLETE', event_log)
       errmsgs = ['Create failed']
       errmsgs << stack_name
       errmsgs << stack.status_reason if stack.status_reason
@@ -241,11 +242,12 @@ class Kumogata::Client
   def update_stack(template, stack_name)
     stack = @cloud_formation.stacks[stack_name]
     stack.status
-    stack.update(build_update_options(template.to_json))
 
     Kumogata.logger.info("Updating stack: #{stack_name}".green)
+    event_log = create_event_log(stack)
+    stack.update(build_update_options(template.to_json))
 
-    unless while_in_progress(stack, 'UPDATE_COMPLETE')
+    unless while_in_progress(stack, 'UPDATE_COMPLETE', event_log)
       errmsgs = ['Update failed']
       errmsgs << stack_name
       errmsgs << stack.status_reason if stack.status_reason
@@ -262,12 +264,13 @@ class Kumogata::Client
     stack.status
 
     Kumogata.logger.info("Deleting stack: #{stack_name}".red)
+    event_log = create_event_log(stack)
     stack.delete
 
     completed = false
 
     begin
-      completed = while_in_progress(stack, 'DELETE_COMPLETE')
+      completed = while_in_progress(stack, 'DELETE_COMPLETE', event_log)
     rescue AWS::CloudFormation::Errors::ValidationError
       # Handle `Stack does not exist`
       completed = true
@@ -328,9 +331,7 @@ class Kumogata::Client
     end
   end
 
-  def while_in_progress(stack, complete_status)
-    event_log = {}
-
+  def while_in_progress(stack, complete_status, event_log)
     while stack.status =~ /_IN_PROGRESS\Z/
       print_event_log(stack, event_log)
       sleep 1
@@ -364,6 +365,17 @@ class Kumogata::Client
     end
   end
 
+  def create_event_log(stack)
+    event_log = {}
+
+    events_for(stack).sort_by {|i| i['Timestamp'] }.each do |event|
+      event_id = event['EventId']
+      event_log[event_id] = event
+    end
+
+    return event_log
+  end
+
   def build_create_options
     opts = {}
     add_parameters(opts)

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/spec/kumogata_create_spec.rb

@@ -23,6 +23,7 @@ end
     run_client(:create, :template => template) do |client, cf|
       json = eval_template(template, :update_deletion_policy => true).to_json
       client.should_receive(:print_event_log).twice
+      client.should_receive(:create_event_log).once
 
       output = make_double('output') do |obj|
         obj.should_receive(:key) { 'AZ' }
@@ -85,6 +86,7 @@ end
       expect(template['Resources']['myEC2Instance']['DeletionPolicy']).to eq('Delete')
       json = template.to_json
       client.should_receive(:print_event_log).twice
+      client.should_receive(:create_event_log).once
 
       output = make_double('output') do |obj|
         obj.should_receive(:key) { 'AZ' }
@@ -152,6 +154,7 @@ end
     run_client(:create, :template => template, :options => {:parameters => {'InstanceType'=>'m1.large'}}) do |client, cf|
       json = eval_template(template, :update_deletion_policy => true).to_json
       client.should_receive(:print_event_log).twice
+      client.should_receive(:create_event_log).once
 
       output = make_double('output') do |obj|
         obj.should_receive(:key) { 'AZ' }
@@ -357,6 +360,7 @@ end
     run_client(:create, :template => template, :options => {:parameters => {'InstanceType'=>'m1.large'}, :encrypt_parameters => ['Password']}) do |client, cf|
       json = eval_template(template, :update_deletion_policy => true, :add_encryption_password => true).to_json
       client.should_receive(:print_event_log).twice
+      client.should_receive(:create_event_log).once
 
       output = make_double('output') do |obj|
         obj.should_receive(:key) { 'AZ' }

data/spec/kumogata_delete_spec.rb

@@ -2,6 +2,7 @@ describe 'Kumogata::Client#delete' do
   it 'update a stack from Ruby template' do
     run_client(:delete, :arguments => ['MyStack'], :options => {:force => true}) do |client, cf|
       client.should_receive(:print_event_log).once
+      client.should_receive(:create_event_log).once
 
       stack = make_double('stack') do |obj|
         obj.should_receive(:delete).with(no_args())

data/spec/kumogata_update_spec.rb

@@ -23,6 +23,7 @@ end
     run_client(:update, :arguments => ['MyStack'], :template => template) do |client, cf|
       json = eval_template(template).to_json
       client.should_receive(:print_event_log).once
+      client.should_receive(:create_event_log).once
 
       output = make_double('output') do |obj|
         obj.should_receive(:key) { 'AZ' }
@@ -87,6 +88,7 @@ end
     run_client(:update, :arguments => ['MyStack'], :template => template, :options => {:parameters => {'InstanceType'=>'m1.large'}}) do |client, cf|
       json = eval_template(template).to_json
       client.should_receive(:print_event_log).once
+      client.should_receive(:create_event_log).once
 
       output = make_double('output') do |obj|
         obj.should_receive(:key) { 'AZ' }
@@ -176,6 +178,7 @@ end
     run_client(:update, :arguments => ['MyStack'], :template => template, :options => {:parameters => {'InstanceType'=>'m1.large'}, :encrypt_parameters => ['Password']}) do |client, cf|
       json = eval_template(template, :add_encryption_password => true).to_json
       client.should_receive(:print_event_log).once
+      client.should_receive(:create_event_log).once
 
       output = make_double('output') do |obj|
         obj.should_receive(:key) { 'AZ' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Genki Sugawara