kitchen-dokken 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e002503da77ac2cfef2c4b438bbae22456c2c243
-  data.tar.gz: 195ee44c88ff70005443628b7680482ce4644575
+  metadata.gz: 7b7c6e90633d7f197e5eba5b0f787cddb34278fe
+  data.tar.gz: 7bb46d28bfb95681ef03a14e04ec8ad61ed7f45f
 SHA512:
-  metadata.gz: 2e4ef34b0fb97a894b8d205b8b985668b71fb1908e43fc878fbad012ac5def9ad87670fc34b668556178f3fddaaf27abce1ae5bb3f3289a82dc31edcfcbb2654
-  data.tar.gz: 1689cc3dcc2246c9abd779e768d5287dff5096e7821eda24d86d62115471faa29fb3d2ac908edce865f95a49ffef7abd2c1d4ab4f304b73b90efd2d9ee8e5b54
+  metadata.gz: 1aa4885d08709c86d31dde98a254aaabffae1aded7ed328fa2615a0f9b22cf86d3291590b59d249a14fe58a1eb751bb8b0c5c1f211f5fce0f808bd15a0a85ff8
+  data.tar.gz: c328e1cc4f336024a7868a41832e954c06a68a501ca4a2cbc7615d32d797d11b30004c136a0add9ab8e1fda153617f7d18ebcfb9d5b1ea449f6816d7078440d4

data/lib/kitchen/driver/dokken.rb

@@ -31,8 +31,12 @@ 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'
 
       # (see Base#create)
       def create(state)
@@ -70,7 +74,7 @@ module Kitchen
                           opts = Docker.options
                           opts[:read_timeout] = 3600
                           opts[:write_timeout] = 3600
-                          Docker::Connection.new(Docker.url, opts)
+                          Docker::Connection.new(config[:docker_host], opts)
                         end
       end
 
@@ -107,6 +111,7 @@ module Kitchen
         state[:platform_image] = platform_image
         state[:instance_name] = instance_name
         state[:instance_platform_name] = instance_platform_name
+        state[:image_prefix] = image_prefix
       end
 
       def instance_name
@@ -123,7 +128,7 @@ module Kitchen
       end
 
       def image_prefix
-        'someara'
+        config[:image_prefix]
       end
 
       def delete_runner
@@ -282,11 +287,10 @@ module Kitchen
       end
 
       def data_image
-        'someara/kitchen-cache:latest'
+        config[:data_image]
       end
 
       def data_container_name
-        # "#{instance.suite.name}-data"
         "#{instance.name}-data"
       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.1'
+    DOKKEN_VERSION = '0.0.2'
   end
 end

data/lib/kitchen/transport/dokken.rb

@@ -82,8 +82,8 @@ module Kitchen
         end
 
         def upload(locals, remote)
-          ip = ENV['DOCKER_HOST'].split('tcp://')[1].split(':')[0]
           # require 'pry' ; binding.pry
+          ip = ENV['DOCKER_HOST'].split('tcp://')[1].split(':')[0]
           port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
 
           tmpdir = Dir.tmpdir
@@ -112,7 +112,7 @@ module Kitchen
           args = ['exec', '-it', runner, '/bin/bash', '-login', '-i']
           LoginCommand.new('docker', args)
         end
-        
+
         private
 
         def instance_name
@@ -125,7 +125,7 @@ module Kitchen
         end
 
         def image_prefix
-          'someara'
+          options[:image_prefix]
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -31,9 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".cane"
 - ".gitignore"
-- ".tailor"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile

data/.tailor

@@ -1,4 +0,0 @@
-Tailor.config do |config|
-  config.formatters "text"
-  config.file_set 'lib/**/*.rb'
-end