kumogata2 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6db4a45c394094f8864f856bfd395f6f241ced59
-  data.tar.gz: 770e9b3fed15e232d59bd13bac0bf7aebc619c28
+  metadata.gz: f72ddc930b873013eae7ffe270adea2fb9af18b2
+  data.tar.gz: 82efb3c67e1884efe560cbb70ca0be4afa90c78b
 SHA512:
-  metadata.gz: d7791866506cd56ca7ed5be88e0ab6b619140ae5cb245abbd66fa970056289771219edd834bcef14bd2e9f08df9b4db357fae803c9bc61f6a058b3407662e9f3
-  data.tar.gz: 02d7c9156d0acd8d96c67a18e83071fdfc24dd7e984a3cbf22590062f8877effd5a0fcc5ad50f9c58107c7444529a6caea91faf3b359356a94db6d6b06ba859c
+  metadata.gz: 22f8d4c63bdd2c0442235ba0b5094dc55bcc69fe619e4f46b9dc755f266ef7c7f3c7c70c26eebce4f0e649b00379733a01e0b657218b4cdccf4a37b3d38ec7b1
+  data.tar.gz: 432370f671bd0420a449219804bb80ee8931067285db4e2743725f886807d70d53a2967520760449868232ec83799d5b8e241950a9cd5335708f632234712b64

data/lib/kumogata2/cli/option_parser.rb

@@ -4,6 +4,7 @@ module Kumogata2::CLI
       result_log: File.join(Dir.pwd, 'result.yaml'),
       color: $stdout.tty?,
     }
+    DEFAULT_OPTION_RETRY_LIMIT = 100
 
     COMMANDS = {
       describe: {
@@ -84,7 +85,8 @@ module Kumogata2::CLI
       arguments = nil
       # https://github.com/aws/aws-sdk-ruby/blob/v2.3.11/aws-sdk-core/lib/aws-sdk-core/plugins/regional_endpoint.rb#L18
       region_keys = %w(AWS_REGION AMAZON_REGION AWS_DEFAULT_REGION)
-      options = {aws: {region: ENV.values_at(*region_keys).compact.first}}
+      options = { aws: { region: ENV.values_at(*region_keys).compact.first,
+                  retry_limit: DEFAULT_OPTION_RETRY_LIMIT } }
 
       opt = ::OptionParser.new
       opt.summary_width = 65535
@@ -93,6 +95,7 @@ module Kumogata2::CLI
       opt.on('-k', '--access-key ACCESS_KEY') {|v| options[:aws][:access_key_id]     = v }
       opt.on('-s', '--secret-key SECRET_KEY') {|v| options[:aws][:secret_access_key] = v }
       opt.on('-r', '--region REGION')         {|v| options[:aws][:region]            = v }
+      opt.on('',   '--retry-limit LIMIT')     {|v| options[:aws][:retry_limit]       = v }
 
       opt.on('', '--profile PROFILE') do |v|
         options[:aws][:credentials] ||= {}

data/lib/kumogata2/client.rb

@@ -191,7 +191,7 @@ class Kumogata2::Client
 
     params = {
       stack_name: stack_name,
-      template_body: convert_output_value(template),
+      template_body: convert_output_value(template, false),
       parameters: parameters_array,
     }
 
@@ -237,7 +237,7 @@ class Kumogata2::Client
 
     params = {
       stack_name: stack_name,
-      template_body: convert_output_value(template),
+      template_body: convert_output_value(template, false),
       parameters: parameters_array,
     }
 
@@ -303,7 +303,7 @@ class Kumogata2::Client
   end
 
   def validate_template(template)
-    get_client.validate_template(template_body: convert_output_value(template))
+    get_client.validate_template(template_body: convert_output_value(template, false))
     log(:info, 'Template validated successfully', color: :green)
   end
 
@@ -354,7 +354,7 @@ class Kumogata2::Client
     params = {
       stack_name: stack_name,
       change_set_name: change_set_name,
-      template_body: convert_output_value(template),
+      template_body: convert_output_value(template, false),
       parameters: parameters_array,
       change_set_type: change_set_type,
     }
@@ -701,15 +701,17 @@ EOS
     end
   end
 
-  def convert_output_value(value)
+  def convert_output_value(value, color = true)
     ext = get_output_format
     Kumogata2::Plugin.plugin_by_name.each do |type, plugin|
       next unless plugin[:ext].include? ext
+
+      plugin_instance = find_or_create_plugin('xxx.' + ext)
       case type
       when 'json'
-        return JSON.pretty_generate(value)
+        return plugin_instance.dump(value, color)
       when 'yaml'
-        return YAML.dump(value)
+        return plugin_instance.dump(value, color)
       end
     end
     value

data/lib/kumogata2/plugin/json.rb

@@ -9,7 +9,11 @@ class Kumogata2::Plugin::JSON
     JSON.parse(str)
   end
 
-  def dump(hash)
-    JSON.pretty_generate(hash).colorize_as(:json)
+  def dump(hash, color = true)
+    if color
+      JSON.pretty_generate(hash).colorize_as(:json)
+    else
+      JSON.pretty_generate(hash)
+    end
   end
 end

data/lib/kumogata2/plugin/yaml.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+
 class Kumogata2::Plugin::YAML
   Kumogata2::Plugin.register(:yaml, ['yaml', 'yml', 'template'], self)
 
@@ -10,7 +11,12 @@ class Kumogata2::Plugin::YAML
     YAML.load(str)
   end
 
-  def dump(hash)
-    YAML.dump(hash).colorize_as(:yaml)
+  def dump(hash, color = true)
+    Hashie.stringify_keys!(hash)
+    if color
+      YAML.dump(hash).colorize_as(:yaml)
+    else
+      YAML.dump(hash)
+    end
   end
 end

data/lib/kumogata2/version.rb

@@ -1,3 +1,3 @@
 module Kumogata2
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata2
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk