tiller 0.7.0 → 0.7.1
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 +3 -5
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2e62758150f605bde5fe1a7569a7c21863a20efa
|
|
4
|
+
data.tar.gz: a4add2e1ddd2d052a2ba02e8439a28def3cf8243
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c5de9d5c1cbc59a625a330b67661a1ce8d64724d603c10d883deaad2e44c587d0f178eb9a009da3f5e9fa0504dad05f18f46b8b718c2c72ee4309cd1259ac6b4
|
|
7
|
+
data.tar.gz: ace0330ab12fce2633dad432124ba8750efd9081bb6ec9afb17e1d8b5d1e4057e61dd9d95bd7db9c4ced16a5042bdbbea4b4e84ed5e8909d15072c333e95f29f
|
data/bin/tiller
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
#
|
|
9
9
|
# Mark Dastmalchi-Round <github@markround.com>
|
|
10
10
|
|
|
11
|
-
VERSION = '0.7.
|
|
11
|
+
VERSION = '0.7.1'
|
|
12
12
|
|
|
13
13
|
require 'erb'
|
|
14
14
|
require 'ostruct'
|
|
@@ -100,7 +100,7 @@ module Tiller
|
|
|
100
100
|
end
|
|
101
101
|
end
|
|
102
102
|
|
|
103
|
-
log.info("
|
|
103
|
+
log.info("Available templates : #{templates.keys}")
|
|
104
104
|
|
|
105
105
|
# Now we go through each template we've identified, and get the
|
|
106
106
|
# values for each one.
|
|
@@ -108,11 +108,9 @@ module Tiller
|
|
|
108
108
|
templates.each do |template, content|
|
|
109
109
|
|
|
110
110
|
# Start with a hash of our global values
|
|
111
|
-
tiller = global_values
|
|
111
|
+
tiller = Hash.new.merge(global_values)
|
|
112
112
|
target_values = {}
|
|
113
113
|
|
|
114
|
-
# Todo: add in our values from common.yaml here if they exist
|
|
115
|
-
|
|
116
114
|
# Now we add to the 'tiller' hash with values from each DataSource, warning if we
|
|
117
115
|
# get duplicate values.
|
|
118
116
|
data_classes.each do |data_class|
|