kumogata 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baf7b8cbddd815d7f08705918dcb9bba0f426345
-  data.tar.gz: d8df685f3891d4266da07997a2926a4a33083dfc
+  metadata.gz: 67a5c56f5378acd9da8583d197a558cca8b0d2fb
+  data.tar.gz: 53facba7232603a24adbb060ca8a534035033609
 SHA512:
-  metadata.gz: 7b36d2411bdd49f4b2031efa2c45fd4f8fbd30591857c85098b1f004805b6e5cbe6615fccbfa998cc5e62becd5bd3a2324adbaf211848df68c19f7341097da94
-  data.tar.gz: 0ad0e636569b330cb22849a41c2728c0b2419767d170e26225633069274b6cdb0b01a00be168003e2f066bbf4bd02ba2a5eb90362be0f61975115196aeb9908c
+  metadata.gz: 7f442adbf70667594dfee27379892ffb7a1d7334577c4e4f57e91aaa1204c0f8fce5e058dbb5b213c88b24d480da4e2ff4f2b5bd016b6a647535ecfa6e0ee411
+  data.tar.gz: 0484a0ac808e3cb894bb92b1890e8e49005bd20024b62c1e16ec1ac1e68562324ef13d2976e98eb91395bea91c3093348f23aaad1da69370908796ef29778a88

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?201403082134)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403082134)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403091705)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403091705)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 
@@ -80,6 +80,7 @@ Options:
     -k, --access-key ACCESS_KEY
     -s, --secret-key SECRET_KEY
     -r, --region REGION
+        --format TMPLATE_FORMAT
         --skip-replace-underscore
         --deletion-policy-retain
     -p, --parameters KEY_VALUES

data/lib/kumogata/argument_parser.rb

@@ -76,24 +76,25 @@ class Kumogata::ArgumentParser
       update_usage(opt)
 
       begin
-        opt.on('-k', '--access-key ACCESS_KEY')            {|v| options[:access_key_id]                 = v     }
-        opt.on('-s', '--secret-key SECRET_KEY')            {|v| options[:secret_access_key]             = v     }
-        opt.on('-r', '--region REGION')                    {|v| options[:region]                        = v     }
-        opt.on(''  , '--skip-replace-underscore')          {    options[:replace_underscore]            = false }
-        opt.on(''  , '--deletion-policy-retain')           {    options[:deletion_policy_retain]        = true  }
-        opt.on('-p', '--parameters KEY_VALUES', Array)     {|v| options[:parameters]                    = v     }
-        opt.on('-e', '--encrypt-parameters KEYS', Array)   {|v| options[:encrypt_parameters]            = v     }
-        opt.on('',   '--encryption-password PASS')         {|v| options[:encryption_password]           = v     }
-        opt.on('',   '--skip-send-password')               {    options[:skip_send_password] = true  }
-        opt.on(''  , '--capabilities CAPABILITIES', Array) {|v| options[:capabilities]                  = v     }
-        opt.on(''  , '--disable-rollback')                 {    options[:disable_rollback]              = true  }
-        opt.on(''  , '--notify SNS_TOPICS', Array)         {|v| options[:notify]                        = v     }
-        opt.on(''  , '--timeout MINUTES', Integer)         {|v| options[:timeout]                       = v     }
-        opt.on(''  , '--result-log PATH')                  {|v| options[:result_log]                    = v     }
-        opt.on(''  , '--force')                            {    options[:force]                         = true  }
-        opt.on('-w', '--ignore-all-space')                 {    options[:ignore_all_space]              = true  }
-        opt.on(''  , '--no-color')                         {    options[:color]                         = false }
-        opt.on(''  , '--debug')                            {    options[:debug]                         = true  }
+        opt.on('-k', '--access-key ACCESS_KEY')                 {|v| options[:access_key_id]                 = v     }
+        opt.on('-s', '--secret-key SECRET_KEY')                 {|v| options[:secret_access_key]             = v     }
+        opt.on('-r', '--region REGION')                         {|v| options[:region]                        = v     }
+        opt.on(''  , '--format TMPLATE_FORMAT', [:ruby, :json]) {|v| options[:format]                        = v     }
+        opt.on(''  , '--skip-replace-underscore')               {    options[:replace_underscore]            = false }
+        opt.on(''  , '--deletion-policy-retain')                {    options[:deletion_policy_retain]        = true  }
+        opt.on('-p', '--parameters KEY_VALUES', Array)          {|v| options[:parameters]                    = v     }
+        opt.on('-e', '--encrypt-parameters KEYS', Array)        {|v| options[:encrypt_parameters]            = v     }
+        opt.on('',   '--encryption-password PASS')              {|v| options[:encryption_password]           = v     }
+        opt.on('',   '--skip-send-password')                    {    options[:skip_send_password] = true  }
+        opt.on(''  , '--capabilities CAPABILITIES', Array)      {|v| options[:capabilities]                  = v     }
+        opt.on(''  , '--disable-rollback')                      {    options[:disable_rollback]              = true  }
+        opt.on(''  , '--notify SNS_TOPICS', Array)              {|v| options[:notify]                        = v     }
+        opt.on(''  , '--timeout MINUTES', Integer)              {|v| options[:timeout]                       = v     }
+        opt.on(''  , '--result-log PATH')                       {|v| options[:result_log]                    = v     }
+        opt.on(''  , '--force')                                 {    options[:force]                         = true  }
+        opt.on('-w', '--ignore-all-space')                      {    options[:ignore_all_space]              = true  }
+        opt.on(''  , '--no-color')                              {    options[:color]                         = false }
+        opt.on(''  , '--debug')                                 {    options[:debug]                         = true  }
         opt.parse!
 
         unless (command = ARGV.shift)

data/lib/kumogata/client.rb

@@ -107,11 +107,16 @@ class Kumogata::Client
   private ###########################################################
 
   def open_template(path_or_url)
+    format = @options.format || (ruby_template?(path_or_url) ? :ruby : :json)
+
     open(path_or_url) do |f|
-      if ruby_template?(path_or_url)
+      case format
+      when :ruby
         evaluate_template(f)
-      else
+      when :json
         JSON.parse(f.read)
+      else
+        raise "Unknown format: #{format}"
       end
     end
   end
@@ -324,16 +329,41 @@ class Kumogata::Client
   end
 
   def while_in_progress(stack, complete_status)
+    event_log = {}
+
     while stack.status =~ /_IN_PROGRESS\Z/
-      print '.'.intense_black unless @options.debug?
+      print_event_log(stack, event_log)
       sleep 1
     end
 
+    print_event_log(stack, event_log)
     completed = (stack.status == complete_status)
     Kumogata.logger.info(completed ? 'Successfully' : 'Failed')
     return completed
   end
 
+  def print_event_log(stack, event_log)
+    events_for(stack).sort_by {|i| i['Timestamp'] }.each do |event|
+      event_id = event['EventId']
+
+      unless event_log[event_id]
+        event_log[event_id] = event
+
+        timestamp = event['Timestamp']
+        summary = {}
+
+        ['LogicalResourceId', 'ResourceStatus', 'ResourceStatusReason'].map do |k|
+          summary[k] = event[k]
+        end
+
+        puts [
+          timestamp.getlocal.strftime('%Y/%m/%d %H:%M:%S %Z'),
+          summary.to_json.colorize_as(:json),
+        ].join(': ')
+      end
+    end
+  end
+
   def build_create_options
     opts = {}
     add_parameters(opts)
@@ -377,7 +407,7 @@ class Kumogata::Client
   def update_deletion_policy(template)
     if @options.delete_stack? or @options.deletion_policy_retain?
       template['Resources'].each do |k, v|
-        v['DeletionPolicy'] = 'Retain'
+        v['DeletionPolicy'] ||= 'Retain'
       end
     end
   end

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/spec/kumogata_create_spec.rb

