nutkins 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f6f7c532a577c1197ee2c0a70e473768b6a62de
-  data.tar.gz: 5bc0353b28487ecbb350b018b1366f9e2e32cccf
+  metadata.gz: 1bd8ba58c448c0926badec45b1f9b008e64f3b24
+  data.tar.gz: 224e661371deed2e36281e9371370b7d3df757fb
 SHA512:
-  metadata.gz: df4a28b2f1e73a0002925ba716cf07f3123dfe2b8e73ae395869efc5fcb7f47efcb1d908f8370380058b6137a71491c83eca7bacd7f12db1e7104bb0346bb505
-  data.tar.gz: eee76a3dbf64326de23f47eb0056261d32eaabd908faa00b9538178d31de321e5ed61d70260fe45a13638de15fed6eb109188cf9a7114d47f494d0b58bd304e2
+  metadata.gz: c3a1d0b249945812bd1e62d16400f99f2d89ec7e1acac4c68f87c3f7096f861c9dad186e9a7e74e805ca1c7d7123149e28eb4e75dc68c09578bbc92bc5f4ed5c
+  data.tar.gz: 667e711943593dd8f1d6b10b883225402dc6b5d8b6ded9a95abf90fdd1c517080dde6811ea58c012f2a1df29a8460268988e1c315b319db982e0b3c71d809d0c

data/lib/nutkins/docker_builder.rb

@@ -24,8 +24,14 @@ module Nutkins::DockerBuilder
       cache_is_dirty = false
       build_commands = cfg["build"]["commands"]
       build_commands.each do |build_cmd|
-        cmd = /^\w+/.match(build_cmd).to_s.downcase
-        cmd_args = build_cmd[(cmd.length + 1)..-1].strip
+        unless build_cmd.kind_of? Hash or build_cmd.keys.length != 1
+          raise "build command should be single value hash e.g. 'run:bash'"
+        end
+
+        # build command as object, e.g. run: bash
+        cmd = build_cmd.keys.first.downcase
+        cmd_args = build_cmd[cmd]
+
         # docker run is always used and forms the basis of the cache key
         run_args = nil
         env_args = nil
@@ -34,8 +40,11 @@ module Nutkins::DockerBuilder
 
         case cmd
         when "run"
-          cmd_args.gsub! /\n+/, ' '
-          run_args = cmd_args
+          if cmd_args.kind_of? String
+            run_args = cmd_args.gsub /\n+/, ' '
+          else
+            run_args = cmd_args.join ' && '
+          end
         when "add"
           *add_files, add_files_dest = cmd_args.split ' '
           add_files = add_files.map { |src| Dir.glob src }.flatten
@@ -45,8 +54,8 @@ module Nutkins::DockerBuilder
             src + ':' + Digest::MD5.file(src).to_s
           end.push(add_files_dest).join(' ')
         when "cmd", "entrypoint", "env", "expose", "label", "onbuild", "user", "volume", "workdir"
-          run_args = "#(nop) #{build_cmd}"
-          env_args = build_cmd
+          env_args = cmd + ' ' + (cmd_args.kind_of?(String) ? cmd_args : JSON.dump(cmd_args))
+          run_args = "#(nop) #{env_args}"
         else
           raise "unsupported command: #{cmd}"
           # TODO add metadata flags
@@ -64,7 +73,7 @@ module Nutkins::DockerBuilder
               parent_img_id = cache_img_id
               next
             else
-              puts "not in cache, starting from #{parent_img_id}"
+              puts "not in cache: #{run_args} - starting from #{parent_img_id}"
               cache_is_dirty = true
             end
           end

data/lib/nutkins/version.rb

@@ -1,3 +1,3 @@
 module Nutkins
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

metadata

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