kitchen-dokken 0.0.34 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df5fc9ab1a4677a9b159b88dd83550201402b1b3
-  data.tar.gz: 231e77bfb9af35a97d3ab0ab539d42f07c1b6378
+  metadata.gz: 9bd5711a6236c9c2dc47a25a39f8ae501f1028bf
+  data.tar.gz: ec7bcf47d0e3fda4f7d8cf7acb2b244f988623ec
 SHA512:
-  metadata.gz: 50c08510ea829c301145272affec2fd5f053c674cad8dbf1e405344596d788ccb96190f722d386b2763a5232a5f9ec3a56a162a3bdfa0dc46207710d4da13b15
-  data.tar.gz: 97378652af596204da5a1ba946444f3a14051697bae1a0889585d12f5ebf367ff465f108c8f7acef2ef81781adfd77d90e9ffb87eb51a1346fcf868b6e2eb360
+  metadata.gz: 0b98109b62876a75718afbdc3dc69fcf14179ca1b6d5b2de194d70f301a1755e49196a96c530fd96c1001186b24e3f73ebf61e6abf9aa0676beb897adc279ce7
+  data.tar.gz: 3eb5d9079cb646069be4203954d69e2a94090b2c48a9cf57f343a3c834cb3ef5a5fd1ac69e11443d456658e2192a3e5ff91ed5651847767b88ff9464da1539b0

data/lib/kitchen/driver/dokken.rb

@@ -110,31 +110,26 @@ module Kitchen
 
         return if ::Docker::Image.exist?(work_image, docker_connection)
 
-        FileUtils.mkdir_p context_root
-        File.write("#{context_root}/Dockerfile", work_image_dockerfile)
-
-        begin
-          with_retries do
-            @intermediate_image = ::Docker::Image.build_from_dir(
-              context_root,
-              {
-                # 'nocache' => true,
-                # 'forcerm' => true,
-                # 'q' => true,
-                't' => work_image
-              },
-              docker_connection
-            )
+        Dir.mktmpdir do |context_root|
+          File.write("#{context_root}/Dockerfile", work_image_dockerfile)
+          begin
+            with_retries do
+              @intermediate_image = ::Docker::Image.build_from_dir(
+                context_root,
+                {
+                  # 'nocache' => true,
+                  # 'forcerm' => true,
+                  # 'q' => true,
+                  't' => work_image
+                },
+                docker_connection
+              )
+            end
+          rescue Exception => e
+            raise "work_image build failed: #{e}"
           end
-        rescue Exception => e
-          fail  "work_image build failed: #{e}"
+          state[:work_image] = work_image
         end
-        state[:work_image] = work_image
-      end
-
-      def context_root
-        tmpdir = Dir.tmpdir
-        "#{tmpdir}/dokken/#{instance_name}"
       end
 
       def work_image_dockerfile
@@ -211,7 +206,7 @@ module Kitchen
             '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
@@ -222,7 +217,7 @@ module Kitchen
         data_container = run_container(
           'name' => data_container_name,
           'Image' => "#{repo(data_image)}:#{tag(data_image)}",
-          'PortBindings' => port_forwards({}, "22"),
+          'PortBindings' => port_forwards({}, '22'),
           'PublishAllPorts' => true
         )
         # require 'pry' ; binding.pry
@@ -304,24 +299,20 @@ module Kitchen
       end
 
       def stop_container(name)
-        begin
-          with_retries { @container = ::Docker::Container.get(name, docker_connection) }
-          with_retries do
-            @container.stop(force: true)
-            wait_running_state(name, false)
-          end
-        rescue ::Docker::Error::NotFoundError
-          debug "Container #{name} not found. Nothing to stop."
+        with_retries { @container = ::Docker::Container.get(name, docker_connection) }
+        with_retries do
+          @container.stop(force: true)
+          wait_running_state(name, false)
         end
+      rescue ::Docker::Error::NotFoundError
+        debug "Container #{name} not found. Nothing to stop."
       end
 
       def delete_container(name)
-        begin
-          with_retries { @container = ::Docker::Container.get(name, docker_connection) }
-          with_retries { @container.delete(force: true, v: true) }
-        rescue ::Docker::Error::NotFoundError
-          debug "Container #{name} not found. Nothing to delete."
-        end
+        with_retries { @container = ::Docker::Container.get(name, docker_connection) }
+        with_retries { @container.delete(force: true, v: true) }
+      rescue ::Docker::Error::NotFoundError
+        debug "Container #{name} not found. Nothing to delete."
       end
 
       def wait_running_state(name, v)
@@ -366,7 +357,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
@@ -374,9 +365,9 @@ module Kitchen
 
       def port_forwards(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"] = [{
-            :HostPort => host || ''
+            HostPort: host || ''
           }]
         end
         config
@@ -388,20 +379,20 @@ module Kitchen
       end
 
       def pull_image(image)
-        with_retries {
+        with_retries do
           ::Docker::Image.create({ 'fromImage' => "#{repo(image)}:#{tag(image)}" }, docker_connection)
-        }
+        end
       end
 
       def runner_container_name
-        "#{instance_name}"
+        instance_name.to_s
       end
 
-      def with_retries(&block)
+      def with_retries
         tries = api_retries
         begin
-          block.call
-          # Only catch errors that can be fixed with retries.
+          yield
+        # Only catch errors that can be fixed with retries.
         rescue ::Docker::Error::ServerError, # 404
                ::Docker::Error::UnexpectedResponseError, # 400
                ::Docker::Error::TimeoutError,

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

@@ -54,7 +54,7 @@ EOF
         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 = ::Docker::Image.build_from_dir("#{tmpdir}/dokken", 'nocache' => true, 'rm' => true)
         i.tag('repo' => repo(data_image), 'tag' => tag(data_image), 'force' => true)
       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 = '0.0.34'
+    DOKKEN_VERSION = '0.0.35'.freeze
   end
 end

data/lib/kitchen/provisioner/dokken.rb

@@ -59,7 +59,7 @@ module Kitchen
       end
 
       def runner_container_name
-        "#{instance.name}"
+        instance.name.to_s
       end
     end
   end

data/lib/kitchen/transport/dokken.rb

@@ -65,13 +65,13 @@ module Kitchen
 
           with_retries { @runner = ::Docker::Container.get(instance_name, {}, docker_connection) }
           with_retries do
-            o = @runner.exec(Shellwords.shellwords(command)) { |_stream, chunk| print "#{chunk}" }
+            o = @runner.exec(Shellwords.shellwords(command)) { |_stream, chunk| print chunk.to_s }
             @exit_code = o[2]
           end
 
           if @exit_code != 0
-            fail Transport::DockerExecFailed,
-                 "Docker Exec (#{@exit_code}) for command: [#{command}]"
+            raise Transport::DockerExecFailed,
+                  "Docker Exec (#{@exit_code}) for command: [#{command}]"
           end
 
           # Disabling this for now.. the Docker ZFS driver won't let us
@@ -93,7 +93,7 @@ module Kitchen
           elsif options[:docker_host_url] =~ /tcp:/
             ip = options[:docker_host_url].split('tcp://')[1].split(':')[0]
           else
-            fail Kitchen::UserError, 'docker_host_url must be tcp:// or unix://'
+            raise Kitchen::UserError, 'docker_host_url must be tcp:// or unix://'
           end
 
           port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
@@ -120,7 +120,7 @@ module Kitchen
         end
 
         def login_command
-          @runner = "#{options[:instance_name]}"
+          @runner = options[:instance_name].to_s
           args = ['exec', '-it', @runner, '/bin/bash', '-login', '-i']
           LoginCommand.new('docker', args)
         end
@@ -140,10 +140,10 @@ module Kitchen
           options[:image_prefix]
         end
 
-        def with_retries(&block)
+        def with_retries
           tries = 20
           begin
-            block.call
+            yield
             # Only catch errors that can be fixed with retries.
           rescue ::Docker::Error::ServerError, # 404
                  ::Docker::Error::UnexpectedResponseError, # 400

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -55,7 +55,7 @@ files:
 - lib/kitchen/transport/dokken/helpers.rb
 homepage: https://github.com/someara/kitchen-dokken
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []