test-kitchen 2.7.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6ccfe0fbf72b2850671e2e1782c9b8477dd2134a3582d8087dd61c77a7414c7
-  data.tar.gz: 74b6c95a6bc563f846ae54f6c1f62661b4cb1128aa278535e8234e95c2be3ce1
+  metadata.gz: 51ed51940914e0c4ffb30d1e11be2e3554289833261e0b418eaa2ebdb674cab9
+  data.tar.gz: c3c9be7593e1c0c333102168228c84e217244c5071da0bfb2ba543edca7581ba
 SHA512:
-  metadata.gz: 7a01947ea6e91991646128a65733f0b9b9a7c1d50cb76cb2b373288dbc2b2b3e631d3a217cbbbcec09b21331ef21545dfb89af3ec595ea69ca3b82e367febccc
-  data.tar.gz: 2735785eb1b12548353a38da11ff74484daa403fd4672d196d30915807f937b7dab0760cccf502d32ceb4620cabf5274f7f12a07efe85d179c0a3ce8d1e165f6
+  metadata.gz: 59633a6df2c274542ee3d4c649c55f8632077a98476ee655a1f59c0b39d42fad9077294b0e615d8e7f697feef4cbb027a9df7be81708832760d45eee72fbf159
+  data.tar.gz: 34164cc7046bb2aa507fa33373c928d94be84284a99ba629562c585614c1818d032a42a1b2b83ab0b95382e984841be63a2dc32a05412dbf8d60a15839325146

data/lib/kitchen.rb

@@ -16,8 +16,6 @@
 # limitations under the License.
 
 require "pathname" unless defined?(Pathname)
-require "thread"
-
 require_relative "kitchen/errors"
 require_relative "kitchen/logger"
 require_relative "kitchen/logging"
@@ -67,7 +65,7 @@ module Kitchen
     #
     # @return [Pathname] root path of gem
     def source_root
-      @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
+      @source_root ||= Pathname.new(File.expand_path("..", __dir__))
     end
 
     # Returns a default logger which emits on standard output.

data/lib/kitchen/cli.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # CI tests fail without an explicit unconditional require of Thor
-require "thor" # rubocop:disable ChefRuby/UnlessDefinedRequire
+require "thor" # rubocop:disable Chef/Ruby/UnlessDefinedRequire
 
 require_relative "../kitchen"
 require_relative "generator/init"
@@ -162,7 +162,7 @@ module Kitchen
       long_desc <<-DESC
         The instance states are in order: destroy, create, converge, setup, verify, destroy.
         Change one or more instances from the current state to the #{action} state. Actions for all
-        intermediate states will be executed. See http://kitchen.ci for further explanation.
+        intermediate states will be executed. See https://kitchen.ci/ for further explanation.
       DESC
       method_option :concurrency,
         aliases: "-c",

data/lib/kitchen/command.rb

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "thread"
-
 module Kitchen
   module Command
     # Base class for CLI commands.

data/lib/kitchen/command/diagnose.rb

@@ -18,7 +18,7 @@
 require_relative "../command"
 require_relative "../diagnostic"
 
-require "yaml" unless defined?(YAML)
+autoload :YAML, "yaml"
 
 module Kitchen
   module Command
@@ -32,9 +32,9 @@ module Kitchen
 
         loader = record_failure { load_loader }
 
-        puts Kitchen::Diagnostic.new(
+        puts YAML.dump(Kitchen::Diagnostic.new(
           loader: loader, instances: instances, plugins: plugins?
-        ).read.to_yaml
+        ).read)
       end
 
       private

data/lib/kitchen/config.rb

@@ -213,7 +213,7 @@ module Kitchen
           provisioner: Provisioner::DEFAULT_PLUGIN,
           verifier: Verifier::DEFAULT_PLUGIN,
           transport: lambda do |_suite, platform|
-            platform =~ /^win/i ? "winrm" : Transport::DEFAULT_PLUGIN
+            /^win/i.match?(platform) ? "winrm" : Transport::DEFAULT_PLUGIN
           end,
         },
         kitchen_root: kitchen_root,
