test-kitchen 1.10.2 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c365d365930afd27da95bdfd0ba7215b0c062d34
-  data.tar.gz: 4b356e57b52d46ffa351fc06e79d2ab530d31cdb
+  metadata.gz: 18c07230017975d3394e829c8325bce98a9d29e7
+  data.tar.gz: 7beebf652866a5046898dcb9b0b21ac5b82d4e8e
 SHA512:
-  metadata.gz: c53f55c6469483d23333d7df71316f91ed005340aab50161edae21af70bd294ca67be3462eda45318b77527a9902dfea94a1009f58d160ed6296dae4a8b80fce
-  data.tar.gz: aea64bb5f8ab4add497688f808bcfdae894361b42f76dab1275f3001a8428621325dc7f9cea6778fb8d88a91e7f1b4af011751758505b6cf9c871cb8a1181e15
+  metadata.gz: 197303853148d6c9f2ca5add5d67c6683089bc4dd26cefb7e5b22b3b6f612adb68b82146027acaee6fdba7091bb5b49371429f0ecc1b92f8cb42c2895762b04e
+  data.tar.gz: 03bd9a05645d7e5860cf72a99569dd6b57fd7fdd795c90cc004b247eeccce3be31c9ae3b1b94aa6b5102bdaad494bb096cb667d6619f46afa362f83f6a833c4a

data/.kitchen.ci.yml

@@ -23,4 +23,4 @@ verifier:
 suites:
   - name: default
     run_list:
-      - recipe[filezilla]
+      - recipe[test_cookbook::default]

data/Berksfile

@@ -1,3 +1,3 @@
 source "https://supermarket.chef.io"
 
