tiller 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a9e59b53054ab622d4627c753fa3dfd770e96d2
-  data.tar.gz: 06b68072cad4551bd719d75a781dda4a615e2684
+  metadata.gz: 969709faff86bb0c4fc5bf2e31a315597fa10d50
+  data.tar.gz: 1f0ee6caa52d3328b942bf1f86ef30f30be1853c
 SHA512:
-  metadata.gz: 5505a2fb4696e0ebeccf32b57d3ec8ae6709f5dd0498681ff8c01623a5a542beb3f9d4f21b98a116428cb629d5610d2224d4b904c87a50bb98891528360344fe
-  data.tar.gz: e57a8bf3bd36f48fb7c9fa37f4bb9a2e530cb11b23b2a0b5ce0403aa791d6695b3dcd3dddb5db29bb62ca93acbd6640546118b7c0955f1607a89bc8b4fd6384d
+  metadata.gz: 8110a45a9c7703ca5cc92f8b1d2f5577fd03f1632cbd463469ddbc6fb675f84c17294f23bcdfa219bdaa5723924a2cbe287f81cde462b0d1f73bc4b0666079aa
+  data.tar.gz: 8e3330c3a86eb00a7d7f8411ba42ddf1b00b977f744f6ef6bc6840fb2f1c2f64366f2f7596822a624361b396785909aa329fe002a455bb0bfc5c4f2c14886a7a

data/bin/tiller

@@ -47,12 +47,31 @@ module Tiller
   # Add tiller_lib to the LOAD PATH so we can pull in user-defined plugins
   $LOAD_PATH.unshift(config[:tiller_lib]) unless $LOAD_PATH.include?(config[:tiller_lib])
 
-  # Load the common YAML configuration file
+  # Load the common YAML configuration files
   begin
+    config_loaded = false
+
+    # Is there a common.yaml ? If so, load that first
     common_file = File.join(config[:tiller_base], 'common.yaml')
-    config.merge!(YAML.load(open(common_file)))
+    if File.exists?(common_file)
+      config.merge!(YAML.load(open(common_file)))
+      config_loaded = true
+    end
+
+    # Load and deep merge anything under config.d if present
+    config_d_dir =  File.join(config[:tiller_base], 'config.d')
+    Dir.glob(File.join(config_d_dir, '**', '*.yaml')).each do |f|
+      log.info("Loading config file #{f}")
+      config.deep_merge!(YAML.load(open(f)))
+      config_loaded = true
+    end
+
   rescue StandardError => e
-    abort "Error : Could not open common configuration file!\n#{e}"
+    abort "Error : Could not open common configuration files!\n#{e}"
+  end
+
+  unless config_loaded
+    abort "Error: No configuration files present!"
   end
 
   # Check for keys only present in v2 format (everything in one common.yaml)
@@ -247,7 +266,7 @@ module Tiller
     Process.wait(child_pid)
 
     # Capture the child process status, so we can also exit with this code
-    exit_status = $?.exitstatus
+    exit_status = ($?.exitstatus == nil) ? 0 : $?.exitstatus
 
     log.info("Child process exited with status #{exit_status}")
     log.info('Child process finished, Tiller is stopping.')

data/lib/tiller/version.rb

@@ -1 +1 @@
-VERSION="0.9.4"
+VERSION="0.9.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-10-14 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