@@ -244,16 +244,18 @@ module Kitchen
     # @return [Instance] a new Instance object
     # @api private
     def new_instance(suite, platform, index)
+      sf = new_state_file(suite, platform)
+
       Instance.new(
         driver: new_driver(suite, platform),
-        lifecycle_hooks: new_lifecycle_hooks(suite, platform),
+        lifecycle_hooks: new_lifecycle_hooks(suite, platform, sf),
         logger: new_instance_logger(suite, platform, index),
         suite: suite,
         platform: platform,
         provisioner: new_provisioner(suite, platform),
         transport: new_transport(suite, platform),
         verifier: new_verifier(suite, platform),
-        state_file: new_state_file(suite, platform)
+        state_file: sf
       )
     end
 
@@ -284,11 +286,12 @@ module Kitchen
     #
     # @param suite [Suite,#name] a Suite
     # @param platform [Platform,#name] a Platform
+    # @param state_file [Kitchen::StateFile] a SateFile
     # @return [LifecycleHooks] a new LifecycleHooks object
     # @api private
-    def new_lifecycle_hooks(suite, platform)
+    def new_lifecycle_hooks(suite, platform, state_file)
       lhdata = data.lifecycle_hooks_data_for(suite.name, platform.name)
-      LifecycleHooks.new(lhdata)
+      LifecycleHooks.new(lhdata, state_file)
     end
 
     # Builds a newly configured Provisioner object, for a given Suite and

data/lib/kitchen/lifecycle_hook/base.rb

@@ -0,0 +1,78 @@
+module Kitchen
+  class LifecycleHook
+    class Base
+      # @return [Kitchen::LifecycleHooks]
+      attr_reader :lifecycle_hooks
+
+      # return [String]
+      attr_reader :phase
+
+      # return [Hash]
+      attr_reader :hook
+
+      # @param lifecycle_hooks [Kitchen::LifecycleHooks]
+      # @param phase [String]
+      # @param hook [Hash]
+      def initialize(lifecycle_hooks, phase, hook)
+        @lifecycle_hooks = lifecycle_hooks
+        @phase = phase
+        @hook = hook
+      end
+
+      # return [void]
+      def run
+        raise NotImplementedError
+      end
+
+      # @return [TrueClass, FalseClass]
+      def should_run?
+        if !includes.empty?
+          includes.include?(platform_name)
+        elsif !excludes.empty?
+          !excludes.include?(platform_name)
+        else
+          true
+        end
+      end
+
+      # @return [Logger] the lifecycle hooks's logger
+      #   otherwise
+      # @api private
+      def logger
+        lifecycle_hooks.send(:logger)
+      end
+
+      private
+
+      # @return [Kitchen::Instance]
+      def instance
+        lifecycle_hooks.instance
+      end
+
+      # @return [Hash]
+      def config
+        lifecycle_hooks.send(:config)
+      end
+
+      # @return [Kitchen::StateFile]
+      def state_file
+        lifecycle_hooks.state_file
+      end
+
+      # @return [Array<String>] names of excluded platforms
+      def excludes
+        @excludes ||= hook.fetch(:excludes, [])
+      end
+
+      # @return [Array<String>] names of only included platforms
+      def includes
+        @includes ||= hook.fetch(:includes, [])
+      end
+
+      # @return [String]
+      def platform_name
+        instance.platform.name
+      end
+    end
+  end
+end

data/lib/kitchen/lifecycle_hook/local.rb

@@ -0,0 +1,53 @@
+require_relative "base"
+require_relative "../shell_out"
+require_relative "../logging"
+
+module Kitchen
+  class LifecycleHook
+    class Local < Base
+      include ShellOut
+      include Logging
+
+      # Execute a specific local command hook.
+      #
+      # @return [void]
+      def run
+        state = state_file.read
+        # set up empty user variable
+        user = {}
+        # Set up some environment variables with instance info.
+        environment = {
+          "KITCHEN_INSTANCE_NAME" => instance.name,
+          "KITCHEN_SUITE_NAME" => instance.suite.name,
+          "KITCHEN_PLATFORM_NAME" => instance.platform.name,
+          "KITCHEN_INSTANCE_HOSTNAME" => state[:hostname].to_s,
+        }
+        # If the user specified env vars too, fix them up because symbol keys
+        # make mixlib-shellout sad.
+        hook[:environment]&.each do |k, v|
+          environment[k.to_s] = v.to_s
+        end
+
+        # add user to user hash for later merging
+        user[:user] = hook[:user] if hook[:user]
+
+        # Default the cwd to the kitchen root and resolve a relative input cwd against that.
+        cwd = if hook[:cwd]
+                File.expand_path(hook[:cwd], config[:kitchen_root])
+              else
+                config[:kitchen_root]
+              end
+        # Build the options for mixlib-shellout.
+        opts = {}.merge(user).merge(cwd: cwd, environment: environment)
+        run_command(command, opts)
+      end
+
+      private
+
+      # @return [String]
+      def command
+        hook.fetch(:local)
+      end
+    end
+  end
+end

data/lib/kitchen/lifecycle_hook/remote.rb

@@ -0,0 +1,33 @@
+require_relative "base"
+require_relative "../errors"
+
+module Kitchen
+  class LifecycleHook
+    class Remote < Base
+      # Execute a specific remote command hook.
+      #
+      # @return [void]
+      def run
+        # Check if we're in a state that makes sense to even try.
+        unless instance.last_action
+          if hook[:skippable]
+            # Just not even trying.
+            return
+          else
+            raise UserError, "Cannot use remote lifecycle hooks during phases when the instance is not available"
+          end
+        end
+
+        conn = instance.transport.connection(state_file.read)
+        conn.execute(command)
+      end
+
+      private
+
+      # return [String]
+      def command
+        hook.fetch(:remote)
+      end
+    end
+  end
+end

data/lib/kitchen/lifecycle_hooks.rb

@@ -15,8 +15,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require_relative "configurable"
 require_relative "errors"
-require_relative "shell_out"
+require_relative "lifecycle_hook/local"
+require_relative "lifecycle_hook/remote"
+require_relative "logging"
 
 module Kitchen
   # A helper object used by {Instance} to coordinate lifecycle hook calls from
@@ -27,10 +30,10 @@ module Kitchen
   class LifecycleHooks
     include Configurable
     include Logging
-    include ShellOut
 
-    def initialize(config)
+    def initialize(config, state_file)
       init_config(config)
+      @state_file = state_file
     end
 
     # Run a lifecycle phase with the pre and post hooks.
@@ -40,21 +43,22 @@ module Kitchen
     # @param block [Proc] Block of code implementing the lifecycle phase.
     # @return [void]
     def run_with_hooks(phase, state_file, &block)
-      run(instance, phase, state_file, :pre)
+      run(phase, :pre)
       yield
-      run(instance, phase, state_file, :post)
+      run(phase, :post)
     end
 
+    # @return [Kitchen::StateFile]
+    attr_reader :state_file
+
     private
 
     # Execute a specific lifecycle hook.
     #
-    # @param instance [Instance] The instance object to run against.
     # @param phase [String] Lifecycle phase which is being executed.
-    # @param state_file [StateFile] Instance state file object.
     # @param hook_timing [Symbol] `:pre` or `:post` to indicate which hook to run.
     # @return [void]
-    def run(instance, phase, state_file, hook_timing)
+    def run(phase, hook_timing)
       # Yes this has to be a symbol because of how data munger works.
       hook_key = :"#{hook_timing}_#{phase}"
       # No hooks? We're outta here.
@@ -65,80 +69,24 @@ module Kitchen
         # Coerce the common case of a bare string to be a local command. This
         # is to match the behavior of the old `pre_create_command` semi-hook.
         hook = { local: hook } if hook.is_a?(String)
