kumogata 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7537f25fa6ed9e22a4c12d03cac0a00ec783801e
-  data.tar.gz: e325a318da75a8be3ef42a8ef89353c71bf95291
+  metadata.gz: 60b666d69792655cd9d5f1ef9b67d8bc73aa1801
+  data.tar.gz: b40df1b37bad8bc10c9fa2f680324fad09ada144
 SHA512:
-  metadata.gz: 1802d2a36f631d1130b2e8471e12ead569363ffee7dfa99c41b23b45c6affc15dfca2c3ab0385a661fab81778df147356533440e9504d568a79964cc69a368a2
-  data.tar.gz: 03203252527136f4626c658550ab5f3775e0db76ffe80455b721ccd399fd77cf5adb4554652f3ce7b3af9fffa32729ea4205279d1ff0b14ed3a7c2cf5e86958c
+  metadata.gz: 0d1acf88ed630a8ecba7cfa15ac2b8503d128ee9dcb9617cfea4eba019f1047e1548bd4c84c26b1c4909846b782a547cd8c4d8477969b1f7fe746eb83538ef6b
+  data.tar.gz: 5647c1968838158a41bf6568842074cfeed764a8471737454ffe645f658eca9cfde5fb201252efa97cbe470753c97015d553c2afc00c433f1adb9a5ae8ae308d

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?201404191738)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201404191738)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201404231403)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201404231403)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 
@@ -281,6 +281,32 @@ Resources do
 end # Resources
 ```
 
+## Iteration
+
+You can use the Iteration in the template using `_(...)` method.
+
+```ruby
+Resources do
+  ['instance1', 'instance2', 'instance3'].echo {|instance_name|
+    _(instance_name) do
+      Type "AWS::EC2::Instance"
+      Properties do
+        ImageId "ami-XXXXXXXX"
+        InstanceType { Ref "InstanceType" }
+        KeyName "your_key_name"
+
+        UserData (<<-EOS).undent.encode64
+          #!/bin/bash
+          yum install -y httpd
+          service httpd start
+          hostname #{instance_name}
+        EOS
+      end
+    end
+  }
+end
+```
+
 ## Post command
 
 You can run shell/ssh commands after building servers using `_post()`.
@@ -340,7 +366,7 @@ Status: 0
 
 ## YAML template
 
-You can also use the template YAML instead of JSON and Ruby.
+You can also use the YAML template instead of JSON and Ruby.
 
 ```yaml
 ---
@@ -384,6 +410,36 @@ Outputs:
 
     $ kumogata convert Drupal_Single_Instance.template --output-format=yaml
 
+## Outputs Filter
+
+```ruby
+Outputs do
+  MyPublicIp do
+    Value { Fn__GetAtt "MyInstance", "PublicIp" }
+  end
+end
+
+_outputs_filter do |output|
+  outputs["PublicIp"].gsub!('.', '_')
+  # PublicIp: XXX.XXX.XXX.XXX => XXX-XXX-XXX-XXX
+end
+
+_post do
+  ...
+end
+```
+
+## Configuration File
+
+Kumogata supports [aws-cli configuration file](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waitcondition.html).
+
+```
+[default]
+aws_access_key_id=AKIAIOSFODNN7EXAMPLE
+aws_secret_access_key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+aws_security_token=texample123324
+```
+
 ## Demo
 
 * Create resources

data/lib/kumogata/client.rb

@@ -15,6 +15,7 @@ class Kumogata::Client
     add_encryption_password(template)
 
     outputs = create_stack(template, stack_name)
+    filter_outputs(template, outputs)
     @post_processing.run(:create, outputs)
 
     outputs
@@ -58,6 +59,7 @@ class Kumogata::Client
     add_encryption_password(template)
 
     outputs = update_stack(template, stack_name)
+    filter_outputs(template, outputs)
     @post_processing.run(:update, outputs)
 
     outputs
@@ -262,6 +264,10 @@ class Kumogata::Client
         @__hash__[path] = value
       end
 
+      def _outputs_filter(&block)
+        @__hash__[:_outputs_filter] = block
+      end
+
       def _post(options = {}, &block)
         commands = Dslh::ScopeBlock.nest(binding, 'block')
 
@@ -618,4 +624,12 @@ EOS
       raise "1 validation error detected: Value '#{stack_name}' at 'stackName' failed to satisfy constraint: Member must satisfy regular expression pattern: [a-zA-Z][-a-zA-Z0-9]*"
     end
   end
+
+  def filter_outputs(template, outputs)
+    if (_outputs_filter = template.delete(:_outputs_filter))
+      _outputs_filter.call(outputs)
+    end
+
+    return outputs
+  end
 end

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.4.11'
+  VERSION = '0.4.12'
 end

data/spec/kumogata_create_spec.rb

@@ -262,6 +262,98 @@ end
     end
   end
 
+  it 'create a stack from Ruby template and run ssh command (modify outputs)' do
+    template = <<-TEMPLATE
+Resources do
+  myEC2Instance do
+    Type "AWS::EC2::Instance"
+    Properties do
+      ImageId "ami-XXXXXXXX"
+      InstanceType "t1.micro"
+    end
+  end
+end
+
+Outputs do
+  PublicIp do
+    Value do
+      Fn__GetAtt "myEC2Instance", "PublicIp"
+    end
+  end
+end
+
+_outputs_filter do |outputs|
+  outputs['MyOutput'] = 100
+end
+
+_post do
+  ssh_command do
+    ssh do
+      host { Key "PublicIp" }
+      user "ec2-user"
+    end
+    command <<-EOS
+      ls
+    EOS
+  end
+end
+    TEMPLATE
+
+    run_client(:create, :template => template) do |client, cf|
+      json = eval_template(template, :update_deletion_policy => true).to_json
+      client.should_receive(:print_event_log).twice
+      client.should_receive(:create_event_log).once
+
+      output = make_double('output') do |obj|
+        obj.should_receive(:key) { 'PublicIp' }
+        obj.should_receive(:value) { '127.0.0.1' }
+      end
+
+      resource_summary = make_double('resource_summary') do |obj|
+        obj.should_receive(:[]).with(:logical_resource_id) { 'myEC2Instance' }
+        obj.should_receive(:[]).with(:physical_resource_id) { 'i-XXXXXXXX' }
+        obj.should_receive(:[]).with(:resource_type) { 'AWS::EC2::Instance' }
+        obj.should_receive(:[]).with(:resource_status) { 'CREATE_COMPLETE' }
+        obj.should_receive(:[]).with(:resource_status_reason) { nil }
+        obj.should_receive(:[]).with(:last_updated_timestamp) { '2014-03-02 04:35:12 UTC' }
+      end
+
+      stack = make_double('stack') do |obj|
+        obj.should_receive(:status).and_return(
+            'CREATE_COMPLETE', 'CREATE_COMPLETE',
+            'DELETE_COMPLETE', 'DELETE_COMPLETE', 'DELETE_COMPLETE')
+        obj.should_receive(:outputs) { [output] }
+        obj.should_receive(:resource_summaries) { [resource_summary] }
+        obj.should_receive(:delete)
+      end
+
+      stacks = make_double('stacks') do |obj|
+        obj.should_receive(:create)
+           .with('kumogata-user-host-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', json, {}) { stack }
+        obj.should_receive(:[])
+           .with('kumogata-user-host-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX') { stack }
+      end
+
+      cf.should_receive(:stacks).twice { stacks }
+
+      client.instance_variable_get(:@post_processing)
+           .should_receive(:run_ssh_command)
+           .with({"host"=>"<%= Key \"PublicIp\" %>", "user"=>"ec2-user", "request_pty"=>true}, "      ls\n", {"PublicIp"=>"127.0.0.1", "MyOutput"=>100})
+           .and_return(["file1\nfile2\n", "", 0])
+
+      client.instance_variable_get(:@post_processing)
+            .should_receive(:print_command).with('ssh_command')
+
+      client.instance_variable_get(:@post_processing)
+            .should_receive(:print_command_result)
+            .with("file1\nfile2\n", "", 0)
+
+      client.instance_variable_get(:@post_processing)
+            .should_receive(:save_command_results)
+            .with([{'ssh_command' => {'ExitStatus' => 0, 'StdOut' => "file1\nfile2\n", 'StdErr' => ""}}])
+    end
+  end
+
   it 'create a stack from Ruby template and run command (specifies timing)' do
     template = <<-TEMPLATE
 Resources do

data/spec/kumogata_update_spec.rb

@@ -299,6 +299,96 @@ end
     end
   end
 
+  it 'update a stack from Ruby template and run ssh command (modify outputs)' do
+    template = <<-TEMPLATE
+Resources do
+  myEC2Instance do
+    Type "AWS::EC2::Instance"
+    Properties do
+      ImageId "ami-XXXXXXXX"
+      InstanceType "t1.micro"
+    end
+  end
+end
+
+Outputs do
+  PublicIp do
+    Value do
+      Fn__GetAtt "myEC2Instance", "PublicIp"
+    end
+  end
+end
+
+_outputs_filter do |outputs|
+  outputs['PublicIp'].gsub!('.', '-')
+end
+
+_post do
+  ssh_command do
+    after :update
+    ssh do
+      host { Key "PublicIp" }
+      user "ec2-user"
+    end
+    command <<-EOS
+      ls
+    EOS
+  end
+end
+    TEMPLATE
+
+    run_client(:update, :arguments => ['MyStack'], :template => template) do |client, cf|
+      json = eval_template(template).to_json
+      client.should_receive(:print_event_log).once
+      client.should_receive(:create_event_log).once
+
+      output = make_double('output') do |obj|
+        obj.should_receive(:key) { 'PublicIp' }
+        obj.should_receive(:value) { '127.0.0.1' }
+      end
+
+      resource_summary = make_double('resource_summary') do |obj|
+        obj.should_receive(:[]).with(:logical_resource_id) { 'myEC2Instance' }
+        obj.should_receive(:[]).with(:physical_resource_id) { 'i-XXXXXXXX' }
+        obj.should_receive(:[]).with(:resource_type) { 'AWS::EC2::Instance' }
+        obj.should_receive(:[]).with(:resource_status) { 'UPDATE_COMPLETE' }
+        obj.should_receive(:[]).with(:resource_status_reason) { nil }
+        obj.should_receive(:[]).with(:last_updated_timestamp) { '2014-03-02 04:35:12 UTC' }
+      end
+
+      stack = make_double('stack') do |obj|
+        obj.should_receive(:update).with(:template => json)
+        obj.should_receive(:status).and_return(
+            'UPDATE_COMPLETE', 'UPDATE_COMPLETE', 'UPDATE_COMPLETE')
+        obj.should_receive(:outputs) { [output] }
+        obj.should_receive(:resource_summaries) { [resource_summary] }
+      end
+
+      stacks = make_double('stacks') do |obj|
+        obj.should_receive(:[])
+           .with('MyStack') { stack }
+      end
+
+      cf.should_receive(:stacks) { stacks }
+
+      client.instance_variable_get(:@post_processing)
+           .should_receive(:run_ssh_command)
+           .with({"host"=>"<%= Key \"PublicIp\" %>", "user"=>"ec2-user", "request_pty"=>true}, "      ls\n", {"PublicIp"=>"127-0-0-1"})
+           .and_return(["file1\nfile2\n", "", 0])
+
+      client.instance_variable_get(:@post_processing)
+            .should_receive(:print_command).with('ssh_command')
+
+      client.instance_variable_get(:@post_processing)
+            .should_receive(:print_command_result)
+            .with("file1\nfile2\n", "", 0)
+
+      client.instance_variable_get(:@post_processing)
+            .should_receive(:save_command_results)
+            .with([{'ssh_command' => {'ExitStatus' => 0, 'StdOut' => "file1\nfile2\n", 'StdErr' => ""}}])
+    end
+  end
+
   it 'update a stack from Ruby template and run command (specifies timing)' do
     template = <<-TEMPLATE
 Resources do

data/spec/spec_helper.rb

@@ -35,6 +35,12 @@ def tempfile(content, template_ext)
   end
 end
 
+class Proc
+  def to_s
+    "<Proc Object>"
+  end
+end
+
 def run_client(command, options = {})
   $stdout = open('/dev/null', 'w') unless ENV['DEBUG']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -326,4 +326,3 @@ test_files:
 - spec/kumogata_validate_spec.rb
 - spec/spec_helper.rb
 - spec/string_stream_spec.rb
-has_rdoc: