nutkins 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e73d665ef1da7e2713d6d7ab469d963f50969c39
-  data.tar.gz: 02399c0c0dca4636432ec49625978433b9e3f994
+  metadata.gz: 9873753bcc6bffb9546adf4022433732facc78c0
+  data.tar.gz: 15bfa779ab8115550d137f02ebb1591524ff4763
 SHA512:
-  metadata.gz: 6d0cc75a3a1d4b93d7ffc50ebed8233e69d3c17577cabffe1f96e94a4aee7ac94432b683e479b5fdd83f11f390bd6c2003ce699d5dac4ed259429b54c4e6b140
-  data.tar.gz: eca9bb3a1db88257cf7813e0eb62fe2cab4c5ec7b41067ac4d691f010b9de3ac9a778f505ec1370c441a3ec4559a9e5faff6e9d0c92a7ac7eaba3630498f1256
+  metadata.gz: 0ec0681915beb261b91a511ec5f5bcd79b46722df1f230d5cbb3caf025ba6182ea99ce236f2a4bf0f8b82fd1666a7bb0824f6a1bff79d16fdeab5f257f261527
+  data.tar.gz: cd44f7e126e9feaf8253d0c0b6c94874b712ba168857657bcec282897761de689ba659d4ffb0a3e2d43ad3857b78f93da8636403536bf891f83b02d9e6a6130a

data/lib/nutkins.rb

@@ -15,6 +15,9 @@ require "nutkins/version"
 
 require_relative "hash_dig"
 
+# throughout this file "path" is a directory, it should be "." or a single path like "directory"
+# which should correspond to a directory within the project root containing a nutkin.yaml
+
 # Must be somedomain.net instead of somedomain.net/, otherwise, it will throw exception.
 module Nutkins
   CONFIG_FILE_NAME = 'nutkins.yaml'
@@ -48,9 +51,11 @@ module Nutkins
       # TODO: flag to suppress building base image?
       base = cfg['base']
       unless @built[base]
-        if image_in_project? base
+        base_cfg = config_for_image base
+        if base_cfg
+          base_path = base_cfg['path']
           puts "building parent of #{img_name}: #{base}"
-          build base
+          build base_path
         end
       end
       prev_image_id = Docker.image_id_for_tag tag
@@ -204,15 +209,15 @@ module Nutkins
       File.unlink secret if path_is_dir
     end
 
-    def extract_secrets img_dirs
-      if img_dirs.empty?
-        img_dirs = get_all_img_dirs
+    def extract_secrets paths
+      if paths.empty?
+        paths = get_all_img_paths
         # there may be secrets in the root even if there is no image build there
-        img_dirs.push '.' unless img_dirs.include? '.'
+        paths.push '.' unless paths.include? '.'
       end
 
-      img_dirs.each do |img_dir|
-        get_secrets(img_dir).each do |secret|
+      paths.each do |path|
+        get_secrets(path).each do |secret|
           loop do
             puts "enter passphrase for #{secret}"
             break if system 'gpg', secret
@@ -253,8 +258,8 @@ module Nutkins
                  '-advertise-client-urls', "http://#{gateway}:#{ETCD_PORT}",
                  '-listen-client-urls', "http://0.0.0.0:#{ETCD_PORT}"
 
-      img_dirs = get_all_img_dirs
-      configs = img_dirs.map &method(:get_image_config)
+      all_paths = get_all_img_paths
+      configs = all_paths.map &method(:get_image_config)
       etcd_store = {}
       configs.each do |config|
         etcd_store.merge! config['etcd']['data'] if config.dig('etcd', 'data')
@@ -328,19 +333,19 @@ module Nutkins
       raise "missing #{img_cfg_path}" unless File.exists?(img_cfg_path)
       img_cfg = YAML.load_file(img_cfg_path)
       img_cfg['image'] ||= path if path != '.'
-      raise "#{img_cfg_path} must contain 'image' entry" unless img_cfg['image']
+      img_cfg['path'] = path
+      raise "#{img_cfg_path} must contain `image' entry" unless img_cfg['image']
 
       img_cfg['shell'] ||= '/bin/sh'
-      img_cfg['path'] ||= img_cfg_path
       img_cfg['directory'] = directory
       img_cfg["version"] ||= @config.version if @config.version
       img_cfg['version'] = img_cfg['version'].to_s
-      raise "#{img_cfg_path} must contain 'version' entry" unless img_cfg.has_key? 'version'
+      raise "#{img_cfg_path} must contain `version' entry" unless img_cfg.has_key? 'version'
       img_cfg['latest_tag'] = get_tag img_cfg
       img_cfg['tag'] = img_cfg['latest_tag'] + ':' + img_cfg['version']
 
       base = img_cfg['base']
-      raise "#{img_cfg_path} must include `base` field" unless  base
+      raise "#{img_cfg_path} must include `base' field" unless  base
       @img_configs[path] = img_cfg
     end
 
@@ -356,20 +361,20 @@ module Nutkins
       repository + '/' + img_cfg['image']
     end
 
-    def get_all_img_dirs
+    def get_all_img_paths
       Dir.glob("#{@project_root}{,/*}/nutkin.yaml").map do |path|
         File.basename File.dirname(path)
       end
     end
 
-    def image_in_project? image_name
-      get_all_img_dirs.map(&method(:get_image_config)).find do |cfg|
+    def config_for_image image_name
+      get_all_img_paths.map(&method(:get_image_config)).find do |cfg|
         cfg['image'] == image_name
       end
     end
 
-    def get_secrets img_dir
-      Dir.glob("#{img_dir}/{volumes,secrets}/*.gpg")
+    def get_secrets path
+      Dir.glob("#{path}/{volumes,secrets}/*.gpg")
     end
 
     private

data/lib/nutkins/version.rb

@@ -1,3 +1,3 @@
 module Nutkins
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nutkins
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - James Pike