kumogata 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df82f77f6c7023cbdaa9cf336a3857bd76bdbecb
-  data.tar.gz: 0f6e167f920c80123bcf89338dbb023439eb46c8
+  metadata.gz: 7fdd78705361ec8fc36f2c44c1082e16f5c28789
+  data.tar.gz: a87009e2d2ee94e6b23415e1e6d6b6c7ebd7aad5
 SHA512:
-  metadata.gz: a53b163c4963b3a216e4c7e2d563f63d75f76073f4f18b0386e75120e417f0717bcc5cfbaefe007d402e16c0c92de04cbe8669c1cff80d450fe5682f68442f1e
-  data.tar.gz: ec3887e27bcecedb0ce01bf7e79a7e0077a0d6e61ee6269c88e51e9de72d9a3fbcb87f79f374c95f0c50547569ffcea2336d0ea2405043908c09e619434b8236
+  metadata.gz: e4af102fcc4b069f907dc145da52e899de20574f36500058c16ae80036d85d7147339dba61b0941033c0e5a4e3e55a2271c095d86771748367dbc169447abec1
+  data.tar.gz: ede746e11db3a41f3b1aae33dfa209e8fcbb1583f1a994d7ba8853703f11fa918d3efff1b9b83eab86977439f97bfe7cda595d891ebf571ac478e9bd367e6265

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?201403130235)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403130235)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403151714)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403151714)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 

data/bin/kumogata

@@ -2,6 +2,7 @@
 $: << File.expand_path("#{File.dirname __FILE__}/../lib")
 require 'rubygems'
 require 'kumogata'
+require 'kumogata/argument_parser'
 
 options = nil
 
@@ -14,7 +15,7 @@ parsed = Kumogata::ArgumentParser.parse! {|parser, cmd, args, opts|
 }
 
 begin
-  command, arguments, options = parsed
+  command, arguments, options, output_result = parsed
 
   aws_opts = {}
 
@@ -24,8 +25,8 @@ begin
 
   AWS.config(aws_opts) unless aws_opts.empty?
 
-  String.colorize = ($stdout.tty? and options.color?)
-  Diffy::Diff.default_format = ($stdout.tty? and options.color?) ? :color : :text
+  String.colorize = options.color?
+  Diffy::Diff.default_format = options.color? ? :color : :text
 
   if options.debug?
     Kumogata.logger.set_debug(true)
@@ -37,12 +38,21 @@ begin
   end
 
   out = Kumogata::Client.new(options).send(command, *arguments)
-  puts out if out
+
+  if output_result and out
+    puts out
+  end
 rescue Exception => e
   $stderr.puts("[ERROR] #{e.message}".red) unless e.kind_of?(Interrupt)
 
   if options and options.debug?
     raise e
+  else
+    backtrace = Kumogata::Utils.filter_backtrace(e.backtrace)
+    backtrace = backtrace.slice(0, 3)
+    unless backtrace.empty?
+      $stderr.puts "  from #{backtrace.first}".red
+    end
   end
 
   exit 1

data/kumogata.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk'
   spec.add_dependency 'coderay'
   spec.add_dependency 'diffy'
-  spec.add_dependency 'dslh', '>= 0.2.5'
+  spec.add_dependency 'dslh', '>= 0.2.6'
   spec.add_dependency 'hashie'
   spec.add_dependency 'highline'
   spec.add_dependency 'json'

data/lib/kumogata/argument_parser.rb

@@ -3,58 +3,61 @@ $kumogata = Hashie::Mash.new
 
 class Kumogata::ArgumentParser
   DEFAULT_OPTIONS = {
-    :replace_underscore => true,
     :delete_stack => true,
     :result_log => File.join(Dir.pwd, 'result.json'),
     :command_result_log => File.join(Dir.pwd, 'command_result.json'),
-    :color => true,
+    :color => $stdout.tty?,
     :debug => false,
   }
 
   COMMANDS = {
     :create => {
       :description => 'Create resources as specified in the template',
-      :arguments   => [:path_or_url, :stack_name?]
+      :arguments   => [:path_or_url, :stack_name?],
+      :output      => false,
     },
     :validate => {
       :description => 'Validate a specified template',
-      :arguments   => [:path_or_url]
+      :arguments   => [:path_or_url],
+      :output      => false,
     },
     :convert => {
       :description => 'Convert a template format',
-      :arguments   => [:path_or_url]
+      :arguments   => [:path_or_url],
     },
     :update => {
       :description => 'Update a stack as specified in the template',
-      :arguments   => [:path_or_url, :stack_name]
+      :arguments   => [:path_or_url, :stack_name],
+      :output      => false,
     },
     :delete => {
       :description => 'Delete a specified stack',
-      :arguments   => [:stack_name]
+      :arguments   => [:stack_name],
+      :output      => false,
     },
     :list => {
       :description => 'List summary information for stacks',
-      :arguments   => [:stack_name?]
+      :arguments   => [:stack_name?],
     },
     :export => {
       :description => 'Export a template from a specified stack',
-      :arguments   => [:stack_name]
+      :arguments   => [:stack_name],
     },
     :'show-events' => {
       :description => 'Show events for a specified stack',
-      :arguments   => [:stack_name]
+      :arguments   => [:stack_name],
     },
     :'show-outputs' => {
       :description => 'Show outputs for a specified stack',
-      :arguments   => [:stack_name]
+      :arguments   => [:stack_name],
     },
     :'show-resources' => {
       :description => 'Show resources for a specified stack',
-      :arguments   => [:stack_name]
+      :arguments   => [:stack_name],
     },
     :diff => {
       :description => 'Compare templates logically',
-      :arguments   => [:path_or_url1, :path_or_url2]
+      :arguments   => [:path_or_url1, :path_or_url2],
     },
   }
 
