tiller 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19b9c31a627b8be234e1222fada6dbfdcd5a0fd8
-  data.tar.gz: 306d86613d62bb5a8cbf93e423fa1ca92192fdbd
+  metadata.gz: fe6f12cf89be768c76267511b8b197b4fc1bba6c
+  data.tar.gz: b36c3b73947eef269e4b672f3a0b05511ea345ce
 SHA512:
-  metadata.gz: b622b2787cad0505049358ceb99a7ed6fc3a6c9154fa6e9541b76876302add88d198995a825df32b98ecd069c2780d5687c7f52a51ee31cbdf37015c76c94656
-  data.tar.gz: d4700698a4537c923f899e834fd8c318d2ac2ad3385b3509b1570f7eeb14c236d9511487627cd3780cc315c4f153b2360def6925190c6de0467ea11480f9f652
+  metadata.gz: 9d3898a7da36129148f38da6aeee2ba43a4f932472060642a0a1a44473355230718938ed90e2d584543f2c9b7dd01561b7e2ca1d84954192d2249d3e89431f8c
+  data.tar.gz: debda6b46a3f5b75b04e6698b839f377326920b0fe417db6e202ea06f7a0621e623435c3cd5a64742a14f06d7f2dcc58afdc214dad17f38ca7ba4f8763eef947

data/bin/tiller

@@ -4,7 +4,7 @@
 # didn't have an existing gem named after it!
 # Mark Round <github@markround.com>
 
-VERSION = '0.5.0'
+VERSION = '0.5.1'
 
 require 'erb'
 require 'ostruct'
@@ -164,15 +164,17 @@ module Tiller
 
   if config[:no_exec] == false && config.key?('exec')
     # All templates created, so let's start the replacement process
-    puts "Executing #{config['exec']}..."
+    puts "Executing #{config['exec'].to_s}..."
 
     # Spawn and wait so API can continue to run
-    child_pid = spawn(config['exec'])
+    child_pid = launch(config['exec'], :verbose => config[:verbose])
 
     puts "Child process forked with PID #{child_pid}." if config[:verbose]
 
     # Catch signals and send them on to the child process
-    [ :INT, :TERM, :HUP ].each { |sig| Signal.trap(sig) { signal(sig, child_pid, config) } }
+    [ :INT, :TERM, :HUP ].each do |sig|
+      Signal.trap(sig) { signal(sig, child_pid, :verbose => config[:verbose]) }
+    end
 
     Process.wait(child_pid)
 

data/lib/tiller/util.rb

@@ -13,11 +13,29 @@ def warn_merge(key, old, new, type, source)
 end
 
 # Pass signals on to child process
-def signal(sig, pid, config)
-  puts "Caught signal #{sig}, passing to PID #{pid}" if config[:verbose]
+def signal(sig, pid, options={})
+  puts "Caught signal #{sig}, passing to PID #{pid}" if options[:verbose]
   begin
     Process.kill(sig, pid)
   rescue Errno::ESRCH
     false
   end
+end
+
+# Launch the replacement process.
+def launch(cmd, options={})
+  # If an array, then we use a different form of spawn() which
+  # avoids a subshell. See https://github.com/markround/tiller/issues/8
+  if cmd.is_a?(Array)
+    final='cmd[0]'
+    # Build up the list of arguments when using the array form of spawn()
+    if cmd.size > 1
+      (1..cmd.size-1).each {|c| final="#{final} , cmd[#{c}]" }
+    end
+    pid=eval "spawn(#{final})"
+  else
+    pid=spawn(cmd)
+  end
+
+  pid
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Mark Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies: []
 description: A tool to create configuration files from a variety of sources, particularly
   useful for Docker containers. See https://github.com/markround/tiller for examples