kitchen-dokken 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c5b7b7002c7d29ca102d308c4181c17b6784a23
-  data.tar.gz: 2fd2ed37b36d7e06fc2052457ea7c55794c0a361
+  metadata.gz: 81daf71f8d536cfea2ed2c3cc01515f1314c6e5b
+  data.tar.gz: 2b534fd81353056a9dcc0b979f4851f34da2c361
 SHA512:
-  metadata.gz: 1a7a73124810ce381907b0be9d087a5de2a1fcad14c9d7f995f475d622bfd0a2c38ce82fb0b47bdee4ccef37ec487356d84e9e5fcf5fd7bcd1aaa4c47484d7c6
-  data.tar.gz: d9a383aae0f51ab4c6c860c63716a93eec01635a2209e890a6d277919a523c7a9600351a19082cb31774f08dc975c61712a65f0fc5204fc330ef358d4f949e0e
+  metadata.gz: 66e0a6d48b6c8491b46c4b16fb12cb2ebc885ce70357b62bf0cbd14c451b066fee8c8c358168e830d6e95518710f8679ec65537ffc56a1fa767fd2117373eee0
+  data.tar.gz: 68fc9c3c03950a75a5169cd779ac9669da7d1801d28cbf698df09c3d12e1dda325b8c72c2c3d22e26ce972a0007914290a765c971ed7f28909fab6e96f49ab5e

data/lib/kitchen/driver/dokken.rb

@@ -86,7 +86,7 @@ module Kitchen
           stop_data_container
           delete_data_container
         end
-        
+
         stop_runner_container
         delete_runner_container
         delete_work_image

data/lib/kitchen/driver/dokken_version.rb

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

data/lib/kitchen/transport/dokken.rb

@@ -64,7 +64,7 @@ module Kitchen
         end
 
         def execute(command)
-          return if command.nil?
+          require 'pry'; return if command.nil?
 
           with_retries { @runner = ::Docker::Container.get(instance_name, {}, docker_connection) }
           with_retries do
@@ -75,58 +75,58 @@ module Kitchen
           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}"
-        #     `#{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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen