test-kitchen 2.3.4 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15c9a72eb04c9c0bc9e568e4e239dc05c7dad13d721370afdcc1b35df180ff12
-  data.tar.gz: 528b0c3bc29d1b16c3e56feeaf35f87a5b1b6d1c37b757f6460e19045a219b15
+  metadata.gz: 15da3669fff472ce1a908562922fa945e8e65a82657b360270e498f17493ace0
+  data.tar.gz: 663b1e2800aff7ae63a8c9b2d2333c5af41b69503e116014ea4fde9f2e212438
 SHA512:
-  metadata.gz: 9a4fe9ce79cad2bce2c4fa8fd61b2a5a105183c4d5962c5041f25b0f79e95e2e75c0d84190d21b5915cdb88498bb94e7cce7644aa6ee16428c8bbb760aaa89c6
-  data.tar.gz: f9cf235f6fcaa1594747e92695b34160bbfd3f45fc9f061c553c74d1bda51663fa2ae0304c2f5fae2feb54deb6779f5c033ee56f3aab4bed3e9c109c46f60ff0
+  metadata.gz: f8fa9c1c41866ca32d894a8bd835ab80d389a9e9ea52839b8ec6f19f5a740837d9f57535c9f111d57a97c7649b7097440430ced07bd278e2c99d1f402fe486a0
+  data.tar.gz: e608e44111952e8b46486960a17b79b817b5adde8a83f17863d7332c0f408b11686290fc0ac385aa9dff1f2864495e5e5e9b27c0a489809109c08ad5f7c22ddc

data/Gemfile

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 source "https://rubygems.org"
 gemspec
 
@@ -10,7 +9,7 @@ group :integration do
 end
 
 group :changelog do
-  gem "github_changelog_generator", "1.15.0"
+  gem "github_changelog_generator", "1.15.2"
 end
 
 group :debug do
@@ -26,13 +25,3 @@ end
 group :docs do
   gem "yard"
 end
-
-instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
-
-# To avoid bringing in development or test dependencies that are not
-# absolutely needed, if you want to load tools not present in the gemspec
-# or this Gemfile, add those additional dependencies into a Gemfile.local
-# file which is ignored by this repository.
-# rubocop:disable Security/Eval
-eval(IO.read(__FILE__ + ".local"), binding) if File.exist?(__FILE__ + ".local")
-# rubocop:enable Security/Eval

data/lib/kitchen.rb

@@ -19,36 +19,36 @@
 require "pathname"
 require "thread"
 
-require "kitchen/errors"
-require "kitchen/logger"
-require "kitchen/logging"
-require "kitchen/shell_out"
-require "kitchen/configurable"
-require "kitchen/util"
-
-require "kitchen/provisioner"
-require "kitchen/provisioner/base"
-require "kitchen/color"
-require "kitchen/collection"
-require "kitchen/config"
-require "kitchen/data_munger"
-require "kitchen/driver"
-require "kitchen/driver/base"
-require "kitchen/driver/ssh_base"
-require "kitchen/driver/proxy"
-require "kitchen/instance"
-require "kitchen/lifecycle_hooks"
-require "kitchen/transport"
-require "kitchen/transport/base"
-require "kitchen/loader/yaml"
-require "kitchen/metadata_chopper"
-require "kitchen/platform"
-require "kitchen/state_file"
-require "kitchen/ssh"
-require "kitchen/suite"
-require "kitchen/verifier"
-require "kitchen/verifier/base"
-require "kitchen/version"
+require_relative "kitchen/errors"
+require_relative "kitchen/logger"
+require_relative "kitchen/logging"
+require_relative "kitchen/shell_out"
+require_relative "kitchen/configurable"
+require_relative "kitchen/util"
+
+require_relative "kitchen/provisioner"
+require_relative "kitchen/provisioner/base"
+require_relative "kitchen/color"
+require_relative "kitchen/collection"
+require_relative "kitchen/config"
+require_relative "kitchen/data_munger"
+require_relative "kitchen/driver"
+require_relative "kitchen/driver/base"
+require_relative "kitchen/driver/ssh_base"
+require_relative "kitchen/driver/proxy"
+require_relative "kitchen/instance"
+require_relative "kitchen/lifecycle_hooks"
+require_relative "kitchen/transport"
+require_relative "kitchen/transport/base"
+require_relative "kitchen/loader/yaml"
+require_relative "kitchen/metadata_chopper"
+require_relative "kitchen/platform"
+require_relative "kitchen/state_file"
+require_relative "kitchen/ssh"
+require_relative "kitchen/suite"
+require_relative "kitchen/verifier"
+require_relative "kitchen/verifier/base"
+require_relative "kitchen/version"
 
 # Test Kitchen base module.
 #

data/lib/kitchen/cli.rb

@@ -18,8 +18,8 @@
 
 require "thor"
 
-require "kitchen"
-require "kitchen/generator/init"
+require_relative "../kitchen"
+require_relative "generator/init"
 
 module Kitchen
   # The command line runner for Kitchen.

data/lib/kitchen/command/action.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/command"
+require_relative "../command"
 
 require "benchmark"
 

data/lib/kitchen/command/console.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/command"
+require_relative "../command"
 
 module Kitchen
   module Command

data/lib/kitchen/command/diagnose.rb

@@ -16,8 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/command"
-require "kitchen/diagnostic"
+require_relative "../command"
+require_relative "../diagnostic"
 
 require "yaml"
 

data/lib/kitchen/command/doctor.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/command"
+require_relative "../command"
 
 module Kitchen
   module Command

data/lib/kitchen/command/exec.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/command"
+require_relative "../command"
 
 module Kitchen
   module Command

data/lib/kitchen/command/list.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/command"
+require_relative "../command"
 require "json"
 
 module Kitchen

data/lib/kitchen/command/login.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/command"
+require_relative "../command"
 
 module Kitchen
   module Command

data/lib/kitchen/command/package.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/command"
+require_relative "../command"
 
 module Kitchen
   module Command

data/lib/kitchen/command/sink.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/command"
+require_relative "../command"
 
 module Kitchen
   module Command

data/lib/kitchen/command/test.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/command"
+require_relative "../command"
 
 require "benchmark"
 

data/lib/kitchen/configurable.rb

@@ -18,7 +18,7 @@
 
 require "thor/util"
 
-require "kitchen/lazy_hash"
+require_relative "lazy_hash"
 
 module Kitchen
   # A mixin for providing configuration-related behavior such as default
@@ -349,6 +349,12 @@ module Kitchen
       code_parts = resolve_proxy_settings_from_config
       code_parts << shell_env_var("TEST_KITCHEN", 1)
       code_parts << shell_env_var("CI", ENV["CI"]) if ENV["CI"]
+      code_parts << shell_env_var("CHEF_LICENSE", ENV["CHEF_LICENSE"]) if ENV["CHEF_LICENSE"]
+      ENV.select { |key, value| key.start_with?("TKENV_") }.each do |key, value|
+        env_var_name = "#{key}".sub!("TKENV_", "")
+        code_parts << shell_env_var(env_var_name, value)
+      end
+
       code_parts << code
       code_parts.join("\n")
     end

data/lib/kitchen/data_munger.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "vendor/hash_recursive_merge"
+require_relative "../vendor/hash_recursive_merge"
 
 module Kitchen
   # Class to handle recursive merging of configuration between platforms,

data/lib/kitchen/diagnostic.rb

@@ -16,8 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/util"
-require "kitchen/version"
+require_relative "util"
+require_relative "version"
 
 module Kitchen
   # Combines and compiles diagnostic information about a Test Kitchen

data/lib/kitchen/driver.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/plugin"
+require_relative "plugin"
 
 module Kitchen
   # A driver is responsible for carrying out the lifecycle activities of an

data/lib/kitchen/driver/base.rb

@@ -16,11 +16,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/configurable"
-require "kitchen/errors"
-require "kitchen/lazy_hash"
-require "kitchen/logging"
-require "kitchen/shell_out"
+require_relative "../configurable"
+require_relative "../errors"
+require_relative "../lazy_hash"
+require_relative "../logging"
+require_relative "../shell_out"
 
 module Kitchen
   module Driver

data/lib/kitchen/driver/dummy.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen"
+require_relative "../../kitchen"
 
 module Kitchen
   module Driver

data/lib/kitchen/driver/exec.rb

@@ -13,10 +13,10 @@
 # limitations under the License.
 #
 
-require "kitchen/driver/base"
-require "kitchen/shell_out"
-require "kitchen/transport/exec"
-require "kitchen/version"
+require_relative "base"
+require_relative "../shell_out"
+require_relative "../transport/exec"
+require_relative "../version"
 
 module Kitchen
   module Driver

data/lib/kitchen/driver/proxy.rb

@@ -18,8 +18,8 @@
 # limitations under the License.
 #
 
-require "kitchen/driver/ssh_base"
-require "kitchen/version"
+require_relative "ssh_base"
+require_relative "../version"
 
 module Kitchen
   module Driver

data/lib/kitchen/driver/ssh_base.rb

@@ -18,7 +18,7 @@
 
 require "thor/util"
 
-require "kitchen/lazy_hash"
+require_relative "../lazy_hash"
 require "benchmark"
 
 module Kitchen

data/lib/kitchen/generator/init.rb

@@ -136,7 +136,7 @@ module Kitchen
         rakedoc = <<-RAKE.gsub(/^ {10}/, "")
 
           begin
-            require 'kitchen/rake_tasks'
+            require_relative '../rake_tasks'
             Kitchen::RakeTasks.new
           rescue LoadError
             puts '>>>>> Kitchen gem not loaded, omitting tasks' unless ENV['CI']
@@ -154,7 +154,7 @@ module Kitchen
         thordoc = <<-THOR.gsub(/^ {10}/, "")
 
           begin
-            require 'kitchen/thor_tasks'
+            require_relative '../thor_tasks'
             Kitchen::ThorTasks.new
           rescue LoadError
             puts '>>>>> Kitchen gem not loaded, omitting tasks' unless ENV['CI']

data/lib/kitchen/lifecycle_hooks.rb

@@ -16,8 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/errors"
-require "kitchen/shell_out"
+require_relative "errors"
+require_relative "shell_out"
 
 module Kitchen
   # A helper object used by {Instance} to coordinate lifecycle hook calls from

data/lib/kitchen/loader/yaml.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 
 require "erb"
-require "vendor/hash_recursive_merge"
+require_relative "../../vendor/hash_recursive_merge"
 require "yaml"
 
 module Kitchen

data/lib/kitchen/plugin.rb

@@ -17,8 +17,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/errors"
-require "kitchen/util"
+require_relative "errors"
+require_relative "util"
 
 module Kitchen
   module Plugin

data/lib/kitchen/provisioner.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/plugin"
+require_relative "plugin"
 
 module Kitchen
   # A provisioner is responsible for generating the commands necessary to

data/lib/kitchen/provisioner/base.rb

@@ -16,9 +16,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/configurable"
-require "kitchen/errors"
-require "kitchen/logging"
+require_relative "../configurable"
+require_relative "../errors"
+require_relative "../logging"
 
 module Kitchen
   module Provisioner

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

@@ -16,8 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/errors"
-require "kitchen/logging"
+require_relative "../../errors"
+require_relative "../../logging"
 
 module Kitchen
   module Provisioner

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

@@ -19,9 +19,9 @@
 require "shellwords"
 require "rbconfig"
 
-require "kitchen/errors"
-require "kitchen/logging"
-require "kitchen/shell_out"
+require_relative "../../errors"
+require_relative "../../logging"
+require_relative "../../shell_out"
 
 module Kitchen
   module Provisioner

data/lib/kitchen/provisioner/chef_apply.rb

@@ -30,8 +30,8 @@
 #   name: chef_apply
 #
 # platforms:
-#   - name: ubuntu-16.04
-#   - name: centos-7
+#   - name: ubuntu-20.04
+#   - name: centos-8
 #
 # suites:
 #   - name: default
@@ -45,7 +45,7 @@
 # chef-apply apply/recipe1.rb
 # chef-apply apply/recipe2.rb
 
-require "kitchen/provisioner/chef_base"
+require_relative "chef_base"
 
 module Kitchen
   module Provisioner

data/lib/kitchen/provisioner/chef_base.rb

@@ -21,10 +21,10 @@ require "pathname"
 require "json"
 require "cgi"
 
-require "kitchen/provisioner/chef/policyfile"
-require "kitchen/provisioner/chef/berkshelf"
-require "kitchen/provisioner/chef/common_sandbox"
-require "kitchen/util"
+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"
@@ -69,6 +69,7 @@ module Kitchen
         README.* VERSION metadata.{json,rb} attributes.rb recipe.rb
         attributes/**/* definitions/**/* files/**/* libraries/**/*
         providers/**/* recipes/**/* resources/**/* templates/**/*
+        ohai/**/*
       ).join(",")
       # to ease upgrades, allow the user to turn deprecation warnings into errors
       default_config :deprecations_as_errors, false
@@ -153,7 +154,7 @@ module Kitchen
 
             # New Usage #
             provisioner:
-              product_name: <chef or chefdk>
+              product_name: <chef or chef-workstation>
               install_strategy: skip
           MSG
         when provisioner[:require_chef_omnibus].to_s.match(/\d/)
@@ -166,7 +167,7 @@ module Kitchen
 
             # New Usage #
             provisioner:
-              product_name: <chef or chefdk>
+              product_name: <chef or chef-workstation>
               product_version: #{provisioner[:require_chef_omnibus]}
           MSG
         when provisioner[:require_chef_omnibus] == "latest"
@@ -179,7 +180,7 @@ module Kitchen
 
             # New Usage #
             provisioner:
-              product_name: <chef or chefdk>
+              product_name: <chef or chef-workstation>
               install_strategy: always
           MSG
         end
@@ -199,11 +200,11 @@ module Kitchen
 
         # Deprecated Example #
         provisioner:
-          chef_omnibus_install_options: -P chefdk -c current
+          chef_omnibus_install_options: -P chef-workstation -c current
 
         # New Usage #
         provisioner:
-          product_name: chefdk
+          product_name: chef-workstation
           channel: current
       MSG
 
@@ -216,7 +217,7 @@ module Kitchen
 
         # New Usage #
         provisioner:
-          product_name: <chef or chefdk>
+          product_name: <chef or chef-workstation>
           download_url: http://direct-download-url
       MSG
 
@@ -225,9 +226,9 @@ module Kitchen
         fully managed by using attribute settings.
       MSG
 
-      # Reads the local Chef::Config object (if present).  We do this because
-      # we want to start bring Chef config and ChefDK tool config closer
-      # together.  For example, we want to configure proxy settings in 1
+      # Reads the local Chef::Config object (if present). We do this because
+      # we want to start bring Chef config and Chef Workstation config closer
+      # together. For example, we want to configure proxy settings in 1
       # location instead of 3 configuration files.
       #
       # @param config [Hash] initial provided configuration
@@ -328,7 +329,7 @@ module Kitchen
         return unless config[:require_chef_omnibus] || config[:product_name]
         return if config[:product_name] && config[:install_strategy] == "skip"
 
-        prefix_command(sudo(install_script_contents))
+        prefix_command(install_script_contents)
       end
 
       private
@@ -509,6 +510,8 @@ module Kitchen
           channel: config[:channel].to_sym,
           install_command_options: {
             install_strategy: config[:install_strategy],
+            tmp_dir: config[:root_path],
+            "TMPDIR" => config[:root_path],
           },
         }.tap do |opts|
           opts[:shell_type] = :ps1 if powershell_shell?
@@ -534,7 +537,6 @@ module Kitchen
             # install.ps1 only supports http_proxy
             prox.delete_if { |p| %i{https_proxy ftp_proxy no_proxy}.include?(p) } if powershell_shell?
           end
-
           opts[:install_command_options].merge!(proxies)
         end)
         config[:chef_omnibus_root] = installer.root
@@ -553,8 +555,14 @@ module Kitchen
       end
 
       def install_from_file(command)
-        install_file = "/tmp/chef-installer.sh"
-        script = ["cat > #{install_file} <<\"EOL\""]
+        install_file = "#{config[:root_path]}/chef-installer.sh"
+        script = []
+        script << "mkdir -p #{config[:root_path]}"
+        script << "if [ $? -ne 0 ]; then"
+        script << "  echo Kitchen config setting root_path: '#{config[:root_path]}' not creatable by regular user "
+        script << "  exit 1"
+        script << "fi"
+        script << "cat > #{install_file} <<\"EOL\""
         script << command
         script << "EOL"
         script << "chmod +x #{install_file}"
@@ -569,7 +577,7 @@ module Kitchen
           config[:require_chef_omnibus], powershell_shell?, install_options
         )
         config[:chef_omnibus_root] = installer.root
-        installer.install_command
+        sudo(installer.install_command)
       end
 
       # Hook used in subclasses to indicate support for policyfiles.

data/lib/kitchen/provisioner/chef_solo.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/provisioner/chef_base"
+require_relative "chef_base"
 
 module Kitchen
   module Provisioner

data/lib/kitchen/provisioner/chef_zero.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/provisioner/chef_base"
+require_relative "chef_base"
 
 module Kitchen
   module Provisioner

data/lib/kitchen/provisioner/dummy.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen"
+require_relative "../../kitchen"
 
 module Kitchen
   module Provisioner

data/lib/kitchen/provisioner/shell.rb

@@ -18,8 +18,8 @@
 
 require "shellwords"
 
-require "kitchen/provisioner/base"
-require "kitchen/version"
+require_relative "base"
+require_relative "../version"
 
 module Kitchen
   module Provisioner
@@ -106,13 +106,17 @@ module Kitchen
 
         if config[:arguments] && !config[:arguments].empty?
           if config[:arguments].is_a?(Array)
-            script = Shellwords.join([script] + config[:arguments])
+            if powershell_shell?
+              script = ([script] + config[:arguments]).join(" ")
+            else
+              script = Shellwords.join([script] + config[:arguments])
+            end
           else
             script.concat(" ").concat(config[:arguments].to_s)
           end
         end
 
-        code = powershell_shell? ? %{& "#{script}"} : sudo(script)
+        code = powershell_shell? ? %{& #{script}} : sudo(script)
 
         prefix_command(wrap_shell_code(code))
       end

data/lib/kitchen/rake_tasks.rb

@@ -18,7 +18,7 @@
 
 require "rake/tasklib"
 
-require "kitchen"
+require_relative "../kitchen"
 
 module Kitchen
   # Kitchen Rake task generator.

data/lib/kitchen/ssh.rb

@@ -21,8 +21,8 @@ require "net/ssh"
 require "net/scp"
 require "socket"
 
-require "kitchen/errors"
-require "kitchen/login_command"
+require_relative "errors"
+require_relative "login_command"
 
 module Kitchen
   # Wrapped exception for any internally raised SSH-related errors.

data/lib/kitchen/thor_tasks.rb

@@ -18,7 +18,7 @@
 
 require "thor"
 
-require "kitchen"
+require_relative "../kitchen"
 
 module Kitchen
   # Kitchen Thor task generator.

data/lib/kitchen/transport.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/plugin"
+require_relative "plugin"
 
 module Kitchen
   # A transport is responsible for the communication with an instance,

data/lib/kitchen/transport/base.rb

@@ -17,11 +17,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/configurable"
-require "kitchen/errors"
-require "kitchen/lazy_hash"
-require "kitchen/logging"
-require "kitchen/login_command"
+require_relative "../configurable"
+require_relative "../errors"
+require_relative "../lazy_hash"
+require_relative "../logging"
+require_relative "../login_command"
 
 module Kitchen
   module Transport

data/lib/kitchen/transport/dummy.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen"
+require_relative "../../kitchen"
 
 module Kitchen
   module Transport

data/lib/kitchen/transport/exec.rb

@@ -14,9 +14,9 @@
 
 require "fileutils"
 
-require "kitchen/shell_out"
-require "kitchen/transport/base"
-require "kitchen/version"
+require_relative "../shell_out"
+require_relative "base"
+require_relative "../version"
 
 module Kitchen
   module Transport

data/lib/kitchen/transport/ssh.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen"
+require_relative "../../kitchen"
 
 require "fileutils"
 require "net/ssh"

data/lib/kitchen/transport/winrm.rb

@@ -20,7 +20,7 @@
 
 require "rbconfig"
 require "uri"
-require "kitchen"
+require_relative "../../kitchen"
 require "winrm"
 
 module Kitchen

data/lib/kitchen/util.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/errors"
+require_relative "errors"
 require "thor/util"
 
 module Kitchen

data/lib/kitchen/verifier.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/plugin"
+require_relative "plugin"
 
 module Kitchen
   # A verifier is responsible for running tests post-converge to confirm that

data/lib/kitchen/verifier/base.rb

@@ -16,9 +16,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/errors"
-require "kitchen/configurable"
-require "kitchen/logging"
+require_relative "../errors"
+require_relative "../configurable"
+require_relative "../logging"
 
 module Kitchen
   module Verifier
@@ -75,6 +75,13 @@ module Kitchen
           debug("Transfer complete")
           conn.execute(prepare_command)
           conn.execute(run_command)
+
+          info("Downloading files from #{instance.to_str}")
+          config[:downloads].to_h.each do |remotes, local|
+            debug("Downloading #{Array(remotes).join(", ")} to #{local}")
+            conn.download(remotes, local)
+          end
+          debug("Download complete")
         end
       rescue Kitchen::Transport::TransportFailed => ex
         raise ActionFailed, ex.message

data/lib/kitchen/verifier/busser.rb

@@ -19,7 +19,7 @@
 require "base64"
 require "digest"
 
-require "kitchen/verifier/base"
+require_relative "base"
 
 module Kitchen
   module Verifier

data/lib/kitchen/verifier/dummy.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/verifier/base"
+require_relative "base"
 
 module Kitchen
   module Verifier

data/lib/kitchen/verifier/shell.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/verifier/base"
+require_relative "base"
 
 module Kitchen
   module Verifier

data/lib/kitchen/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "2.3.4".freeze
+  VERSION = "2.5.3".freeze
 end

data/support/chef_base_install_command.ps1

@@ -44,7 +44,7 @@ Function Download-Chef($md_url, $dst) {
 }
 
 Function Install-Chef($msi) {
-  Log "Installing Chef package $msi"
+  Log "Installing Chef Infra Client package $msi"
   $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi" -Passthru -Wait
 
   if ($p.ExitCode -ne 0) { throw "msiexec was not successful. Received exit code $($p.ExitCode)" }
@@ -73,11 +73,11 @@ Try {
   $msi = Unresolve-Path $msi
 
   if (Check-UpdateChef $chef_omnibus_root $version) {
-    Write-Host "-----> Installing Chef package ($pretty_version)`n"
+    Write-Host "-----> Installing Chef Infra Client package ($pretty_version)`n"
     Download-Chef "$chef_metadata_url" $msi
     Install-Chef $msi
   } else {
-    Write-Host "-----> Chef package installation detected ($pretty_version)`n"
+    Write-Host "-----> Chef Infra Client package installation detected ($pretty_version)`n"
 }
 Catch {
   Write-Error ($_ | ft -Property * | out-string) -ErrorAction Continue

data/support/chef_base_install_command.sh

@@ -206,7 +206,7 @@ unable_to_download() {
 main() {
   should_update_chef "$chef_omnibus_root" "$version"
   if test $? -eq 0; then
-    echo "-----> Installing Chef package (${pretty_version})";
+    echo "-----> Installing Chef Infra Client package (${pretty_version})";
 
     # solaris 10 lacks recent enough credentials, so http url is used
     platform="`/usr/bin/uname -s 2>/dev/null`";
@@ -218,7 +218,7 @@ main() {
     do_download "$chef_omnibus_url" /tmp/install.sh;
     $sudo_sh /tmp/install.sh $install_flags;
   else
-    echo "-----> Chef package installation detected (${pretty_version})";
+    echo "-----> Chef Infra Client package installation detected (${pretty_version})";
   fi
 }
 

data/templates/init/chefignore.erb

@@ -1 +1,2 @@
 .kitchen
+kitchen*.yml

data/templates/init/kitchen.yml.erb

@@ -6,8 +6,8 @@ provisioner:
   name: <%= config[:provisioner] %>
 
 platforms:
-  - name: ubuntu-18.04
-  - name: centos-7
+  - name: ubuntu-20.04
+  - name: centos-8
 
 suites:
   - name: default

data/test-kitchen.gemspec

@@ -24,12 +24,12 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">= 2.3"
 
   gem.add_dependency "mixlib-shellout",    ">= 1.2", "< 4.0"
-  gem.add_dependency "net-scp",            ">= 1.1", "< 3.0" # pinning until we can confirm 3+ works
-  gem.add_dependency "net-ssh",            ">= 2.9", "< 6.0" # pinning until we can confirm 6+ works
+  gem.add_dependency "net-scp",            ">= 1.1", "< 4.0" # pinning until we can confirm 4+ works
+  gem.add_dependency "net-ssh",            ">= 2.9", "< 7.0" # pinning until we can confirm 7+ works
   gem.add_dependency "net-ssh-gateway",    ">= 1.2", "< 3.0" # pinning until we can confirm 3+ works
   gem.add_dependency "ed25519",            "~> 1.2" # ed25519 ssh key support
   gem.add_dependency "bcrypt_pbkdf",       "~> 1.0" # ed25519 ssh key support
-  gem.add_dependency "thor",               "~> 0.19"
+  gem.add_dependency "thor",               ">= 0.19", "< 2.0"
   gem.add_dependency "mixlib-install",     "~> 3.6"
   gem.add_dependency "winrm",              "~> 2.0"
   gem.add_dependency "winrm-elevated",     "~> 1.0"
@@ -42,8 +42,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"
 
-  gem.add_development_dependency "aruba",     "~> 0.11"
-  gem.add_development_dependency "fakefs",    "~> 0.4"
+  gem.add_development_dependency "aruba",     "~> 0.11", "< 1.0"
+  gem.add_development_dependency "fakefs",    "~> 1.0"
   gem.add_development_dependency "minitest",  "~> 5.3", "< 5.12"
   gem.add_development_dependency "mocha",     "~> 1.1"
   gem.add_development_dependency "cucumber",  ">= 2.1", "< 4.0" # we just need to validate 4.0 when it comes out

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.5.3
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -39,7 +39,7 @@ dependencies:
         version: '1.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '1.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '2.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '2.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
   requirement: !ruby/object:Gem::Requirement
@@ -122,16 +122,22 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mixlib-install
   requirement: !ruby/object:Gem::Requirement
@@ -257,6 +263,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -264,20 +273,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -487,7 +499,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Test Kitchen is an integration tool for developing and testing infrastructure