kumogata 0.2.14 → 0.2.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTRiNjQ5NzgzNjlhMDIzZDI2NzE4NTA0OWE2NjU4MjdlODBhNDkxMA==
+    ZmI3MThkOWFjMTgxNDA2YzI3ZjQ5NzU1NjZkMmUyNmFjOWI3MWMyOQ==
   data.tar.gz: !binary |-
-    ZWM4Y2MxOWU0ZjMxMDkzMTQ3OGY2MTcyNmRkNzJjODA5MDgzYjNiYQ==
+    NTNhYjcwN2YxYzUzNzM1OWVlYzBlOWM3NjUxOThkNzg0M2I5ZTMwZg==
 SHA512:
   metadata.gz: !binary |-
-    NTdkNmUzNGIxNzBiNDA0N2NjZDcxODkzY2I0NzZmYWQ1NmM2Zjc2MTUzN2Uy
-    ZWEwMzA0NjFjODg3MzdmZjc0ZWYyYTFjNDUzNWM4NjAxYzE3ZTU2YTc2MzBl
-    MTYwOTg1NTUxZjdmMjQ1ZTE2YWI5Y2IyZThhYTc1Y2MzZGM1Y2I=
+    YjIyZTkwYmNhZDFhMDJhYTdiMmIxMjIwZjcwYzZmYzgxYmE2NWYxYmE2NmYy
+    YmExNmRjMWE1NjhiMzEwNjFlOTU4MjQ5OTJkN2NkNTE4ZmJjNjI5N2FkM2Yx
+    MjFjZDRiNWRjNDhlNTZhZGE3YzRiMTdkODdmNTM4ODhiZDEzNWM=
   data.tar.gz: !binary |-
-    YzdjMGE2NDEwOThiYjA2MWZkMjJlMDkxNjNiYTQxYTcxY2QzYTBmNTk3Nzg4
-    MWRlZmE5MGQzYzFiMGQwOGRiNTBkNTU5ZGEyM2JiMjNmNGEzNDIxNDQ1MjY3
-    MzhjMTY3MmEwOWQ0NGM5MmI2ZWUwN2ZhYjFhODdlYzc1NjhjMjQ=
+    YmQwMTlmNGU5YjAwNGI1ZWJiNGIzZjgyMWNlOWViMTgzMmRhZDY1NjNmYjVj
+    ZjdiN2Q5NGY3ODMzYTMxYjEwMGU4M2Y4ZWM0MDYwMzNmNWVmN2Q4MjMwZWQx
+    NzQwYmE1NWJhNmVmYzgxOWI2MDZjYWQ4MzI2Y2NlYjdhZGMwOGE=

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?201403072016)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403072016)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403072151)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403072151)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 
@@ -97,6 +97,12 @@ Options:
         --debug
 ```
 
+### KUMOGATA_OPTIONS
+
+`KUMOGATA_OPTIONS` variable specifies default options.
+
+e.g. `KUMOGATA_OPTIONS='-e Password'`
+
 ### Create resources
 
     $ kumogata create template.rb

data/lib/kumogata.rb

@@ -14,6 +14,7 @@ require 'open-uri'
 require 'optparse'
 require 'singleton'
 require 'stringio'
+require 'strscan'
 require 'uuidtools'
 
 require 'kumogata/argument_parser'

data/lib/kumogata/argument_parser.rb

@@ -5,7 +5,6 @@ module Kumogata
 end
 
 class Kumogata::ArgumentParser
-
   DEFAULT_OPTIONS = {
     :replace_underscore => true,
     :delete_stack => true,
@@ -72,6 +71,10 @@ class Kumogata::ArgumentParser
     arguments = nil
     options = {}
 
+    if ENV['KUMOGATA_OPTIONS']
+      ARGV.concat(scan_args(ENV['KUMOGATA_OPTIONS']))
+    end
+
     ARGV.options do |opt|
       update_usage(opt)
 
@@ -196,4 +199,31 @@ class Kumogata::ArgumentParser
       options.parameters[Kumogata::ENCRYPTION_PASSWORD] = passwd.encode64
     end
   end
+
+  def scan_args(str)
+    args = []
+    ss = StringScanner.new(str)
+    buf = ''
+
+    until ss.eos?
+      if ss.scan(/\s+/)
+        unless buf.empty?
+          args << buf
+          buf = ''
+        end
+      elsif (tok = ss.scan(/'[^']*'/))
+        buf << tok.gsub(/'([^']*)'/) { $1 }
+      elsif (tok = ss.scan(/"[^"]*"/))
+        buf << tok.gsub(/"([^"]*)"/) { $1 }
+      elsif (tok = ss.scan(/[^\s'"]+/))
+        buf << tok
+      else
+        buf << ss.getch
+      end
+    end
+
+    args << buf unless buf.empty?
+
+    return args
+  end
 end

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.2.14'
+  VERSION = '0.2.15'
 end

data/spec/kumogata_validate_spec.rb

@@ -21,7 +21,7 @@ end
     EOS
 
     run_client(:validate, :template => template) do |client, cf|
-      json = eval_template(template).to_json
+      json = eval_template(template, :add_encryption_password_for_validation => true).to_json
 
       cf.should_receive(:validate_template).with(json) {
         {}
@@ -52,7 +52,7 @@ end
 
     expect {
       run_client(:validate, :template => template) do |client, cf|
-        json = eval_template(template).to_json
+        json = eval_template(template, :add_encryption_password_for_validation => true).to_json
 
         cf.should_receive(:validate_template).with(json) {
           {
@@ -88,9 +88,11 @@ end
     EOS
 
     run_client(:validate, :template => template, :template_ext => '.template') do |client, cf|
-      json = JSON.parse(template).to_json
+      template = JSON.parse(template)
+      add_encryption_password_for_validation(template)
+      json = template.to_json
 
-      cf.should_receive(:validate_template).with(json) {
+      cf.should_receive(:validate_template) {
         {}
       }
     end
@@ -121,7 +123,9 @@ end
 
     expect {
       run_client(:validate, :template => template, :template_ext => '.template') do |client, cf|
-        json = JSON.parse(template).to_json
+        template = JSON.parse(template)
+        add_encryption_password_for_validation(template)
+        json = template.to_json
 
         cf.should_receive(:validate_template).with(json) {
           {

data/spec/spec_helper.rb

@@ -57,6 +57,10 @@ def eval_template(template, options = {})
     add_encryption_password(template)
   end
 
+  if options[:add_encryption_password_for_validation]
+    add_encryption_password_for_validation(template)
+  end
+
   return template
 end
 
@@ -75,6 +79,15 @@ def add_encryption_password(template)
   }
 end
 
+def add_encryption_password_for_validation(template)
+  template['Parameters'] ||= {}
+
+  template['Parameters'][Kumogata::ENCRYPTION_PASSWORD] = {
+    'Type' => 'String',
+    'Default' => "(#{Kumogata::ENCRYPTION_PASSWORD})",
+  }
+end
+
 def make_double(name)
   obj = double(name)
   yield(obj)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - Genki Sugawara