kumogata2 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f8d233adf58c553d0835355ab7c9befc443df1d
-  data.tar.gz: 007dcc0ccdaa8fd9870ab0f9ee74a4fab04f577f
+  metadata.gz: 179adaf126269ec84361603f4195e22424289ac8
+  data.tar.gz: 677c9a57a3a0bb7766831faa888ee3e3c68f3dae
 SHA512:
-  metadata.gz: 536c5cc9d3b2a6ab91e4ba3bde0919b249ab7f00f4e8cd4762ba2666c62de6b104bf62d4e541950a28e370dd201ee0a599c46244bfee3aad08280c47d9171204
-  data.tar.gz: 3676a3513ddc0b497e9812b4f362f3934b7baa4ab504e4ae200553de73c461ccbd79d07e68da79cd4dec45f6f07a49f5112501c9dc1af9ea879bd9d6571807d3
+  metadata.gz: a643d946b7c12c60aa438d65fad921960b73fe60a2390ea1abc7078a86c973c5001350f37ebed2837851c3e8c37a0c0422397fef79f5968e08185e3035450e01
+  data.tar.gz: a0414ff4884871e759c44d1d2fef10f22ffcf501958a54a48764b354c35cb92ae138cb2604bfe9552da0f1ee065f0bc3671a9d7f4aeb5c24ea1d0aa3f83058db

data/.gitignore

@@ -8,4 +8,5 @@
 /spec/reports/
 /tmp/
 *.json
+*.yaml
 test.rb

data/README.md

@@ -4,6 +4,8 @@ Kumogata2 is a tool for [AWS CloudFormation](https://aws.amazon.com/cloudformati
 
 This is a `format converter` + `useful tool`.
 
+[![Gem Version](https://badge.fury.io/rb/kumogata2.png?201406152020)](http://badge.fury.io/rb/kumogata2)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/kumogata2/cli/option_parser.rb

@@ -1,8 +1,7 @@
 module Kumogata2::CLI
   class OptionParser
     DEFAULT_OPTIONS = {
-      result_log: File.join(Dir.pwd, 'result.json'),
-      command_result_log: File.join(Dir.pwd, 'command_result.json'),
+      result_log: File.join(Dir.pwd, 'result.yaml'),
       color: $stdout.tty?,
     }
 
@@ -261,7 +260,7 @@ module Kumogata2::CLI
       max = expected.length
 
       if arguments.length < min or max < arguments.length
-        raise "Usage: kumogata #{command} #{arguments_to_message(expected)} [options]"
+        raise "Usage: kumogata2 #{command} #{arguments_to_message(expected)} [options]"
       end
     end
 

data/lib/kumogata2/client.rb

@@ -150,7 +150,7 @@ class Kumogata2::Client
 
   def get_client
     return @client unless @client.nil?
-    @client = Aws::CloudFormation::Client.new
+    @client = Aws::CloudFormation::Client.new(@options.aws)
   end
 
   def get_resource
@@ -175,7 +175,7 @@ class Kumogata2::Client
 
     params = {
       stack_name: stack_name,
-      template_body: template.to_json,
+      template_body: convert_output_value(template),
       parameters: parameters_array,
     }
 
@@ -220,7 +220,7 @@ class Kumogata2::Client
 
     params = {
       stack_name: stack_name,
-      template_body: template.to_json,
+      template_body: convert_output_value(template),
       parameters: parameters_array,
     }
 
@@ -285,7 +285,7 @@ class Kumogata2::Client
   end
 
   def validate_template(template)
-    get_client.validate_template(template_body: template.to_json)
+    get_client.validate_template(template_body: convert_output_value(template))
     log(:info, 'Template validated successfully', color: :green)
   end
 
@@ -319,7 +319,7 @@ class Kumogata2::Client
     params = {
       stack_name: stack_name,
       change_set_name: change_set_name,
-      template_body: template.to_json,
+      template_body: convert_output_value(template),
       parameters: parameters_array,
     }
 
@@ -382,8 +382,12 @@ class Kumogata2::Client
     resp.to_h
   end
 
+  def get_output_format
+    @options.output_format || 'template'
+  end
+
   def convert0(template)
-    ext = @options.output_format || 'template'
+    ext = get_output_format
     plugin = find_or_create_plugin('xxx.' + ext)
 
     if plugin
@@ -605,13 +609,14 @@ Outputs:
 EOS
 
     if @options.result_log?
+      logname = get_output_filename(@options.result_log, stack_name)
       puts <<-EOS
 
-(Save to `#{@options.result_log}`)
+(Save to `#{logname}`)
       EOS
 
-      open(@options.result_log, 'wb') do |f|
-        f.puts JSON.pretty_generate({
+      open(logname, 'wb') do |f|
+        f.puts convert_output_value({
           'StackName' => stack_name,
           'StackResourceSummaries' => summaries,
           'Outputs' => outputs,
@@ -620,6 +625,32 @@ EOS
     end
   end
 
+  def convert_output_value(value)
+    ext = get_output_format
+    Kumogata2::Plugin.plugin_by_name.each do |type, plugin|
+      next unless plugin[:ext].include? ext
+      case type
+      when 'json'
+        return JSON.pretty_generate(value)
+      when 'yaml'
+        return YAML.dump(value)
+      end
+    end
+    value
+  end
+
+  def get_output_filename(value, stack_name = '')
+    ext = get_output_format
+    Kumogata2::Plugin.plugin_by_name.each do |type, plugin|
+      if plugin[:ext].include? ext
+        plugin_ext = plugin[:ext].first
+        filename = stack_name.empty? ? File.basename(value, '.yaml') : stack_name
+        return "#{filename}.#{plugin_ext}"
+      end
+    end
+    value
+  end
+
   def post_process(path_or_url, outputs)
     plugin = find_or_create_plugin(path_or_url)
 

data/lib/kumogata2/plugin/json.rb

@@ -1,5 +1,5 @@
 class Kumogata2::Plugin::JSON
-  Kumogata2::Plugin.register(:json, ['json', 'js', 'template'], self)
+  Kumogata2::Plugin.register(:json, ['json', 'js'], self)
 
   def initialize(options)
     @options = options

data/lib/kumogata2/plugin/yaml.rb

@@ -1,6 +1,6 @@
 require 'yaml'
 class Kumogata2::Plugin::YAML
-  Kumogata2::Plugin.register(:yaml, ['yaml', 'yml'], self)
+  Kumogata2::Plugin.register(:yaml, ['yaml', 'yml', 'template'], self)
 
   def initialize(options)
     @options = options

data/lib/kumogata2/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata2
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Kumogata2 is a tool for AWS CloudFormation.