tiller 0.2.4 → 0.2.5
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 +6 -3
- data/lib/tiller/api.rb +1 -3
- 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: e94f34b60987dff612b49a337676c7498f0fa2c2
|
|
4
|
+
data.tar.gz: 070f1cb472cebb7e4c52806dad6e0b521ffeafc7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 13427f9196656d8cf30f5c45c64bdd457c157201ef2e45be85603526834e8c77280135f5e1dfe26c50b18d6919970d3008c39d4ec875c447c3468164589e8201
|
|
7
|
+
data.tar.gz: 1756029ede9afbe58b1474dcfb152ec96b05ba215b66d91f77b2f241ec5e0445c163fc3bcc5100d7ef0d0a2034c1d0eed89ea20cfa5eb71df06e9f30fb6e87a6
|
data/bin/tiller
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
# didn't have an existing gem named after it!
|
|
5
5
|
# Mark Round <github@markround.com>
|
|
6
6
|
|
|
7
|
-
VERSION = '0.2.
|
|
7
|
+
VERSION = '0.2.5'
|
|
8
8
|
|
|
9
9
|
require 'erb'
|
|
10
10
|
require 'ostruct'
|
|
@@ -45,6 +45,7 @@ module Tiller
|
|
|
45
45
|
config[:no_exec] = false
|
|
46
46
|
config[:verbose] = false
|
|
47
47
|
config['api_enable'] = false
|
|
48
|
+
config['api_port'] = 6275
|
|
48
49
|
|
|
49
50
|
optparse = OptionParser.new do |opts|
|
|
50
51
|
opts.on('-n', '--no-exec', 'Do not execute a replacement process') do
|
|
@@ -146,8 +147,10 @@ module Tiller
|
|
|
146
147
|
# get duplicate values.
|
|
147
148
|
DataSource.subclasses.each do |data_class|
|
|
148
149
|
dc = data_class.new(config)
|
|
149
|
-
|
|
150
|
-
|
|
150
|
+
if dc.values(template) != nil
|
|
151
|
+
values.merge!(dc.values(template)) do |key, old, new|
|
|
152
|
+
warn_merge(key, old, new, 'data', data_class.to_s)
|
|
153
|
+
end
|
|
151
154
|
end
|
|
152
155
|
|
|
153
156
|
# Now get target_values (where the file should be installed to,
|
data/lib/tiller/api.rb
CHANGED
|
@@ -9,15 +9,13 @@ require 'tiller/api/handlers/template'
|
|
|
9
9
|
|
|
10
10
|
|
|
11
11
|
API_VERSION=1
|
|
12
|
-
API_PORT=6275
|
|
13
12
|
|
|
14
13
|
# The following is a VERY simple HTTP API, used for querying the status of Tiller
|
|
15
14
|
# after it has generated templates and forked a child process.
|
|
16
15
|
|
|
17
16
|
def tiller_api(tiller_api_hash)
|
|
18
17
|
|
|
19
|
-
api_port = tiller_api_hash['config']['api_port']
|
|
20
|
-
tiller_api_hash['config']['api_port'] : API_PORT
|
|
18
|
+
api_port = tiller_api_hash['config']['api_port']
|
|
21
19
|
|
|
22
20
|
puts "Tiller API starting on port #{api_port}"
|
|
23
21
|
|
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.2.
|
|
4
|
+
version: 0.2.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Mark Round
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-
|
|
11
|
+
date: 2014-11-27 00:00:00.000000000 Z
|
|
12
12
|
dependencies: []
|
|
13
13
|
description: A tool to create configuration files in Docker containers from a variety
|
|
14
14
|
of sources. See https://github.com/markround/tiller for examples and documentation.
|