test-kitchen 3.9.0 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fae4c8857a3ec9bf61d2e6309ce8b9c593ad5704f497aefeb491c9cc9d5f2a6
-  data.tar.gz: ae7e88b27e210a1b484823b4bed9004e18e346df4b90176788823c78c754cfe8
+  metadata.gz: afc726dab92d4107edf13980480047c6286dbc816001eb61597206806e279644
+  data.tar.gz: 8cb0615335e7b7239e717bc4fac1c60ee0d4da202607be641542633fd0152f6b
 SHA512:
-  metadata.gz: bea3627796d12458f2f65a62d0bb5f5d3efd986fdf3bd2800a4adb0b360003ffa4da0f2a0705462388cae152a9faef30cba1d1bef5bc17ceb5ba17e04b653f44
-  data.tar.gz: 47d8c9adc151d38b2670b0f191bddb31966c523e87612dddee898584aaa5ad9ca1bc07eb8ec2544363125c78faa8430dd3b45f19e7df82d00143bfb06df72295
+  metadata.gz: afc342581e2d0b242bae26f23d5b872610c24cc78c160405ae7b7a56c9c45b595ab4a55ef88c6bb153a302e3a8aaa42cdb0218d2e6c98827ab04b5ecbf7eb47f
+  data.tar.gz: 5ece9c33f5ce95f94ff35f52d3a66b34c67da743f4ea296f89879c35da1c0bd97f503bdb94e3050ac588ade627bc3b65342d9bafa747cacfa0889982989b760e

data/Gemfile

@@ -6,21 +6,19 @@ group :test do
   gem "rake"
   gem "rb-readline"
   gem "aruba",     ">= 0.11", "< 3.0"
+  gem "chef-cli"
   gem "countloc",  "~> 0.4"
   gem "cucumber",  ">= 9.2", "< 11"
   gem "fakefs",    "~> 3.0"
-  gem "maruku",    "~> 0.6"
+  gem "kitchen-inspec"
+  gem "maruku",    "~> 0.7"
   gem "minitest",  "~> 5.3", "< 6.0"
   gem "mocha",     "~> 2.0"
 end
 
 group :integration do
-  gem "chef-cli"
   gem "kitchen-dokken"
-  gem "kitchen-inspec"
   gem "kitchen-vagrant"
-  gem "inspec", "~> 5.22" # Fix dependency conflicts for ruby < 3.4
-  gem "train", "~> 3.10" # Fix dependency conflicts for ruby < 3.4
 end
 
 group :linting do

data/lib/kitchen/driver/exec.rb

@@ -53,8 +53,8 @@ module Kitchen
 
       private
 
-      # Resets the non-Kitchen managed instance using by issuing a command
-      # over SSH.
+      # Resets the non-Kitchen managed instance by issuing a command
+      # locally.
       #
       # @param state [Hash] the state hash
       # @api private

data/lib/kitchen/generator/init.rb

@@ -39,7 +39,7 @@ module Kitchen
       class_option :provisioner,
         type: :string,
         aliases: "-P",
-        default: "chef_solo",
+        default: "chef_infra",
         desc: <<-D.gsub(/^\s+/, "").tr("\n", " ")
           The default Kitchen Provisioner to use
         D

data/lib/kitchen/instance.rb

@@ -413,6 +413,7 @@ module Kitchen
       banner "Converging #{to_str}..."
       elapsed = action(:converge) do |state|
         if legacy_ssh_base_driver?
+          provisioner.check_license
           legacy_ssh_base_converge(state)
         else
           provisioner.check_license

data/lib/kitchen/loader/yaml.rb

@@ -277,7 +277,7 @@ module Kitchen
             backtrace: e.backtrace,
           },
         }
-        result[:error][:raw_file] = File.read(file) unless file.nil?
+        result[:error][:raw_file] = File.read(file) if file && File.exist?(file)
         result
       end
 

data/lib/kitchen/provisioner/base.rb

@@ -70,7 +70,6 @@ module Kitchen
       # rubocop:disable Metrics/AbcSize
       def call(state)
         create_sandbox
-        prepare_install_script
 
         instance.transport.connection(state) do |conn|
           config[:uploads].to_h.each do |locals, remote|
@@ -78,21 +77,24 @@ module Kitchen
             conn.upload(locals.to_s, remote)
           end
 
-          # Run the init command to create the kitchen tmp directory
-          conn.execute(encode_for_powershell(init_command))
-
-          # Upload the install script instead of directly executing the command
-          if install_command
-            script_filename = windows_os? ? "install_script.ps1" : "install_script"
-            remote_script_path = remote_path_join(resolve_remote_path(config[:root_path]), script_filename)
+          # Check if we need to upload script (for Windows SSH or other scenarios requiring script upload)
+          transport_config = instance.transport.instance_variable_get(:@config)
+          debug("Windows OS: #{windows_os?} and Transport config: #{transport_config.inspect}")
+          if windows_os? && transport_config && transport_config[:name] == "ssh"
+            prepare_install_script
+            # Run the init command to create the kitchen tmp directory
+            conn.execute(encode_for_powershell(init_command))
+            remote_script_path = remote_path_join(resolve_remote_path(config[:root_path]), "install_script.ps1")
             if install_script_path
               debug("Uploading install script to #{remote_script_path}")
               conn.upload(install_script_path, remote_script_path)
-              # Make script executable on remote host
-              conn.execute(make_executable_command(remote_script_path))
-              # Execute the uploaded script
+              debug("Executing install script with #{run_script_command(remote_script_path)}")
               conn.execute(run_script_command(remote_script_path))
             end
+          else
+            # For all other scenarios, execute install command directly
+            debug("Executing install command: #{install_command}")
+            conn.execute(install_command)
           end
 
           # The install script will remove the kitchen tmp directory, hence creating it again.
@@ -100,7 +102,9 @@ module Kitchen
           info("Transferring files to #{instance.to_str}")
           conn.upload(sandbox_dirs, resolve_remote_path(config[:root_path]))
           debug("Transfer complete")
+          debug("Executing prepare command: #{prepare_command}")
           conn.execute(prepare_command)
+          debug("Executing run command: #{run_command}")
           conn.execute_with_retry(
             encode_for_powershell(run_command),
             config[:retry_on_exit_code],
@@ -292,8 +296,8 @@ module Kitchen
       end
 
       def encode_for_powershell(script)
-        return script unless windows_os?
         return script if script.nil? || script.empty?
+        return script unless windows_os? && instance.transport.instance_variable_get(:@config)[:name] == "ssh"
 
         utf16le = script.encode(Encoding::UTF_16LE)
         encoded = [utf16le].pack("m0")
@@ -306,18 +310,16 @@ module Kitchen
       #
       # @api private
       def prepare_install_script
+        return unless windows_os?
+
         command = install_command
         return if command.nil? || command.empty?
 
         info("Preparing install script")
-        script_filename = windows_os? ? "install_script.ps1" : "install_script"
-        @install_script_path = File.join(sandbox_path, script_filename)
+        @install_script_path = File.join(sandbox_path, "install_script.ps1")
 
         debug("Creating install script at #{@install_script_path}")
         File.open(@install_script_path, "wb") do |file|
-          unless windows_os?
-            file.write("#!/bin/sh\n")
-          end
           file.write(command)
         end
 
@@ -329,31 +331,15 @@ module Kitchen
         @install_script_path
       end
 
-      # Returns a command to make a script executable on the remote host.
-      #
-      # @param script_path [String] path to the script on the remote host
-      # @return [String] command to make the script executable
-      # @api private
-      def make_executable_command(script_path)
-        debug "echo Making script executable"
-        return if windows_os?
-
-        prefix_command(wrap_shell_code(sudo("chmod +x #{script_path}")))
-      end
-
       # Returns a command to execute a script on the remote host.
       #
       # @param script_path [String] path to the script on the remote host
       # @return [String] command to execute the script
       # @api private
       def run_script_command(script_path)
-        if windows_os?
-          # Use parameters to suppress PowerShell formatting and control characters
-          # that can interfere with console output over SSH
-          "powershell -NoProfile -NonInteractive -NoLogo -ExecutionPolicy Bypass -File #{script_path}"
-        else
-          prefix_command(wrap_shell_code(sudo(script_path)))
-        end
+        # Use parameters to suppress PowerShell formatting and control characters
+        # that can interfere with console output over SSH
+        "powershell -NoProfile -NonInteractive -NoLogo -ExecutionPolicy Bypass -File #{script_path}"
       end
 
       # Resolves PowerShell environment variables in remote paths to actual paths
@@ -364,7 +350,7 @@ module Kitchen
       # @return [String] the resolved path
       # @api private
       def resolve_remote_path(path)
-        return path unless windows_os?
+        return path unless windows_os? && instance.transport.instance_variable_get(:@config)[:name] == "ssh"
 
         # For Windows, resolve common PowerShell environment variables
         resolved_path = path.dup

data/lib/kitchen/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "3.9.0".freeze
+  VERSION = "3.9.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.9.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-05 00:00:00.000000000 Z
+date: 2025-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf