kitchen-dokken 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd87d062c7f883b08cfcf39b5e34ff90a6812f34
-  data.tar.gz: 214d13b75716785c6c3f0d3ab3ffa290c1d95ecd
+  metadata.gz: 9ff9ae0aef7da46692d99db224bea980cb5abd73
+  data.tar.gz: 6105f417d480202d545176d77e40308acf94f82f
 SHA512:
-  metadata.gz: ec19a0c8dada3d6c913c140b9e586a277bf572216cfd61fcacbf3ac12abf217e2a2c33146ef3d3c9da17bc266e4e0a9d0aceec1edab9453a87ada28241dd423f
-  data.tar.gz: 9a591dced051bd240dc4fc4a87ff75f3f5edecd547e6eae807b6a6ab34fa64e645791333218ee3ab0dbe2f5e3aa189635ecc9a5d2f6f0cee9ec39446abc07027
+  metadata.gz: 8841985e9e70281e36997d08db94bd2577988559c533b8c169f7992614c378b834a2e337d1523efb4d7bd1add6bcbbfce4e659caf10cec251be2a9157391ff62
+  data.tar.gz: 51f876da1dbc8d3b2e1b8dc91046c34aaac392fc71c5ccb7dddc5e84a7806c1f10a90c7d3de1aa65cdde8aa8c204fce5be6715429f67f6bbfffe2acd2948c3f3

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Dokken Changelog
 
+# 2.1.9
+- Various fixes around remote docker host usage
+
 # 2.1.8
 - Using user specified image_prefix in instance_name
 

data/lib/kitchen/driver/dokken.rb

@@ -95,11 +95,6 @@ module Kitchen
 
       private
 
-      def remote_docker_host?
-        return true if config[:docker_host_url] =~ /^tcp:/
-        false
-      end
-
       def api_retries
         config[:api_retries]
       end
@@ -201,8 +196,8 @@ module Kitchen
 
       def dokken_binds
         ret = []
-        ret << "#{dokken_kitchen_sandbox}:/opt/kitchen" unless dokken_kitchen_sandbox.nil?
-        ret << "#{dokken_verifier_sandbox}:/opt/verifier" unless dokken_verifier_sandbox.nil?
+        ret << "#{dokken_kitchen_sandbox}:/opt/kitchen" unless dokken_kitchen_sandbox.nil? || remote_docker_host?
+        ret << "#{dokken_verifier_sandbox}:/opt/verifier" unless dokken_verifier_sandbox.nil? || remote_docker_host?
         ret << Array(config[:binds]) unless config[:binds].nil?
         ret.flatten
       end

data/lib/kitchen/driver/dokken_version.rb

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

data/lib/kitchen/helpers.rb

@@ -145,6 +145,22 @@ EOF
       return true if config[:docker_host_url] =~ /^tcp:/
       false
     end
+
+    def sandbox_path
+      "#{Dir.home}/.dokken/verifier_sandbox/#{instance_name}"
+    end
+
+    def sandbox_dirs
+      Dir.glob(File.join(sandbox_path, '*'))
+    end
+
+    def create_sandbox
+      info("Creating kitchen sandbox in #{sandbox_path}")
+      unless ::Dir.exist?(sandbox_path)
+        FileUtils.mkdir_p(sandbox_path)
+        File.chmod(0755, sandbox_path)
+      end
+    end
   end
 end
 
@@ -192,8 +208,6 @@ module Kitchen
 
       def call(state)
         create_sandbox
-        sandbox_dirs = Dir.glob(File.join(sandbox_path, '*'))
-
         instance.transport.connection(state) do |conn|
           conn.execute(install_command)
 

data/lib/kitchen/provisioner/dokken.rb

@@ -35,11 +35,17 @@ module Kitchen
       default_config :chef_options, ' -z'
       default_config :chef_log_level, 'warn'
       default_config :chef_output_format, 'doc'
+      default_config :docker_host_url, default_docker_host
 
       # (see Base#call)
       def call(state)
         create_sandbox
         instance.transport.connection(state) do |conn|
+          if remote_docker_host?
+            info("Transferring files to #{instance.to_str}")
+            conn.upload(sandbox_dirs, config[:root_path])
+          end
+
           conn.execute(prepare_command)
           conn.execute_with_retry(
             run_command,
@@ -50,8 +56,8 @@ module Kitchen
         end
       rescue Kitchen::Transport::TransportFailed => ex
         raise ActionFailed, ex.message
-        # ensure
-        #   cleanup_sandbox
+      ensure
+        cleanup_sandbox if remote_docker_host?
       end
 
       def validate_config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen