kitchen-dokken 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b7c6e90633d7f197e5eba5b0f787cddb34278fe
-  data.tar.gz: 7bb46d28bfb95681ef03a14e04ec8ad61ed7f45f
+  metadata.gz: 88d6029b483e226cbc957fe69b74ca84c82e4056
+  data.tar.gz: 807b3e3bc5eafc95bfecf839fcf1e1c0c9299b95
 SHA512:
-  metadata.gz: 1aa4885d08709c86d31dde98a254aaabffae1aded7ed328fa2615a0f9b22cf86d3291590b59d249a14fe58a1eb751bb8b0c5c1f211f5fce0f808bd15a0a85ff8
-  data.tar.gz: c328e1cc4f336024a7868a41832e954c06a68a501ca4a2cbc7615d32d797d11b30004c136a0add9ab8e1fda153617f7d18ebcfb9d5b1ea449f6816d7078440d4
+  metadata.gz: 82bae93221009e3db53506225c4b45ec0ecd4ccef1b6f506e48f219c2c6e5288269e1a5850f0f8df3d5a230e058d0244dbe84be1c00d7768d32ff8071b737eac
+  data.tar.gz: 528058ab13a004529bf4acc8f330f9c0eb2e1f2b79097bf5d18f02e66a72c38b321974dfb169f166f23ce7c5122549d8738a8a8005ccb63102ce567ba032d659

data/lib/kitchen/driver/dokken.rb

@@ -31,12 +31,14 @@ module Kitchen
     #
     # @author Sean OMeara <sean@chef.io>
     class Dokken < Kitchen::Driver::Base
-      default_config :docker_host, ENV['DOCKER_HOST'] || 'unix:///var/run/docker.sock'
       default_config :pid_one_command, 'sh -c "trap exit 0 SIGTERM; while :; do sleep 1; done"'
       default_config :privileged, false
       default_config :image_prefix, nil
       default_config :chef_version, '12.5.1'
       default_config :data_image, 'someara/kitchen-cache:latest'
+      default_config :docker_host_url, ENV['DOCKER_HOST'] || 'unix:///var/run/docker.sock'
+      default_config :read_timeout, 3600
+      default_config :write_timeout, 3600
 
       # (see Base#create)
       def create(state)
@@ -69,28 +71,26 @@ module Kitchen
 
       private
 
-      def connection
-        @connection ||= begin
-                          opts = Docker.options
-                          opts[:read_timeout] = 3600
-                          opts[:write_timeout] = 3600
-                          Docker::Connection.new(config[:docker_host], opts)
-                        end
+      def docker_connection
+        opts = Docker.options
+        opts[:read_timeout] = config[:read_timeout]
+        opts[:write_timeout] = config[:write_timeout]
+        @docker_connection ||= Docker::Connection.new(config[:docker_host_url], opts)
       end
 
       def delete_work_image
-        return unless Docker::Image.exist?(work_image, connection)
-        i = Docker::Image.get(work_image, connection)
+        return unless Docker::Image.exist?(work_image, docker_connection)
+        i = Docker::Image.get(work_image, docker_connection)
         i.remove(force: true)
       end
 
       def build_work_image(state)
-        return if Docker::Image.exist?(work_image, connection)
+        return if Docker::Image.exist?(work_image, docker_connection)
 
         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 }, connection)
+        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)
         state[:work_image] = work_image
       end
@@ -210,7 +210,7 @@ module Kitchen
       end
 
       def delete_image(name)
-        i = Docker::Image.get(name, connection)
+        i = Docker::Image.get(name, docker_connection)
         i.remove(force: true)
       rescue Docker::Error => e
         puts "Image #{name} not found. Nothing to delete."
@@ -229,7 +229,7 @@ module Kitchen
       end
 
       def delete_container(name)
-        c = Docker::Container.get(name, connection)
+        c = Docker::Container.get(name, docker_connection)
         puts "Destroying container #{name}."
         c.stop
         c.delete(force: true, v: true)
@@ -244,7 +244,7 @@ module Kitchen
       end
 
       def create_container(args)
-        c = Docker::Container.create(args.clone, connection)
+        c = Docker::Container.create(args.clone, docker_connection)
       rescue Docker::Error::ConflictError
         c = Docker::Container.get(args['name'])
       end
@@ -259,14 +259,14 @@ module Kitchen
 
       def pull_image(image)
         retries ||= 3
-        Docker::Image.create({ 'fromImage' => repo(image), 'tag' => tag(image) }, connection)
+        Docker::Image.create({ 'fromImage' => repo(image), 'tag' => tag(image) }, docker_connection)
       rescue Docker::Error => e
         retry unless (tries -= 1).zero?
         raise e.message
       end
 
       def pull_if_missing(image)
-        return if Docker::Image.exist?("#{repo(image)}:#{tag(image)}", connection)
+        return if Docker::Image.exist?("#{repo(image)}:#{tag(image)}", docker_connection)
         pull_image image
       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.2'
+    DOKKEN_VERSION = '0.0.3'
   end
 end

data/lib/kitchen/transport/dokken.rb

@@ -38,6 +38,7 @@ module Kitchen
 
       plugin_version Kitchen::VERSION
 
+      default_config :docker_host_url, ENV['DOCKER_HOST'] || 'unix:///var/run/docker.sock'
       default_config :read_timeout, 3600
       default_config :write_timeout, 3600
 
@@ -55,7 +56,7 @@ module Kitchen
       # @author Sean OMeara <sean@chef.io>
       class Connection < Kitchen::Transport::Dokken::Connection
         def docker_connection
-          @docker_connection ||= Docker::Connection.new(Docker.url, options[:docker_host])
+          @docker_connection ||= Docker::Connection.new(options[:docker_host_url], options[:docker_host_options])
         end
 
         def execute(command)
@@ -82,8 +83,7 @@ module Kitchen
         end
 
         def upload(locals, remote)
-          # require 'pry' ; binding.pry
-          ip = ENV['DOCKER_HOST'].split('tcp://')[1].split(':')[0]
+          ip = options[:docker_host_url].split('://')[1].split(':')[0]
           port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
 
           tmpdir = Dir.tmpdir
@@ -139,7 +139,8 @@ module Kitchen
       # @api private
       def connection_options(data) # rubocop:disable Metrics/MethodLength
         opts = {}
-        opts[:docker_host] = Docker.options
+        opts[:docker_host_url] = config[:docker_host_url]
+        opts[:docker_host_options] = Docker.options
         opts[:data_container] = data[:data_container]
         opts[:instance_name] = data[:instance_name]
         opts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sean OMeara
@@ -14,14 +14,14 @@ dependencies:
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 description: A Test Kitchen Driver for Dokken
@@ -31,8 +31,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -54,20 +54,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver that talks to the Docker Remote API and uses Volumes
   to produce sparse container images
 test_files: []
-has_rdoc: