tiller 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c32c4ca4b4639f9805d818dc47918d843cca787c
-  data.tar.gz: 482b956bea0ca02af1c91079bbd3e49b04859e07
+  metadata.gz: cbd7c351b404d9ad522229e387678dcfac6cc625
+  data.tar.gz: 944655c1a9f52ff0385e8e56fe85cfc52a00751d
 SHA512:
-  metadata.gz: 866676d926a31d6987888aa8e258d14e71fe9ba2348cac6a28e83d2082bbd55fbd5ff1022d3166a2bfc80e793c071826e146494a2e3e88c9736551cc0a05e7cb
-  data.tar.gz: ac0d422c214bcf8cbcd48734fa38d181d8911fab8176bcd7e8a32e527d88153c867e96760e57c27550089ee74849ca2c85ec360843d953aa681fb69d90516d8a
+  metadata.gz: 6362ad6e2febddbc0075e9fdbda50128bc27eca7b633efc0ca2903085c3a303acde1df32b8bdf7260bf35b6d75c493c19745ddf788387ecc280c318a3117670f
+  data.tar.gz: f35071d852eb1e01eddfccdec52e8eeeb1b0321bc2b36cb6866c004e939ffa3130a97bedfe6750097d2f020a13285e20247b86e5ae1a3066e5f73a9b7ce78b9a

data/bin/tiller

@@ -4,7 +4,7 @@
 # didn't have an existing gem named after it!
 # Mark Round <github@markround.com>
 
-VERSION = '0.3.2'
+VERSION = '0.4.0'
 
 require 'erb'
 require 'ostruct'
@@ -161,14 +161,18 @@ module Tiller
     puts "Executing #{config['exec']}..."
 
     # Fork and wait so API can continue to run
-    fork do
-      system(config['exec'])
+    child_pid = fork do
+      exec(config['exec'])
     end
 
-    puts "Child process forked." if config[:verbose]
-    Process.wait
-    puts "Child process finished, Tiller is stopping." if config[:verbose]
-  end
+    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) } }
 
+    Process.wait(child_pid)
+
+    puts 'Child process finished, Tiller is stopping.' if config[:verbose]
+  end
 
 end

data/lib/tiller/api.rb

@@ -54,10 +54,10 @@ def tiller_api(tiller_api_hash)
 
       # Response
       socket.print "HTTP/1.1 #{response[:status]}\r\n" +
-                       "Content-Type: application/json\r\n" +
-                       "Server: Tiller #{VERSION} / API v#{API_VERSION}\r\n"
-                       "Content-Length: #{response[:content].bytesize}\r\n" +
-                       "Connection: close\r\n"
+                   "Content-Type: application/json\r\n" +
+                   "Server: Tiller #{VERSION} / API v#{API_VERSION}\r\n"
+                   "Content-Length: #{response[:content].bytesize}\r\n" +
+                   "Connection: close\r\n"
       socket.print "\r\n"
       socket.print response[:content]
       socket.close

data/lib/tiller/defaults.rb

@@ -7,7 +7,7 @@ module Tiller
     # from the -e flag or set it to default_environment.
     :environment          => (ENV['environment'].nil?)  ? nil : ENV['environment'],
     # This can be overridden in common.yaml.
-    'default_environment' => 'production',
+    'default_environment' => 'development',
     :no_exec              => false,
     :verbose              => false,
     'api_enable'          => false,

data/lib/tiller/util.rb

@@ -10,4 +10,14 @@ def warn_merge(key, old, new, type, source)
   puts "Warning, merging duplicate #{type} values."
   puts "#{key} => '#{old}' being replaced by : '#{new}' from #{source}"
   new
+end
+
+# Pass signals on to child process
+def signal(sig, pid, config)
+  puts "Caught signal #{sig}, passing to PID #{pid}" if config[:verbose]
+  begin
+    Process.kill(sig, pid)
+  rescue Errno::ESRCH
+    false
+  end
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies: []
-description: A tool to create configuration files in Docker containers from a variety
-  of sources. See https://github.com/markround/tiller for examples and documentation.
+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
+  and documentation.
 email: github@markround.com
 executables:
 - tiller
@@ -87,5 +88,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Dynamic configuration generation for Docker
+summary: Dynamic configuration file generation
 test_files: []