-cookbook "filezilla"
+cookbook "test_cookbook", :path => "./test/cookbooks/test_cookbook"

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## [v1.11.0](https://github.com/test-kitchen/test-kitchen/tree/v1.11.0) (2016-08-11)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.10.2...v1.11.0)
+
+**Implemented enhancements:**
+
+- Provide some way for Chef to know it's running under test [\#458](https://github.com/test-kitchen/test-kitchen/issues/458)
+- Dont set ssh key configuration if a password is specified [\#1095](https://github.com/test-kitchen/test-kitchen/pull/1095) ([mwrock](https://github.com/mwrock))
+- Ability to work with Instances over SSH tunnel. [\#1091](https://github.com/test-kitchen/test-kitchen/pull/1091) ([EYurchenko](https://github.com/EYurchenko))
+- Add environment variables $TEST\_KITCHEN and $CI [\#1081](https://github.com/test-kitchen/test-kitchen/pull/1081) ([coderanger](https://github.com/coderanger))
+- Adding test\_base\_path CLI arg to the diagnose command [\#1076](https://github.com/test-kitchen/test-kitchen/pull/1076) ([tyler-ball](https://github.com/tyler-ball))
+- Add legacy\_mode argument for chef\_solo provisioner [\#1073](https://github.com/test-kitchen/test-kitchen/pull/1073) ([SaltwaterC](https://github.com/SaltwaterC))
+- Added support for Chef 10 [\#1072](https://github.com/test-kitchen/test-kitchen/pull/1072) ([acondrat](https://github.com/acondrat))
+
+**Fixed bugs:**
+
+- Escape paths before running policyfile commands [\#1085](https://github.com/test-kitchen/test-kitchen/pull/1085) ([coderanger](https://github.com/coderanger))
+
 ## [v1.10.2](https://github.com/test-kitchen/test-kitchen/tree/v1.10.2) (2016-06-23)
 [Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.10.1...v1.10.2)
 

data/Gemfile

@@ -1,13 +1,7 @@
 # -*- encoding: utf-8 -*-
 source "https://rubygems.org"
 gemspec
-
-group :guard do
-  gem "guard-minitest"
-  gem "guard-cucumber", "~> 1.4"
-  gem "guard-rubocop"
-  gem "guard-yard"
-end
+gem "rack", "< 2.0"
 
 group :integration do
   gem "berkshelf", "~> 4.3"

data/MAINTAINERS.md

@@ -20,6 +20,7 @@ receive a veto from the Lieutenant or the Project Lead.
 * [Kimball Johnson](https://github.com/drrk)
 * [Lamont Granquist](https://github.com/lamont-granquist)
 * [Matt Wrock](https://github.com/mwrock)
+* [Noah Kantrowitz](https://github.com/coderanger)
 * [Robb Kidd](https://github.com/robbkidd)
 * [Sean Omeara](http://github.com/someara)
 * [Steven Murawski](http://github.com/smurawski)

data/Rakefile

@@ -40,23 +40,8 @@ rescue LoadError
   puts "finstyle/rubocop is not available.  gem install finstyle to do style checking."
 end
 
-begin
-  if RUBY_ENGINE != "jruby"
-    require "cane/rake_task"
-    desc "Run cane to check quality metrics"
-    Cane::RakeTask.new do |cane|
-      cane.canefile = "./.cane"
-    end
-
-    desc "Run all quality tasks"
-    task :quality => [:cane, :style, :stats]
-  else
-    desc "Run all quality tasks"
-    task :quality => [:style, :stats]
-  end
-rescue LoadError
-  puts "cane is not available. (sudo) gem install cane to check quality metrics."
-end
+desc "Run all quality tasks"
+task :quality => [:style, :stats]
 
 begin
   require "yard"

data/lib/kitchen/cli.rb

@@ -135,6 +135,7 @@ module Kitchen
       :type => :boolean,
       :desc => "Include all diagnostics"
     log_options
+    test_base_path
     def diagnose(*args)
       update_config!
       perform("diagnose", "diagnose", args, :loader => @loader)

data/lib/kitchen/configurable.rb

@@ -312,7 +312,11 @@ module Kitchen
     end
 
     def env_wrapped(code)
-      (proxy_settings << code).join("\n")
+      code_parts = proxy_settings
+      code_parts << shell_env_var("TEST_KITCHEN", 1)
+      code_parts << shell_env_var("CI", ENV["CI"]) if ENV["CI"]
+      code_parts << code
+      code_parts.join("\n")
     end
 
     def proxy_setting_keys

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

@@ -16,6 +16,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require "shellwords"
+require "rbconfig"
+
 require "kitchen/errors"
 require "kitchen/logging"
 require "kitchen/shell_out"
@@ -36,7 +39,7 @@ module Kitchen
 
         # Creates a new cookbook resolver.
         #
-        # @param berksfile [String] path to a Berksfile
+        # @param policyfile [String] path to a Policyfile
         # @param path [String] path in which to vendor the resulting
         #   cookbooks
         # @param logger [Kitchen::Logger] a logger to use for output, defaults
@@ -59,7 +62,7 @@ module Kitchen
         # in the desired path.
         def resolve
           info("Exporting cookbook dependencies from Policyfile #{path}...")
-          run_command("chef export #{policyfile} #{path} --force")
+          run_command("chef export #{escape_path(policyfile)} #{escape_path(path)} --force")
         end
 
         # Runs `chef install` to determine the correct cookbook set and
@@ -67,7 +70,7 @@ module Kitchen
         def compile
           info("Policy lock file doesn't exist, running `chef install` for "\
                "Policyfile #{policyfile}...")
-          run_command("chef install #{policyfile}")
+          run_command("chef install #{escape_path(policyfile)}")
         end
 
         private
@@ -101,6 +104,29 @@ module Kitchen
               "Could not find the chef executable in your PATH."
           end
         end
+
+        # Escape spaces in a path in way that works with both Sh (Unix) and
+        # Windows.
+        #
+        # @param path [String] Path to escape
+        # @return [String]
+        # @api private
+        def escape_path(path)
+          if RbConfig::CONFIG["host_os"] =~ /mswin|mingw/
+            # 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"]/
+              "\"#{path.gsub(/[ \t\n\v\"\\]/) { |m| "\\" + m[0] }}\""
+            else
+              path
+            end
+          else
+            Shellwords.escape(path)
+          end
+        end
       end
     end
   end

data/lib/kitchen/provisioner/chef_solo.rb

@@ -45,20 +45,37 @@ module Kitchen
         prepare_solo_rb
       end
 
+      def modern?
+        version = config[:require_chef_omnibus]
+
+        case version
+        when nil, false, true, 11, "11", "latest"
+          true
+        else
+          if Gem::Version.correct?(version)
+            Gem::Version.new(version) >= Gem::Version.new("11.0") ? true : false
+          else
+            true
+          end
+        end
+      end
+
       # (see Base#run_command)
-      def run_command # rubocop:disable Metrics/AbcSize
-        level = config[:log_level]
+      # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/AbcSize
+      def run_command
+        config[:log_level] = "info" if !modern? && config[:log_level] = "auto"
         cmd = sudo(config[:chef_solo_path]).dup.
           tap { |str| str.insert(0, "& ") if powershell_shell? }
         args = [
           "--config #{remote_path_join(config[:root_path], "solo.rb")}",
-          "--log_level #{level}",
-          "--force-formatter",
+          "--log_level #{config[:log_level]}",
           "--no-color",
           "--json-attributes #{remote_path_join(config[:root_path], "dna.json")}"
         ]
+        args << " --force-formatter" if modern?
         args << "--logfile #{config[:log_file]}" if config[:log_file]
         args << "--profile-ruby" if config[:profile_ruby]
+        args << "--legacy-mode" if config[:legacy_mode]
 
         prefix_command(
           wrap_shell_code(

data/lib/kitchen/transport/ssh.rb

@@ -19,6 +19,7 @@
 require "kitchen"
 
 require "net/ssh"
+require "net/ssh/gateway"
 require "net/scp"
 require "timeout"
 require "benchmark"
@@ -53,6 +54,9 @@ module Kitchen
       default_config :connection_retry_sleep, 1
       default_config :max_wait_until_ready, 600
 
+      default_config :ssh_gateway, nil
+      default_config :ssh_gateway_username, nil
+
       default_config :ssh_key, nil
       expand_path_for :ssh_key
 
@@ -142,6 +146,11 @@ module Kitchen
           if options.key?(:forward_agent)
             args += %W[ -o ForwardAgent=#{options[:forward_agent] ? "yes" : "no"} ]
           end
+          if ssh_gateway
+            gateway_command = "ssh -q #{ssh_gateway_username}@#{ssh_gateway} nc #{hostname} #{port}"
+            # Should support other ports than 22 for ssh gateways
+            args += %W[ -o ProxyCommand=#{gateway_command} -p 22 ]
+          end
           Array(options[:keys]).each { |ssh_key| args += %W[ -i #{ssh_key} ] }
           args += %W[ -p #{port} ]
           args += %W[ #{username}@#{hostname} ]
@@ -226,6 +235,33 @@ module Kitchen
         # @api private
         attr_reader :port
 
+        # @return [String] The ssh gateway to use when connecting to the
+        #   remote SSH host
+        # @api private
+        attr_reader :ssh_gateway
+
+        # @return [String] The username to use when using an ssh gateway
+        # @api private
+        attr_reader :ssh_gateway_username
+
+        # Establish an SSH session on the remote host using a gateway host.
+        #
+        # @param opts [Hash] retry options
+        # @option opts [Integer] :retries the number of times to retry before
+        #   failing
+        # @option opts [Float] :delay the number of seconds to wait until
+        #   attempting a retry
+        # @option opts [String] :message an optional message to be logged on
+        #   debug (overriding the default) when a rescuable exception is raised
+        # @return [Net::SSH::Connection::Session] the SSH connection session
+        # @api private
+        def establish_connection_via_gateway(opts)
+          retry_connection(opts) do
+            Net::SSH::Gateway.new(ssh_gateway,
+              ssh_gateway_username, options).ssh(hostname, username, options)
+          end
+        end
+
         # Establish an SSH session on the remote host.
         #
         # @param opts [Hash] retry options
@@ -238,8 +274,27 @@ module Kitchen
         # @return [Net::SSH::Connection::Session] the SSH connection session
         # @api private
         def establish_connection(opts)
-          logger.debug("[SSH] opening connection to #{self}")
-          Net::SSH.start(hostname, username, options)
+          retry_connection(opts) do
+            Net::SSH.start(hostname, username, options)
+          end
+        end
+
+        # Connecto to a host executing passed block and properly handling retreis.
+        #
+        # @param opts [Hash] retry options
+        # @option opts [Integer] :retries the number of times to retry before
+        #   failing
+        # @option opts [Float] :delay the number of seconds to wait until
+        #   attempting a retry
+        # @option opts [String] :message an optional message to be logged on
+        #   debug (overriding the default) when a rescuable exception is raised
+        # @return [Net::SSH::Connection::Session] the SSH connection session
+        # @api private
+        def retry_connection(opts)
+          log_msg = "[SSH] opening connection to #{self}"
+          log_msg += " via #{ssh_gateway_username}@#{ssh_gateway}" if ssh_gateway
+          logger.debug(log_msg)
+          yield
         rescue *RESCUE_EXCEPTIONS_ON_ESTABLISH => e
           if (opts[:retries] -= 1) > 0
             message = if opts[:message]
@@ -298,6 +353,8 @@ module Kitchen
           @connection_retry_sleep = @options.delete(:connection_retry_sleep)
           @max_ssh_sessions       = @options.delete(:max_ssh_sessions)
           @max_wait_until_ready   = @options.delete(:max_wait_until_ready)
+          @ssh_gateway            = @options.delete(:ssh_gateway)
+          @ssh_gateway_username   = @options.delete(:ssh_gateway_username)
         end
 
         # Returns a connection session, or establishes one when invoked the
@@ -307,10 +364,17 @@ module Kitchen
         # @return [Net::SSH::Connection::Session] the SSH connection session
         # @api private
         def session(retry_options = {})
-          @session ||= establish_connection({
-            :retries => connection_retries.to_i,
-            :delay   => connection_retry_sleep.to_i
-          }.merge(retry_options))
+          if ssh_gateway
+            @session ||= establish_connection_via_gateway({
+              :retries => connection_retries.to_i,
+              :delay   => connection_retry_sleep.to_i
+            }.merge(retry_options))
+          else
+            @session ||= establish_connection({
+              :retries => connection_retries.to_i,
+              :delay   => connection_retry_sleep.to_i
+            }.merge(retry_options))
+          end
         end
 
         # String representation of object, reporting its connection details and
@@ -347,12 +411,17 @@ module Kitchen
           :connection_retries     => data[:connection_retries],
           :connection_retry_sleep => data[:connection_retry_sleep],
           :max_ssh_sessions       => data[:max_ssh_sessions],
-          :max_wait_until_ready   => data[:max_wait_until_ready]
+          :max_wait_until_ready   => data[:max_wait_until_ready],
+          :ssh_gateway            => data[:ssh_gateway],
+          :ssh_gateway_username   => data[:ssh_gateway_username]
         }
 
-        opts[:keys_only] = true                     if data[:ssh_key]
-        opts[:keys] = Array(data[:ssh_key])         if data[:ssh_key]
-        opts[:auth_methods] = ["publickey"]         if data[:ssh_key]
+        if data[:ssh_key] && !data.key?(:password)
+          opts[:keys_only] = true
+          opts[:keys] = Array(data[:ssh_key])
+          opts[:auth_methods] = ["publickey"]
+        end
+
         opts[:password] = data[:password]           if data.key?(:password)
         opts[:forward_agent] = data[:forward_agent] if data.key?(:forward_agent)
         opts[:verbose] = data[:verbose].to_sym      if data.key?(:verbose)

data/lib/kitchen/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "1.10.2"
+  VERSION = "1.11.0"
 end

data/spec/kitchen/configurable_spec.rb

@@ -732,7 +732,8 @@ describe Kitchen::Configurable do
       ENV.replace("http_proxy"  => nil, "HTTP_PROXY"  => nil,
                   "https_proxy" => nil, "HTTPS_PROXY" => nil,
                   "ftp_proxy"   => nil, "FTP_PROXY"   => nil,
-                  "no_proxy"    => nil, "NO_PROXY"    => nil)
+                  "no_proxy"    => nil, "NO_PROXY"    => nil,
+                  "CI"          => nil)
     end
 
     after do
@@ -747,6 +748,7 @@ describe Kitchen::Configurable do
       it "uses bourne shell (sh)" do
         cmd.must_equal(outdent!(<<-CODE.chomp))
           sh -c '
+          TEST_KITCHEN="1"; export TEST_KITCHEN
           mkdir foo
           '
         CODE
@@ -759,6 +761,7 @@ describe Kitchen::Configurable do
           sh -c '
           http_proxy="http://proxy"; export http_proxy
           HTTP_PROXY="http://proxy"; export HTTP_PROXY
+          TEST_KITCHEN="1"; export TEST_KITCHEN
           mkdir foo
           '
         CODE
@@ -771,6 +774,7 @@ describe Kitchen::Configurable do
           sh -c '
           https_proxy="https://proxy"; export https_proxy
           HTTPS_PROXY="https://proxy"; export HTTPS_PROXY
+          TEST_KITCHEN="1"; export TEST_KITCHEN
           mkdir foo
           '
         CODE
@@ -783,6 +787,7 @@ describe Kitchen::Configurable do
           sh -c '
           ftp_proxy="ftp://proxy"; export ftp_proxy
           FTP_PROXY="ftp://proxy"; export FTP_PROXY
+          TEST_KITCHEN="1"; export TEST_KITCHEN
           mkdir foo
           '
         CODE
@@ -801,6 +806,7 @@ describe Kitchen::Configurable do
           HTTPS_PROXY="https://proxy"; export HTTPS_PROXY
           ftp_proxy="ftp://proxy"; export ftp_proxy
           FTP_PROXY="ftp://proxy"; export FTP_PROXY
+          TEST_KITCHEN="1"; export TEST_KITCHEN
           mkdir foo
           '
         CODE
@@ -814,6 +820,7 @@ describe Kitchen::Configurable do
           sh -c '
           http_proxy="http://proxy"; export http_proxy
           HTTP_PROXY="http://proxy"; export HTTP_PROXY
+          TEST_KITCHEN="1"; export TEST_KITCHEN
           mkdir foo
           '
         CODE
@@ -827,6 +834,7 @@ describe Kitchen::Configurable do
           sh -c '
           https_proxy="https://proxy"; export https_proxy
           HTTPS_PROXY="https://proxy"; export HTTPS_PROXY
+          TEST_KITCHEN="1"; export TEST_KITCHEN
           mkdir foo
           '
         CODE
@@ -839,6 +847,7 @@ describe Kitchen::Configurable do
 
         cmd.must_equal(outdent!(<<-CODE.chomp))
           sh -c '
+          TEST_KITCHEN="1"; export TEST_KITCHEN
           mkdir foo
           '
         CODE
@@ -851,6 +860,7 @@ describe Kitchen::Configurable do
 
         cmd.must_equal(outdent!(<<-CODE.chomp))
           sh -c '
+          TEST_KITCHEN="1"; export TEST_KITCHEN
           mkdir foo
           '
         CODE
@@ -864,6 +874,7 @@ describe Kitchen::Configurable do
           sh -c '
           ftp_proxy="ftp://proxy"; export ftp_proxy
           FTP_PROXY="ftp://proxy"; export FTP_PROXY
+          TEST_KITCHEN="1"; export TEST_KITCHEN
           mkdir foo
           '
         CODE
@@ -874,6 +885,7 @@ describe Kitchen::Configurable do
 
         cmd.must_equal(outdent!(<<-CODE.chomp))
           sh -c '
+          TEST_KITCHEN="1"; export TEST_KITCHEN
           mkdir foo
           '
         CODE
@@ -891,6 +903,7 @@ describe Kitchen::Configurable do
           HTTP_PROXY="http://proxy"; export HTTP_PROXY
           no_proxy="http://no"; export no_proxy
           NO_PROXY="http://no"; export NO_PROXY
+          TEST_KITCHEN="1"; export TEST_KITCHEN
           mkdir foo
           '
         CODE
@@ -908,6 +921,7 @@ describe Kitchen::Configurable do
           HTTPS_PROXY="https://proxy"; export HTTPS_PROXY
           no_proxy="http://no"; export no_proxy
           NO_PROXY="http://no"; export NO_PROXY
+          TEST_KITCHEN="1"; export TEST_KITCHEN
           mkdir foo
           '
         CODE
@@ -925,6 +939,19 @@ describe Kitchen::Configurable do
           FTP_PROXY="ftp://proxy"; export FTP_PROXY
           no_proxy="http://no"; export no_proxy
           NO_PROXY="http://no"; export NO_PROXY
+          TEST_KITCHEN="1"; export TEST_KITCHEN
+          mkdir foo
+          '
+        CODE
+      end
+
+      it "exports CI when CI is set" do
+        ENV["CI"] = "1"
+
+        cmd.must_equal(outdent!(<<-CODE.chomp))
+          sh -c '
+          TEST_KITCHEN="1"; export TEST_KITCHEN
+          CI="1"; export CI
           mkdir foo
           '
         CODE
@@ -936,7 +963,7 @@ describe Kitchen::Configurable do
       before { platform.stubs(:shell_type).returns("powershell") }
 
       it "uses powershell shell" do
-        cmd.must_equal("mkdir foo")
+        cmd.must_equal("$env:TEST_KITCHEN = \"1\"\nmkdir foo")
       end
 
       it "exports http_proxy & HTTP_PROXY when :http_proxy is set" do
@@ -945,6 +972,7 @@ describe Kitchen::Configurable do
         cmd.must_equal(outdent!(<<-CODE.chomp))
           $env:http_proxy = "http://proxy"
           $env:HTTP_PROXY = "http://proxy"
+          $env:TEST_KITCHEN = "1"
           mkdir foo
         CODE
       end
@@ -955,6 +983,7 @@ describe Kitchen::Configurable do
         cmd.must_equal(outdent!(<<-CODE.chomp))
           $env:https_proxy = "https://proxy"
           $env:HTTPS_PROXY = "https://proxy"
+          $env:TEST_KITCHEN = "1"
           mkdir foo
         CODE
       end
@@ -965,6 +994,7 @@ describe Kitchen::Configurable do
         cmd.must_equal(outdent!(<<-CODE.chomp))
           $env:ftp_proxy = "ftp://proxy"
           $env:FTP_PROXY = "ftp://proxy"
+          $env:TEST_KITCHEN = "1"
           mkdir foo
         CODE
       end
@@ -981,6 +1011,7 @@ describe Kitchen::Configurable do
           $env:HTTPS_PROXY = "https://proxy"
           $env:ftp_proxy = "ftp://proxy"
           $env:FTP_PROXY = "ftp://proxy"
+          $env:TEST_KITCHEN = "1"
           mkdir foo
         CODE
       end
@@ -992,6 +1023,7 @@ describe Kitchen::Configurable do
         cmd.must_equal(outdent!(<<-CODE.chomp))
           $env:http_proxy = "http://proxy"
           $env:HTTP_PROXY = "http://proxy"
+          $env:TEST_KITCHEN = "1"
           mkdir foo
         CODE
       end
@@ -1003,6 +1035,7 @@ describe Kitchen::Configurable do
         cmd.must_equal(outdent!(<<-CODE.chomp))
           $env:https_proxy = "https://proxy"
           $env:HTTPS_PROXY = "https://proxy"
+          $env:TEST_KITCHEN = "1"
           mkdir foo
         CODE
       end
@@ -1014,6 +1047,7 @@ describe Kitchen::Configurable do
         cmd.must_equal(outdent!(<<-CODE.chomp))
           $env:ftp_proxy = "ftp://proxy"
           $env:FTP_PROXY = "ftp://proxy"
+          $env:TEST_KITCHEN = "1"
           mkdir foo
         CODE
       end
@@ -1029,6 +1063,7 @@ describe Kitchen::Configurable do
           $env:HTTP_PROXY = "http://proxy"
           $env:no_proxy = "http://no"
           $env:NO_PROXY = "http://no"
+          $env:TEST_KITCHEN = "1"
           mkdir foo
         CODE
       end
@@ -1044,6 +1079,7 @@ describe Kitchen::Configurable do
           $env:HTTPS_PROXY = "https://proxy"
           $env:no_proxy = "http://no"
           $env:NO_PROXY = "http://no"
+          $env:TEST_KITCHEN = "1"
           mkdir foo
         CODE
       end
@@ -1059,6 +1095,17 @@ describe Kitchen::Configurable do
           $env:FTP_PROXY = "ftp://proxy"
           $env:no_proxy = "http://no"
           $env:NO_PROXY = "http://no"
+          $env:TEST_KITCHEN = "1"
+          mkdir foo
+        CODE
+      end
+
+      it "exports CI when CI is set" do
+        ENV["CI"] = "1"
+
+        cmd.must_equal(outdent!(<<-CODE.chomp))
+          $env:TEST_KITCHEN = "1"
+          $env:CI = "1"
           mkdir foo
         CODE
       end

data/spec/kitchen/provisioner/chef/policyfile_spec.rb

@@ -0,0 +1,140 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Noah Kantrowitz
+#
+# Copyright (C) 2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative "../../../spec_helper"
+require "kitchen/provisioner/chef/policyfile"
+
+describe Kitchen::Provisioner::Chef::Policyfile do
+  let(:policyfile) { "" }
+  let(:path) { "" }
+  let(:null_logger) do
+    stub(:fatal => nil, :error => nil, :warn => nil, :info => nil,
+         :debug => nil, :banner => nil)
+  end
+  let(:described_object) do
+    Kitchen::Provisioner::Chef::Policyfile.new(policyfile, path, null_logger)
+  end
+  let(:os) { "" }
+  before do
+    @original_rbconfig = RbConfig::CONFIG
+    verbose = $VERBOSE
+    $VERBOSE = nil
+    RbConfig.const_set(:CONFIG, "host_os" => os)
+    $VERBOSE = verbose
+  end
+  after do
+    verbose = $VERBOSE
+    $VERBOSE = nil
+    RbConfig.const_set(:CONFIG, @original_rbconfig)
+    $VERBOSE = verbose
+  end
+
+  # rubocop:disable Metrics/LineLength
+  describe "#resolve" do
+    subject { described_object.resolve }
+
+    describe "on Unix" do
+      let(:os) { "linux-gnu" }
+
+      describe "with simple paths" do
+        let(:policyfile) { "/home/user/cookbook/Policyfile.rb" }
+        let(:path) { "/tmp/kitchen/cookbooks" }
+        it do
+          described_object.expects(:run_command).with("chef export /home/user/cookbook/Policyfile.rb /tmp/kitchen/cookbooks --force")
+          subject
+        end
+      end
+
+      describe "with Jenkins-y paths" do
+        let(:policyfile) { "/home/jenkins/My Chef Cookbook/workspace/current/Policyfile.rb" }
+        let(:path) { "/tmp/kitchen/cookbooks" }
+        it do
+          described_object.expects(:run_command).with("chef export /home/jenkins/My\\ Chef\\ Cookbook/workspace/current/Policyfile.rb /tmp/kitchen/cookbooks --force")
+          subject
+        end
+      end
+    end
+
+    describe "on Windows" do
+      let(:os) { "mswin" }
+
+      describe "with simple paths" do
+        let(:policyfile) { "C:\\cookbook\\Policyfile.rb" }
+        let(:path) { "C:\\Temp\\kitchen\\cookbooks" }
+        it do
+          described_object.expects(:run_command).with("chef export C:\\cookbook\\Policyfile.rb C:\\Temp\\kitchen\\cookbooks --force")
+          subject
+        end
+      end
+
+      describe "with Jenkins-y paths" do
+        let(:policyfile) { "C:\\Program Files\\Jenkins\\My Chef Cookbook\\workspace\\current\\Policyfile.rb" }
+        let(:path) { "C:\\Temp\\kitchen\\cookbooks" }
+        it do
+          described_object.expects(:run_command).with("chef export \"C:\\\\Program\\ Files\\\\Jenkins\\\\My\\ Chef\\ Cookbook\\\\workspace\\\\current\\\\Policyfile.rb\" C:\\Temp\\kitchen\\cookbooks --force")
+          subject
+        end
+      end
+    end
+  end
+
+  describe "#compile" do
+    subject { described_object.compile }
+
+    describe "on Unix" do
+      let(:os) { "linux-gnu" }
+
+      describe "with simple paths" do
+        let(:policyfile) { "/home/user/cookbook/Policyfile.rb" }
+        it do
+          described_object.expects(:run_command).with("chef install /home/user/cookbook/Policyfile.rb")
+          subject
+        end
+      end
+
+      describe "with Jenkins-y paths" do
+        let(:policyfile) { "/home/jenkins/My Chef Cookbook/workspace/current/Policyfile.rb" }
+        it do
+          described_object.expects(:run_command).with("chef install /home/jenkins/My\\ Chef\\ Cookbook/workspace/current/Policyfile.rb")
+          subject
+        end
+      end
+    end
+
+    describe "on Windows" do
+      let(:os) { "mswin" }
+
+      describe "with simple paths" do
+        let(:policyfile) { "C:\\cookbook\\Policyfile.rb" }
+        it do
+          described_object.expects(:run_command).with("chef install C:\\cookbook\\Policyfile.rb")
+          subject
+        end
+      end
+
+      describe "with Jenkins-y paths" do
+        let(:policyfile) { "C:\\Program Files\\Jenkins\\My Chef Cookbook\\workspace\\current\\Policyfile.rb" }
+        it do
+          described_object.expects(:run_command).with("chef install \"C:\\\\Program\\ Files\\\\Jenkins\\\\My\\ Chef\\ Cookbook\\\\workspace\\\\current\\\\Policyfile.rb\"")
+          subject
+        end
+      end
+    end
+  end
+  # rubocop:enable Metrics/LineLength
+end

data/spec/kitchen/provisioner/chef_solo_spec.rb

@@ -401,6 +401,11 @@ describe Kitchen::Provisioner::ChefSolo do
         cmd.must_match regexify(" --log_level auto", :partial_line)
       end
 
+      it "sets log level flag on chef-solo to info by default if running Chef < 11" do
+        config[:require_chef_omnibus] = "10.34.6"
+        cmd.must_match regexify(" --log_level info", :partial_line)
+      end
+
       it "set log level flag for custom level" do
         config[:log_level] = :extreme
 
@@ -411,6 +416,11 @@ describe Kitchen::Provisioner::ChefSolo do
         cmd.must_match regexify(" --force-formatter", :partial_line)
       end
 
+      it "does not set force formatter flag on chef-solo if running Chef < 11" do
+        config[:require_chef_omnibus] = "10.34.6"
+        cmd.wont_match regexify(" --force-formatter", :partial_line)
+      end
+
       it "sets no color flag on chef-solo" do
         cmd.must_match regexify(" --no-color", :partial_line)
       end
@@ -437,6 +447,18 @@ describe Kitchen::Provisioner::ChefSolo do
 
         cmd.wont_match regexify(" --profile-ruby", :partial_line)
       end
+
+      it "sets legacy-mode flag when config element is set" do
+        config[:legacy_mode] = true
+
+        cmd.must_match regexify(" --legacy-mode", :partial_line)
+      end
+
+      it "does not set legacy-mode flag when config element is falsey" do
+        config[:legacy_mode] = false
+
+        cmd.wont_match regexify(" --legacy-mode", :partial_line)
+      end
     end
 
     describe "for powershell shells on windows os types" do

data/spec/kitchen/transport/ssh_spec.rb

@@ -531,6 +531,64 @@ describe Kitchen::Transport::Ssh do
         make_connection
       end
 
+      it "does not set :keys_only if :ssh_key is set in config but password is set" do
+        config[:ssh_key] = "ssh_key_from_config"
+        config[:password] = "password"
+
+        klass.expects(:new).with do |hash|
+          hash[:keys_only].nil?
+        end
+
+        make_connection
+      end
+
+      it "does not set :auth_methods if :ssh_key is set in config but password is set" do
+        config[:ssh_key] = "ssh_key_from_config"
+        config[:password] = "password"
+
+        klass.expects(:new).with do |hash|
+          hash[:auth_methods].nil?
+        end
+
+        make_connection
+      end
+
+      it "does not set :keys_only if :ssh_key is set in state but password is set" do
+        state[:ssh_key] = "ssh_key_from_config"
+        config[:ssh_key] = false
+        config[:password] = "password"
+
+        klass.expects(:new).with do |hash|
+          hash[:keys_only].nil?
+        end
+
+        make_connection
+      end
+
+      it "does not set :keys to an array if :ssh_key is set in config but password is set" do
+        config[:kitchen_root] = "/r"
+        config[:ssh_key] = "ssh_key_from_config"
+        config[:password] = "password"
+
+        klass.expects(:new).with do |hash|
+          hash[:keys].nil?
+        end
+
+        make_connection
+      end
+
+      it "does not set :keys to an array if :ssh_key is set in state but password is set" do
+        state[:ssh_key] = "ssh_key_from_state"
+        config[:ssh_key] = "ssh_key_from_config"
+        config[:password] = "password"
+
+        klass.expects(:new).with do |hash|
+          hash[:keys].nil?
+        end
+
+        make_connection
+      end
+
       it "passes in :password if set in config" do
         config[:password] = "password_from_config"
 

data/test-kitchen.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "mixlib-shellout", ">= 1.2", "< 3.0"
   gem.add_dependency "net-scp",         "~> 1.1"
   gem.add_dependency "net-ssh",         ">= 2.9", "< 4.0"
+  gem.add_dependency "net-ssh-gateway", "~> 1.2.0"
   gem.add_dependency "safe_yaml",       "~> 1.0"
   gem.add_dependency "thor",            "~> 0.18"
   gem.add_dependency "mixlib-install",  "~> 1.0", ">= 1.0.4"
@@ -59,5 +60,4 @@ Gem::Specification.new do |gem|
   # may introduce new and undesireable style choices which would be immediately
   # enforced in CI
   gem.add_development_dependency "finstyle",  "1.5.0"
-  gem.add_development_dependency "cane",      "2.6.2"
 end

data/test/cookbooks/test_cookbook/metadata.rb

@@ -0,0 +1,6 @@
+name "test_cookbook"
+maintainer "Maintainer"
+maintainer_email "Maintainer@example.com"
+license "Apache 2.0"
+description "Used for testing test-kitchen"
+version "0.1.0"

data/test/cookbooks/test_cookbook/recipes/default.rb

@@ -0,0 +1 @@
+directory "/tk_test_directory"

data/test/integration/default/default_spec.rb

@@ -1,3 +1,3 @@
-describe oneget("FileZilla Client 3.14.1") do
-  it { should be_installed }
+describe directory("/tk_test_directory") do
+  it { should exist }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.11.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -64,6 +64,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh-gateway
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -406,20 +420,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: cane
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.6.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.6.2
 description: Test Kitchen is an integration tool for developing and testing infrastructure
   code and software on isolated target platforms.
 email:
@@ -429,7 +429,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".cane"
 - ".gitattributes"
 - ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
@@ -557,6 +556,7 @@ files:
 - spec/kitchen/metadata_chopper_spec.rb
 - spec/kitchen/platform_spec.rb
 - spec/kitchen/provisioner/base_spec.rb
+- spec/kitchen/provisioner/chef/policyfile_spec.rb
 - spec/kitchen/provisioner/chef_apply_spec.rb
 - spec/kitchen/provisioner/chef_base_spec.rb
 - spec/kitchen/provisioner/chef_solo_spec.rb
@@ -609,6 +609,8 @@ files:
 - templates/init/chefignore.erb
 - templates/init/kitchen.yml.erb
 - test-kitchen.gemspec
+- test/cookbooks/test_cookbook/metadata.rb
+- test/cookbooks/test_cookbook/recipes/default.rb
 - test/integration/default/default_spec.rb
 - testing_windows.md
 homepage: http://kitchen.ci
@@ -631,7 +633,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Test Kitchen is an integration tool for developing and testing infrastructure
@@ -677,6 +679,7 @@ test_files:
 - spec/kitchen/metadata_chopper_spec.rb
 - spec/kitchen/platform_spec.rb
 - spec/kitchen/provisioner/base_spec.rb
+- spec/kitchen/provisioner/chef/policyfile_spec.rb
 - spec/kitchen/provisioner/chef_apply_spec.rb
 - spec/kitchen/provisioner/chef_base_spec.rb
 - spec/kitchen/provisioner/chef_solo_spec.rb
@@ -701,5 +704,6 @@ test_files:
 - spec/kitchen_spec.rb
 - spec/spec_helper.rb
 - spec/support/powershell_max_size_spec.rb
+- test/cookbooks/test_cookbook/metadata.rb
+- test/cookbooks/test_cookbook/recipes/default.rb
 - test/integration/default/default_spec.rb
-has_rdoc: 

data/.cane

@@ -1,8 +0,0 @@
---abc-max 20
---style-measure 100
---abc-exclude Kitchen::ThorTasks#define
---abc-exclude Kitchen::Driver::SSHBase#converge
---abc-exclude Kitchen::Driver::SSHBase#verify
---abc-exclude Kitchen::Configurable#wrap_shell_code
---style-exclude lib/vendor/**/*.rb
---doc-exclude lib/vendor/**/.rb