kitchen-dokken 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9542662c0401ceb1ecf7c7ee9b2f64bb93235abb
-  data.tar.gz: f8f22845915285d458affc73c68d4cd063aa1e22
+  metadata.gz: efbf96ca5b0ca0c3d40ebba12366344d6c57c14b
+  data.tar.gz: 3d55d6ad8f53872a1705e1f33dc8db3b6033665e
 SHA512:
-  metadata.gz: c21a4687a8256b3819617b879c4d9ce3c2eab2bc551d7f291c1c84e92a0e3082509929646e138c9508fc83399d6aff535657fecd54b8ce773af7afa40c679ade
-  data.tar.gz: e65d5623e21ce1df2409c43fbdc00fdfe6ec3ffa19e00eafd65a8dc9d320c0cafc8d21496dabfadcaef96d0de3c8a8385201c5c701463e17b0affb38b628c300
+  metadata.gz: 310c30253e415a0fe611b0735fcb02dc1512105674356a35e4e1934c3fc551743a127299c21d4e95e85d68cb546e7e5b77091819733c052f226ee1ca1dc76dc9
+  data.tar.gz: 659ef467deec7be33f9b2ccf3873b63603c94bec873b332aec43a80d9f91a78b42f69466c7d3e02e660134085bd722774c269d35a2836ecfe2bf9ce527320135

data/CHANGELOG.md

@@ -1,7 +1,11 @@
 # Dokken Changelog
 
+# 2.1.7
+- bumping version. must have accidentally pushed a 2.1.6
+
 # 2.1.6
-- #102 - Use platform name for image unless specified
+- PR #107 - pass write_timeout to runner exec
+- PR #110 - (fix issue #109) - Add retry feature
 
 # 2.1.5
 - Fixing (again) latest/current logic (thanks @tas50)

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.6'.freeze
+    DOKKEN_VERSION = '2.1.7'.freeze
   end
 end

data/lib/kitchen/helpers.rb

@@ -120,7 +120,7 @@ EOF
       # refs:
       # https://github.com/docker/machine/issues/1814
       # https://github.com/docker/toolbox/issues/607
-      return Dir.home.sub 'C:/Users', '/c/Users' if (Dir.home =~ /^C:/ and remote_docker_host?)
+      return Dir.home.sub 'C:/Users', '/c/Users' if Dir.home =~ /^C:/ && remote_docker_host?
       Dir.home
     end
 
@@ -188,18 +188,18 @@ 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)          
-          
+        sandbox_dirs = Dir.glob(File.join(sandbox_path, '*'))
+
+        instance.transport.connection(state) do |conn|
+          conn.execute(install_command)
+
           unless state[:data_container].nil?
             conn.execute(init_command)
             info("Transferring files to #{instance.to_str}")
             conn.upload(sandbox_dirs, config[:root_path])
-            debug("Transfer complete")
+            debug('Transfer complete')
           end
-          
+
           conn.execute(prepare_command)
           conn.execute(run_command)
         end

data/lib/kitchen/provisioner/dokken.rb

@@ -40,7 +40,13 @@ module Kitchen
       def call(state)
         create_sandbox
         instance.transport.connection(state) do |conn|
-          conn.execute(run_command)
+          conn.execute(prepare_command)
+          conn.execute_with_retry(
+            run_command,
+            config[:retry_on_exit_code],
+            config[:max_retries],
+            config[:wait_for_retry]
+          )
         end
       rescue Kitchen::Transport::TransportFailed => ex
         raise ActionFailed, ex.message

data/lib/kitchen/transport/dokken.rb

@@ -68,11 +68,11 @@ module Kitchen
 
           with_retries { @runner = ::Docker::Container.get(instance_name, {}, docker_connection) }
           with_retries do
-            o = @runner.exec(Shellwords.shellwords(command), 'e' => { 'TERM' => 'xterm' }) { |_stream, chunk| print chunk.to_s }
+            o = @runner.exec(Shellwords.shellwords(command), wait: options[:timeout], 'e' => { 'TERM' => 'xterm' }) { |_stream, chunk| print chunk.to_s }
             @exit_code = o[2]
           end
 
-          raise Transport::DockerExecFailed, "Docker Exec (#{@exit_code}) for command: [#{command}]" if @exit_code != 0
+          raise Transport::DockerExecFailed.new("Docker Exec (#{@exit_code}) for command: [#{command}]", @exit_code) if @exit_code != 0
         end
 
         def upload(locals, remote)
@@ -191,6 +191,7 @@ module Kitchen
         opts[:docker_host_options] = ::Docker.options
         opts[:data_container] = data[:data_container]
         opts[:instance_name] = data[:instance_name]
+        opts[:timeout] = data[:write_timeout]
         opts
       end
 

metadata

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