test-kitchen 2.3.4 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15c9a72eb04c9c0bc9e568e4e239dc05c7dad13d721370afdcc1b35df180ff12
-  data.tar.gz: 528b0c3bc29d1b16c3e56feeaf35f87a5b1b6d1c37b757f6460e19045a219b15
+  metadata.gz: 13209f8ae2db3d98eefbf14798a6ac583d867ce4f8e0dd19615ed6a2bdc3b2a7
+  data.tar.gz: 9e4300e69c3873ef2310381ab3c4f52349683bf1635afa4ce7464d89d33c1874
 SHA512:
-  metadata.gz: 9a4fe9ce79cad2bce2c4fa8fd61b2a5a105183c4d5962c5041f25b0f79e95e2e75c0d84190d21b5915cdb88498bb94e7cce7644aa6ee16428c8bbb760aaa89c6
-  data.tar.gz: f9cf235f6fcaa1594747e92695b34160bbfd3f45fc9f061c553c74d1bda51663fa2ae0304c2f5fae2feb54deb6779f5c033ee56f3aab4bed3e9c109c46f60ff0
+  metadata.gz: f40db4a968197d9102ba4a651ce6dce9b5557cc6498a5fca8529fb0cad9c5467d99f3340f99ed6d25f1424c95edd3dda2676a16ea98ddc556d69514e6e7d9b9b
+  data.tar.gz: 14ea562a570a3263111942233bc5bbd53aba4c75128284a8e84e295c612612b86293036cf7d56f9b5860a486d5f3d450b92934334c81cc6eb6b21754ae9ae8de

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

@@ -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"

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

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.4.0".freeze
 end

data/templates/init/chefignore.erb

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

data/test-kitchen.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
 
   gem.add_development_dependency "aruba",     "~> 0.11"
-  gem.add_development_dependency "fakefs",    "~> 0.4"
+  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.4.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -270,14 +270,14 @@ dependencies:
     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 +487,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