kitchen-dokken 1.1.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 58e2db230012534363f80d718b772aa80f0b83508d897fc98f9512b2d185a537
-  data.tar.gz: 125305326fa90977a660ad490be77d4c584f608805cbfde32c33f7efb2d9d08b
+SHA1:
+  metadata.gz: 7c5b7b7002c7d29ca102d308c4181c17b6784a23
+  data.tar.gz: 2fd2ed37b36d7e06fc2052457ea7c55794c0a361
 SHA512:
-  metadata.gz: ed015f54fc91069db6e59a420e0799fab5894ca514071842493f6d2345e92ae8c5aa6d69ba3f8e9c414ecc5c2e7a5bf131fcdca9763bae2d66b3f2399049769b
-  data.tar.gz: b47b38e0bf2d5b7bbf65fd6a027767e6a8e832acd583371acb6f145022800e73edcec8df94d7bee13a07a155f1aadd48a4eea38770a7765e3e8407374b931f21
+  metadata.gz: 1a7a73124810ce381907b0be9d087a5de2a1fcad14c9d7f995f475d622bfd0a2c38ce82fb0b47bdee4ccef37ec487356d84e9e5fcf5fd7bcd1aaa4c47484d7c6
+  data.tar.gz: d9a383aae0f51ab4c6c860c63716a93eec01635a2209e890a6d277919a523c7a9600351a19082cb31774f08dc975c61712a65f0fc5204fc330ef358d4f949e0e

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.1.0 / Unreleased
+
+* Initial release

data/lib/kitchen/driver/dokken.rb

@@ -19,9 +19,9 @@ require 'digest'
 require 'kitchen'
 require 'tmpdir'
 require 'docker'
-require_relative 'dokken/helpers'
+require_relative '../helpers'
 
-include Dokken::Driver::Helpers
+include Dokken::Helpers
 
 # FIXME: - make true
 Excon.defaults[:ssl_verify_peer] = false
@@ -35,8 +35,8 @@ module Kitchen
       default_config :pid_one_command, 'sh -c "trap exit 0 SIGTERM; while :; do sleep 1; done"'
       default_config :image_prefix, nil
       default_config :chef_image, 'chef/chef'
-      default_config :chef_version, 'latest'
-      default_config :data_image, 'someara/kitchen-cache:latest'
+      default_config :chef_version, 'current'
+      default_config :data_image, 'dokken/kitchen-cache:latest'
       default_config :docker_host_url, default_docker_host
       default_config :dns, nil
       default_config :dns_search, nil
@@ -64,8 +64,12 @@ module Kitchen
         create_chef_container state
 
         # data
-        make_data_image
-        start_data_container state
+        dokken_create_sandbox
+
+        if remote_docker_host?
+          make_data_image
+          start_data_container state
+        end
 
         # work image
         build_work_image state
@@ -78,8 +82,11 @@ module Kitchen
       end
 
       def destroy(_state)
-        stop_data_container
-        delete_data_container
+        if remote_docker_host?
+          stop_data_container
+          delete_data_container
+        end
+        
         stop_runner_container
         delete_runner_container
         delete_work_image
@@ -87,6 +94,11 @@ module Kitchen
 
       private
 
+      def remote_docker_host?
+        return true if config[:docker_host_url] =~ /^tcp:/
+        false
+      end
+
       def api_retries
         config[:api_retries]
       end
@@ -110,22 +122,18 @@ module Kitchen
       end
 
       def build_work_image(state)
-        # require 'pry' ; binding.pry
-
+        info('Building work image..')
         return if ::Docker::Image.exist?(work_image, {}, docker_connection)
 
         begin
           @intermediate_image = ::Docker::Image.build(
             work_image_dockerfile,
             {
-              # 'nocache' => true,
-              # 'forcerm' => true,
-              # 'q' => true,
-              't' => work_image
+              't' => work_image,
             },
             docker_connection
           )
-        rescue Exception => e
+        rescue
           raise "work_image build failed: #{e}"
         end
 
@@ -146,11 +154,6 @@ module Kitchen
         state[:image_prefix] = image_prefix
       end
 
