nutkins 0.4.0 → 0.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/nutkins/version.rb +1 -1
- data/lib/nutkins.rb +16 -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: b874e33bfa103042603054b4ba321c1a5df2e819
|
4
|
+
data.tar.gz: 59ef7eded283b1715c84f6b9b3fa173d2404efc7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5d06cb4717c71e617c0583ac6f3904aa1909c22611c39420b5a9ce76aa1c2519ac2c34a77f73730e0b39049341568a7f9693540356f339d002cbfc233471a257
|
7
|
+
data.tar.gz: bffcf7293e083bfda9469d149bbd87062165954da6268effd5e1d9ba0b25c49a10191c5e5acaeeaefeb1279853c416e1171fb0a8c5d97f57d0ad56d63238dae8
|
data/lib/nutkins/version.rb
CHANGED
data/lib/nutkins.rb
CHANGED
@@ -210,6 +210,18 @@ module Nutkins
|
|
210
210
|
etcd_store = {}
|
211
211
|
configs.each do |config|
|
212
212
|
etcd_store.merge! config['etcd']['data'] if config.dig('etcd', 'data')
|
213
|
+
|
214
|
+
if config.dig('etcd', 'files')
|
215
|
+
config['etcd']['files'].each do |file|
|
216
|
+
etcd_data_path = File.join config['directory'], file
|
217
|
+
begin
|
218
|
+
etcd_store.merge! YAML.load_file(etcd_data_path)
|
219
|
+
rescue => e
|
220
|
+
puts "failed to load etcd data file: #{etcd_data_path}"
|
221
|
+
puts e
|
222
|
+
end
|
223
|
+
end
|
224
|
+
end
|
213
225
|
end
|
214
226
|
|
215
227
|
if Docker.run 'start', name
|
@@ -258,9 +270,11 @@ module Nutkins
|
|
258
270
|
end
|
259
271
|
|
260
272
|
def get_image_config path
|
261
|
-
|
273
|
+
directory = get_project_dir(path)
|
274
|
+
img_cfg_path = File.join directory, IMG_CONFIG_FILE_NAME
|
262
275
|
img_cfg = File.exists?(img_cfg_path) ? YAML.load_file(img_cfg_path) : {}
|
263
|
-
img_cfg[
|
276
|
+
img_cfg['image'] ||= path if path != '.'
|
277
|
+
img_cfg['directory'] = directory
|
264
278
|
img_cfg["version"] ||= @config.version if @config.version
|
265
279
|
img_cfg['version'] = img_cfg['version'].to_s
|
266
280
|
raise 'missing mandatory version field' unless img_cfg.has_key? 'version'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: nutkins
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- James Pike
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-08-
|
11
|
+
date: 2016-08-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|