nutkins 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a50484d569a045dee261e24b487378e573c7cfc
-  data.tar.gz: 6c0db6d0f5501ae03af069158077e6c03faa858f
+  metadata.gz: e39c7d9fb6cf2c1c75ea934110db18766e507ab8
+  data.tar.gz: b8e2dbfa8a16cd68b564db04bd024114cf4c042a
 SHA512:
-  metadata.gz: a4e534198a34b3e27dc6a1858449feda482c6d4fa7a211b47595c482c1c3167df7779e55bdb7d831f2b4a198f0ff29b3c9177f98a001ea8743c923672a391b85
-  data.tar.gz: 2e7aca7855fbb48911aeec5b77f944c355b6445da42c6caa5070a7c4e42d8ff544ed53c9ea2e153a928821477b0e98971ed57502250ff75c65ad64eed0c10a2f
+  metadata.gz: ec3ae892c0dd327696cee6e7254a1cfb3e50bf2a4e3348b012184fc4a1ff61adba402abe451e9b21a15c0bf2f54d49e85cef11ff9706673ce56fcc115ce0fde8
+  data.tar.gz: c1db55842f25e02cb6163218e6e74d881ab8364f0bbd13763f876cde5c533c9115f7f83fd578ec8a08e400e5e9cac483fa199fef47f11c95af7d616be99e87e1

data/bin/nutkins

@@ -58,12 +58,7 @@ module Nutkins::Command
 
     case command
     when 'build'
-      names = config.names
-      if names.empty?
-        nutkins.build
-      else
-        config.names.each &nutkins.method(:build)
-      end
+      config.names.each &nutkins.method(:build)
     when 'create'
       config.names.each do |name|
         nutkins.create name, preserve: config.preserve

data/lib/nutkins/version.rb

@@ -1,3 +1,3 @@
 module Nutkins
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/nutkins.rb

@@ -28,15 +28,11 @@ module Nutkins
       end
     end
 
-    def build img_name = '.'
+    def build img_name
       cfg = get_image_config img_name
       img_dir = get_project_dir img_name
       raise "directory `#{img_dir}' does not exist" unless Dir.exists? img_dir
-
-      if img_name == '.'
-        img_name = cfg["image"]
-        raise "nutkin.yaml requires image entry for `build .'" unless img_name
-      end
+      tag = get_tag cfg
 
       build_cfg = cfg["build"]
       if build_cfg
@@ -45,7 +41,6 @@ module Nutkins
         Download.download_resources img_dir, resources if resources
       end
 
-      tag = get_tag img_name
       prev_image_id = Docker.image_id_for_tag tag
 
       if run_docker "build", "-t", tag, img_dir
@@ -80,7 +75,7 @@ module Nutkins
         end
       end
 
-      tag = get_tag img_name
+      tag = get_tag cfg
       prev_container_id = Docker.container_id_for_tag tag unless preserve
       puts "creating new docker image"
       unless run_docker "create", "-it", *flags, tag, *docker_args
@@ -100,15 +95,20 @@ module Nutkins
 
     def run img_name, reuse: false, shell: false
       cfg = get_image_config img_name
-      tag = get_tag img_name
+      tag = get_tag cfg
       create_args = []
       if shell
         raise '--shell and --reuse arguments are incompatible' if reuse
 
         # TODO: test for smell-baron
         create_args = JSON.parse(`docker inspect #{tag}`)[0]["Config"]["Cmd"]
+
+        kill_everything = create_args[0] == '-a'
+        create_args.shift if kill_everything
+
         create_args.unshift '/bin/bash', '---'
         create_args.unshift '-f' unless create_args[0] == '-f'
+        create_args.unshift '-a' if kill_everything
         # TODO: provide version that doesn't require smell-baron
       end
 
@@ -123,7 +123,12 @@ module Nutkins
     end
 
     def delete img_name
-      puts "TODO: delete #{img_name}"
+      cfg = get_image_config img_name
+      tag = get_tag cfg
+      container_id = Docker.container_id_for_tag tag
+      raise "no container to delete" if container_id.nil?
+      puts "deleting container #{container_id}"
+      run_docker "rm", container_id
     end
 
     def delete_all
@@ -147,9 +152,9 @@ module Nutkins
     end
 
     def extract_secrets img_names
-      with_current = img_names.empty?
-      img_names = get_image_names(img_names)
-      img_names.push '.' if with_current
+      if img_names.empty?
+        img_names = get_all_img_names(img_names).push '.'
+      end
 
       img_names.each do |img_name|
         get_secrets(img_name).each do |secret|
@@ -175,7 +180,7 @@ module Nutkins
     def get_image_config path
       img_cfg_path = File.join get_project_dir(path), IMG_CONFIG_FILE_NAME
       img_cfg = File.exists?(img_cfg_path) ? YAML.load_file(img_cfg_path) : {}
-      @repository = img_cfg['repository'] || @config.repository
+      img_cfg["image"] ||= path if path != '.'
       img_cfg
     end
 
@@ -183,18 +188,21 @@ module Nutkins
       path == '.' ? @project_root : File.join(@project_root, path)
     end
 
-    def get_tag tag
-      raise "command requires `repository' entry in nutkins.yaml or nutkin.yaml" if @repository.nil?
-      @repository + '/' + tag
+    def get_tag img_cfg
+      unless img_cfg.has_key? "image"
+        raise "nutkins.yaml should contain `image' entry for this command"
+      end
+
+      repository = img_cfg['repository'] || @config.repository
+      if repository.nil?
+        raise "nutkins.yaml or nutkin.yaml should contain `repository' entry for this command"
+      end
+      repository + '/' + img_cfg['image']
     end
 
-    def get_image_names img_names
-      if img_names.empty?
-        Dir.glob("#{@project_root}/*/Dockerfile").map do |path|
-          File.basename File.dirname(path)
-        end
-      else
-        img_names
+    def get_all_img_names img_names
+      Dir.glob("#{@project_root}/*/Dockerfile").map do |path|
+        File.basename File.dirname(path)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutkins
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - James Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler