tiller 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de1c0f1f8381638d2568818134f335b4184a0b1c
-  data.tar.gz: 3613aa2b175fa801b671fab200b234153bfc698b
+  metadata.gz: 226f7774206435ec5cfa4e785b2a7400a65571c4
+  data.tar.gz: a80f2572702cde9f298831b956e33ac873905219
 SHA512:
-  metadata.gz: ff24474771f4041cede5a6fdedf6ee47c63f43288a57e9fa77a67f2472257f55d9e14cd496469ecf2f78a596b5f964a9d859721363f9f957c0c18b0d20a42039
-  data.tar.gz: de08322c4b9ecbf1cc2976e0a65fea61a1b8971c26caf3b01c0b90b3e7ae7dce35946b20b44e79b7ff3ad96fc391432ea8b2d5692ed996da31c0ba0a5ef0a8b9
+  metadata.gz: 2a7add80a4a3d5ffd317ff45bb3a778097f5de902210655d01ef03f982d07e12c44de647cdbd460b642cfca4e366e0a03c37eb1a63bb4eab43cf781727b4fe26
+  data.tar.gz: e05a6e6ba7a14a255a22ff3ab16e1d6a88d0f3266b9b6cf3bb3113ab98002be50292ba611437df0b1c66ec8b27c63d509ffe139da82c3fa238b16e386824da47

data/bin/tiller

@@ -8,7 +8,7 @@
 #
 # Mark Dastmalchi-Round <github@markround.com>
 
-VERSION = '0.6.1'
+VERSION = '0.6.2'
 
 require 'erb'
 require 'ostruct'

data/lib/tiller/data/defaults.rb

@@ -17,14 +17,17 @@ class DefaultsDataSource < Tiller::DataSource
     @defaults_hash = Hash.new
 
     # Read defaults in from defaults file
+    # Handle empty files - if YAML didn't parse, it returns false so we skip them
     if File.file? defaults_file
-      @defaults_hash.deep_merge!(YAML.load(open(defaults_file)))
+      yaml = YAML.load(open(defaults_file))
+      @defaults_hash.deep_merge!(yaml) if yaml != false
     end
 
     # If we have YAML files in defaults.d, also merge them
     if File.directory? defaults_dir
       Dir.glob(File.join(defaults_dir,'*.yaml')).each do |d|
-        @defaults_hash.deep_merge!(YAML.load(open(d)))
+        yaml = YAML.load(open(d))
+        @defaults_hash.deep_merge!() if yaml != false
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-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