-      def instance_name
-        prefix = (Digest::SHA2.hexdigest FileUtils.pwd)[0,10]
-        "#{prefix}-#{instance.name}"
-      end
-
       def delete_chef_container
         debug "driver - deleting container #{chef_container_name}"
         delete_container chef_container_name
@@ -189,6 +192,13 @@ module Kitchen
         instance_name
       end
 
+      def dokken_binds
+        ret = []
+        ret << "#{dokken_sandbox_path}:/opt/kitchen" unless dokken_sandbox_path.nil?
+        ret << config[:binds] unless config[:binds].nil?
+        ret
+      end
+
       def start_runner_container(state)
         debug "driver - starting #{runner_container_name}"
         runner_container = run_container(
@@ -199,16 +209,19 @@ module Kitchen
           'ExposedPorts' => exposed_ports({}, config[:forward]),
           'HostConfig' => {
             'Privileged' => config[:privileged],
-            'VolumesFrom' => [chef_container_name, data_container_name],
-            'Binds' => Array(config[:binds]),
+            'VolumesFrom' => [
+              chef_container_name,
+              # data_container_name
+            ],
+            'Binds' => dokken_binds,
             'Dns' => config[:dns],
-            'DnsSearch'=> config[:dns_search],
+            'DnsSearch' => config[:dns_search],
             'Links' => Array(config[:links]),
             'CapAdd' => Array(config[:cap_add]),
             'CapDrop' => Array(config[:cap_drop]),
             'SecurityOpt' => Array(config[:security_opt]),
             'NetworkMode' => config[:network_mode],
-            'PortBindings' => port_forwards({}, config[:forward])
+            'PortBindings' => port_forwards({}, config[:forward]),
           }
         )
         state[:runner_container] = runner_container.json
@@ -221,23 +234,19 @@ module Kitchen
           'Image' => "#{repo(data_image)}:#{tag(data_image)}",
           'HostConfig' => {
             'PortBindings' => port_forwards({}, '22'),
-            'PublishAllPorts' => true
+            'PublishAllPorts' => true,
           }
         )
-        # require 'pry' ; binding.pry
         state[:data_container] = data_container.json
       end
 
       def make_data_image
-        debug "driver - pulling #{data_image}"
-        pull_if_missing data_image
-        # -- or --
-        # debug 'driver - calling create_data_image'
-        # create_data_image
+        debug 'driver - calling create_data_image'
+        create_data_image
       end
 
       def create_chef_container(state)
-        c = ::Docker::Container.get(chef_container_name, {}, docker_connection)
+        ::Docker::Container.get(chef_container_name, {}, docker_connection)
       rescue ::Docker::Error::NotFoundError
         begin
           debug "driver - creating volume container #{chef_container_name} from #{chef_image}"
@@ -265,7 +274,7 @@ module Kitchen
       def delete_image(name)
         with_retries { @image = ::Docker::Image.get(name, {}, docker_connection) }
         with_retries { @image.remove(force: true) }
-      rescue ::Docker::Error => e
+      rescue ::Docker::Error
         puts "Image #{name} not found. Nothing to delete."
       end
 
@@ -305,7 +314,7 @@ module Kitchen
       def stop_container(name)
         with_retries { @container = ::Docker::Container.get(name, {}, docker_connection) }
         with_retries do
-          @container.stop(force: true)
+          @container.stop(force: false)
           wait_running_state(name, false)
         end
       rescue ::Docker::Error::NotFoundError
@@ -344,6 +353,7 @@ module Kitchen
       end
 
       def chef_version
+        return 'current' if config[:chef_version] == 'latest'
         config[:chef_version]
       end
 
@@ -361,7 +371,7 @@ module Kitchen
 
       def exposed_ports(config, rules)
         Array(rules).each do |prt_string|
-          guest, host = prt_string.to_s.split(':').reverse
+          guest, _host = prt_string.to_s.split(':').reverse
           config["#{guest}/tcp"] = {}
         end
         config
@@ -371,7 +381,7 @@ module Kitchen
         Array(rules).each do |prt_string|
           guest, host = prt_string.to_s.split(':').reverse
           config["#{guest}/tcp"] = [{
-            HostPort: host || ''
+            HostPort: host || '',
           }]
         end
         config

data/lib/kitchen/driver/dokken_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '1.1.1'.freeze
+    DOKKEN_VERSION = '2.0.1'.freeze
   end
 end

data/lib/kitchen/helpers.rb

@@ -0,0 +1,127 @@
+module Dokken
+  module Helpers
+    def insecure_ssh_public_key
+      <<-EOF
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCoJwyW7qNhw+NTuOjC4+RVpESl+JBXebXzB7JqxRgKAbymq6B39azEAiNx5NzHkWcQmOyQNhFpKFSAufegcXRS4ctS1LcElEoXe9brDAqKEBSkmnXYfZXMNIG0Enw4+5W/rZxHFCAlsUSAHYtYZEs+3CgbIWuHhZ95C8UC6nGLWHNZOjcbsYZFrnFfO0qg0ene2w8LKhxqj5X0MRSdCIn1IwyxIbl5NND5Yk1Hx8JKsJtTiNTdxssiMgmM5bvTbYQUSf8pbGrRI30VQKBgQ8/UkidZbaTfvzWXYpwcDUERSbzEYCvkUytTemZIv6uhpPxqkfjl6KEOOml/iGqquPEr test-kitchen-rsa
+EOF
+    end
+
+    def insecure_ssh_private_key
+      <<-EOF
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAqCcMlu6jYcPjU7jowuPkVaREpfiQV3m18weyasUYCgG8pqug
+d/WsxAIjceTcx5FnEJjskDYRaShUgLn3oHF0UuHLUtS3BJRKF3vW6wwKihAUpJp1
+2H2VzDSBtBJ8OPuVv62cRxQgJbFEgB2LWGRLPtwoGyFrh4WfeQvFAupxi1hzWTo3
+G7GGRa5xXztKoNHp3tsPCyocao+V9DEUnQiJ9SMMsSG5eTTQ+WJNR8fCSrCbU4jU
+3cbLIjIJjOW7022EFEn/KWxq0SN9FUCgYEPP1JInWW2k3781l2KcHA1BEUm8xGAr
+5FMrU3pmSL+roaT8apH45eihDjppf4hqqrjxKwIDAQABAoIBAEj7Cb/IOykHd/ay
+XnOXrVZuQU03oI4WyR19zbYBbPmK33IHM1JdUmqP8wpPpnMHbJALj0DX9p6JXoOw
+MwVzuGTwkuqUYAqgwbeHjDPfugNKD2uRjmwztXw3ncOl8jxZFRloJFfFKF6znWNt
+bzkh7naN3upHiv/6wsgqj4tAbZ9oRC1crO6bsNr3P6YooiG5RRNpHepiyXphyhN6
+We1p5ZOQ/pUSE0Ca4wTlUhJHTUPMz7VFs/8CH0loRIsGPBROarPkoLVF+/UNyX8e
++BGMhoUtQH2XvjEzWUl5jKJOnvKRIV+0j/upWXsPQKF5glVPmPrTVUAxThfu6rAa
+4Z3JveECgYEA0Pz3Hl0SlPR79r2qofh1ZNa8zvQDL+iLopULwDiil5qlUxJ+DgOl
+1kWXLhjdg/NfoTBHvBjdJu274YJgaGQOfCy5747YDVsakKOm4bI9+Jr2agshPyE6
+f1RNmGL8K8fNtpGq4G14o+pSQOPNrEfcFKgm3sosZWJAWaA64hmtiXcCgYEAzfp6
+FbodfUypAV5Zd6PCO2eJMjLdvGaNuH/Umo80WNV7XZ6iJ6MUeQe+YwxFJigjC3ii
+ifLUj3kL7+wu7sEtkzS3zNd34KfhQ5fLADttfFgjjfm7IxlDD4ABaUgjwZM2gfXi
+xCwRhwwNgilF6qABJ1CLt8JSqKubkqvO1P1gQu0CgYEA0GA6AcNpYK344Eey1/bF
+DntyHKN+fglPGReldM7Dh4gBabgZid2nP+N5XtQaIpPKeQyLqgfckhEecTau68dA
+Dh4Gcs6pq394GFmkbotrcPMJ2SgpySlXi1fCWrvvlbON8IiDqWxdiop74wmArFOm
+I86ZmzBYXeo+IV869vAFcPcCgYBrvvyh5OuMIc++YYZXaRgvTueblLQc22CDBItI
+FmUBmxqfTF3ycgJBlWVoFoENhq1eUMplctrx+hXeeSPLzM10VX1X79ZLdEYHv513
+D58kDk7684mKwKotr34NfqkFl2ZJ8T+f8pVwmUNvtPtX0j8IO7/6bfIjPTFyNeFJ
+1QjHuQKBgQC/LE05M4eeWXihZ7c7fyWHLyddcPdH48LRF9UH9yjKF84jXRT91uMv
+XuIb2Qt4MLHABySsk653LDw/jTIGV26c068nZryq5OUPxk67Xgod54jKgOwjgjZS
+X8N2N9ZNnORJqK374yGj1jWUU66mQhPvn49QpG8P2HEoh2RQjNvyHA==
+-----END RSA PRIVATE KEY-----
+EOF
+    end
+
+    def data_dockerfile
+      <<-EOF
+FROM centos:7
+MAINTAINER Sean OMeara \"sean@sean.io\"
+
+ENV LANG en_US.UTF-8
+
+RUN yum -y install tar rsync openssh-server passwd git
+RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
+
+RUN mkdir -p /root/.ssh/
+COPY authorized_keys /root/.ssh/authorized_keys
+
+EXPOSE 22
+CMD [ "/usr/sbin/sshd", "-D", "-p", "22", "-o", "UseDNS=no", "-o", "UsePrivilegeSeparation=no", "-o", "MaxAuthTries=60" ]
+
+VOLUME /opt/kitchen
+VOLUME /opt/verifier
+EOF
+    end
+
+    def create_data_image
+      return if ::Docker::Image.exist?(data_image)
+
+      tmpdir = Dir.tmpdir
+      FileUtils.mkdir_p "#{tmpdir}/dokken"
+      File.write("#{tmpdir}/dokken/Dockerfile", data_dockerfile)
+      File.write("#{tmpdir}/dokken/authorized_keys", insecure_ssh_public_key)
+
+      i = ::Docker::Image.build_from_dir(
+        "#{tmpdir}/dokken",
+        'nocache' => true,
+        'rm' => true
+      )
+      i.tag('repo' => repo(data_image), 'tag' => tag(data_image), 'force' => true)
+    end
+
+    def default_docker_host
+      if ENV['DOCKER_HOST']
+        ENV['DOCKER_HOST']
+      elsif File.exist?('/var/run/docker.sock')
+        'unix:///var/run/docker.sock'
+      # TODO: Docker for Windows also operates over a named pipe at
+      # //./pipe/docker_engine that can be used if named pipe support is
+      # added to the docker-api gem.
+      else
+        'tcp://127.0.0.1:2375'
+      end
+    end
+
+    def dokken_create_sandbox
+      info("Creating local sandbox in #{dokken_sandbox_path}")
+      FileUtils.mkdir_p(dokken_sandbox_path)
+      File.chmod(0755, dokken_sandbox_path)
+    end
+
+    def dokken_sandbox_path
+      "#{Dir.home}/.dokken/sandbox/#{instance_name}"
+    end
+
+    def instance_name
+      prefix = (Digest::SHA2.hexdigest FileUtils.pwd)[0, 10]
+      "#{prefix}-#{instance.name}"
+    end
+  end
+end
+
+module Kitchen
+  module Provisioner
+    class Base
+      def create_sandbox
+        info("Creating local sandbox in #{sandbox_path}")
+        FileUtils.mkdir_p(sandbox_path)
+        File.chmod(0755, sandbox_path)
+      end
+
+      def sandbox_path
+        "#{Dir.home}/.dokken/sandbox/#{instance_name}"
+      end
+
+      def instance_name
+        prefix = (Digest::SHA2.hexdigest FileUtils.pwd)[0, 10]
+        "#{prefix}-#{instance.name}"
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/dokken.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 #
-# Author:: Sean OMeara (<sean@chef.io>)
+# Author:: Sean OMeara (<sean@sean.io>)
 #
 # Copyright (C) 2015, Sean OMeara
 #
@@ -18,10 +18,13 @@
 
 require 'kitchen'
 require 'kitchen/provisioner/chef_zero'
+require_relative '../helpers'
+
+include Dokken::Helpers
 
 module Kitchen
   module Provisioner
-    # @author Sean OMeara <sean@chef.io>
+    # @author Sean OMeara <sean@sean.io>
     class Dokken < Kitchen::Provisioner::ChefZero
       kitchen_provisioner_api_version 2
 
@@ -32,23 +35,18 @@ module Kitchen
       # (see Base#call)
       def call(state)
         create_sandbox
-        sandbox_dirs = Dir.glob(File.join(sandbox_path, '*'))
-
         instance.transport.connection(state) do |conn|
-          info("Transferring files to #{instance.to_str}")
-          conn.upload(sandbox_dirs, config[:root_path])
-          debug('Transfer complete')
           conn.execute(run_command)
         end
       rescue Kitchen::Transport::TransportFailed => ex
         raise ActionFailed, ex.message
-      ensure
-        cleanup_sandbox
+        # ensure
+        #   cleanup_sandbox
       end
 
       private
 
-      # magic method name because we're subclassing ChefZero
+      # patching Kitchen::Provisioner::ChefZero#run_command
       def run_command
         cmd = '/opt/chef/embedded/bin/chef-client'
         cmd << ' -z'

data/lib/kitchen/transport/dokken.rb

@@ -19,9 +19,9 @@ require 'kitchen'
 require 'net/scp'
 require 'tmpdir'
 require 'digest/sha1'
-require_relative 'dokken/helpers'
+require_relative '../helpers'
 
-include Dokken::Transport::Helpers
+include Dokken::Helpers
 
 module Kitchen
   module Transport
@@ -35,7 +35,7 @@ module Kitchen
     #
     # @author Sean OMeara <sean@chef.io>
     class Dokken < Kitchen::Transport::Base
-      kitchen_transport_api_version 1
+      kitchen_transport_api_version 2
 
       plugin_version Kitchen::VERSION
 
@@ -43,7 +43,7 @@ module Kitchen
       default_config :read_timeout, 3600
       default_config :write_timeout, 3600
       default_config :host_ip_override do |transport|
-        transport.docker_for_mac_or_win? ? "localhost" : false
+        transport.docker_for_mac_or_win? ? 'localhost' : false
       end
 
       # (see Base#connection)
@@ -72,72 +72,61 @@ module Kitchen
             @exit_code = o[2]
           end
 
-          if @exit_code != 0
-            raise Transport::DockerExecFailed,
-                  "Docker Exec (#{@exit_code}) for command: [#{command}]"
-          end
-
-          # Disabling this for now.. the Docker ZFS driver won't let us
-          # commit running containers.
-          #
-          # with_retries { @old_image = ::Docker::Image.get(work_image, {}, docker_connection) }
-          # with_retries { @new_image = @runner.commit }
-          # with_retries { @new_image.tag('repo' => work_image, 'tag' => 'latest', 'force' => 'true') }
-          # with_retries { @old_image.remove }
+          raise Transport::DockerExecFailed, "Docker Exec (#{@exit_code}) for command: [#{command}]" if @exit_code != 0
         end
 