-        if hook.include?(:local)
-          # Local command execution on the workstation.
-          run_local_hook(instance, state_file, hook)
-        elsif hook.include?(:remote)
-          # Remote command execution on the test instance.
-          run_remote_hook(instance, state_file, hook)
-        else
-          raise UserError, "Unknown lifecycle hook target #{hook.inspect}"
-        end
+        hook = generate_hook(phase, hook)
+        hook.run if hook.should_run?
       end
     end
 
-    # Execute a specific local command hook.
-    #
-    # @param instance [Instance] The instance object to run against.
-    # @param state_file [StateFile] Instance state file object.
-    # @param hook [Hash] Hook configration to use.
-    # @return [void]
-    def run_local_hook(instance, state_file, hook)
-      cmd = hook.fetch(:local)
-      state = state_file.read
-      # set up empty user variable
-      user = {}
-      # Set up some environment variables with instance info.
-      environment = {
-        "KITCHEN_INSTANCE_NAME" => instance.name,
-        "KITCHEN_SUITE_NAME" => instance.suite.name,
-        "KITCHEN_PLATFORM_NAME" => instance.platform.name,
-        "KITCHEN_INSTANCE_HOSTNAME" => state[:hostname].to_s,
-      }
-      # If the user specified env vars too, fix them up because symbol keys
-      # make mixlib-shellout sad.
-      if hook[:environment]
-        hook[:environment].each do |k, v|
-          environment[k.to_s] = v.to_s
-        end
-      end
-
-      # add user to user hash for later merging
-      if hook[:user]
-        user[:user] = hook[:user]
+    # @param phase [String]
+    # @param hook [Hash]
+    # @return [Kitchen::LifecycleHook::Local, Kitchen::LifecycleHook::Remote]
+    def generate_hook(phase, hook)
+      if hook.include?(:local)
+        # Local command execution on the workstation.
+        Kitchen::LifecycleHook::Local.new(self, phase, hook)
+      elsif hook.include?(:remote)
+        # Remote command execution on the test instance.
+        Kitchen::LifecycleHook::Remote.new(self, phase, hook)
+      else
+        raise UserError, "Unknown lifecycle hook target #{hook.inspect}"
       end
-
-      # Default the cwd to the kitchen root and resolve a relative input cwd against that.
-      cwd = if hook[:cwd]
-              File.expand_path(hook[:cwd], config[:kitchen_root])
-            else
-              config[:kitchen_root]
-            end
-      # Build the options for mixlib-shellout.
-      opts = {}.merge(user).merge(cwd: cwd, environment: environment)
-      run_command(cmd, opts)
-    end
-
-    # Execute a specific remote command hook.
-    #
-    # @param instance [Instance] The instance object to run against.
-    # @param state_file [StateFile] Instance state file object.
-    # @param hook [Hash] Hook configration to use.
-    # @return [void]
-    def run_remote_hook(instance, state_file, hook)
-      # Check if we're in a state that makes sense to even try.
-      unless instance.last_action
-        if hook[:skippable]
-          # Just not even trying.
-          return
-        else
-          raise UserError, "Cannot use remote lifecycle hooks during phases when the instance is not available"
-        end
-      end
-
-      cmd = hook.fetch(:remote)
-      conn = instance.transport.connection(state_file.read)
-      conn.execute(cmd)
     end
   end
 end

data/lib/kitchen/loader/yaml.rb

@@ -17,6 +17,7 @@
 
 require "erb" unless defined?(Erb)
 require_relative "../../vendor/hash_recursive_merge"
+require "psych" unless defined?(Psych)
 require "yaml" unless defined?(YAML)
 
 module Kitchen

data/lib/kitchen/provisioner/base.rb

@@ -51,6 +51,7 @@ module Kitchen
 
       default_config :command_prefix, nil
 
+      default_config :uploads, {}
       default_config :downloads, {}
 
       expand_path_for :test_base_path
@@ -72,6 +73,10 @@ module Kitchen
         sandbox_dirs = Util.list_directory(sandbox_path)
 
         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)
           conn.execute(init_command)
           info("Transferring files to #{instance.to_str}")

data/lib/kitchen/provisioner/chef/policyfile.rb

@@ -110,13 +110,13 @@ module Kitchen
         # @return [String]
         # @api private
         def escape_path(path)
-          if RbConfig::CONFIG["host_os"] =~ /mswin|mingw/
+          if /mswin|mingw/.match?(RbConfig::CONFIG["host_os"])
             # I know what you're thinking: "just use Shellwords.escape". That
             # method produces incorrect results on Windows with certain input
             # which would be a metacharacter in Sh but is not for one or more of
             # Windows command line parsing libraries. This covers the 99% case of
             # spaces in the path without breaking other stuff.
-            if path =~ /[ \t\n\v"]/
+            if /[ \t\n\v"]/.match?(path)
               "\"#{path.gsub(/[ \t\n\v\"\\]/) { |m| '\\' + m[0] }}\""
             else
               path
@@ -136,7 +136,7 @@ module Kitchen
           # @api private
           def detect_chef_command!(logger)
             unless ENV["PATH"].split(File::PATH_SEPARATOR).any? do |path|
-              if RbConfig::CONFIG["host_os"] =~ /mswin|mingw/
+              if /mswin|mingw/.match?(RbConfig::CONFIG["host_os"])
                 # Windows could have different extentions: BAT, EXE or NONE
                 %w{chef chef.exe chef.bat}.each do |bin|
                   File.exist?(File.join(path, bin))
@@ -146,7 +146,7 @@ module Kitchen
               end
             end
               logger.fatal("The `chef` executable cannot be found in your " \
-                          "PATH. Ensure you have installed ChefDK or Chef Workstation " \
+                          "PATH. Ensure you have installed Chef Workstation " \
                           "from https://downloads.chef.io and that your PATH " \
                           "setting includes the path to the `chef` command.")
               raise UserError,

data/lib/kitchen/provisioner/chef_base.rb

@@ -24,9 +24,9 @@ require_relative "chef/policyfile"
 require_relative "chef/berkshelf"
 require_relative "chef/common_sandbox"
 require_relative "../util"
-require "mixlib/install"
-require "mixlib/install/script_generator"
-require "license_acceptance/acceptor"
+module LicenseAcceptance
+  autoload :Acceptor, "license_acceptance/acceptor"
+end
 
 begin
   require "chef-config/config"
@@ -156,7 +156,7 @@ module Kitchen
               product_name: <chef or chef-workstation>
               install_strategy: skip
           MSG
-        when provisioner[:require_chef_omnibus].to_s.match(/\d/)
+        when provisioner[:require_chef_omnibus].to_s.match?(/\d/)
           Util.outdent!(<<-MSG)
             The 'require_chef_omnibus' attribute with version values will change
             to use the new 'product_version' attribute.
@@ -503,6 +503,7 @@ module Kitchen
       # @return [String] contents of product based install script
       # @api private
       def script_for_product
+        require "mixlib/install"
         installer = Mixlib::Install.new({
           product_name: config[:product_name],
           product_version: config[:product_version],
@@ -576,6 +577,7 @@ module Kitchen
       # @return [String] contents of version based install script
       # @api private
       def script_for_omnibus_version
+        require "mixlib/install/script_generator"
         installer = Mixlib::Install::ScriptGenerator.new(
           config[:require_chef_omnibus], powershell_shell?, install_options
         )

data/lib/kitchen/provisioner/chef_solo.rb

@@ -27,6 +27,10 @@ module Kitchen
 
       plugin_version Kitchen::VERSION
 
+      # ChefSolo is dependent on Berkshelf, which is not thread-safe.
+      # See discussion on https://github.com/test-kitchen/test-kitchen/issues/1307
+      no_parallel_for :converge
+
       default_config :solo_rb, {}
 
       default_config :chef_solo_path do |provisioner|

data/lib/kitchen/ssh.rb

@@ -16,8 +16,9 @@
 # limitations under the License.
 
 require "logger"
-require "net/ssh" unless defined?(Net::SSH)
-require "net/scp"
+module Net
+  autoload :SSH, "net/ssh"
+end
 require "socket" unless defined?(Socket)
 
 require_relative "errors"
@@ -90,6 +91,7 @@ module Kitchen
     #   `Net::SCP.upload`
     # @see http://net-ssh.github.io/net-scp/classes/Net/SCP.html#method-i-upload
     def upload!(local, remote, options = {}, &progress)
+      require "net/scp" unless defined?(Net::SCP)
       if progress.nil?
         progress = lambda do |_ch, name, sent, total|
           logger.debug("Uploaded #{name} (#{total} bytes)") if sent == total
@@ -100,6 +102,7 @@ module Kitchen
     end
 
     def upload(local, remote, options = {}, &progress)
+      require "net/scp" unless defined?(Net::SCP)
       if progress.nil?
         progress = lambda do |_ch, name, sent, total|
           if sent == total

data/lib/kitchen/state_file.rb

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "yaml" unless defined?(YAML)
+autoload :YAML, "yaml"
 
 module Kitchen
   # Exception class for any exceptions raised when reading and parsing a state

data/lib/kitchen/transport/exec.rb

@@ -28,7 +28,7 @@ module Kitchen
       plugin_version Kitchen::VERSION
 
       def connection(state, &block)
-        options = config.to_hash.merge(state)
+        options = connection_options(config.to_hash.merge(state))
         Kitchen::Transport::Exec::Connection.new(options, &block)
       end
 
@@ -40,19 +40,105 @@ module Kitchen
         def execute(command)
           return if command.nil?
 
-          run_command(command)
+          if host_os_windows?
+            run_command(run_from_file_command(command))
+            close
+          else
+            run_command(command)
+          end
+        end
+
+        def close
+          if host_os_windows?
+            FileUtils.remove(exec_script_file)
+          end
         end
 
         # "Upload" the files by copying them locally.
         #
         # @see Base#upload
         def upload(locals, remote)
-          FileUtils.mkdir_p(remote)
+          # evaluate $env:temp on Windows
+          real_remote = remote.to_s == "\$env:TEMP\\kitchen" ? kitchen_temp : remote
+          FileUtils.mkdir_p(real_remote)
           Array(locals).each do |local|
-            FileUtils.cp_r(local, remote)
+            FileUtils.cp_r(local, real_remote)
+          end
+        end
+
+        # (see Base#init_options)
+        def init_options(options)
+          super
+          @instance_name = @options.delete(:instance_name)
+          @kitchen_root = @options.delete(:kitchen_root)
+        end
+
+        private
+
+        # @return [String] display name for the associated instance
+        # @api private
+        attr_reader :instance_name
+
+        # @return [String] local path to the root of the project
+        # @api private
+        attr_reader :kitchen_root
+
+        # Takes a long command and saves it to a file and uploads it to
+        # the test instance. Windows has cli character limits.
+        #
+        # @param command [String] a long command to be saved and uploaded
+        # @return [String] a command that executes the uploaded script
+        # @api private
+        def run_from_file_command(command)
+          if logger.debug?
+            debug("Creating exec script for #{instance_name} (#{exec_script_file})")
+            debug("Executing #{exec_script_file}")
+          end
+          File.open(exec_script_file, "wb") { |file| file.write(command) }
+          %{powershell -file "#{exec_script_file}"}
+        end
+
+        # @return [String] evaluated $env:temp variable
+        # @api private
+        def kitchen_temp
+          "#{ENV["temp"]}/kitchen"
+        end
+
+        # @return [String] name of script using instance name
+        # @api private
+        def exec_script_name
+          "#{instance_name}-exec-script.ps1"
+        end
+
+        # @return [String] file path for exec script to be run
+        # @api private
+        def exec_script_file
+          File.join(kitchen_root, ".kitchen", exec_script_name)
+        end
+
+        def host_os_windows?
+          case RbConfig::CONFIG["host_os"]
+          when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+            true
+          else
+            false
           end
         end
+      end
+
+      private
 
+      # Builds the hash of options needed by the Connection object on construction.
+      #
+      # @param data [Hash] merged configuration and mutable state data
+      # @return [Hash] hash of connection options
+      # @api private
+      def connection_options(data)
+        opts = {
+          instance_name: instance.name,
+          kitchen_root: Dir.pwd,
+        }
+        opts
       end
     end
   end

data/lib/kitchen/transport/winrm.rb

@@ -308,16 +308,20 @@ module Kitchen
 
         # Builds a `LoginCommand` for use by Linux-based platforms.
         #
-        # TODO: determine whether or not `desktop` exists
-        #
         # @return [LoginCommand] a login command
         # @api private
         def login_command_for_linux
-          args  = %W{-u #{options[:user]}}
-          args += %W{-p #{options[:password]}} if options.key?(:password)
-          args += %W{#{URI.parse(options[:endpoint]).host}:#{rdp_port}}
+          xfreerdp = Util.command_exists? "xfreerdp"
+          unless xfreerdp
+            raise WinrmFailed, "xfreerdp binary not found. Please install freerdp2-x11 on Debian-based systems or freerdp on Redhat-based systems."
+          end
+
+          args  = %W{/u:#{options[:user]}}
+          args += %W{/p:#{options[:password]}} if options.key?(:password)
+          args += %W{/v:#{URI.parse(options[:endpoint]).host}:#{rdp_port}}
+          args += %W{/cert-tofu} # always accept certificate
 
-          LoginCommand.new("rdesktop", args)
+          LoginCommand.new(xfreerdp, args)
         end
 
         # Builds a `LoginCommand` for use by Mac-based platforms.

data/lib/kitchen/util.rb

@@ -110,7 +110,7 @@ module Kitchen
     def self.wrap_command(cmd)
       cmd = "false" if cmd.nil?
       cmd = "true" if cmd.to_s.empty?
-      cmd = cmd.sub(/\n\Z/, "") if cmd =~ /\n\Z/
+      cmd = cmd.sub(/\n\Z/, "") if /\n\Z/.match?(cmd)
 
       "sh -c '\n#{cmd}\n'"
     end
@@ -215,5 +215,15 @@ module Kitchen
     def self.snake_case(a_string)
       Thor::Util.snake_case(a_string)
     end
+
+    # Check if a cmd exists on the PATH
+    def self.command_exists?(cmd)
+      paths = ENV["PATH"].split(File::PATH_SEPARATOR) + [ "/bin", "/usr/bin", "/sbin", "/usr/sbin" ]
+      paths.each do |path|
+        filename = File.join(path, cmd)
+        return filename if File.executable?(filename)
+      end
+      false
+    end
   end
 end

data/lib/kitchen/verifier/busser.rb

@@ -168,7 +168,7 @@ module Kitchen
       # @api private
       def gem_install_args
         gem, version = config[:version].split("@")
-        if gem =~ /^\d+\.\d+\.\d+/
+        if /^\d+\.\d+\.\d+/.match?(gem)
           version = gem
           gem = "busser"
         end

data/lib/kitchen/version.rb

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

data/test-kitchen.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "kitchen/version"
 require "English"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -415,6 +415,9 @@ files:
 - lib/kitchen/generator/init.rb
 - lib/kitchen/instance.rb
 - lib/kitchen/lazy_hash.rb
+- lib/kitchen/lifecycle_hook/base.rb
+- lib/kitchen/lifecycle_hook/local.rb
+- lib/kitchen/lifecycle_hook/remote.rb
 - lib/kitchen/lifecycle_hooks.rb
 - lib/kitchen/loader/yaml.rb
 - lib/kitchen/logger.rb
@@ -500,7 +503,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Test Kitchen is an integration tool for developing and testing infrastructure