test-kitchen 3.7.2 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d5084681fcdd3347fff64203a6a4a01e005297e2da8da4a19268e862c015f78
-  data.tar.gz: a97d9c95641aef0c507f775dbf8164e73acc712bd5efed94324209c8b7a5d725
+  metadata.gz: b2b9e6d594b61d9e569f8051f34251c4c1c4c531618c70d382558f34c2b4fbdb
+  data.tar.gz: 6703f8a68a196806e858011fdc1a7695e5e48c936a8e86c550ce8369aba82174
 SHA512:
-  metadata.gz: a1c90dbec6701faa9b16472fea3b46bff2e5743fb08db95d44a305dcfa7bdcea5c92961a5c82d9758e199f128dfbf746474414db8ec1cc910b99e6471b9e5ec0
-  data.tar.gz: 698c4e4f6a617799ac5930da2ab8e4e934a5cbc523cb7515bc241117e3544166acf81a8fcc8b716c58fa0319b41b78e51a1dbc2846faaa442435d0937764521e
+  metadata.gz: 36e39c93bc5d66d0d46b790f927ee54c412c6467fd61c72a981721511814c1681925232851a437013a1a4c3ee250cc73ae251b057931db9024dab20596c31db9
+  data.tar.gz: 930266c1bc9c86e98def9eb3e78cf9bde2d8106a13fa831f1f56a88a3ca3d9b48f2c9508df077a4e414add79ef792b47255870c0ff7a12351f238501cdb138f8

data/Gemfile

@@ -7,7 +7,7 @@ group :test do
   gem "rb-readline"
   gem "aruba",     ">= 0.11", "< 3.0"
   gem "countloc",  "~> 0.4"
-  gem "cucumber",  ">= 9.2", "< 10"
+  gem "cucumber",  ">= 9.2", "< 11"
   gem "fakefs",    "~> 3.0"
   gem "maruku",    "~> 0.6"
   gem "minitest",  "~> 5.3", "< 6.0"

data/lib/kitchen/provisioner/base.rb

@@ -70,20 +70,39 @@ 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|
             debug("Uploading #{Array(locals).join(", ")} to #{remote}")
             conn.upload(locals.to_s, remote)
           end
-          conn.execute(install_command)
+
+          # Run the init command to create the kitchen tmp directory
+          conn.execute(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)
+            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
+              conn.execute(run_script_command(remote_script_path))
+            end
+          end
+
+          # The install script will remove the kitchen tmp directory, hence creating it again.
           conn.execute(init_command)
           info("Transferring files to #{instance.to_str}")
-          conn.upload(sandbox_dirs, config[:root_path])
+          conn.upload(sandbox_dirs, resolve_remote_path(config[:root_path]))
           debug("Transfer complete")
           conn.execute(prepare_command)
           conn.execute_with_retry(
-            run_command,
+            encode_for_powershell(run_command),
             config[:retry_on_exit_code],
             config[:max_retries],
             config[:wait_for_retry]
@@ -195,6 +214,7 @@ module Kitchen
         return if sandbox_path.nil?
 
         debug("Cleaning up local sandbox in #{sandbox_path}")
+        @install_script_path = nil
         FileUtils.rmtree(sandbox_path)
       end
 
@@ -270,6 +290,102 @@ module Kitchen
       def prefix_command(script)
         config[:command_prefix] ? "#{config[:command_prefix]} #{script}" : script
       end
+
+      def encode_for_powershell(script)
+        return script unless windows_os?
+
+        utf16le = script.encode(Encoding::UTF_16LE)
+        encoded = [utf16le].pack("m0")
+
+        "powershell -NoProfile -NonInteractive -NoLogo -ExecutionPolicy Bypass -EncodedCommand #{encoded}"
+      end
+
+      # Writes the install command to a file that will be uploaded to the instance
+      # and executed.
+      #
+      # @api private
+      def prepare_install_script
+        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)
+
+        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
+
+        # Make script executable locally
+        FileUtils.chmod(0755, @install_script_path) unless windows_os?
+      end
+
+      def install_script_path
+        @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
+      end
+
+      # Resolves PowerShell environment variables in remote paths to actual paths
+      # for use with net/scp and other transport operations that can't handle
+      # PowerShell variables like $env:TEMP.
+      #
+      # @param path [String] the remote path that may contain PowerShell env vars
+      # @return [String] the resolved path
+      # @api private
+      def resolve_remote_path(path)
+        return path unless windows_os?
+
+        # For Windows, resolve common PowerShell environment variables
+        resolved_path = path.dup
+
+        # Replace $env:TEMP with the actual Windows temp directory based on the transport username
+        if resolved_path.include?("$env:TEMP")
+          # Try to get username from transport configuration
+          # For Windows systems, fallback to "Administrator" if not found
+          username = begin
+            instance.transport[:username]
+                     rescue
+                       nil
+          end
+          username ||= "Administrator"
+
+          temp_path = "C:/Users/#{username}/AppData/Local/Temp"
+          resolved_path = resolved_path.gsub("$env:TEMP", temp_path)
+        end
+
+        # Convert backslashes to forward slashes for cross-platform compatibility
+        resolved_path.tr("\\", "/")
+      end
     end
   end
 end

data/lib/kitchen/provisioner/chef_base.rb

@@ -322,7 +322,7 @@ module Kitchen
                  init_command_vars_for_bourne(dirs)
                end
 
-        prefix_command(shell_code_from_file(vars, "chef_base_init_command"))
+        encode_for_powershell(prefix_command(shell_code_from_file(vars, "chef_base_init_command")))
       end
 
       # (see Base#install_command)

data/lib/kitchen/transport/ssh.rb

@@ -364,7 +364,9 @@ module Kitchen
           logger.debug(masked_string)
           yield
         rescue *RESCUE_EXCEPTIONS_ON_ESTABLISH => e
-          if (opts[:retries] -= 1) > 0
+          retries_left = opts[:retries] - 1
+          if retries_left > 0
+            opts[:retries] = retries_left
             message = if opts[:message]
                         logger.debug("[SSH] connection failed (#{e.inspect})")
                         opts[:message]

data/lib/kitchen/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.8.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-03 00:00:00.000000000 Z
+date: 2025-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf