tiller 0.6.1 → 0.6.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/bin/tiller +1 -1
- data/lib/tiller/data/defaults.rb +5 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 226f7774206435ec5cfa4e785b2a7400a65571c4
|
|
4
|
+
data.tar.gz: a80f2572702cde9f298831b956e33ac873905219
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2a7add80a4a3d5ffd317ff45bb3a778097f5de902210655d01ef03f982d07e12c44de647cdbd460b642cfca4e366e0a03c37eb1a63bb4eab43cf781727b4fe26
|
|
7
|
+
data.tar.gz: e05a6e6ba7a14a255a22ff3ab16e1d6a88d0f3266b9b6cf3bb3113ab98002be50292ba611437df0b1c66ec8b27c63d509ffe139da82c3fa238b16e386824da47
|
data/bin/tiller
CHANGED
data/lib/tiller/data/defaults.rb
CHANGED
|
@@ -17,14 +17,17 @@ class DefaultsDataSource < Tiller::DataSource
|
|
|
17
17
|
@defaults_hash = Hash.new
|
|
18
18
|
|
|
19
19
|
# Read defaults in from defaults file
|
|
20
|
+
# Handle empty files - if YAML didn't parse, it returns false so we skip them
|
|
20
21
|
if File.file? defaults_file
|
|
21
|
-
|
|
22
|
+
yaml = YAML.load(open(defaults_file))
|
|
23
|
+
@defaults_hash.deep_merge!(yaml) if yaml != false
|
|
22
24
|
end
|
|
23
25
|
|
|
24
26
|
# If we have YAML files in defaults.d, also merge them
|
|
25
27
|
if File.directory? defaults_dir
|
|
26
28
|
Dir.glob(File.join(defaults_dir,'*.yaml')).each do |d|
|
|
27
|
-
|
|
29
|
+
yaml = YAML.load(open(d))
|
|
30
|
+
@defaults_hash.deep_merge!() if yaml != false
|
|
28
31
|
end
|
|
29
32
|
end
|
|
30
33
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: tiller
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.6.
|
|
4
|
+
version: 0.6.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Mark Dastmalchi-Round
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-07-
|
|
11
|
+
date: 2015-07-20 00:00:00.000000000 Z
|
|
12
12
|
dependencies: []
|
|
13
13
|
description: A tool to create configuration files from a variety of sources, particularly
|
|
14
14
|
useful for Docker containers. See https://github.com/markround/tiller for examples
|