-        def upload(locals, remote)
-          port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
-
-          if options[:host_ip_override]
-            # Allow connecting to any ip/hostname to support sibling containers
-            ip = options[:host_ip_override]
-          elsif options[:docker_host_url] =~ /unix:/
-            if options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostIp] = '0.0.0.0'
-              ip = options[:data_container][:NetworkSettings][:IPAddress]
-              port = '22'
-            else
-              # we should read the proper mapped ip, since this allows us to upload the files
-              ip = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostIp]
-            end
-          elsif options[:docker_host_url] =~ /tcp:/
-            ip = options[:docker_host_url].split('tcp://')[1].split(':')[0]
-          else
-            raise Kitchen::UserError, 'docker_host_url must be tcp:// or unix://'
-          end
-
-          tmpdir = Dir.tmpdir
-          FileUtils.mkdir_p "#{tmpdir}/dokken"
-          File.write("#{tmpdir}/dokken/id_rsa", insecure_ssh_private_key)
-          FileUtils.chmod(0600, "#{tmpdir}/dokken/id_rsa")
-
-          begin
-            rsync_cmd = '/usr/bin/rsync -a -e'
-            rsync_cmd << ' \''
-            rsync_cmd << 'ssh -2'
-            rsync_cmd << " -i #{tmpdir}/dokken/id_rsa"
-            rsync_cmd << ' -o CheckHostIP=no'
-            rsync_cmd << ' -o Compression=no'
-            rsync_cmd << ' -o PasswordAuthentication=no'
-            rsync_cmd << ' -o StrictHostKeyChecking=no'
-            rsync_cmd << ' -o UserKnownHostsFile=/dev/null'
-            rsync_cmd << ' -o LogLevel=ERROR'
-            rsync_cmd << " -p #{port}"
-            rsync_cmd << '\''
-            rsync_cmd << " #{locals.join(' ')} root@#{ip}:#{remote}"
-            %x(#{rsync_cmd})
-          rescue Errno::ENOENT
-            debug 'Rsync is not installed. Falling back to SCP.'
-            locals.each do |local|
-              Net::SCP.upload!(ip,
-                               'root',
-                               local,
-                               remote,
-                               recursive: true,
-                               ssh: { port: port, keys: ["#{tmpdir}/dokken/id_rsa"] })
-            end
-          end
-        end
+        # def upload(locals, remote)
+        #   port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
+
+        #   if options[:host_ip_override]
+        #     # Allow connecting to any ip/hostname to support sibling containers
+        #     ip = options[:host_ip_override]
+        #   elsif options[:docker_host_url] =~ /unix:/
+        #     if options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostIp] == '0.0.0.0'
+        #       ip = options[:data_container][:NetworkSettings][:IPAddress]
+        #       port = '22'
+        #     else
+        #       # we should read the proper mapped ip, since this allows us to upload the files
+        #       ip = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostIp]
+        #     end
+        #   elsif options[:docker_host_url] =~ /tcp:/
+        #     ip = options[:docker_host_url].split('tcp://')[1].split(':')[0]
+        #   else
+        #     raise Kitchen::UserError, 'docker_host_url must be tcp:// or unix://'
+        #   end
+
+        #   tmpdir = Dir.tmpdir
+        #   FileUtils.mkdir_p "#{tmpdir}/dokken"
+        #   File.write("#{tmpdir}/dokken/id_rsa", insecure_ssh_private_key)
+        #   FileUtils.chmod(0600, "#{tmpdir}/dokken/id_rsa")
+
+        #   begin
+        #     rsync_cmd = '/usr/bin/rsync -a -e'
+        #     rsync_cmd << ' \''
+        #     rsync_cmd << 'ssh -2'
+        #     rsync_cmd << " -i #{tmpdir}/dokken/id_rsa"
+        #     rsync_cmd << ' -o CheckHostIP=no'
+        #     rsync_cmd << ' -o Compression=no'
+        #     rsync_cmd << ' -o PasswordAuthentication=no'
+        #     rsync_cmd << ' -o StrictHostKeyChecking=no'
+        #     rsync_cmd << ' -o UserKnownHostsFile=/dev/null'
+        #     rsync_cmd << ' -o LogLevel=ERROR'
+        #     rsync_cmd << " -p #{port}"
+        #     rsync_cmd << '\''
+        #     rsync_cmd << " #{locals.join(' ')} root@#{ip}:#{remote}"
+        #     `#{rsync_cmd}`
+        #   rescue Errno::ENOENT
+        #     debug 'Rsync is not installed. Falling back to SCP.'
+        #     locals.each do |local|
+        #       Net::SCP.upload!(ip,
+        #                        'root',
+        #                        local,
+        #                        remote,
+        #                        recursive: true,
+        #                        ssh: { port: port, keys: ["#{tmpdir}/dokken/id_rsa"] })
+        #     end
+        #   end
+        # end
 
         def login_command
           @runner = options[:instance_name].to_s
@@ -180,7 +169,10 @@ module Kitchen
       #
       # @return [TrueClass,FalseClass]
       def docker_for_mac_or_win?
-        ::Docker.info(::Docker::Connection.new(config[:docker_host_url], {}))['Name'] == "moby"
+        # require 'pry' ; binding.pry
+        ::Docker.info(::Docker::Connection.new(config[:docker_host_url], {}))['Name'] == 'moby'
+      rescue
+        false
       end
 
       private
@@ -191,7 +183,7 @@ module Kitchen
       # @param data [Hash] merged configuration and mutable state data
       # @return [Hash] hash of connection options
       # @api private
-      def connection_options(data) # rubocop:disable Metrics/MethodLength
+      def connection_options(data)
         opts = {}
         opts[:host_ip_override] = config[:host_ip_override]
         opts[:docker_host_url] = config[:docker_host_url]
@@ -213,7 +205,6 @@ module Kitchen
           @connection.close
         end
 
-        @connection_options = options
         @connection = Kitchen::Transport::Dokken::Connection.new(options, &block)
       end
 

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-31 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -51,13 +45,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
 - lib/kitchen/driver/dokken.rb
-- lib/kitchen/driver/dokken/helpers.rb
 - lib/kitchen/driver/dokken_version.rb
+- lib/kitchen/helpers.rb
 - lib/kitchen/provisioner/dokken.rb
 - lib/kitchen/transport/dokken.rb
-- lib/kitchen/transport/dokken/helpers.rb
 homepage: https://github.com/someara/kitchen-dokken
 licenses:
 - Apache-2.0
@@ -77,7 +71,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver that talks to the Docker Remote API and uses Volumes

data/lib/kitchen/driver/dokken/helpers.rb

@@ -1,75 +0,0 @@
-module Dokken
-  module Driver
-    module Helpers
-      def insecure_ssh_public_key
-        <<-EOF
-ssh-dss AAAAB3NzaC1kc3MAAACBANmw8lqXnnGoQ0LusVNr/716mQhEgxb8RYQbg+HP0w//XXVZki2iSC7/LhQEdYgUZaBYJKpBNQ3FSIvyfM5RksicEF10jv/QQ+gsQKHf/jyWTLSiiaSJiwhDrkNW94V/T2pczXlK2j5UiyGKA6UDmSeiS6Ve969nqLJLb77xWOlXAAAAFQCsaq9PvaFa+SXUfWYV9JrDskPtywAAAIBmTuJyTAqdy+xPiI7AFI+BCuWpjrczBs/aw3R5ArNaRf3/PBUumpAUCePJ6UPcw5vU74AloCYvcUnwU8IbZ/Oj6A5NGTo6HvIajP2Y8E17cjsMTXzTPbuT1SqkrlVcsQtJpHU/+WBGoUJeWg66/CjUp/Nx2YK+6QJzoALBLyJW+AAAAIEAyi7XX3Ev12AXgpwRPPbfVltJ9H5Hpll34gc2ORhmCSL6RE42BpAXuzI7lbGun2dXFsCdDm0DQz3h4JHtTHePd6xXqyPpUda4ktLVtEWMm0XIQNE8P5zP0gcfqVe4prOYeBLwrvAkyeNY5wosgzGHrQ+/hFwW3s8liEjZaFDhCWY= test-kitchen
-EOF
-      end
-
-      def insecure_ssh_private_key
-        <<-EOF
------BEGIN DSA PRIVATE KEY-----
-MIIBuwIBAAKBgQDZsPJal55xqENC7rFTa/+9epkIRIMW/EWEG4Phz9MP/111WZIt
-okgu/y4UBHWIFGWgWCSqQTUNxUiL8nzOUZLInBBddI7/0EPoLECh3/48lky0oomk
-iYsIQ65DVveFf09qXM15Sto+VIshigOlA5knokulXvevZ6iyS2++8VjpVwIVAKxq
-r0+9oVr5JdR9ZhX0msOyQ+3LAoGAZk7ickwKncvsT4iOwBSPgQrlqY63MwbP2sN0
-eQKzWkX9/zwVLpqQFAnjyelD3MOb1O+AJaAmL3FJ8FPCG2fzo+gOTRk6Oh7yGoz9
-mPBNe3I7DE180z27k9UqpK5VXLELSaR1P/lgRqFCXloOuvwo1KfzcdmCvukCc6AC
-wS8iVvgCgYEAyi7XX3Ev12AXgpwRPPbfVltJ9H5Hpll34gc2ORhmCSL6RE42BpAX
-uzI7lbGun2dXFsCdDm0DQz3h4JHtTHePd6xXqyPpUda4ktLVtEWMm0XIQNE8P5zP
-0gcfqVe4prOYeBLwrvAkyeNY5wosgzGHrQ+/hFwW3s8liEjZaFDhCWYCFASgG6eP
-vVnsIrCx2rI5/KEQZ+oG
------END DSA PRIVATE KEY-----
-EOF
-      end
-
-      def data_dockerfile
-        <<-EOF
-FROM centos:7
-MAINTAINER Sean OMeara \"sean@sean.io\"
-
-ENV LANG en_US.UTF-8
-
-RUN yum -y install tar rsync openssh-server passwd git
-RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
-RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
-
-RUN mkdir -p /root/.ssh/
-COPY authorized_keys /root/.ssh/authorized_keys
-
-EXPOSE 22
-CMD [ "/usr/sbin/sshd", "-D", "-p", "22", "-o", "UseDNS=no", "-o", "UsePrivilegeSeparation=no" ]
-
-VOLUME /opt/kitchen
-VOLUME /opt/verifier
-EOF
-      end
-
-      def create_data_image
-        return if ::Docker::Image.exist?(data_image)
-
-        tmpdir = Dir.tmpdir
-        FileUtils.mkdir_p "#{tmpdir}/dokken"
-        File.write("#{tmpdir}/dokken/Dockerfile", data_dockerfile)
-        File.write("#{tmpdir}/dokken/authorized_keys", insecure_ssh_public_key)
-
-        i = ::Docker::Image.build_from_dir("#{tmpdir}/dokken", 'nocache' => true, 'rm' => true)
-        i.tag('repo' => repo(data_image), 'tag' => tag(data_image), 'force' => true)
-      end
-
-      def default_docker_host
-        if ENV['DOCKER_HOST']
-          ENV['DOCKER_HOST']
-        elsif File.exist?('/var/run/docker.sock')
-          'unix:///var/run/docker.sock'
-        # TODO: Docker for Windows also operates over a named pipe at
-        # //./pipe/docker_engine that can be used if named pipe support is
-        # added to the docker-api gem.
-        else
-          'tcp://127.0.0.1:2375'
-        end
-      end
-    end
-  end
-end

data/lib/kitchen/transport/dokken/helpers.rb

@@ -1,22 +0,0 @@
-module Dokken
-  module Transport
-    module Helpers
-      def insecure_ssh_private_key
-        <<-EOF
------BEGIN DSA PRIVATE KEY-----
-MIIBuwIBAAKBgQDZsPJal55xqENC7rFTa/+9epkIRIMW/EWEG4Phz9MP/111WZIt
-okgu/y4UBHWIFGWgWCSqQTUNxUiL8nzOUZLInBBddI7/0EPoLECh3/48lky0oomk
-iYsIQ65DVveFf09qXM15Sto+VIshigOlA5knokulXvevZ6iyS2++8VjpVwIVAKxq
-r0+9oVr5JdR9ZhX0msOyQ+3LAoGAZk7ickwKncvsT4iOwBSPgQrlqY63MwbP2sN0
-eQKzWkX9/zwVLpqQFAnjyelD3MOb1O+AJaAmL3FJ8FPCG2fzo+gOTRk6Oh7yGoz9
-mPBNe3I7DE180z27k9UqpK5VXLELSaR1P/lgRqFCXloOuvwo1KfzcdmCvukCc6AC
-wS8iVvgCgYEAyi7XX3Ev12AXgpwRPPbfVltJ9H5Hpll34gc2ORhmCSL6RE42BpAX
-uzI7lbGun2dXFsCdDm0DQz3h4JHtTHePd6xXqyPpUda4ktLVtEWMm0XIQNE8P5zP
-0gcfqVe4prOYeBLwrvAkyeNY5wosgzGHrQ+/hFwW3s8liEjZaFDhCWYCFASgG6eP
-vVnsIrCx2rI5/KEQZ+oG
------END DSA PRIVATE KEY-----
-EOF
-      end
-    end
-  end
-end