kumogata 0.2.19 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTIzZjQ1YzM3MGFkNzQ0YmRiMjYyMDFlMjVmYjEwMjgzNTliZDU2Mg==
+    MDJiY2RhMjljMGZiZDMzOGM3YTdlZjkxYmFkNTk3YjIwNDc3NmJmOQ==
   data.tar.gz: !binary |-
-    ZTA2ZjU5YTc1YTRjMjE4ZGY0NWUzNzM1ZTBhNjljMDBjNmY4NzhlYQ==
+    YjU3NzFmM2I0MTIzMWQ3MjQ3N2E4YjcyODBmMTg5YzJhOGU4OWZlZg==
 SHA512:
   metadata.gz: !binary |-
-    ZmU2OWY3YzBjM2QwYjE1ZjQ0OGE3ZGE0ZmYwOGQ2MDdhNzIxOWM5MGE3YjMx
-    YjgwYjRhMmY0Y2MzMWI4OTFiMmFmMmQxZjRmNzQxNmFmNTZjNGEwZDllZmNh
-    MDU3ZWVmMmYyZDkzOTEzYzEzZDk4OGJjOTQxOWZjMTVhYmRlOGU=
+    NDllOGZhMzQ0ZjRlODVlMmI3MTVjZGU1NzhhMDkxNjJmM2EzNmRiZTk4Zjk4
+    ODQxZWU5Y2NmZTEyMmI2MzQzNjhiMGM1MGM4NGI3Y2Y1OGM2MTY2ZDc4Mzc4
+    NTg4MDNlNTQ5YjYxZmVjZGNlODVlYzJmYjliNjRhYWJkOTUyMTU=
   data.tar.gz: !binary |-
-    ZjFmZmRjMmY5ODE0MzRhOWQxMmE5MDE4N2ExZmI0YmEwMTllZjA1YWE5ODNk
-    N2MyN2NlNzQwYzI4MWZiZTVjZmM3MTVlZTFkMGQ1MDlkYTkzODVjNzczNDhm
-    MzAwY2IxYjU1MzJjMDU2OTRmYmY3ZGI0ODA1NDY5MzBhYjc1MjU=
+    MjYyN2YzZjFmOGZjNzE5OGVhNWZlNmYzNTZlY2E0ODVlZWI0Zjk4Y2RmYjkz
+    MTE2OGExMWMzN2FiNjRmYWI3M2E5NTlhMDg4YzYwZTU2MTBkY2M3NWFiOWNj
+    NTRkN2FiMDI1N2Y5ZTliNzk0ZjQ4N2M5ZmRhM2Y2MGIzOWIxNjQ=

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

data/lib/kumogata/argument_parser.rb

@@ -185,24 +185,13 @@ class Kumogata::ArgumentParser
 
   def update_parameters(options)
     parameters = {}
-    passwd = options.encryption_password || Kumogata::Crypt.mkpasswd(16)
-    enc_params = options.encrypt_parameters
 
     (options.parameters || []).each do |i|
       key, value = i.split('=', 2)
-
-      if enc_params and (enc_params.include?('*') or enc_params.include?(key))
-        value = Kumogata::Crypt.encrypt(passwd, value)
-      end
-
       parameters[key] = value
     end
 
     options.parameters = parameters
-
-    if options.encrypt_parameters? and not options.skip_send_password?
-      options.parameters[Kumogata::ENCRYPTION_PASSWORD] = passwd.encode64
-    end
   end
 
   def scan_args(str)

data/lib/kumogata/client.rb

@@ -355,10 +355,21 @@ class Kumogata::Client
     if @options.parameters? and not @options.parameters.empty?
       parameters = {}
 
+      enc_params = @options.encrypt_parameters
+      passwd = @options.encryption_password || Kumogata::Crypt.mkpasswd(16)
+
       @options.parameters.each do |key, value|
+        if enc_params and (enc_params.include?('*') or enc_params.include?(key))
+          value = Kumogata::Crypt.encrypt(passwd, value)
+        end
+
         parameters[key] = value
       end
 
+      if @options.encrypt_parameters? and not @options.skip_send_password?
+        parameters[Kumogata::ENCRYPTION_PASSWORD] = passwd.encode64
+      end
+
       hash[:parameters] = parameters
     end
   end

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.2.19'
+  VERSION = '0.3.0'
 end

data/spec/kumogata_create_spec.rb

@@ -233,7 +233,7 @@ Outputs do
 end
     EOS
 
-    run_client(:create, :template => template, :options => {:parameters => {'InstanceType'=>'m1.large'}, :encrypt_parameters => true}) do |client, cf|
+    run_client(:create, :template => template, :options => {:parameters => {'InstanceType'=>'m1.large'}, :encrypt_parameters => ['Password']}) do |client, cf|
       json = eval_template(template, :update_deletion_policy => true, :add_encryption_password => true).to_json
 
       output = make_double('output') do |obj|
@@ -261,7 +261,7 @@ end
 
       stacks = make_double('stacks') do |obj|
         obj.should_receive(:create)
-           .with('kumogata-user-host-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', json, {:parameters=>{"InstanceType"=>"m1.large"}}) { stack }
+           .with('kumogata-user-host-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', json, {:parameters=>{"InstanceType"=>"m1.large", "EncryptionPassword"=>"KioqKioqKioqKioqKioqKg=="}}) { stack }
         obj.should_receive(:[])
            .with('kumogata-user-host-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX') { stack }
       end

data/spec/kumogata_update_spec.rb

@@ -171,7 +171,7 @@ Outputs do
 end
     EOS
 
-    run_client(:update, :arguments => ['MyStack'], :template => template, :options => {:parameters => {'InstanceType'=>'m1.large'}, :encrypt_parameters => true}) do |client, cf|
+    run_client(:update, :arguments => ['MyStack'], :template => template, :options => {:parameters => {'InstanceType'=>'m1.large'}, :encrypt_parameters => ['Password']}) do |client, cf|
       json = eval_template(template, :add_encryption_password => true).to_json
 
       output = make_double('output') do |obj|
@@ -189,7 +189,7 @@ end
       end
 
       stack = make_double('stack') do |obj|
-        obj.should_receive(:update).with(:template => json, :parameters=>{"InstanceType"=>"m1.large"})
+        obj.should_receive(:update).with(:template => json, :parameters=>{"InstanceType"=>"m1.large", "EncryptionPassword"=>"KioqKioqKioqKioqKioqKg=="})
         obj.should_receive(:status).and_return(
             'UPDATE_COMPLETE', 'UPDATE_COMPLETE', 'UPDATE_COMPLETE')
         obj.should_receive(:outputs) { [output] }

data/spec/spec_helper.rb

@@ -12,6 +12,12 @@ class Kumogata::Utils
   end
 end
 
+class Kumogata::Crypt
+  def self.mkpasswd(n)
+    '*' * n
+  end
+end
+
 def tempfile(content, template_ext)
   basename = "#{File.basename __FILE__}.#{$$}"
   basename = [basename, template_ext]

metadata

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