kumogata 0.2.13 → 0.2.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjUxM2NjNThmOTI1OTdlMmNlZTAyNjg5NzAwMjg4ZTViYzU5Mjk5NA==
+    NTRiNjQ5NzgzNjlhMDIzZDI2NzE4NTA0OWE2NjU4MjdlODBhNDkxMA==
   data.tar.gz: !binary |-
-    ZmNlYWU3YTg2YjBkZDhkNzBkYTZmZTEyYzlhNzI2ZmJkMjU1NDQ0Zg==
+    ZWM4Y2MxOWU0ZjMxMDkzMTQ3OGY2MTcyNmRkNzJjODA5MDgzYjNiYQ==
 SHA512:
   metadata.gz: !binary |-
-    YjcxOGQxMjBmYTc2MTEwYjk0ZDMxNjgwMmNhNGNlMjJkYWI1YzE5YzRjNzlm
-    MDE1OTUwYTliZmM2NTcyNGMyYmM1MmExYjI2OTZkYzNiMThjYWRjMTMzMTNm
-    YzNmMWQ4ODRiNTliMDI5ZDI4OTQzOTk0ZjFjZmYzZWJkYWU1MTQ=
+    NTdkNmUzNGIxNzBiNDA0N2NjZDcxODkzY2I0NzZmYWQ1NmM2Zjc2MTUzN2Uy
+    ZWEwMzA0NjFjODg3MzdmZjc0ZWYyYTFjNDUzNWM4NjAxYzE3ZTU2YTc2MzBl
+    MTYwOTg1NTUxZjdmMjQ1ZTE2YWI5Y2IyZThhYTc1Y2MzZGM1Y2I=
   data.tar.gz: !binary |-
-    YmU1MzdmMGE3YTYyMzE3NzJhZjhjYjYwYzY0MGQzYjIzNjM0MzY4YTAxYzVj
-    NjAzY2MwNDFhNGVlNGFjODY1YjQ0MzM2N2ZhMjAzMmFkMjNmY2I2YmJjZmY0
-    Y2QzYjk0NzY1ZTBhYTM2ODY1ZTM3MzBiYjM2ZWZlNmYzZjQ3ZDk=
+    YzdjMGE2NDEwOThiYjA2MWZkMjJlMDkxNjNiYTQxYTcxY2QzYTBmNTk3Nzg4
+    MWRlZmE5MGQzYzFiMGQwOGRiNTBkNTU5ZGEyM2JiMjNmNGEzNDIxNDQ1MjY3
+    MzhjMTY3MmEwOWQ0NGM5MmI2ZWUwN2ZhYjFhODdlYzc1NjhjMjQ=

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?201403072000)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403072000)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![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)
 
 It can define a template in Ruby DSL, such as:
 
@@ -215,7 +215,9 @@ end
 
 * Command line
 
-    $ kumogata create template.rb -e 'Password1,Password2' -p 'Param1=xxx,Param2=xxx,Password1=xxx,Password2=xxx'
+```
+$ kumogata create template.rb -e 'Password1,Password2' -p 'Param1=xxx,Param2=xxx,Password1=xxx,Password2=xxx'
+```
 
 * Template
 
@@ -248,7 +250,7 @@ Resources do
           commands do
             any_command do
               command (<<-EOS).fn_join
-                ENCRYPTION_PASSWORD="`echo <%= Ref Kumogata::ENCRYPTION_PASSWORD %> | base64 -d`"
+                ENCRYPTION_PASSWORD="`echo '<%= Ref Kumogata::ENCRYPTION_PASSWORD %>' | base64 -d`"
 
                 # Decrypt Password1
                 echo '<%= Ref "Password1" %>' | base64 -d | openssl enc -d -aes256 -pass pass:"$ENCRYPTION_PASSWORD" > password1

data/lib/kumogata/client.rb

@@ -18,6 +18,7 @@ class Kumogata::Client
 
   def validate(path_or_url)
     template = open_template(path_or_url)
+    add_encryption_password_for_validation(template)
     validate_template(template)
     nil
   end
@@ -372,6 +373,15 @@ class Kumogata::Client
     end
   end
 
+  def add_encryption_password_for_validation(template)
+    template['Parameters'] ||= {}
+
+    template['Parameters'][Kumogata::ENCRYPTION_PASSWORD] ||= {
+      'Type' => 'String',
+      'Default' => "(#{Kumogata::ENCRYPTION_PASSWORD})",
+    }
+  end
+
   def validate_template(template)
     result = @cloud_formation.validate_template(template.to_json)
 

data/lib/kumogata/version.rb

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

metadata

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