@@ -81,7 +84,7 @@ class Kumogata::ArgumentParser
         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(''  , '--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     }
@@ -95,6 +98,7 @@ class Kumogata::ArgumentParser
         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.parse!
@@ -128,6 +132,7 @@ class Kumogata::ArgumentParser
       end
     end
 
+    output = COMMANDS[command].fetch(:output, true)
     command = command.to_s.gsub('-', '_').to_sym
 
     $kumogata.command = command
@@ -135,7 +140,7 @@ class Kumogata::ArgumentParser
     $kumogata.options = options
     options = $kumogata.options # Copy of the reference
 
-    [command, arguments, options]
+    [command, arguments, options, output]
   end
 
   private

data/lib/kumogata/client.rb

@@ -17,14 +17,14 @@ class Kumogata::Client
     outputs = create_stack(template, stack_name)
     @post_processing.run(:create, outputs)
 
-    nil
+    outputs
   end
 
   def validate(path_or_url)
     template = open_template(path_or_url)
     add_encryption_password_for_validation(template)
     validate_template(template)
-    nil
+    true
   end
 
   def convert(path_or_url)
@@ -48,7 +48,7 @@ class Kumogata::Client
     outputs = update_stack(template, stack_name)
     @post_processing.run(:update, outputs)
 
-    nil
+    outputs
   end
 
   def delete(stack_name)
@@ -58,7 +58,7 @@ class Kumogata::Client
       delete_stack(stack_name)
     end
 
-    nil
+    true
   end
 
   def list(stack_name = nil)
@@ -134,7 +134,7 @@ class Kumogata::Client
   def evaluate_template(template, path_or_url)
     key_converter = proc do |key|
       key = key.to_s
-      key.gsub!('__', '::') if @options.replace_underscore?
+      key.gsub!('__', '::') unless @options.skip_replace_underscore?
       key
     end
 
@@ -551,16 +551,21 @@ Stack Resource Summaries:
 
 Outputs:
 #{JSON.pretty_generate(outputs).colorize_as(:json)}
+EOS
 
-(Save to `#{@options.result_log}`)
-    EOS
+    if @options.result_log?
+      puts <<-EOS
 
-    open(@options.result_log, 'wb') do |f|
-      f.puts JSON.pretty_generate({
-        'StackName' => stack_name,
-        'StackResourceSummaries' => summaries,
-        'Outputs' => outputs,
-      })
+(Save to `#{@options.result_log}`)
+      EOS
+
+      open(@options.result_log, 'wb') do |f|
+        f.puts JSON.pretty_generate({
+          'StackName' => stack_name,
+          'StackResourceSummaries' => summaries,
+          'Outputs' => outputs,
+        })
+      end
     end
   end
 

data/lib/kumogata/post_processing.rb

@@ -62,7 +62,9 @@ class Kumogata::PostProcessing
       }
     end
 
-    save_command_results(results) unless results.empty?
+    if @options.command_result_log? and not results.empty?
+      save_command_results(results)
+    end
   end
 
   private

data/lib/kumogata/utils.rb

@@ -17,6 +17,25 @@ class Kumogata::Utils
       a_zA_Z0_9 = (('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a)
       a_zA_Z0_9.sample(n).join
     end
+
+    def filter_backtrace(backtrace)
+      filter_path = ['(eval)']
+
+      if defined?(Gem)
+        filter_path.concat(Gem.path)
+      end
+
+      RbConfig::CONFIG.select {|k, v|
+        k.to_s =~ /libdir/
+      }.each {|k, v| filter_path << v }
+
+      filter_path = filter_path.map {|i| /\A#{Regexp.escape(i)}/ }
+
+      backtrace.select do |path|
+        path = path.split(':', 2).first
+        not filter_path.any? {|i| i =~ path }
+      end
+    end
   end # of class methods
 end
 

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

data/lib/kumogata.rb

@@ -14,6 +14,7 @@ require 'net/ssh'
 require 'open-uri'
 require 'open3'
 require 'optparse'
+require 'rbconfig'
 require 'retryable'
 require 'set'
 require 'singleton'
@@ -22,7 +23,6 @@ require 'term/ansicolor'
 require 'thread'
 require 'uuidtools'
 
-require 'kumogata/argument_parser'
 require 'kumogata/client'
 require 'kumogata/crypt'
 require 'kumogata/ext/coderay_ext'

data/spec/kumogata_update_spec.rb

@@ -77,11 +77,11 @@ Outputs do
 end
     EOS
 
-    Timecop.freeze(Time.parse('2014/03/13 0:00')) do
+    Timecop.freeze(Time.utc(2014)) do
       run_client(:update, :arguments => ['MyStack'], :template => template, :options => {:deletion_policy_retain => true}) do |client, cf|
         template = eval_template(template, :update_deletion_policy => true)
         template["Resources"]["myEC2Instance"]["Metadata"] = {
-          "DeletionPolicyUpdateKeyForKumogata" => "DeletionPolicyUpdateValueForKumogata1394636400"
+          "DeletionPolicyUpdateKeyForKumogata" => "DeletionPolicyUpdateValueForKumogata1388534400"
         }
         json = template.to_json
         client.should_receive(:print_event_log).once

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'kumogata'
+require 'kumogata/argument_parser'
 require 'tempfile'
 require 'time'
 require 'timecop'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement