kitchen-dokken 2.4.1 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b36486a74d03c58b8ed8fdad948f06028f1fb1ae
-  data.tar.gz: c8a95b0ab5526d783a60a23c0a693392645f51d2
+  metadata.gz: 2c96c48b219e98045ac11e51e56610767eaba3b5
+  data.tar.gz: f3bdb6494d7c029ce6144d27a8ffa1448940309b
 SHA512:
-  metadata.gz: 7ca1a539cecff671e82091faf2cb41e696bf52c8b330398748dd89989d18e8842011ef2ead744537cd569f3771582f98f00641ef9a5647ecc7450c9f373c5796
-  data.tar.gz: 59ffd591e931ae9698c3aafc8240baaa1c13101838b6e1d729294b8270563671769097fe29ffa1a6f1dc216e07262ff5a980003154ab032de4741b9509ebbc9a
+  metadata.gz: 2c452fb897d7a6cfa9a537e403b205556578f079592eee2746418b79a2069b7956c250638e887cc2f1ca0b8784785783c3bdb6b5ded4c7991e48d698fa090914
+  data.tar.gz: ec2525c3c9baae58bb5aeaa4ef206d586e1f5ab6672c1633a9e9bbf0f3ca4957e1f4004b5887d99e620adc67922008c2b4849de073a5b0819d7057f64af9cc2b

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Dokken Changelog
 
+# 2.4.3
+- Using better paths for lockfiles
+
+# 2.4.2
+- Using lockfile gem around chef-client container and dokken network creation
+
 # 2.4.1
 - Adding NotFoundError to with_retries and beefing up rescues
 

data/lib/kitchen/driver/dokken.rb

@@ -19,6 +19,7 @@ require 'digest'
 require 'kitchen'
 require 'tmpdir'
 require 'docker'
+require 'lockfile'
 require_relative '../helpers'
 
 include Dokken::Helpers
@@ -56,7 +57,7 @@ module Kitchen
       default_config :write_timeout, 3600
 
       # (see Base#create)
-      def create(state)
+      def create(state)        
         # image to config
         pull_platform_image
 
@@ -297,17 +298,18 @@ module Kitchen
       end
 
       def make_dokken_network
-        debug 'driver - checking for dokken network'
-        with_retries { ::Docker::Network.get('dokken', {}, docker_connection) }
-      rescue
-        with_retries do
+        lockfile = Lockfile.new "#{home_dir}/.dokken-network.lock"
+        begin
+          lockfile.lock
+          with_retries { ::Docker::Network.get('dokken', {}, docker_connection) }
+        rescue
           begin
-            info 'Creating dokken network'
-            n = ::Docker::Network.create('dokken', {})
-            debug "n - #{n}"
+            with_retries { ::Docker::Network.create('dokken', {}) }
           rescue ::Docker::Error => e
-            debug "driver - :#{e}:"
+            debug "driver - error :#{e}:"
           end
+        ensure
+          lockfile.unlock
         end
       end
 
@@ -317,24 +319,30 @@ module Kitchen
       end
 
       def create_chef_container(state)
-        with_retries { ::Docker::Container.get(chef_container_name, {}, docker_connection) }
-      rescue ::Docker::Error::NotFoundError
-        with_retries do
-          begin
-            debug "driver - creating volume container #{chef_container_name} from #{chef_image}"
-            config = {
-              'name' => chef_container_name,
-              'Cmd' => 'true',
-              'Image' => "#{repo(chef_image)}:#{tag(chef_image)}",
-              'HostConfig' => {
-                'NetworkMode' => self[:network_mode],
-              },
-            }
-            chef_container = create_container(config)
-            state[:chef_container] = chef_container.json
-          rescue ::Docker::Error => e
-            raise "driver - #{chef_container_name} failed to create #{e}"
+        lockfile = Lockfile.new "#{home_dir}/.dokken-#{chef_container_name}.lock"
+        begin
+          lockfile.lock
+          with_retries { ::Docker::Container.get(chef_container_name, {}, docker_connection) }
+        rescue ::Docker::Error::NotFoundError
+          with_retries do
+            begin
+              debug "driver - creating volume container #{chef_container_name} from #{chef_image}"
+              config = {
+                'name' => chef_container_name,
+                'Cmd' => 'true',
+                'Image' => "#{repo(chef_image)}:#{tag(chef_image)}",
+                'HostConfig' => {
+                  'NetworkMode' => self[:network_mode],
+                },
+              }
+              chef_container = create_container(config)
+              state[:chef_container] = chef_container.json
+            rescue ::Docker::Error => e
+              raise "driver - #{chef_container_name} failed to create #{e}"
+            end
           end
+        ensure
+          lockfile.unlock
         end
       end
 
@@ -396,6 +404,7 @@ module Kitchen
               end
             end
           rescue ::Docker::Error => e
+            debug "driver - error :#{e}:"
             raise "driver - failed to create_container #{args['name']}"
           end
         end
@@ -524,7 +533,7 @@ module Kitchen
           tries -= 1
           sleep 0.1
           retry if tries > 0
-          debug "tries: #{tries} e: #{e}"
+          debug "tries: #{tries} error: #{e}"
           raise e
         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 = '2.4.1'.freeze
+    DOKKEN_VERSION = '2.4.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.3
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.33'
+- !ruby/object:Gem::Dependency
+  name: lockfile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: A Test Kitchen Driver for Dokken
 email:
 - sean@sean.io
@@ -47,6 +61,7 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - LICENSE
+- lib/kitchen/driver/dokken
 - lib/kitchen/driver/dokken.rb
 - lib/kitchen/driver/dokken_version.rb
 - lib/kitchen/helpers.rb