@@ -22,6 +22,69 @@ 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
+
+      output = make_double('output') do |obj|
+        obj.should_receive(:key) { 'AZ' }
+        obj.should_receive(:value) { 'ap-northeast-1b' }
+      end
+
+      resource_summary = make_double('resource_summary') do |obj|
+        obj.should_receive(:[]).with(:logical_resource_id) { 'myEC2Instance' }
+        obj.should_receive(:[]).with(:physical_resource_id) { 'i-XXXXXXXX' }
+        obj.should_receive(:[]).with(:resource_type) { 'AWS::EC2::Instance' }
+        obj.should_receive(:[]).with(:resource_status) { 'CREATE_COMPLETE' }
+        obj.should_receive(:[]).with(:resource_status_reason) { nil }
+        obj.should_receive(:[]).with(:last_updated_timestamp) { '2014-03-02 04:35:12 UTC' }
+      end
+
+      stack = make_double('stack') do |obj|
+        obj.should_receive(:status).and_return(
+            'CREATE_COMPLETE', 'CREATE_COMPLETE',
+            'DELETE_COMPLETE', 'DELETE_COMPLETE', 'DELETE_COMPLETE')
+        obj.should_receive(:outputs) { [output] }
+        obj.should_receive(:resource_summaries) { [resource_summary] }
+        obj.should_receive(:delete)
+      end
+
+      stacks = make_double('stacks') do |obj|
+        obj.should_receive(:create)
+           .with('kumogata-user-host-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', json, {}) { stack }
+        obj.should_receive(:[])
+           .with('kumogata-user-host-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX') { stack }
+      end
+
+      cf.should_receive(:stacks).twice { stacks }
+    end
+  end
+
+  it 'create a stack from Ruby template (include DeletionPolicy)' do
+    template = <<-EOS
+Resources do
+  myEC2Instance do
+    Type "AWS::EC2::Instance"
+    Properties do
+      ImageId "ami-XXXXXXXX"
+      InstanceType "t1.micro"
+    end
+    DeletionPolicy "Delete"
+  end
+end
+
+Outputs do
+  AZ do
+    Value do
+      Fn__GetAtt "myEC2Instance", "AvailabilityZone"
+    end
+  end
+end
+    EOS
+
+    run_client(:create, :template => template) do |client, cf|
+      template = eval_template(template, :update_deletion_policy => true)
+      expect(template['Resources']['myEC2Instance']['DeletionPolicy']).to eq('Delete')
+      json = template.to_json
+      client.should_receive(:print_event_log).twice
 
       output = make_double('output') do |obj|
         obj.should_receive(:key) { 'AZ' }
@@ -88,6 +151,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
 
       output = make_double('output') do |obj|
         obj.should_receive(:key) { 'AZ' }
@@ -146,6 +210,7 @@ end
 
     run_client(:create, :arguments => ['MyStack'], :template => template) do |client, cf|
       json = eval_template(template).to_json
+      client.should_receive(:print_event_log).once
 
       output = make_double('output') do |obj|
         obj.should_receive(:key) { 'AZ' }
@@ -201,6 +266,7 @@ end
 
     run_client(:create, :arguments => ['MyStack'], :template => template, :options => {:deletion_policy_retain => true}) do |client, cf|
       json = eval_template(template, :update_deletion_policy => true).to_json
+      client.should_receive(:print_event_log).once
 
       output = make_double('output') do |obj|
         obj.should_receive(:key) { 'AZ' }
@@ -290,6 +356,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
 
       output = make_double('output') do |obj|
         obj.should_receive(:key) { 'AZ' }

data/spec/kumogata_delete_spec.rb

@@ -1,6 +1,8 @@
 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
+
       stack = make_double('stack') do |obj|
         obj.should_receive(:delete).with(no_args())
         obj.should_receive(:status).and_return(

data/spec/kumogata_update_spec.rb

@@ -22,6 +22,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
 
       output = make_double('output') do |obj|
         obj.should_receive(:key) { 'AZ' }
@@ -85,6 +86,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
 
       output = make_double('output') do |obj|
         obj.should_receive(:key) { 'AZ' }
@@ -173,6 +175,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
 
       output = make_double('output') do |obj|
         obj.should_receive(:key) { 'AZ' }

data/spec/spec_helper.rb

@@ -80,7 +80,7 @@ end
 
 def update_deletion_policy(template)
   template['Resources'].each do |k, v|
-    v['DeletionPolicy'] = 'Retain'
+    v['DeletionPolicy'] ||= 'Retain'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk