tiller 0.6.3 → 0.6.4
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 +7 -1
- data/lib/tiller/options.rb +3 -0
- 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: 12ba31f3bc1bfba41e65bcd3b0ab7c5257bd8c20
|
|
4
|
+
data.tar.gz: 7c20d6ffbc5c0a518caca23a6813112990348a50
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 11d659d2f809d1a6b423cf25540fcbeab9f8d4f92a6ed8fd7f3b3f5b1175b87cab66dd6c4802dfa78e85e5b4361d279014e72ce630ae25e363a39919ac5f1118
|
|
7
|
+
data.tar.gz: e80b88ded26a38fd419b6c2f84c3b1f12451ea52e878d403e5dfbcf180b70c816f4e85c0f7a25dd4f7e01212d9ded8d21741c6dcbd597020426f9db0a1ca364e
|
data/bin/tiller
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
#
|
|
9
9
|
# Mark Dastmalchi-Round <github@markround.com>
|
|
10
10
|
|
|
11
|
-
VERSION = '0.6.
|
|
11
|
+
VERSION = '0.6.4'
|
|
12
12
|
|
|
13
13
|
require 'erb'
|
|
14
14
|
require 'ostruct'
|
|
@@ -168,6 +168,12 @@ module Tiller
|
|
|
168
168
|
Thread.start{ tiller_api(tiller_api_hash) }
|
|
169
169
|
end
|
|
170
170
|
|
|
171
|
+
# Override the exec if run with -x (see options.rb)
|
|
172
|
+
if config.has_key?(:alt_exec)
|
|
173
|
+
puts "Overriding exec parameter [#{config['exec']}] with [#{config[:alt_exec]}]" if config[:verbose]
|
|
174
|
+
config['exec']=config[:alt_exec]
|
|
175
|
+
end
|
|
176
|
+
|
|
171
177
|
if config[:no_exec] == false && config.key?('exec')
|
|
172
178
|
# All templates created, so let's start the replacement process
|
|
173
179
|
puts "Executing #{config['exec'].to_s}..."
|
data/lib/tiller/options.rb
CHANGED
|
@@ -24,6 +24,9 @@ def parse_options(config)
|
|
|
24
24
|
opts.on('-e', '--environment [ENV]', 'Override the \'environment\' environment variable') do |environment|
|
|
25
25
|
config[:environment] = environment
|
|
26
26
|
end
|
|
27
|
+
opts.on('-x', '--exec [EXEC]', 'Override the \'exec\' variable from common.yaml') do |exec|
|
|
28
|
+
config[:alt_exec] = exec
|
|
29
|
+
end
|
|
27
30
|
|
|
28
31
|
opts.on('-h', '--help', 'Display this screen') do
|
|
29
32
|
puts opts
|