kitchen-dokken 2.20.7 → 2.20.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2362e6800279db285e1838a1e0e050259ae15e39c32e12decb2f3abadc0bf420
-  data.tar.gz: ad63442a5c21154f77fc9a621f5511b99d78d42ce0dd4ac422edf8c2c6c8f702
+  metadata.gz: 5420861f8da3a5e79c7b41f7e4cb6ffbfe020ba1b067f2d34f5a835d67e94d5e
+  data.tar.gz: 727a7c655e5de95a6d5ed27746239857f91411c7e6781ad661aa2db394ae8f4e
 SHA512:
-  metadata.gz: 3963b3c32f3a9cbcaaf9fdc0ae74326c96ae7dc885e5979b5d0f6d7d2ca98592c3b6b26821165cb9e8931a48ac60caa0b255c9bdcac5f6c1255b2489127b6b2f
-  data.tar.gz: 9a58a2fdec86b9f9c5a78711f1fbdc2744ebe0dc4a7050e13e569346a6cb12ec15815ed4b426581d50c6873ab10746728620d1e4320d41619d89e2744107a21f
+  metadata.gz: 88397a421c0aab04294d9642824104f89488fbc6e7216024ec1f4639c893a4cbdb59b3b252048c7011a4cdfa86e2d9832d0272fabdeaa674046a02118a4e482f
+  data.tar.gz: 1a58c08f81c55c249f3e32bf5ff9557c2d7a679991bd48ef5abe03288b3a25b25e6f2f249e4334aab3570eb8bf972a035eacee804926d0810ce974626e5b256c

data/Gemfile

@@ -1,6 +1,5 @@
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in kitchen-dokken.gemspec
 gemspec
 
 group :test do
@@ -11,9 +10,8 @@ end
 
 group :development do
   gem "pry"
-  gem "pry-byebug"
 end
 
-group :chefstyle do
-  gem "chefstyle", "2.2.3"
+group :linting do
+  gem "cookstyle", "8.2.1"
 end

data/Rakefile

@@ -1,9 +1,13 @@
 require "bundler/gem_tasks"
-require "chefstyle"
-require "rubocop/rake_task"
 
-RuboCop::RakeTask.new(:style) do |task|
-  task.options += ["--display-cop-names", "--no-color"]
+begin
+  require "cookstyle/chefstyle"
+  require "rubocop/rake_task"
+  RuboCop::RakeTask.new(:style) do |task|
+    task.options += ["--display-cop-names", "--no-color"]
+  end
+rescue LoadError
+  puts "cookstyle/chefstyle is not available. (sudo) gem install cookstyle to do style checking."
 end
 
 task default: %i{style}

data/kitchen-dokken.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.files         = %w{LICENSE kitchen-dokken.gemspec Gemfile Rakefile} + Dir.glob("lib/**/*")
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 3.1"
 
   spec.add_dependency "docker-api", ">= 1.33", "< 3"
   spec.add_dependency "lockfile", "~> 2.1"

data/lib/kitchen/driver/dokken.rb

@@ -287,7 +287,7 @@ module Kitchen
         volumes = coerce_volumes(volumes, binds)
 
         binds_ret = []
-        binds_ret << "#{dokken_kitchen_sandbox}:/opt/kitchen" unless dokken_kitchen_sandbox.nil? || remote_docker_host? || running_inside_docker?
+        binds_ret << "#{dokken_kitchen_sandbox}:#{resolved_root_path}" unless dokken_kitchen_sandbox.nil? || remote_docker_host? || running_inside_docker?
         binds_ret << "#{dokken_verifier_sandbox}:/opt/verifier" unless dokken_verifier_sandbox.nil? || remote_docker_host? || running_inside_docker?
         binds_ret << binds unless binds.nil?
 
@@ -465,7 +465,7 @@ module Kitchen
               next if v["auth"].nil?
 
               username, password = Base64.decode64(v["auth"]).split(":")
-              @docker_config_creds[k] = { serveraddress: k, username: username, password: password }
+              @docker_config_creds[k] = { serveraddress: k, username:, password: }
             end
           end
 
@@ -518,7 +518,7 @@ module Kitchen
       end
 
       def container_exist?(name)
-        return true if ::Docker::Container.get(name, {}, docker_connection)
+        true if ::Docker::Container.get(name, {}, docker_connection)
       rescue StandardError, ::Docker::Error::NotFoundError
         false
       end

data/lib/kitchen/driver/dokken_version.rb

@@ -18,6 +18,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = "2.20.7".freeze
+    DOKKEN_VERSION = "2.20.8".freeze
   end
 end

data/lib/kitchen/helpers.rb

@@ -83,7 +83,7 @@ module Dokken
         EXPOSE 22
         CMD [ "/usr/sbin/sshd", "-D", "-p", "22", "-o", "UseDNS=no", "-o", "UsePrivilegeSeparation=no", "-o", "MaxAuthTries=60" ]
 
-        VOLUME /opt/kitchen
+        VOLUME #{resolved_root_path}
         VOLUME /opt/verifier
       EOF
     end
@@ -294,6 +294,10 @@ module Dokken
         FileUtils.mkdir_p(sandbox_path, mode: 0o755)
       end
     end
+
+    def resolved_root_path
+      instance.provisioner[:root_path] || "/opt/kitchen"
+    end
   end
 end
 

data/lib/kitchen/provisioner/dokken.rb

@@ -104,8 +104,8 @@ module Kitchen
         cmd << config[:chef_options].to_s
         cmd << " -l #{config[:chef_log_level]}"
         cmd << " -F #{config[:chef_output_format]}"
-        cmd << " -c /opt/kitchen/client.rb"
-        cmd << " -j /opt/kitchen/dna.json"
+        cmd << " -c #{File.join(config[:root_path], "client.rb")}"
+        cmd << " -j #{File.join(config[:root_path], "dna.json")}"
         cmd << "--profile-ruby" if config[:profile_ruby]
         cmd << "--slow-report" if config[:slow_resource_report]
 

data/lib/kitchen/transport/dokken.rb

@@ -165,11 +165,11 @@ module Kitchen
             debug "Rsync is not installed. Falling back to SCP."
             locals.each do |local|
               Net::SCP.upload!(ssh_ip,
-                               "root",
-                               local,
-                               remote,
-                               recursive: true,
-                               ssh: { port: ssh_port, keys: ["#{tmpdir}/id_rsa"] })
+                "root",
+                local,
+                remote,
+                recursive: true,
+                ssh: { port: ssh_port, keys: ["#{tmpdir}/id_rsa"] })
             end
           end
         end
@@ -247,7 +247,7 @@ module Kitchen
       # Creates a new Dokken Connection instance and save it for potential future
       # reuse.
       #
-      # @param options [Hash] conneciton options
+      # @param options [Hash] connection options
       # @return [Ssh::Connection] an SSH Connection instance
       # @api private
       def create_new_connection(options, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.20.7
+  version: 2.20.8
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 2025-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -93,14 +93,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Docker & Chef Infra optimized for rapid testing