kitchen-dokken 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9457c866ed76959da525c5c6ff2cf79ec23ce6f1bc0b3b4f19a1d65dbb8c53d1
-  data.tar.gz: 12416b24465f12771c00ff3d702f0c2283a763e113710da7f5fa43b8f4c21ae5
+  metadata.gz: f9838e52a3dafe9888e01c141655f444b364ffc9721589a4524cc87286dc4110
+  data.tar.gz: 69f9de9936b22eddb8a71786011fafc9c5be00e487a6316264f46dfdd3d66ecc
 SHA512:
-  metadata.gz: 6b1bd8719579b19eca0d091b713c00d94cdfd08e4f3d4a5c79caae06301bfd0bc0f2e84dac691f4a55824e7e0a87a6bf7cc5cce1c3b29c35b9b4414aa2cf687a
-  data.tar.gz: b943f80b7f0664155366080e2a9fe4d3b07e897b77c396d87d31d103c32935d16a7b44c75bf2525f729b028d2bb8bb7a77f8c9f2e98dd2a57ae7e67cb03fc326
+  metadata.gz: 99ce50d234ff2cb2cee7a68282aa89f52072d598673c227663ea965a060863308637f2a22717c70bc521f56fd590f78b23822803e8c1f35797f07d2e12114d60
+  data.tar.gz: 349f2ecbea46e70af465d2bf0fd87c6b04d24458ed607e28d014993f2230143bb0fda20d7b11a13ce410ddcd3ae6d481dc5399541cd339b1966bf24f98ef67aa

data/lib/kitchen/driver/dokken.rb

@@ -15,9 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'digest'
+require 'digest' unless defined?(Digest)
 require 'kitchen'
-require 'tmpdir'
+require 'tmpdir' unless defined?(Dir.mktmpdir)
 require 'docker'
 require 'lockfile'
 require_relative '../helpers'

data/lib/kitchen/driver/dokken_version.rb

@@ -18,6 +18,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '2.10.0'.freeze
+    DOKKEN_VERSION = '2.11.0'.freeze
   end
 end

data/lib/kitchen/helpers.rb

@@ -1,8 +1,8 @@
 module Dokken
   module Helpers
     # https://stackoverflow.com/questions/517219/ruby-see-if-a-port-is-open
-    require 'socket'
-    require 'timeout'
+    require 'socket' unless defined?(Socket)
+    require 'timeout' unless defined?(Timeout)
 
     def port_open?(ip, port)
       begin
@@ -243,7 +243,7 @@ VOLUME /opt/verifier
 
     def remote_docker_host?
       return false if config[:docker_info]['OperatingSystem'].include?('Boot2Docker')
-      return true if config[:docker_host_url] =~ /^tcp:/
+      return true if /^tcp:/.match?(config[:docker_host_url])
       false
     end
 

data/lib/kitchen/transport/dokken.rb

@@ -17,8 +17,8 @@
 
 require 'kitchen'
 require 'net/scp'
-require 'tmpdir'
-require 'digest/sha1'
+require 'tmpdir' unless defined?(Dir.mktmpdir)
+require 'digest/sha1' unless defined?(Digest::SHA1)
 require_relative '../helpers'
 
 include Dokken::Helpers
@@ -82,7 +82,7 @@ module Kitchen
             ssh_ip = options[:host_ip_override]
             ssh_port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
 
-          elsif options[:docker_host_url] =~ /unix:/
+          elsif /unix:/.match?(options[:docker_host_url])
             if options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostIp] == '0.0.0.0'
               ssh_ip = options[:data_container][:NetworkSettings][:IPAddress]
               ssh_port = '22'
@@ -92,16 +92,16 @@ module Kitchen
               ssh_port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
             end
 
-          elsif options[:docker_host_url] =~ /tcp:/
+          elsif /tcp:/.match?(options[:docker_host_url])
             name = options[:data_container][:Name]
 
             # DOCKER_HOST
             docker_host_url_ip = options[:docker_host_url].split('tcp://')[1].split(':')[0]
 
             # mapped IP of data container
-            candidate_ip = ::Docker::Container.all.select do |x|
+            candidate_ip = ::Docker::Container.all.find do |x|
               x.info['Names'][0].eql?(name)
-            end.first.info['NetworkSettings']['Networks']['dokken']['IPAddress']
+            end.info['NetworkSettings']['Networks']['dokken']['IPAddress']
 
             # mapped port
             candidate_ssh_port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.33'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.33'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: lockfile
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +64,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-description: A Test Kitchen Driver for Dokken
+description: A Test Kitchen Driver for Docker & Chef Infra optimized for rapid testing
+  using Chef Infra docker images
 email:
 - sean@sean.io
 executables: []
@@ -93,6 +100,6 @@ requirements: []
 rubygems_version: 3.1.2
 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
+summary: A Test Kitchen Driver for Docker & Chef Infra optimized for rapid testing
+  using Chef Infra docker images
 test_files: []