tiller 0.7.2 → 0.7.3
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 +20 -1
- 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: 7ad52aeecb758099a50e137c5cfac27f3f3b8426
|
|
4
|
+
data.tar.gz: a6a6f0e8fa396b6588ee1172c51ad62f928e10a2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1140c813c8fcf4e324b09ee8dd540146a8889633fa255facadd06a40ea7ef530880185f997bb1d5be15b11c14206f2cb367dc8c464e0561c905a2e4f5c728649
|
|
7
|
+
data.tar.gz: 64e11eb53ba02884144ef9f240d99bbea81136d6b4eba96ee8c7e7a9aec5c5d9abc5aabc619b7229ac7f4fc2fe95c9360407c7c307e2ef851f9cd1ef3d313103
|
data/bin/tiller
CHANGED
data/lib/tiller/data/defaults.rb
CHANGED
|
@@ -45,7 +45,26 @@ class DefaultsDataSource < Tiller::DataSource
|
|
|
45
45
|
end
|
|
46
46
|
|
|
47
47
|
def values(template_name)
|
|
48
|
-
|
|
48
|
+
# Backwards compatibility stuff here. This datasource didn't use to return target_values, so
|
|
49
|
+
# all values were just stored as top-level keys instead of under a separate config: block
|
|
50
|
+
# If a config: block exists, we should use that in preference to the top-level keys, but
|
|
51
|
+
# if not we still return them all so we don't break anything using the old behaviour.
|
|
52
|
+
|
|
53
|
+
if @defaults_hash.key?(template_name)
|
|
54
|
+
values = @defaults_hash[template_name]
|
|
55
|
+
values.key?('config') ? values['config'] : values
|
|
56
|
+
else
|
|
57
|
+
Hash.new
|
|
58
|
+
end
|
|
59
|
+
end
|
|
60
|
+
|
|
61
|
+
def target_values(template_name)
|
|
62
|
+
if @defaults_hash.key?(template_name)
|
|
63
|
+
values = @defaults_hash[template_name]
|
|
64
|
+
values.key?('target') ? values : Hash.new
|
|
65
|
+
else
|
|
66
|
+
Hash.new
|
|
67
|
+
end
|
|
49
68
|
end
|
|
50
69
|
|
|
51
70
|
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.7.
|
|
4
|
+
version: 0.7.3
|
|
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-
|
|
11
|
+
date: 2015-10-28 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
|