kumogata 0.4.15 → 0.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31fb31d3bd0eeaf4c570d2fec593a882e93614cb
-  data.tar.gz: 6f25a7bc7eeb30e32c7140cb8533d1f1819ae6cd
+  metadata.gz: 16f21794bd4f613c8c5f3133c79d6e67cebb080a
+  data.tar.gz: d95ccdfa1ff170a28a1adb035813fb653bd5af44
 SHA512:
-  metadata.gz: ca9e1366f1463327c6040287a3f5fe0180ef1eea5114f46a852c7d1a47a6a09f9b2aec8b456fdcc4ae3c9a71dc42445f82ff491aee918f0e22cd51dbf0ce7eaa
-  data.tar.gz: 53a71f4eb3081df85dfe083e2874f923ab286d163a34a13136a4df806b2d78670fdc6ea8995b3674a931c42dd012022a6b681f052b90e749d4f6f698795a7914
+  metadata.gz: 6acff55885a8c9a9628e843a35d7aae4454e6cc21323b23e2f772c277c879f1f699ebb9f31f58d9d5ae6ee2b0647ca97cc344a532c66e5a9d5ed699bf990101f
+  data.tar.gz: 9bb83190ca997c3f8498b76edc2bf374b6a327b9000be5023dfbcd71c7b2c5d11610da53e899b1f7d4453ba26f74ec6de6e463802a2813812e83626223638c1d

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?201405081730)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201405081730)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201406151300)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201406151300)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 
@@ -34,11 +34,13 @@ Resources do
       InstanceType { Ref "InstanceType" }
       KeyName "your_key_name"
 
-      UserData (<<-EOS).undent.encode64
-        #!/bin/bash
-        yum install -y httpd
-        service httpd start
-      EOS
+      UserData do
+        Fn__Base64 (<<-EOS).undent
+          #!/bin/bash
+          yum install -y httpd
+          service httpd start
+        EOS
+      end
     end
   end
 end
@@ -98,6 +100,7 @@ Options:
         --timeout MINUTES
         --result-log PATH
         --command-result-log PATH
+        --detach
         --force
     -w, --ignore-all-space
         --color

data/bin/kumogata

@@ -65,7 +65,9 @@ begin
 
   out = Kumogata::Client.new(options).send(command, *arguments)
 
-  if output_result and out
+  if [:create, :update, :delete].include?(command) and options.detach?
+    puts '[detached]'
+  elsif output_result and out
     puts out
   end
 rescue Exception => e

data/lib/kumogata/argument_parser.rb

@@ -82,30 +82,31 @@ class Kumogata::ArgumentParser
 
       begin
         supported_formats = [:ruby, :json, :yaml]
-        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(''  , '--config PATH')                              {|v| options[:config_path]                   = v     }
-        opt.on(''  , '--profile CONFIG_PROFILE')                   {|v| options[:config_profile]                = v     }
-        opt.on(''  , '--format TMPLATE_FORMAT', supported_formats) {|v| options[:format]                        = v     }
-        opt.on(''  , '--output-format FORMAT', supported_formats)  {|v| options[:output_format]                 = v     }
-        opt.on(''  , '--skip-replace-underscore')                  {    options[:skip_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(''  , '--command-result-log PATH')                  {|v| options[:command]                       = v     }
-        opt.on(''  , '--force')                                    {    options[:force]                         = true  }
-        opt.on('-w', '--ignore-all-space')                         {    options[:ignore_all_space]              = true  }
-        opt.on(''  , '--color')                                    {    options[:color]                         = 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(''  , '--config PATH')                              {|v| options[:config_path]             = v     }
+        opt.on(''  , '--profile CONFIG_PROFILE')                   {|v| options[:config_profile]          = v     }
+        opt.on(''  , '--format TMPLATE_FORMAT', supported_formats) {|v| options[:format]                  = v     }
+        opt.on(''  , '--output-format FORMAT', supported_formats)  {|v| options[:output_format]           = v     }
+        opt.on(''  , '--skip-replace-underscore')                  {    options[:skip_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(''  , '--command-result-log PATH')                  {|v| options[:command]                 = v     }
+        opt.on(''  , '--detach')                                   {    options[:detach]                  = true  }
+        opt.on(''  , '--force')                                    {    options[:force]                   = true  }
+        opt.on('-w', '--ignore-all-space')                         {    options[:ignore_all_space]        = true  }
+        opt.on(''  , '--color')                                    {    options[:color]                   = 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

@@ -16,10 +16,12 @@ class Kumogata::Client
     add_encryption_password(template)
 
     outputs = create_stack(template, stack_name)
-    @outputs_filter.filter!(outputs)
-    @post_processing.run(:create, outputs)
 
-    outputs
+    unless @options.detach?
+      @outputs_filter.filter!(outputs)
+      @post_processing.run(:create, outputs)
+      outputs
+    end
   end
 
   def validate(path_or_url)
@@ -60,10 +62,12 @@ class Kumogata::Client
     add_encryption_password(template)
 
     outputs = update_stack(template, stack_name)
-    @outputs_filter.filter!(outputs)
-    @post_processing.run(:update, outputs)
 
-    outputs
+    unless @options.detach?
+      @outputs_filter.filter!(outputs)
+      @post_processing.run(:update, outputs)
+      outputs
+    end
   end
 
   def delete(stack_name)
@@ -73,7 +77,9 @@ class Kumogata::Client
       delete_stack(stack_name)
     end
 
-    true
+    unless @options.detach?
+      true
+    end
   end
 
   def list(stack_name = nil)
@@ -210,7 +216,6 @@ class Kumogata::Client
   def evaluate_after_trigger(template)
     triggers = template.delete('_after')
     return {} unless triggers
-
   end
 
   def devaluate_template(template)
@@ -295,6 +300,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)
+
+    return if @options.detach?
+
     event_log = {}
 
     unless while_in_progress(stack, 'CREATE_COMPLETE', event_log)
@@ -324,6 +332,8 @@ class Kumogata::Client
     event_log = create_event_log(stack)
     stack.update(build_update_options(template.to_json))
 
+    return if @options.detach?
+
     unless while_in_progress(stack, 'UPDATE_COMPLETE', event_log)
       errmsgs = ['Update failed']
       errmsgs << stack_name
@@ -346,6 +356,8 @@ class Kumogata::Client
     event_log = create_event_log(stack)
     stack.delete
 
+    return if @options.detach?
+
     completed = false
 
     begin

data/lib/kumogata/ext/string_ext.rb

@@ -11,7 +11,7 @@ class String
     end
   end # of class methods
 
-  Term::ANSIColor::Attribute.named_attributes.map do |attribute|
+  Term::ANSIColor::Attribute.named_attributes.each do |attribute|
     class_eval(<<-EOS, __FILE__, __LINE__ + 1)
       def #{attribute.name}
         if @@colorize

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.4.15'
+  VERSION = '0.4.16'
 end

data/spec/kumogata_create_spec.rb

@@ -59,6 +59,51 @@ end
     end
   end
 
+  it 'create a stack from Ruby template (detach)' do
+    template = <<-EOS
+Resources do
+  myEC2Instance do
+    Type "AWS::EC2::Instance"
+    Properties do
+      ImageId "ami-XXXXXXXX"
+      InstanceType "t1.micro"
+    end
+  end
+end
+
+Outputs do
+  AZ do
+    Value do
+      Fn__GetAtt "myEC2Instance", "AvailabilityZone"
+    end
+  end
+end
+    EOS
+
+    out = run_client(:create, :template => template, :options => {:detach => true}) do |client, cf|
+      json = eval_template(template, :update_deletion_policy => true).to_json
+      client.should_not_receive(:print_event_log)
+      client.should_not_receive(:create_event_log)
+
+      stack = make_double('stack') do |obj|
+        obj.should_not_receive(:status)
+        obj.should_not_receive(:outputs)
+        obj.should_not_receive(:resource_summaries)
+        obj.should_not_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_not_receive(:[])
+      end
+
+      cf.should_receive(:stacks).once { stacks }
+    end
+
+    expect(out).to be_nil
+  end
+
   it 'create a stack from Ruby template and run command' do
     template = <<-TEMPLATE
 Resources do

data/spec/kumogata_delete_spec.rb

@@ -18,4 +18,25 @@ describe 'Kumogata::Client#delete' do
       cf.should_receive(:stacks) { stacks }
     end
   end
+
+  it 'update a stack from Ruby template (detach)' do
+    out = run_client(:delete, :arguments => ['MyStack'], :options => {:force => true, :detach => true}) do |client, cf|
+      client.should_not_receive(:print_event_log)
+      client.should_receive(:create_event_log).once
+
+      stack = make_double('stack') do |obj|
+        obj.should_receive(:delete).with(no_args())
+        obj.should_receive(:status).once
+      end
+
+      stacks = make_double('stacks') do |obj|
+        obj.should_receive(:[])
+           .with('MyStack') { stack }
+      end
+
+      cf.should_receive(:stacks) { stacks }
+    end
+
+    expect(out).to be_nil
+  end
 end

data/spec/kumogata_update_spec.rb

@@ -56,6 +56,50 @@ end
     end
   end
 
+  it 'update a stack from Ruby template (detach)' do
+    template = <<-EOS
+Resources do
+  myEC2Instance do
+    Type "AWS::EC2::Instance"
+    Properties do
+      ImageId "ami-XXXXXXXX"
+      InstanceType "t1.micro"
+    end
+  end
+end
+
+Outputs do
+  AZ do
+    Value do
+      Fn__GetAtt "myEC2Instance", "AvailabilityZone"
+    end
+  end
+end
+    EOS
+
+    out = run_client(:update, :arguments => ['MyStack'], :template => template, :options => {:detach => true}) do |client, cf|
+      json = eval_template(template).to_json
+      client.should_not_receive(:print_event_log)
+      client.should_receive(:create_event_log).once
+
+      stack = make_double('stack') do |obj|
+        obj.should_receive(:update).with(:template => json)
+        obj.should_receive(:status).once
+        obj.should_not_receive(:outputs)
+        obj.should_not_receive(:resource_summaries)
+      end
+
+      stacks = make_double('stacks') do |obj|
+        obj.should_receive(:[])
+           .with('MyStack') { stack }
+      end
+
+      cf.should_receive(:stacks) { stacks }
+    end
+
+    expect(out).to be_nil
+  end
+
   it 'update a stack from Ruby template with deletion policy retain' do
     template = <<-EOS
 Resources do

metadata

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