kitchen-dokken 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb02a9c1e743b3b22ae51e98b789be9315824251
-  data.tar.gz: 3e8d2a2232182a02512524a45a2d32b1b64fcdc3
+  metadata.gz: 41ca8d4ef2829b2ad1047011468fb72489f2abad
+  data.tar.gz: e7c61db95324279df10e5bce107022277615bdcc
 SHA512:
-  metadata.gz: bab9033b4dd0301ea3fd0082bfb4a58a9f60f59d6b791909c454b79f2b0dc560fa25ae15ad4d14fe3ba955ff188bf5fd2666819bb5e91ed50e112d2662761411
-  data.tar.gz: cc62afabc21be68ea48890031a038d4428c988189474a4725270b927346117c9ab6b203dd69ab8329cfbf69faeb82396d8b6149468f669ca3195802468387953
+  metadata.gz: d843971c8690453768bc672dfd317a601ada976cf2c7f8c423926f3d1c72f7ae3e35a998697d6298e42669637883138f21f83dc2a51d243ad3468e77bf2e8a4d
+  data.tar.gz: e928ecd38a6c8cdd85ada3eb2009321a604a9a188eb44d41bf7a668684613f904e35ec4c46e31b60e49556d103f41b02bc433845c83e6b123a84e88de4eaf0bb

data/lib/kitchen/driver/dokken.rb

@@ -239,18 +239,6 @@ module Kitchen
         puts "Image #{name} not found. Nothing to delete."
       end
 
-      def delete_container(name)
-        with_retries { @container = Docker::Container.get(name, docker_connection) }
-        puts "Destroying container #{name}."
-        with_retries do
-          @container.stop(force: true)
-          wait_running_state(args['name'], false)
-        end
-        with_retries { @container.delete(force: true, v: true) }
-      rescue
-        puts "Container #{name} not found. Nothing to delete."
-      end
-
       def container_exist?(name)
         return true if Docker::Container.get(name)
       rescue
@@ -284,15 +272,33 @@ module Kitchen
         @container ? @container.info['State'] : {}
       end
 
+      def delete_container(name)
+        with_retries { @container = Docker::Container.get(name, docker_connection) }
+        puts "Destroying container #{name}."
+
+        begin
+          with_retries { @container.delete(force: true, v: true) }
+        rescue
+          puts "Container #{name} not found. Nothing to stop."
+        end
+
+        begin
+          with_retries do
+            @container.stop(force: true)
+            wait_running_state(args['name'], false)
+          end
+        rescue
+          puts "Container #{name} not found. Nothing to delete."
+        end
+      end
+
       def wait_running_state(name, v)
         @container = Docker::Container.get(name)
-        # require 'pry' ; binding.pry
         i = 0
         tries = 20
         until container_state['Running'] == v || container_state['FinishedAt'] != '0001-01-01T00:00:00Z'
           i += 1
           break if i == tries
-          puts "SEANDEBUG: #{container_state['Running']}"
           sleep 0.1
           @container = Docker::Container.get(name)
         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.16'
+    DOKKEN_VERSION = '0.0.17'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Sean OMeara