kumogata 0.3.11 → 0.3.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2UxODIxNjc5ZDcyMmU2ZTgwNmE3NDdhYWEyYzEwNDhmYmUxOTI3NA==
+    Y2E5OGQ4ZGRjNGI4MWJlNTBlNjQ0NzYzZDY3NTIwYmM0MzVmOTk0Mw==
   data.tar.gz: !binary |-
-    ODgzY2QxYTQ0ZGU2ZDI5MGJlYzNhMDI3NDQwMjUzZmZmZjAyNTcwYg==
+    ODAxMjk3ZjIzZTdkZDM1YzAwZjdlOTY3MGEwNzk2Yjk1ODEyNzA5ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MzdkMmIwOTgxZjllOTRhYmVmZTQyMDFkMTk1MjUyNzgyNGEzZTRiMmUzNDYw
-    ZWMzYjFlMTRlNmE3YzRmMTYyY2VkOWEwYzc3MjE0MmI3ZGI3YjRhNGM5ZTQw
-    NGFiZGRjZTAxMjNiZGMxMDIzM2YzZGZlZmI2YjRmZjBjNWFkNTA=
+    ZWY5YmQ2MmYyMjI5ODQyODk3OGE0YzYwMzg4ZGU5OTMzZWNkZjAyZTEyMjgx
+    NjgwNmM3YzJiOGU3NGM3YmJlNGI1NjIwOGQ4YzEzMjM5NDA1YTUwNDcyMjEz
+    ZjA4NTVjY2MxODk4NTMxMzQ3NGE1ZTg1YWQyNGNjMTUyOTEzOGQ=
   data.tar.gz: !binary |-
-    MDQxNzMzNmZiMDZiZWM4MjA0YzNhMDkwMDIxMGZkODFjOTAxZWEyOTZmY2Ew
-    NWE1N2RjY2E0NmU1OWJlMmQ1ZmZlMDE2OWIwNTcyOWQ5MmI2Zjc2MmQzMThi
-    ODdhYmZjNTczMDMwYzBlMzk1ZTU5OTA1ZWZjZThmZDUyOWFlMWU=
+    ZDA1ZDk0YTQ0OWI2NjQxZTliYTViNWY3NDc1NDQ2ZDhkZTQyNmM3NGM2OGEy
+    OWFlZDcwOTUxY2Q2MGFmODEzY2RiYWRlNWU5NDI0MzBjNzgyNTVkZTE0ZGM1
+    MDViOThiMGYwOTNmYjZhMzQ1YmI0MmEzZjE5MjRiYjY4MTE5YmE=

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

data/lib/kumogata.rb

@@ -14,6 +14,7 @@ require 'net/ssh'
 require 'open-uri'
 require 'open3'
 require 'optparse'
+require 'set'
 require 'singleton'
 require 'strscan'
 require 'term/ansicolor'

data/lib/kumogata/post_processing.rb

@@ -18,21 +18,26 @@ class Kumogata::PostProcessing
     options = _post[:options] || {}
     @command_options.merge(options)
 
+    outputs = template['Outputs'] || {}
+
     _post.fetch(:commands).each do |name, attrs|
       unless attrs.kind_of?(Hash) and attrs['command']
         raise "Invalid post processing: #{name} => #{attrs.inspect}"
       end
 
       timing = [(attrs['after'] || TRIGGER_TIMING)].flatten.map {|i| i.to_sym }
+      command = attrs['command']
+
       validate_timing(name, timing)
+      validate_command_template(name, command, outputs)
 
       @commands[name] = {
         :after   => timing,
-        :command => attrs['command'],
+        :command => command,
       }
 
       if (ssh = attrs['ssh'])
-        validate_ssh(name, ssh)
+        validate_ssh(name, ssh, outputs)
         @commands[name][:ssh] = ssh
       end
     end
@@ -70,7 +75,7 @@ class Kumogata::PostProcessing
     end
   end
 
-  def validate_ssh(name, ssh)
+  def validate_ssh(name, ssh, outputs)
     host, user, options = ssh.values_at('host', 'user', 'options')
 
     unless host and user
@@ -88,6 +93,8 @@ class Kumogata::PostProcessing
       ssh['host'] = host.to_s
     end
 
+    validate_command_template(name, ssh['host'], outputs)
+
     if user.kind_of?(Hash)
       if user.keys != ['Key']
         raise "Invalid post processing ssh user: #{name} => #{user.inspect}"
@@ -99,6 +106,8 @@ class Kumogata::PostProcessing
       ssh['user'] = user.to_s
     end
 
+    validate_command_template(name, ssh['user'], outputs)
+
     if options and not options.kind_of?(Hash)
       raise "Invalid post processing ssh options: #{name} => #{options.inspect}"
     end
@@ -172,6 +181,29 @@ class Kumogata::PostProcessing
     Open3.capture3(command)
   end
 
+  def validate_command_template(name, command, outputs)
+    command = command.undent if @command_options[:undent]
+    trim_mode = @command_options[:trim_mode]
+    expected_outputs = Set.new
+
+    scope = Object.new
+    scope.instance_variable_set(:@__expected_outputs__, expected_outputs)
+
+    scope.instance_eval(<<-EOS)
+      def Key(name)
+        @__expected_outputs__ << name
+      end
+
+      ERB.new(#{command.inspect}, nil, #{trim_mode.inspect}).result(binding)
+    EOS
+
+    expected_outputs.each do |key|
+      unless outputs.keys.include?(key)
+        raise "Unknown output: #{name} => #{key.inspect}"
+      end
+    end
+  end
+
   def evaluate_command_template(command, outputs)
     command = command.undent if @command_options[:undent]
     trim_mode = @command_options[:trim_mode]

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.3.11'
+  VERSION = '0.3.12'
 end

metadata

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