nutkins 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 798a771286c34b95adbba75636c14ec38e7bc639
-  data.tar.gz: 472275ac590b8eab6d01f12e4a23d0f2c1a193bb
+  metadata.gz: b874e33bfa103042603054b4ba321c1a5df2e819
+  data.tar.gz: 59ef7eded283b1715c84f6b9b3fa173d2404efc7
 SHA512:
-  metadata.gz: e532d69c2de6b5266ba035aa77a35014ce95e2351f651744129c9b461d6d76f0a23e68c2cbc4218bc61744bcb3a68e7bd999e3fdb29c493c2056cfef97bd69d1
-  data.tar.gz: 24d5cc0027b41f1b3100d76cc07c6bd6a759a6d1ac3f58664e0981a72175d101e62da3a650d837835633bee41bb7a9b510b3ee7e3e5c1cb57a17607a90aa7ad3
+  metadata.gz: 5d06cb4717c71e617c0583ac6f3904aa1909c22611c39420b5a9ce76aa1c2519ac2c34a77f73730e0b39049341568a7f9693540356f339d002cbfc233471a257
+  data.tar.gz: bffcf7293e083bfda9469d149bbd87062165954da6268effd5e1d9ba0b25c49a10191c5e5acaeeaefeb1279853c416e1171fb0a8c5d97f57d0ad56d63238dae8

data/lib/nutkins/version.rb

@@ -1,3 +1,3 @@
 module Nutkins
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/nutkins.rb

@@ -210,6 +210,18 @@ module Nutkins
       etcd_store = {}
       configs.each do |config|
         etcd_store.merge! config['etcd']['data'] if config.dig('etcd', 'data')
+
+        if config.dig('etcd', 'files')
+          config['etcd']['files'].each do |file|
+            etcd_data_path = File.join config['directory'], file
+            begin
+              etcd_store.merge! YAML.load_file(etcd_data_path)
+            rescue => e
+              puts "failed to load etcd data file: #{etcd_data_path}"
+              puts e
+            end
+          end
+        end
       end
 
       if Docker.run 'start', name
@@ -258,9 +270,11 @@ module Nutkins
     end
 
     def get_image_config path
-      img_cfg_path = File.join get_project_dir(path), IMG_CONFIG_FILE_NAME
+      directory =  get_project_dir(path)
+      img_cfg_path = File.join directory, IMG_CONFIG_FILE_NAME
       img_cfg = File.exists?(img_cfg_path) ? YAML.load_file(img_cfg_path) : {}
-      img_cfg["image"] ||= path if path != '.'
+      img_cfg['image'] ||= path if path != '.'
+      img_cfg['directory'] = directory
       img_cfg["version"] ||= @config.version if @config.version
       img_cfg['version'] = img_cfg['version'].to_s
       raise 'missing mandatory version field' unless img_cfg.has_key? 'version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutkins
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - James Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler