kitchen-dokken 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9baef8d8befdf9a972b01645a3142a3b7a68cd5
-  data.tar.gz: a20d563444e920c44a06421731d3a65bfeae75cf
+  metadata.gz: bacb04ce73c020022800976bb73ed93889a9cddb
+  data.tar.gz: ccda73ee5de4c0409ebaaad8c62606db31ed52b4
 SHA512:
-  metadata.gz: 33510911d8667c088888328688c355215225ec3a7723a35ca616ec8141606b46dd8e1ecbe520f810c9c2866b13417cb217bd1997fdb3104aa49e2fbdc32e4135
-  data.tar.gz: 8df088b0bbeefe23c2a12fe3592fdb39203f73d712db18d7d57f9a666e954163062f87d0f1bf9ce12276b654d950888d3b615076f8471263cfffb4457c77a5e3
+  metadata.gz: b932eb19ed1f361724190a35dd18008dd0cfb90b77f919f626041beb28176aac7642bb09264443d11ca57d49daeb7e574899704aab626f9f48ed6b0f09e7efd8
+  data.tar.gz: 5a7bb932b1d29e098f89ed805ebbbdae46bbd31d6551631694eb228b329b38c458931daa1465f4614d47b0385e0aca3552c3e02309c089b11254a6bdffc778e9

data/lib/kitchen/driver/dokken.rb

@@ -48,7 +48,7 @@ module Kitchen
 
         # chef
         pull_chef_image
-        start_chef_container state
+        create_chef_container state
 
         # data
         make_data_image
@@ -177,6 +177,7 @@ module Kitchen
           },
           'PublishAllPorts' => true
         )
+        # require 'pry' ; binding.pry
         state[:data_container] = data_container.json
       end
 
@@ -188,7 +189,7 @@ module Kitchen
         # create_data_image
       end
 
-      def start_chef_container(state)
+      def create_chef_container(state)
         c = Docker::Container.get(chef_container_name)
       rescue Docker::Error::NotFoundError
         begin
@@ -215,14 +216,14 @@ module Kitchen
       end
 
       def delete_image(name)
-        @image = Docker::Image.get(name, docker_connection)
+        with_retries { @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 delete_container(name)
-        @container = Docker::Container.get(name, docker_connection)
+        with_retries { @container = Docker::Container.get(name, docker_connection) }
         puts "Destroying container #{name}."
         with_retries { @container.stop(force: true) }
         with_retries { @container.delete(force: true, v: true) }
@@ -236,19 +237,44 @@ module Kitchen
         false
       end
 
+      def repo(image)
+        image.split(':')[0]
+      end
+
       def create_container(args)
-        c = Docker::Container.create(args.clone, docker_connection)
+        with_retries do
+          @container = Docker::Container.create(args.clone, docker_connection)
+          @container = Docker::Container.get(args['name'])
+        end
       rescue Docker::Error::ConflictError
-        c = Docker::Container.get(args['name'])
+        with_retries { @container = Docker::Container.get(args['name']) }
       end
 
-      def repo(image)
-        image.split(':')[0]
+      def run_container(args)
+        create_container(args)
+        with_retries do
+          @container.start
+          @container = Docker::Container.get(args['name'])
+          wait_running_state(args['name'], true)
+        end
+        @container
       end
 
-      def run_container(args)
-        @container = create_container(args)
-        with_retries { @container.start }
+      def container_state
+        @container ? @container.info['State'] : {}
+      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
+          sleep 0.1
+          @container = Docker::Container.get(name)
+        end
       end
 
       def tag(image)

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.11'
+    DOKKEN_VERSION = '0.0.12'
   end
 end

metadata

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