kumogata2 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bdba3107a9808d3e5146c6144f4ee7dacdcdc81
-  data.tar.gz: a7037ac8a8eb6048e0bf50ce8478444355d304f2
+  metadata.gz: 2f8d233adf58c553d0835355ab7c9befc443df1d
+  data.tar.gz: 007dcc0ccdaa8fd9870ab0f9ee74a4fab04f577f
 SHA512:
-  metadata.gz: 3ddac5d6010f8f6877bc509395f9fb6768235453e4dcdb71e8b239f035736a4189b0ab1451ae1b33561025cee6125390a810a2dd57824c57b72cb0ac580f9bc3
-  data.tar.gz: 4fb38679de3528e383958a7ff7cc6b6404ec86fc68075e04d57f532b1401a1746602c35d0541aa7f5b70680de00a79aed1ad95da1f0423c5c3e642e88e29190b
+  metadata.gz: 536c5cc9d3b2a6ab91e4ba3bde0919b249ab7f00f4e8cd4762ba2666c62de6b104bf62d4e541950a28e370dd201ee0a599c46244bfee3aad08280c47d9171204
+  data.tar.gz: 3676a3513ddc0b497e9812b4f362f3934b7baa4ab504e4ae200553de73c461ccbd79d07e68da79cd4dec45f6f07a49f5112501c9dc1af9ea879bd9d6571807d3

data/lib/kumogata2/client.rb

@@ -3,8 +3,8 @@ class Kumogata2::Client
 
   def initialize(options)
     @options = options.kind_of?(Hashie::Mash) ? options : Hashie::Mash.new(options)
-    @client = Aws::CloudFormation::Client.new
-    @resource = Aws::CloudFormation::Resource.new(client: @client)
+    @client = nil
+    @resource = nil
     @plugin_by_ext = {}
   end
 
@@ -44,7 +44,7 @@ class Kumogata2::Client
   def delete(stack_name)
     stack_name = normalize_stack_name(stack_name)
     validate_stack_name(stack_name)
-    @resource.stack(stack_name).stack_status
+    get_resource.stack(stack_name).stack_status
 
     if @options.force? or agree("Are you sure you want to delete `#{stack_name}`? ".yellow)
       delete_stack(stack_name)
@@ -148,8 +148,19 @@ class Kumogata2::Client
 
   private
 
+  def get_client
+    return @client unless @client.nil?
+    @client = Aws::CloudFormation::Client.new
+  end
+
+  def get_resource
+    return @resource unless @resource.nil?
+    get_client if @client.nil?
+    @resource = Aws::CloudFormation::Resource.new(client: @client)
+  end
+
   def describe_stack(stack_name)
-    resp = @client.describe_stacks(stack_name: stack_name)
+    resp = get_client.describe_stacks(stack_name: stack_name)
     resp.stacks.first.to_h
   end
 
@@ -179,7 +190,7 @@ class Kumogata2::Client
       :stack_policy_url)
     )
 
-    stack = @resource.create_stack(params)
+    stack = get_resource.create_stack(params)
 
     return if @options.detach?
 
@@ -202,7 +213,7 @@ class Kumogata2::Client
   end
 
   def update_stack(template, stack_name)
-    stack = @resource.stack(stack_name)
+    stack = get_resource.stack(stack_name)
     stack.stack_status
 
     log(:info, "Updating stack: #{stack_name}", color: :green)
@@ -230,7 +241,7 @@ class Kumogata2::Client
     return if @options.detach?
 
     # XXX: Reacquire the stack
-    stack = @resource.stack(stack_name)
+    stack = get_resource.stack(stack_name)
     completed = wait(stack, 'UPDATE_COMPLETE', event_log)
 
     unless completed
@@ -246,7 +257,7 @@ class Kumogata2::Client
   end
 
   def delete_stack(stack_name)
-    stack = @resource.stack(stack_name)
+    stack = get_resource.stack(stack_name)
     stack.stack_status
 
     log(:info, "Deleting stack: #{stack_name}", color: :red)
@@ -259,7 +270,7 @@ class Kumogata2::Client
 
     begin
       # XXX: Reacquire the stack
-      stack = @resource.stack(stack_name)
+      stack = get_resource.stack(stack_name)
       completed = wait(stack, 'DELETE_COMPLETE', event_log)
     rescue Aws::CloudFormation::Errors::ValidationError
       # Handle `Stack does not exist`
@@ -274,7 +285,7 @@ class Kumogata2::Client
   end
 
   def validate_template(template)
-    @client.validate_template(template_body: template.to_json)
+    get_client.validate_template(template_body: template.to_json)
     log(:info, 'Template validated successfully', color: :green)
   end
 
@@ -282,7 +293,7 @@ class Kumogata2::Client
     params = {}
     params[:stack_name] = stack_name if stack_name
 
-    @resource.stacks(params).map do |stack|
+    get_resource.stacks(params).map do |stack|
       {
         'StackName'    => stack.name,
         'CreationTime' => stack.creation_time,
@@ -293,7 +304,7 @@ class Kumogata2::Client
   end
 
   def export_template(stack_name)
-    stack = @resource.stack(stack_name)
+    stack = get_resource.stack(stack_name)
     stack.stack_status
     template = stack.client.get_template(stack_name: stack_name).template_body
     JSON.parse(template)
@@ -319,7 +330,7 @@ class Kumogata2::Client
       :resource_types)
     )
 
-    resp = @client.create_change_set(params)
+    resp = get_client.create_change_set(params)
     change_set_arn = resp.id
 
     completed, change_set = wait_change_set(change_set_arn, 'CREATE_COMPLETE')
@@ -332,7 +343,7 @@ class Kumogata2::Client
 
     log(:info, "Deleting ChangeSet: #{change_set_name}", color: :red)
 
-    @client.delete_change_set(change_set_name: change_set_arn)
+    get_client.delete_change_set(change_set_name: change_set_arn)
 
     begin
       completed, _ = wait_change_set(change_set_arn, 'DELETE_COMPLETE')
@@ -349,25 +360,25 @@ class Kumogata2::Client
   end
 
   def describe_events(stack_name)
-    stack = @resource.stack(stack_name)
+    stack = get_resource.stack(stack_name)
     stack.stack_status
     events_for(stack)
   end
 
   def describe_outputs(stack_name)
-    stack = @resource.stack(stack_name)
+    stack = get_resource.stack(stack_name)
     stack.stack_status
     outputs_for(stack)
   end
 
   def describe_resources(stack_name)
-    stack = @resource.stack(stack_name)
+    stack = get_resource.stack(stack_name)
     stack.stack_status
     resource_summaries_for(stack)
   end
 
   def describe_template_summary(params)
-    resp = @client.get_template_summary(params)
+    resp = get_client.get_template_summary(params)
     resp.to_h
   end
 
@@ -460,7 +471,7 @@ class Kumogata2::Client
     change_set = nil
 
     loop do
-      change_set = @client.describe_change_set(change_set_name: change_set_name)
+      change_set = get_client.describe_change_set(change_set_name: change_set_name)
 
       if change_set.status !~ /(_PENDING|_IN_PROGRESS)\z/
         break

data/lib/kumogata2/plugin/yaml.rb

@@ -0,0 +1,16 @@
+require 'yaml'
+class Kumogata2::Plugin::YAML
+  Kumogata2::Plugin.register(:yaml, ['yaml', 'yml'], self)
+
+  def initialize(options)
+    @options = options
+  end
+
+  def parse(str)
+    YAML.load(str)
+  end
+
+  def dump(hash)
+    YAML.dump(hash).colorize_as(:yaml)
+  end
+end

data/lib/kumogata2/version.rb

@@ -1,3 +1,3 @@
 module Kumogata2
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/lib/kumogata2.rb

@@ -19,5 +19,6 @@ require 'kumogata2/utils'
 
 require 'kumogata2/plugin'
 require 'kumogata2/plugin/json'
+require 'kumogata2/plugin/yaml'
 
 require 'kumogata2/client'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata2
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -177,6 +177,7 @@ files:
 - lib/kumogata2/logger.rb
 - lib/kumogata2/plugin.rb
 - lib/kumogata2/plugin/json.rb
+- lib/kumogata2/plugin/yaml.rb
 - lib/kumogata2/utils.rb
 - lib/kumogata2/version.rb
 homepage: https://github.com/winebarrel/kumogata2
@@ -199,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Kumogata2 is a tool for AWS CloudFormation.