kitchen-dokken 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e41ed07a9b6101a9c1776cfefd7331da307e7b05
-  data.tar.gz: c59293c765538e6305d250d327b2d7052190d797
+  metadata.gz: b9baef8d8befdf9a972b01645a3142a3b7a68cd5
+  data.tar.gz: a20d563444e920c44a06421731d3a65bfeae75cf
 SHA512:
-  metadata.gz: cd9c118f1dffbf87599cebf010625de01827689bb2112b3d2a77dc54e8a29023b1b96b93b1b9e5832299366da32def5aa7df91259979a648b176a36cda1726ea
-  data.tar.gz: 6ed4b419f23f8da2ead923c35969c5d02f03c54422743415d9a1cef301a283bdf89994795d52accf8954ce1cea3c6522e736b52bf8877dfb782942327dbbfddd
+  metadata.gz: 33510911d8667c088888328688c355215225ec3a7723a35ca616ec8141606b46dd8e1ecbe520f810c9c2866b13417cb217bd1997fdb3104aa49e2fbdc32e4135
+  data.tar.gz: 8df088b0bbeefe23c2a12fe3592fdb39203f73d712db18d7d57f9a666e954163062f87d0f1bf9ce12276b654d950888d3b615076f8471263cfffb4457c77a5e3

data/lib/kitchen/driver/dokken.rb

@@ -39,6 +39,7 @@ module Kitchen
       default_config :docker_host_url, ENV['DOCKER_HOST'] || 'unix:///var/run/docker.sock'
       default_config :read_timeout, 3600
       default_config :write_timeout, 3600
+      default_config :api_retries, 20
 
       # (see Base#create)
       def create(state)
@@ -63,6 +64,10 @@ module Kitchen
         save_misc_state state
       end
 
+      def api_retries
+        config[:api_retries]
+      end
+
       def destroy(_state)
         delete_data
         delete_runner
@@ -81,7 +86,7 @@ module Kitchen
       def delete_work_image
         return unless Docker::Image.exist?(work_image, docker_connection)
         with_retries { @work_image = Docker::Image.get(work_image, docker_connection) }
-        with_retries { @work_image.remove(force: true)}
+        with_retries { @work_image.remove(force: true) }
       end
 
       def build_work_image(state)
@@ -210,22 +215,17 @@ module Kitchen
       end
 
       def delete_image(name)
-        i = Docker::Image.get(name, docker_connection)
-        with_retries { i.remove(force: true) }
+        @image = Docker::Image.get(name, docker_connection)
+        with_retries { @image.remove(force: true) }
       rescue Docker::Error => e
         puts "Image #{name} not found. Nothing to delete."
       end
 
-      def run_container(args)
-        c = create_container(args)
-        with_retries { c.start }
-      end
-
       def delete_container(name)
-        c = Docker::Container.get(name, docker_connection)
+        @container = Docker::Container.get(name, docker_connection)
         puts "Destroying container #{name}."
-        with_retries { c.stop(force: true) }
-        with_retries { c.delete(force: true, v: true) }
+        with_retries { @container.stop(force: true) }
+        with_retries { @container.delete(force: true, v: true) }
       rescue
         puts "Container #{name} not found. Nothing to delete."
       end
@@ -246,6 +246,11 @@ module Kitchen
         image.split(':')[0]
       end
 
+      def run_container(args)
+        @container = create_container(args)
+        with_retries { @container.start }
+      end
+
       def tag(image)
         image.split(':')[1] || 'latest'
       end
@@ -288,7 +293,7 @@ module Kitchen
       end
 
       def with_retries(&block)
-        tries = 5
+        tries = api_retries
         begin
           block.call
           # Only catch errors that can be fixed with retries.

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.10'
+    DOKKEN_VERSION = '0.0.11'
   end
 end

metadata

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