kitchen-dokken 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c26ed0d4c8e3da6089281d6c056e1662367f49f2
-  data.tar.gz: 380947f45341c322ba707baaec7642f62a8707b7
+  metadata.gz: e7e868c670043800eaf336e14a7e9de341e5cb89
+  data.tar.gz: 5a0276d5f8c05c06692396d2b0e6f0af0e18e36d
 SHA512:
-  metadata.gz: 48e341852380317b136962664e0195ec0c93a07cec50f79e8d263ad549bc5a377c2674e88fa087c40b030b3c3eac437b5b0935d6d1a91fbb468465814a8cbbca
-  data.tar.gz: 84d126bc3bd5ba32578b1e44b310066cfac3ff19ecfbfd108f9063c5708699a6d0be65a8171b453d8726e0690bef33522549a06255511faa7940b50002c61b69
+  metadata.gz: 75f61c6b4e1cbbb54dda5c4b848be4502c375acb0886cd59fe713174394164a4431f1d1661b20b63a9f69fc3c64f951bc6a15d176e660f9c844adb1150364d63
+  data.tar.gz: ac7c8282311b04de0e7c7027cab12002b2c3b42f1cc3354afaf15801ed27de65019cdd8711c49669e9e5d02c7fe18290f32cc6840ee59d4c8c96e2e77bddd856

data/lib/kitchen/driver/dokken.rb

@@ -80,8 +80,8 @@ module Kitchen
 
       def delete_work_image
         return unless Docker::Image.exist?(work_image, docker_connection)
-        i = Docker::Image.get(work_image, docker_connection)
-        i.remove(force: true)
+        with_retries { @work_image = Docker::Image.get(work_image, docker_connection) }
+        with_retries { @work_image.remove(force: true)}
       end
 
       def build_work_image(state)
@@ -90,8 +90,8 @@ module Kitchen
         FileUtils.mkdir_p context_root
         File.write("#{context_root}/Dockerfile", work_image_dockerfile)
 
-        i = Docker::Image.build_from_dir(context_root, { 'nocache' => true, 'rm' => true }, docker_connection)
-        i.tag('repo' => repo(work_image), 'tag' => tag(work_image), 'force' => true)
+        with_retries { @work_image = Docker::Image.build_from_dir(context_root, { 'nocache' => true, 'rm' => true }, docker_connection) }
+        with_retries { @work_image.tag('repo' => repo(work_image), 'tag' => tag(work_image), 'force' => true) }
         state[:work_image] = work_image
       end
 
@@ -102,7 +102,7 @@ module Kitchen
 
       def work_image_dockerfile
         from = "FROM #{platform_image}"
-        custom = [ 'RUN /bin/sh -c "echo Built with Test Kitchen"' ]
+        custom = ['RUN /bin/sh -c "echo Built with Test Kitchen"']
         Array(config[:intermediate_instructions]).each { |c| custom << c }
         [from, custom].join("\n")
       end
@@ -211,28 +211,21 @@ module Kitchen
 
       def delete_image(name)
         i = Docker::Image.get(name, docker_connection)
-        i.remove(force: true)
+        with_retries { i.remove(force: true) }
       rescue Docker::Error => e
         puts "Image #{name} not found. Nothing to delete."
       end
 
       def run_container(args)
         c = create_container(args)
-        tries ||= 3
-        begin
-          c.start
-          return c
-        rescue Docker::Error => e
-          retry unless (tries -= 1).zero?
-          raise e.message
-        end
+        with_retries { c.start }
       end
 
       def delete_container(name)
         c = Docker::Container.get(name, docker_connection)
         puts "Destroying container #{name}."
-        c.stop
-        c.delete(force: true, v: true)
+        with_retries { c.stop(force: true) }
+        with_retries { c.delete(force: true, v: true) }
       rescue
         puts "Container #{name} not found. Nothing to delete."
       end
@@ -258,11 +251,7 @@ module Kitchen
       end
 
       def pull_image(image)
-        retries ||= 3
-        Docker::Image.create({ 'fromImage' => repo(image), 'tag' => tag(image) }, docker_connection)
-      rescue Docker::Error => e
-        retry unless (tries -= 1).zero?
-        raise e.message
+        with_retries { Docker::Image.create({ 'fromImage' => repo(image), 'tag' => tag(image) }, docker_connection) }
       end
 
       def pull_if_missing(image)
@@ -297,6 +286,22 @@ module Kitchen
       def runner_container_name
         "#{instance.name}"
       end
+
+      def with_retries(&block)
+        tries = 5
+        begin
+          block.call
+          # Only catch errors that can be fixed with retries.
+        rescue Docker::Error::ServerError, # 404
+               Docker::Error::UnexpectedResponseError, # 400
+               Docker::Error::TimeoutError,
+               Docker::Error::IOError => e
+          tries -= 1
+          puts "SEANDEBUG - :#{e}:"
+          retry if tries > 0
+          raise e
+        end
+      end
     end
   end
 end

data/lib/kitchen/driver/dokken_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '0.0.8'
+    DOKKEN_VERSION = '0.0.9'
   end
 end

data/lib/kitchen/transport/dokken.rb

@@ -63,7 +63,7 @@ module Kitchen
           return if command.nil?
 
           runner = Docker::Container.get(instance_name, {}, docker_connection)
-          o = runner.exec(Shellwords.shellwords(command)) { |stream, chunk| print "#{chunk}" }
+          o = runner.exec(Shellwords.shellwords(command)) { |_stream, chunk| print "#{chunk}" }
           exit_code = o[2]
 
           if exit_code != 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen