tiller 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbd7c351b404d9ad522229e387678dcfac6cc625
-  data.tar.gz: 944655c1a9f52ff0385e8e56fe85cfc52a00751d
+  metadata.gz: 19b9c31a627b8be234e1222fada6dbfdcd5a0fd8
+  data.tar.gz: 306d86613d62bb5a8cbf93e423fa1ca92192fdbd
 SHA512:
-  metadata.gz: 6362ad6e2febddbc0075e9fdbda50128bc27eca7b633efc0ca2903085c3a303acde1df32b8bdf7260bf35b6d75c493c19745ddf788387ecc280c318a3117670f
-  data.tar.gz: f35071d852eb1e01eddfccdec52e8eeeb1b0321bc2b36cb6866c004e939ffa3130a97bedfe6750097d2f020a13285e20247b86e5ae1a3066e5f73a9b7ce78b9a
+  metadata.gz: b622b2787cad0505049358ceb99a7ed6fc3a6c9154fa6e9541b76876302add88d198995a825df32b98ecd069c2780d5687c7f52a51ee31cbdf37015c76c94656
+  data.tar.gz: d4700698a4537c923f899e834fd8c318d2ac2ad3385b3509b1570f7eeb14c236d9511487627cd3780cc315c4f153b2360def6925190c6de0467ea11480f9f652

data/bin/tiller

@@ -4,7 +4,7 @@
 # didn't have an existing gem named after it!
 # Mark Round <github@markround.com>
 
-VERSION = '0.4.0'
+VERSION = '0.5.0'
 
 require 'erb'
 require 'ostruct'
@@ -74,6 +74,12 @@ module Tiller
     global_values.merge!(data_class.new(config).global_values) do |key, old, new|
       warn_merge(key, old, new, 'global', data_class.to_s)
     end
+
+    # Now need to see if any of the common.yaml values have been over-ridden by a datasource
+    # e.g. environment-specific execs and so on.
+    config.merge!(data_class.new(config).common) do |key, old, new|
+      warn_merge(key, old, new, 'common', data_class.to_s)
+    end
   end
 
   # Now we go through each template we've identified, and get the
@@ -160,10 +166,8 @@ module Tiller
     # All templates created, so let's start the replacement process
     puts "Executing #{config['exec']}..."
 
-    # Fork and wait so API can continue to run
-    child_pid = fork do
-      exec(config['exec'])
-    end
+    # Spawn and wait so API can continue to run
+    child_pid = spawn(config['exec'])
 
     puts "Child process forked with PID #{child_pid}." if config[:verbose]
 

data/examples/plugins/etc/tiller/environments/production.yaml

@@ -1,5 +1,10 @@
 # Here is an example configuration file for your production environment.
 
+# We override a setting from common.yaml for this environment.
+common:
+  api_enable: true
+  exec: env
+
 # First, we define the values for an example sensu_client template :
 sensu_client.erb:
   target: /etc/sensu/conf.d/client.json

data/lib/tiller/data/file.rb

@@ -13,12 +13,16 @@ class FileDataSource < Tiller::DataSource
     @config_hash = YAML.load(open(env_file))
   end
 
+  def common
+    @config_hash.key?('common') ? @config_hash['common'] : {}
+  end
+
   def values(template_name)
-    @config_hash.key?(template_name) ? @config_hash[template_name]['config'] : Hash.new
+    @config_hash.key?(template_name) ? @config_hash[template_name]['config'] : {}
   end
 
   def target_values(template_name)
     # The config element is redundant (not a target value)
-    @config_hash.key?(template_name) ? @config_hash[template_name] : Hash.new
+    @config_hash.key?(template_name) ? @config_hash[template_name] : {}
   end
 end

data/lib/tiller/datasource.rb

@@ -18,14 +18,20 @@ module Tiller
     def setup
     end
 
+    # This is where we override any of the common.yaml settings per environment.
+    # EG, the exec: parameter and so on.
+    def common
+      {}
+    end
+
     def global_values
-      Hash.new
+      {}
     end
 
     # We should always return a hash; if we have no data for the given
     # template, just return an empty hash.
     def values(_template_name)
-      Hash.new
+      {}
     end
 
     # This should provide a hash similar to this example :
@@ -38,7 +44,7 @@ module Tiller
     # Again, we should always return a hash; if we have no data for the given
     # template, just return an empty hash.
     def target_values(_template_name)
-      Hash.new
+      {}
     end
 
     def ping

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Mark Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-03-16 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
@@ -77,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="