test-kitchen 1.13.2 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78c2cca699db03ee1a9909ea2f018596cf165ef2
-  data.tar.gz: 7b290a7bf32a537d37f399df2f0efad8cf5021e3
+  metadata.gz: c64f3dcd66b57bf7ff548090514dc7c5e78a5de1
+  data.tar.gz: cd97121e6e1aa35a031223f95b2f16377bea1c04
 SHA512:
-  metadata.gz: 8e1a6c1ebac8a6bf832e6d246ddf0ad3126c97e47fce9e92de74a4df5ed4373c927d4351a2b40d5b54fce8eb3fec392e48c14919a7f1205ba3e5aa10aeb7a4a5
-  data.tar.gz: 1292bc9dab4afc3576b3b0e0242f701b2064601a6319c192914ba5268b7d1f9f5da8d4bfe8965b2bbab75256fb2de93d97db3554cfea2f631947f293afe56763
+  metadata.gz: bc16ba277000e21119a03f1cea8d5c0a4c1e1a9b781cff12965579a8618479ffb97e2770bb41356b7a9d4e0f15713975b1e4179f97fa4eb4d9624324dde53492
+  data.tar.gz: 29e6c5386aa55e37b418208f9967ef49595f5f7ca57082922f158360627e0c6559929b80c547842ea56275e2f5ccc59e3932d65e1bbe9c52d94515a9e25e3acd

data/.travis.yml

@@ -23,6 +23,7 @@ bundler_args: --without guard integration
 
 script:
   - bundle exec rake
+  - bundle exec codeclimate-test-reporter
   - bundle install --with integration
   - export KITCHEN_YAML=.kitchen.ci.yml
   - bundle exec kitchen verify ubuntu

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Change Log
 
+## [v1.14.0](https://github.com/test-kitchen/test-kitchen/tree/v1.14.0) (2016-11-22)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.13.2...v1.14.0)
+
+**Implemented enhancements:**
+
+- Test Kitchen should use omnitruck's -d option by default [\#809](https://github.com/test-kitchen/test-kitchen/issues/809)
+
+**Closed issues:**
+
+- Kitchen converge fails, doesn't install omnibus,  \[\[WinRM::FS::Core::FileTransporter\] Upload failed [\#1150](https://github.com/test-kitchen/test-kitchen/issues/1150)
+- Re-Enable Code Climate [\#1146](https://github.com/test-kitchen/test-kitchen/issues/1146)
+- kitchen + berkshelf don't work together with the latest versions of gems [\#1144](https://github.com/test-kitchen/test-kitchen/issues/1144)
+- Vagrant drivers brings up virtualbox machine with 'cable connected' disabled option [\#1143](https://github.com/test-kitchen/test-kitchen/issues/1143)
+- kitchen converge throws Berkshelf::LockfileNotFound on Windows [\#1140](https://github.com/test-kitchen/test-kitchen/issues/1140)
+- Inspect tests is an empty value when using the kitchen\_ec2 driver [\#1136](https://github.com/test-kitchen/test-kitchen/issues/1136)
+- kitchen test or verify with --parallel option fails [\#1125](https://github.com/test-kitchen/test-kitchen/issues/1125)
+
+**Merged pull requests:**
+
+- Added `cache` interface for Drivers so that provisioners can leverage  [\#1149](https://github.com/test-kitchen/test-kitchen/pull/1149) ([afiune](https://github.com/afiune))
+- Ensure that we only berks update with a lockfile [\#1145](https://github.com/test-kitchen/test-kitchen/pull/1145) ([thommay](https://github.com/thommay))
+- Added `last\_error` and `--json` to `kitchen list` [\#1135](https://github.com/test-kitchen/test-kitchen/pull/1135) ([BackSlasher](https://github.com/BackSlasher))
+- Allow the user to make deprecations errors [\#1117](https://github.com/test-kitchen/test-kitchen/pull/1117) ([thommay](https://github.com/thommay))
+
 ## [v1.13.2](https://github.com/test-kitchen/test-kitchen/tree/v1.13.2) (2016-09-26)
 [Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.13.1...v1.13.2)
 

data/Gemfile

@@ -11,5 +11,5 @@ group :integration do
 end
 
 group :test do
-  gem "codeclimate-test-reporter", :require => nil
+  gem "codeclimate-test-reporter", "~> 1.0", ">= 1.0.3", :require => nil
 end

data/features/kitchen_action_commands.feature

@@ -28,12 +28,12 @@ Feature: Running instance actions
   @spawn
   Scenario: Creating a single instance
     When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\Z/
+    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\s+\<None\>\Z/
     When I run `kitchen create client-beans`
     Then the output should contain "Finished creating <client-beans>"
     And the exit status should be 0
     When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Created\s+\<None\>\Z/
 
   @spawn
   Scenario: Creating a single instance that fails
@@ -44,23 +44,23 @@ Feature: Running instance actions
       fail_create: true
     """
     When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\Z/
+    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\s+\<None\>\Z/
     When I run `kitchen create client-beans`
     Then the output should contain "Create failed on instance <client-beans>"
     And the exit status should not be 0
     When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\Z/
+    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\s+Kitchen::ActionFailed\Z/
 
   @spawn
   Scenario: Converging a single instance
     When I successfully run `kitchen create client-beans`
     And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Created\s+\<None\>\Z/
     When I run `kitchen converge client-beans`
     Then the output should contain "Finished converging <client-beans>"
     And the exit status should be 0
     When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Converged\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Converged\s+\<None\>\Z/
 
   @spawn
   Scenario: Converging a single instance that fails
@@ -72,23 +72,23 @@ Feature: Running instance actions
     """
     When I successfully run `kitchen create client-beans`
     And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Created\s+\<None\>\Z/
     When I run `kitchen converge client-beans`
     Then the output should contain "Converge failed on instance <client-beans>"
     And the exit status should not be 0
     When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Created\s+Kitchen::ActionFailed\Z/
 
   @spawn
   Scenario: Setting up a single instance
     When I successfully run `kitchen converge client-beans`
     And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Converged\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Converged\s+\<None\>\Z/
     When I run `kitchen setup client-beans`
     Then the output should contain "Finished setting up <client-beans>"
     And the exit status should be 0
     When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Set Up\s+\<None\>\Z/
 
   @spawn
   Scenario: Setting up a single instance that fails
@@ -100,23 +100,23 @@ Feature: Running instance actions
     """
     When I successfully run `kitchen converge client-beans`
     And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Converged\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Converged\s+\<None\>\Z/
     When I run `kitchen verify client-beans`
     Then the output should contain "Verify failed on instance <client-beans>"
     And the exit status should not be 0
     When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Set Up\s+Kitchen::ActionFailed\Z/
 
   @spawn
   Scenario: Verifying a single instance
     When I successfully run `kitchen setup client-beans`
     And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Set Up\s+\<None\>\Z/
     When I run `kitchen verify client-beans`
     Then the output should contain "Finished verifying <client-beans>"
     And the exit status should be 0
     When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Verified\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Verified\s+\<None\>\Z/
 
   @spawn
   Scenario: Verifying a single instance that fails
@@ -128,23 +128,23 @@ Feature: Running instance actions
     """
     When I successfully run `kitchen setup client-beans`
     And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Set Up\s+\<None\>\Z/
     When I run `kitchen verify client-beans`
     Then the output should contain "Verify failed on instance <client-beans>"
     And the exit status should not be 0
     When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Set Up\s+Kitchen::ActionFailed\Z/
 
   @spawn
   Scenario: Destroying a single instance
     When I successfully run `kitchen create client-beans`
     And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Created\s+\<None\>\Z/
     When I run `kitchen destroy client-beans`
     Then the output should contain "Finished destroying <client-beans>"
     And the exit status should be 0
     When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\Z/
+    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\s+\<None\>\Z/
 
   @spawn
   Scenario: Destroying a single instance that fails
@@ -156,9 +156,9 @@ Feature: Running instance actions
     """
     When I successfully run `kitchen create client-beans`
     And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Created\s+\<None\>\Z/
     When I run `kitchen destroy client-beans`
     Then the output should contain "Destroy failed on instance <client-beans>"
     And the exit status should not be 0
     When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Created\s+Kitchen::ActionFailed\Z/

data/features/kitchen_defaults.feature

@@ -18,7 +18,7 @@ Feature: Test Kitchen defaults
       - name: default
     """
     When I successfully run `kitchen list`
-    Then the output should match /^default-win-81\s+Dummy\s+Dummy\s+Dummy\s+Winrm\s+\<Not Created\>$/
+    Then the output should match /^default-win-81\s+Dummy\s+Dummy\s+Dummy\s+Winrm\s+\<Not Created\>\s+\<None\>$/
 
   Scenario: Non-Windows platforms get the Ssh Transport by default
     Given a file named ".kitchen.yml" with:
@@ -35,4 +35,4 @@ Feature: Test Kitchen defaults
       - name: default
     """
     When I successfully run `kitchen list`
-    Then the output should match /^default-ubuntu-1404\s+Dummy\s+Dummy\s+Dummy\s+Ssh\s+\<Not Created\>$/
+    Then the output should match /^default-ubuntu-1404\s+Dummy\s+Dummy\s+Dummy\s+Ssh\s+\<Not Created\>\s+\<None\>$/

data/features/kitchen_list_command.feature

@@ -22,8 +22,44 @@ Feature: Listing Test Kitchen instances
   Scenario: Listing instances
     When I run `kitchen list`
     Then the exit status should be 0
-    And the output should match /^foobar-ubuntu-1304\s+Dummy\s+ChefSolo\s+Busser\s+Ssh\s+\<Not Created\>$/
-    And the output should match /^foobar-centos-64\s+Dummy\s+ChefSolo\s+Busser\s+Ssh\s+\<Not Created\>$/
+    And the output should match /^foobar-ubuntu-1304\s+Dummy\s+ChefSolo\s+Busser\s+Ssh\s+\<Not Created\>\s+\<None\>$/
+    And the output should match /^foobar-centos-64\s+Dummy\s+ChefSolo\s+Busser\s+Ssh\s+\<Not Created\>\s+\<None\>$/
+
+  Scenario: Listing a single instance with the --json option
+    When I run `kitchen list --json`
+    Then the exit status should be 0
+    And the output should contain exactly:
+    """
+    [
+      {
+        "instance": "foobar-ubuntu-1304",
+        "driver": "Dummy",
+        "provisioner": "ChefSolo",
+        "verifier": "Busser",
+        "transport": "Ssh",
+        "last_action": null,
+        "last_error": null
+      },
+      {
+        "instance": "foobar-centos-64",
+        "driver": "Dummy",
+        "provisioner": "ChefSolo",
+        "verifier": "Busser",
+        "transport": "Ssh",
+        "last_action": null,
+        "last_error": null
+      },
+      {
+        "instance": "foobar-centos-64-with-small-mem",
+        "driver": "Dummy",
+        "provisioner": "ChefSolo",
+        "verifier": "Busser",
+        "transport": "Ssh",
+        "last_action": null,
+        "last_error": null
+      }
+    ]
+    """
 
   Scenario: Listing instances with the --bare option
     When I run `kitchen list --bare`

data/features/kitchen_test_command.feature

@@ -36,7 +36,7 @@ Feature: Running a full test instance test
   Scenario: Running a single instance never destroying an instance
     When I successfully run `kitchen test client-beans --destroy=never`
     And I successfully run `kitchen list client-beans`
-    Then the output should match /^client-beans\s+.+\s+Verified$/
+    Then the output should match /^client-beans\s+.+\s+Verified\s+\<None\>$/
 
   @spawn
   Scenario: Running a single instance always destroying an instance
@@ -49,7 +49,7 @@ Feature: Running a full test instance test
     When I run `kitchen test client-beans --destroy=always`
     Then the exit status should not be 0
     When I successfully run `kitchen list client-beans`
-    Then the output should match /^client-beans\s+.+\s+\<Not Created\>$/
+    Then the output should match /^client-beans\s+.+\s+\<Not Created\>\s+\<None\>$/
 
   @spawn
   Scenario: Running a single instance not destroying an instance on failure
@@ -62,14 +62,14 @@ Feature: Running a full test instance test
     When I run `kitchen test client-beans --destroy=passing`
     Then the exit status should not be 0
     When I successfully run `kitchen list client-beans`
-    Then the output should match /^client-beans\s+.+\s+Created$/
+    Then the output should match /^client-beans\s+.+\s+Created\s+Kitchen::ActionFailed$/
 
   @spawn
   Scenario: Running a single instance destroying an instance on success
     When I run `kitchen test client-beans --destroy=passing`
     Then the exit status should be 0
     When I successfully run `kitchen list client-beans`
-    Then the output should match /^client-beans\s+.+\s+\<Not Created\>$/
+    Then the output should match /^client-beans\s+.+\s+\<Not Created\>\s+\<None\>$/
 
   @spawn
   Scenario: Running all instances
@@ -82,7 +82,7 @@ Feature: Running a full test instance test
     Then the output should contain "Kitchen is finished."
     And the exit status should be 0
     When I successfully run `kitchen list`
-    Then the output should match /^client-cool\s+.+\s+\<Not Created\>$/
-    Then the output should match /^client-beans\s+.+\s+\<Not Created\>$/
-    Then the output should match /^server-cool\s+.+\s+\<Not Created\>$/
-    Then the output should match /^server-beans\s+.+\s+\<Not Created\>$/
+    Then the output should match /^client-cool\s+.+\s+\<Not Created\>\s+\<None\>$/
+    Then the output should match /^client-beans\s+.+\s+\<Not Created\>\s+\<None\>$/
+    Then the output should match /^server-cool\s+.+\s+\<Not Created\>\s+\<None\>$/
+    Then the output should match /^server-beans\s+.+\s+\<Not Created\>\s+\<None\>$/

data/lib/kitchen/cli.rb

@@ -110,6 +110,10 @@ module Kitchen
       :aliases => "-b",
       :type => :boolean,
       :desc => "List the name of each instance only, one per line"
+    method_option :json,
+      :aliases => "-j",
+      :type => :boolean,
+      :desc => "Print data as JSON"
     method_option :debug,
       :aliases => "-d",
       :type => :boolean,

data/lib/kitchen/command/list.rb

@@ -17,6 +17,7 @@
 # limitations under the License.
 
 require "kitchen/command"
+require "json"
 
 module Kitchen
 
@@ -35,6 +36,8 @@ module Kitchen
             "please use `kitchen diagnose'."
         elsif options[:bare]
           puts Array(result).map(&:name).join("\n")
+        elsif options[:json]
+          puts JSON.pretty_generate(Array(result).map { |r| to_hash(r) })
         else
           list_table(result)
         end
@@ -64,7 +67,8 @@ module Kitchen
           color_pad(instance.provisioner.name),
           color_pad(instance.verifier.name),
           color_pad(instance.transport.name),
-          format_last_action(instance.last_action)
+          format_last_action(instance.last_action),
+          format_last_error(instance.last_error)
         ]
       end
 
@@ -84,6 +88,18 @@ module Kitchen
         end
       end
 
+      # Format and color the given last error.
+      #
+      # @param last_error [String] the last error
+      # @return [String] formated last error
+      # @api private
+      def format_last_error(last_error)
+        case last_error
+        when nil then colorize("<None>", :white)
+        else colorize(last_error, :red)
+        end
+      end
+
       # Constructs a list display table and output it to the screen.
       #
       # @param result [Array<Instance>] an array of instances
@@ -93,13 +109,30 @@ module Kitchen
           [
             colorize("Instance", :green), colorize("Driver", :green),
             colorize("Provisioner", :green), colorize("Verifier", :green),
-            colorize("Transport", :green), colorize("Last Action", :green)
+            colorize("Transport", :green), colorize("Last Action", :green),
+            colorize("Last Error", :green)
           ]
         ]
         table += Array(result).map { |i| display_instance(i) }
         print_table(table)
       end
 
+      # Constructs a hashtable representation of a single instance.
+      #
+      # @param result [Hash{Symbol => String}] hash of a single instance
+      # @api private
+      def to_hash(result)
+        {
+          :instance => result.name,
+          :driver => result.driver.name,
+          :provisioner => result.provisioner.name,
+          :verifier => result.verifier.name,
+          :transport => result.transport.name,
+          :last_action => result.last_action,
+          :last_error => result.last_error
+        }
+      end
+
       # Outputs a formatted display table.
       #
       # @api private

data/lib/kitchen/driver/base.rb

@@ -119,6 +119,13 @@ module Kitchen
         @api_version = version
       end
 
+      # Cache directory that a driver could implement to inform the provisioner
+      # that it can leverage it internally
+      #
+      # @return path [String] a path of the cache directory
+      def cache_directory
+      end
+
       private
 
       # Intercepts any bare #puts calls in subclasses and issues an INFO log

data/lib/kitchen/driver/ssh_base.rb

@@ -216,6 +216,13 @@ module Kitchen
         @serial_actions += methods
       end
 
+      # Cache directory that a driver could implement to inform the provisioner
+      # that it can leverage it internally
+      #
+      # @return path [String] a path of the cache directory
+      def cache_directory
+      end
+
       private
 
       def backcompat_merged_state(state)

data/lib/kitchen/instance.rb

@@ -274,6 +274,13 @@ module Kitchen
       state_file.read[:last_action]
     end
 
+    # Returns the error encountered on the last action on the instance
+    #
+    # @return [String] the message of the last error
+    def last_error
+      state_file.read[:last_error]
+    end
+
     # Clean up any per-instance resources before exiting.
     #
     # @return [void]
@@ -485,14 +492,17 @@ module Kitchen
         synchronize_or_call(what, state, &block)
       end
       state[:last_action] = what.to_s
+      state[:last_error] = nil
       elapsed
     rescue ActionFailed => e
       log_failure(what, e)
+      state[:last_error] = e.class.name
       raise(InstanceFailure, failure_message(what) +
         "  Please see .kitchen/logs/#{name}.log for more details",
         e.backtrace)
     rescue Exception => e # rubocop:disable Lint/RescueException
       log_failure(what, e)
+      state[:last_error] = e.class.name
       raise ActionFailed,
         "Failed to complete ##{what} action: [#{e.message}]", e.backtrace
     ensure

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

@@ -64,7 +64,7 @@ module Kitchen
 
           ::Berkshelf.ui.mute do
             berksfile_obj = ::Berkshelf::Berksfile.from_file(berksfile)
-            berksfile_obj.update if always_update
+            berksfile_obj.update if always_update && berkshelf_obj.lockfile.present?
             # Berkshelf requires the directory to not exist
             FileUtils.rm_rf(path)
             berksfile_obj.vendor(path)

data/lib/kitchen/provisioner/chef_base.rb

@@ -67,6 +67,8 @@ module Kitchen
         attributes/**/* definitions/**/* files/**/* libraries/**/*
         providers/**/* recipes/**/* resources/**/* templates/**/*
       ].join(",")
+      # to ease upgrades, allow the user to turn deprecation warnings into errors
+      default_config :deprecations_as_errors, false
 
       default_config :data_path do |provisioner|
         provisioner.calculate_path("data")
@@ -154,6 +156,7 @@ module Kitchen
       # @return [Hash] an option hash for the install commands
       # @api private
       def install_options
+        add_omnibus_directory_option if instance.driver.cache_directory
         project = /\s*-P (\w+)\s*/.match(config[:chef_omnibus_install_options])
         {
           :omnibus_url => config[:chef_omnibus_url],
@@ -168,6 +171,19 @@ module Kitchen
         end
       end
 
+      # Verify if the "omnibus_dir_option" has already been passed, if so we
+      # don't use the @driver.cache_directory
+      #
+      # @api private
+      def add_omnibus_directory_option
+        cache_dir_option = "#{omnibus_dir_option} #{instance.driver.cache_directory}"
+        if config[:chef_omnibus_install_options].nil?
+          config[:chef_omnibus_install_options] = cache_dir_option
+        elsif config[:chef_omnibus_install_options].match(/\s*#{omnibus_dir_option}\s*/).nil?
+          config[:chef_omnibus_install_options] << " " << cache_dir_option
+        end
+      end
+
       # @return [String] an absolute path to a Policyfile, relative to the
       #   kitchen root
       # @api private
@@ -218,7 +234,8 @@ module Kitchen
           :chef_server_url  => "http://127.0.0.1:8889",
           :encrypted_data_bag_secret => remote_path_join(
             root, "encrypted_data_bag_secret"
-          )
+          ),
+          :treat_deprecation_warnings_as_errors => config[:deprecations_as_errors]
         }
       end
 
@@ -327,6 +344,13 @@ module Kitchen
         end
       end
 
+      # @return [String] Correct option per platform to specify the the
+      #                  cache directory
+      # @api private
+      def omnibus_dir_option
+        windows_os? ? "-download_directory" : "-d"
+      end
+
       def install_from_file(command)
         install_file = "/tmp/chef-installer.sh"
         script = ["cat > #{install_file} <<\"EOL\""]

data/lib/kitchen/transport/ssh.rb

@@ -394,7 +394,7 @@ module Kitchen
       # @param data [Hash] merged configuration and mutable state data
       # @return [Hash] hash of connection options
       # @api private
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def connection_options(data)
         opts = {
           :logger                 => logger,

data/lib/kitchen/version.rb

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

data/spec/kitchen/provisioner/chef_base_spec.rb

@@ -26,6 +26,7 @@ describe Kitchen::Provisioner::ChefBase do
   let(:logged_output)   { StringIO.new }
   let(:logger)          { Logger.new(logged_output) }
   let(:platform)        { stub(:os_type => nil) }
+  let(:driver)          { stub(:cache_directory => nil) }
   let(:suite)           { stub(:name => "fries") }
   let(:default_version) { true }
 
@@ -38,7 +39,8 @@ describe Kitchen::Provisioner::ChefBase do
       :name => "coolbeans",
       :logger => logger,
       :suite => suite,
-      :platform => platform
+      :platform => platform,
+      :driver => driver
     )
   end
 
@@ -74,7 +76,6 @@ describe Kitchen::Provisioner::ChefBase do
         provisioner[:chef_omnibus_url].
           must_equal "https://omnitruck.chef.io/install.sh"
       end
-
     end
 
     it ":require_chef_omnibus defaults to true" do
@@ -150,8 +151,9 @@ describe Kitchen::Provisioner::ChefBase do
 
     let(:install_opts) {
       { :omnibus_url => "https://omnitruck.chef.io/install.sh",
-        :project => nil, :install_flags => nil, :sudo_command => "sudo -E",
-        :http_proxy => nil, :https_proxy => nil }
+        :project => nil, :install_flags => nil,
+        :sudo_command => "sudo -E", :http_proxy => nil, :https_proxy => nil
+      }
     }
 
     it "returns nil if :require_chef_omnibus is falsey" do
@@ -313,6 +315,38 @@ describe Kitchen::Provisioner::ChefBase do
 
         cmd.wont_match(/\Amy_prefix /)
       end
+
+      describe "when driver implements the cache_directory interface" do
+        before { driver.stubs(:cache_directory).returns("/tmp/custom/place") }
+
+        it "will use driver.cache_directory to provide a cache directory" do
+          install_opts[:install_flags] = "-d /tmp/custom/place"
+
+          Mixlib::Install::ScriptGenerator.expects(:new).
+            with(default_version, false, install_opts).returns(installer)
+          cmd
+        end
+
+        it "will use driver.cache_directory even if other options are given" do
+          config[:chef_omnibus_install_options] = "-P cool -v 123"
+          install_opts[:install_flags] = "-P cool -v 123 -d /tmp/custom/place"
+          install_opts[:project] = "cool"
+
+          Mixlib::Install::ScriptGenerator.expects(:new).
+            with(default_version, false, install_opts).returns(installer)
+          cmd
+        end
+
+        it "will not use driver.cache_directory if -d options is given" do
+          config[:chef_omnibus_install_options] = "-P cool -d /path -v 123"
+          install_opts[:install_flags] = "-P cool -d /path -v 123"
+          install_opts[:project] = "cool"
+
+          Mixlib::Install::ScriptGenerator.expects(:new).
+            with(default_version, false, install_opts).returns(installer)
+          cmd
+        end
+      end
     end
 
     describe "for product" do
@@ -451,6 +485,21 @@ describe Kitchen::Provisioner::ChefBase do
         end.returns(installer)
         cmd
       end
+
+      describe "when driver implements the cache_directory" do
+        before { driver.stubs(:cache_directory).returns("$env:TEMP\\dummy\\place") }
+
+        it "will have the same behavior on windows" do
+          config[:chef_omnibus_install_options] = "-version 123"
+          install_opts_clone = install_opts.clone
+          install_opts_clone[:sudo_command] = ""
+          install_opts_clone[:install_flags] = "-version 123"
+          install_opts_clone[:install_flags] << " -download_directory $env:TEMP\\dummy\\place"
+          Mixlib::Install::ScriptGenerator.expects(:new).
+            with(default_version, true, install_opts_clone).returns(installer)
+          cmd
+        end
+      end
     end
   end
 
@@ -1321,6 +1370,10 @@ POLICYFILE
             file.must_include %{encrypted_data_bag_secret } +
               %{"/tmp/kitchen/encrypted_data_bag_secret"}
           end
+
+          it "disables deprecation warnings" do
+            file.must_include %{treat_deprecation_warnings_as_errors false}
+          end
         end
 
         it "supports overwriting defaults" do

data/spec/spec_helper.rb

@@ -18,10 +18,7 @@
 
 gem "minitest"
 
-if ENV["CODECLIMATE_REPO_TOKEN"]
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-elsif ENV["COVERAGE"]
+if ENV["CODECLIMATE_REPO_TOKEN"] || ENV["COVERAGE"]
   require "simplecov"
   SimpleCov.profiles.define "gem" do
     command_name "Specs"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.14.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -634,7 +634,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Test Kitchen is an integration tool for developing and testing infrastructure