kitchen-dokken 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2a3c5f4cc8cda372b5443ba6a7db37b1c30d931
-  data.tar.gz: 0f73a2567ef6f90cf577b70f6250d37e5bd0ef82
+  metadata.gz: 12ee1dc19f8d22d9f5aa9f88f392f3dd8ea55b66
+  data.tar.gz: 72a617ee991bf7fc87a566c1d787e616d88e2f75
 SHA512:
-  metadata.gz: a6c0b7166bda56df26537a6ca22ac4949aad575ff0f3d5158d8ee4e59cefcaded112c9b394df615596f7833da259d5c8f6d71351d37e3abf614f42cc159c73f8
-  data.tar.gz: b1d3adc2bf5e47ff0228ca5f9d553e2b557f51ad7d6af1654e91a46a2d3b5df4797e896c421361615bc1b25f0c162183b0f945497d3f79a93697091d102ead8f
+  metadata.gz: aa34003deca0e959a5d5eae5bf2088e6543a9136b7e98b2b3a5997c6917aeae6b08ed3070004cfeaf214ef85afbf81d2b24c694c3bc1db98a06dd96cd3f705db
+  data.tar.gz: 7df22675aff22cba3a9c15ce2d5c1cb1bc47a0889b52298ba35176aad0e685e3d4b74d568495f3a826882004c01dd3a065e9a775f09b212f024ccd0c258e13ce

data/lib/kitchen/driver/dokken.rb

@@ -32,27 +32,27 @@ module Kitchen
     #
     # @author Sean OMeara <sean@chef.io>
     class Dokken < Kitchen::Driver::Base
-      default_config :pid_one_command, 'sh -c "trap exit 0 SIGTERM; while :; do sleep 1; done"'
-      default_config :image_prefix, nil
+      default_config :api_retries, 20
+      default_config :binds, []
+      default_config :cap_add, nil
+      default_config :cap_drop, nil
       default_config :chef_image, 'chef/chef'
       default_config :chef_version, 'current'
       default_config :data_image, 'dokken/kitchen-cache:latest'
-      default_config :docker_host_url, default_docker_host
       default_config :dns, nil
       default_config :dns_search, nil
-      default_config :read_timeout, 3600
-      default_config :write_timeout, 3600
-      default_config :api_retries, 20
-      # docker run args
-      default_config :privileged, false
+      default_config :docker_host_url, default_docker_host
+      default_config :forward, nil
       default_config :hostname, nil
-      default_config :binds, nil # volumes to mount
+      default_config :image_prefix, nil
       default_config :links, nil
-      default_config :cap_add, nil
-      default_config :cap_drop, nil
-      default_config :security_opt, nil
-      default_config :forward, nil
       default_config :network_mode, 'bridge'
+      default_config :pid_one_command, 'sh -c "trap exit 0 SIGTERM; while :; do sleep 1; done"'
+      default_config :privileged, false
+      default_config :read_timeout, 3600
+      default_config :security_opt, nil
+      default_config :volumes, nil
+      default_config :write_timeout, 3600
 
       # (see Base#create)
       def create(state)
@@ -134,7 +134,7 @@ module Kitchen
             docker_connection
           )
         rescue
-          raise "work_image build failed"
+          raise 'work_image build failed'
         end
 
         state[:work_image] = work_image
@@ -192,11 +192,47 @@ module Kitchen
         instance_name
       end
 
+      class PartialHash < Hash
+        def ==(other)
+          other.is_a?(Hash) && all? { |key, val| other.key?(key) && other[key] == val }
+        end
+      end
+
       def dokken_binds
         ret = []
         ret << "#{dokken_sandbox_path}:/opt/kitchen" unless dokken_sandbox_path.nil?
-        ret + Array(config[:binds]) unless config[:binds].nil?
-        ret
+        ret << Array(config[:binds]) unless config[:binds].nil?
+        ret.flatten
+      end
+
+      def dokken_volumes
+        coerce_volumes(config[:volumes])
+      end
+
+      def coerce_volumes(v)
+        case v
+        when PartialHash, nil
+          v
+        when Hash
+          PartialHash[v]
+        else
+          b = []
+          v = Array(v).to_a # in case v.is_A?(Chef::Node::ImmutableArray)
+          v.delete_if do |x|
+            parts = x.split(':')
+            b << x if parts.length > 1
+          end
+          b = nil if b.empty?
+          config[:binds] << b unless b.nil?
+          return PartialHash.new if v.empty?
+          v.each_with_object(PartialHash.new) { |volume, h| h[volume] = {} }
+        end
+      end
+
+      def dokken_volumes_from
+        ret = []
+        ret << chef_container_name
+        ret << data_container_name if remote_docker_host?
       end
 
       def start_runner_container(state)
@@ -207,12 +243,10 @@ module Kitchen
           'Image' => "#{repo(work_image)}:#{tag(work_image)}",
           'Hostname' => config[:hostname],
           'ExposedPorts' => exposed_ports({}, config[:forward]),
+          'Volumes' => dokken_volumes,
           'HostConfig' => {
             'Privileged' => config[:privileged],
-            'VolumesFrom' => [
-              chef_container_name,
-              # data_container_name
-            ],
+            'VolumesFrom' => dokken_volumes_from,
             'Binds' => dokken_binds,
             'Dns' => config[:dns],
             'DnsSearch' => config[:dns_search],

data/lib/kitchen/driver/dokken_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '2.0.4'.freeze
+    DOKKEN_VERSION = '2.0.5'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen