test-kitchen 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed6240c00a8d6ca35986ab16735134c1fe4368b1
-  data.tar.gz: 3b4324d554794093cc15ebd2f82e9bca3c426074
+  metadata.gz: 08a62137db48122bfe93dc6da4e462fc95941bcf
+  data.tar.gz: 72a2c0b1c5ecea3f074386e41316ccd3e6d1e565
 SHA512:
-  metadata.gz: d1949f7688de24d288aa21d15f4d1bc80dc049937b60ab56e3ac445211e7c68c57fcb7c2b1f3fc93fa25e341f2dd9907494ecdcfcda4518dd2939cbed22fec3f
-  data.tar.gz: a8713a783d3ff9b2dff382e790a1496ec75b1f305bab75b02d0a5a36f505995c4b998f2a0a057d6d7443371757b50d69aa732b1d16a467211378500b021836d3
+  metadata.gz: 40a9ceb94182a02f14007b5396e21d729246e2ab51f45e7cbb934b70a605446a53d83001a73ad0b0b4ae8a742bf6656e540f67e016064546ce817158bb7e488f
+  data.tar.gz: f326bbd4cb7f2d454a9fb5f42cef75799641782fda6d681cb1bb44059d49fe1c5304d5325b858ac5594d6cacf1ada040cc7f1d32cfcba799a70d6014176c7d98

data/.gitignore

@@ -3,7 +3,7 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
+Gemfile*.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -1,22 +1,12 @@
 language: ruby
 
 rvm:
-  - 2.2
-  - 2.1
+  - 2.2.4
+  - 2.1.8
   - 2.0.0
-  - 1.9.3
   - ruby-head
 
-env:
-  - RUBYGEMS_VERSION=
-  - RUBYGEMS_VERSION=2.4.5
-  - RUBYGEMS_VERSION=2.2.2
-  - RUBYGEMS_VERSION=2.1.11
-  - RUBYGEMS_VERSION=2.0.14
-  - RUBYGEMS_VERSION=1.8.29
-
 before_install:
-  - if [ -n "$RUBYGEMS_VERSION" ]; then gem update --system $RUBYGEMS_VERSION; fi
   - gem --version
 
 bundler_args: --without guard
@@ -24,29 +14,35 @@ bundler_args: --without guard
 sudo: false
 
 matrix:
+  include:
+    - rvm: 2.2.4
+      sudo: required
+      dist: trusty
+      # To run the proxy tests we need additional gems than what Test Kitchen normally uses
+      # for testing
+      gemfile: Gemfile.proxy_tests
+      before_install:
+        - gem install bundler
+        - sudo apt-get update
+        - sudo apt-get -y install squid3 git curl
+      env:
+        # ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY']
+        - secure: "E7h427Y8z6Nx5sdrA4Ye9gO9pDGpe4jxfhJdM4HPJIM/FSkEJM0ZDPdvhQ6QAQ1S1AHja/JhQUFaNP5NzKhRkVqGCzunBBC6RVb7pp1Qo16EMhJkg7LEsExiSsjQykAzt2w6K/71V+mIlMKxCPYdpu6PT/8w/jZFgBqLEHXuogU="
+        - global:
+          - PROXY_TESTS_DIR=proxy_tests/files/default/scripts
+          - PROXY_TESTS_REPO=$PROXY_TESTS_DIR/repo
+
+      script:
+        - bundle exec kitchen --version
+        # TODO switch to master when https://github.com/chef/proxy_tests/pull/12 is merged
+        - git clone https://github.com/chef/proxy_tests.git
+        - rvmsudo -E bundle exec bash $PROXY_TESTS_DIR/run_tests.sh kitchen \* \* /tmp/out.txt
+      after_script:
+        - cat /tmp/out.txt
+        - sudo cat /var/log/squid3/cache.log
+        - sudo cat /var/log/squid3/access.log
   allow_failures:
     - rvm: ruby-head
-  exclude:
-    - rvm: 2.2
-      env: RUBYGEMS_VERSION=2.2.2
-    - rvm: 2.2
-      env: RUBYGEMS_VERSION=2.1.11
-    - rvm: 2.2
-      env: RUBYGEMS_VERSION=2.0.14
-    - rvm: 2.2
-      env: RUBYGEMS_VERSION=1.8.29
-    - rvm: 2.1
-      env: RUBYGEMS_VERSION=1.8.29
-    - rvm: 2.0.0
-      env: RUBYGEMS_VERSION=1.8.29
-    - rvm: ruby-head
-      env: RUBYGEMS_VERSION=2.2.2
-    - rvm: ruby-head
-      env: RUBYGEMS_VERSION=2.1.11
-    - rvm: ruby-head
-      env: RUBYGEMS_VERSION=2.0.14
-    - rvm: ruby-head
-      env: RUBYGEMS_VERSION=1.8.29
 
 notifications:
   irc: "chat.freenode.net#kitchenci"

data/CHANGELOG.md

@@ -1,4 +1,48 @@
-## 1.4.2
+## 1.5.0
+
+### Potentially breaking changes
+
+### Bug fixes
+
+* PR [#499][]: Use single quotes in Rake/Thorfile templates ([@chr4][])
+* PR [#697][]: Set default log level even if you forget to add it to command line arg ([@scotthain][])
+* PR [#816][]: Fix SuSe OS Busser install ([@Peuserik][])
+* PR [#824][]: Fix handling of chunked ssh output ([@kingpong][])
+* PR [#833][]: Updates the gem path to install everything in /tmp/verifier ([@scotthain][])
+* PR [#835][]: WinRM connect (with retry) is failing on Windows ([@Stift][])
+* PR [#864][]: Fix Windows Omnibus Install ([@dissonanz][])
+* PR [#878][]: write install_command to file and invoke on the instance to avoid command too long on windows ([@mwrock][])
+* PR [#897][]: typo: on != no ([@miketheman][])
+* PR [#919][]: Because net/ssh is no longer including timeout.rb, we need to so that Ruby doesn't think Timeout belongs to the TK class ([@tyler-ball][])
+
+### New features
+
+* PR [#741][]: Add shell verifier ([@sawanoboly][])
+* PR [#752][]: Make lazyhash enumerable ([@caboteria][])
+* PR [#827][]: update omnibus url to chef.io ([@andrewelizondo][])
+* PR [#857][]: add cli option to set the test path ([@chris-rock][])
+* PR [#892][]: Adding proxy tests to the Travis.yml ([@tyler-ball][])
+* PR [#895][]: Adding in ChefConfig support to enable loading proxy config from chef config files ([@tyler-ball][])
+* PR [#901][]: Add support for --profile-ruby ([@martinb3][])
+* PR [#906][]: Adding Maintainers file ([@cheeseplus][])
+
+### Improvements
+
+* PR [#753][]: add tests for empty or missing files ([@miketheman][])
+* PR [#776][]: Add more options for WinRM ([@smurawski][])
+* PR [#782][]: Use [`mixlib-install`](https://github.com/chef/mixlib-install) to generate chef install command. ([@thommay][])
+* PR [#804][]: Drop Ruby 1.9 from TravisCI build matrix ([@thommay][])
+* PR [#813][]: Honor proxy ENV variables ([@mcquin][])
+* PR [#825][]: Add hooks for instance cleanup before exit ([@coderanger][])
+* PR [#872][]: Added try/catch around main and set error action to stop ([@mcallb][])
+* PR [#885][]: Running the chef_base provisioner install_command via sudo, and command_prefix support ([@adamleff][])
+* PR [#896][]: Fixing garbled output for chef_zero provisioner ([@someara][])
+* PR [#908][]: Updating to the latest release of net-ssh to consume https://github.com/net-ssh/net-ssh/pull/280 ([@tyler-ball][])
+* PR [#911][]: Put Travis on a diet ([@cheeseplus][])
+* PR [#912][]: The netssh 3.0 update returns a different error on connection timeout than 2.9.2 did, adding it to the retry list ([@tyler-ball][])
+
+
+## 1.4.2 / 2015-08-03
 
 ### Potentially breaking changes
 
@@ -717,6 +761,7 @@ The initial release.
 [#481]: https://github.com/test-kitchen/test-kitchen/issues/481
 [#489]: https://github.com/test-kitchen/test-kitchen/issues/489
 [#498]: https://github.com/test-kitchen/test-kitchen/issues/498
+[#499]: https://github.com/test-kitchen/test-kitchen/issues/499
 [#504]: https://github.com/test-kitchen/test-kitchen/issues/504
 [#507]: https://github.com/test-kitchen/test-kitchen/issues/507
 [#510]: https://github.com/test-kitchen/test-kitchen/issues/510
@@ -762,6 +807,7 @@ The initial release.
 [#675]: https://github.com/test-kitchen/test-kitchen/issues/675
 [#688]: https://github.com/test-kitchen/test-kitchen/issues/688
 [#689]: https://github.com/test-kitchen/test-kitchen/issues/689
+[#697]: https://github.com/test-kitchen/test-kitchen/issues/697
 [#704]: https://github.com/test-kitchen/test-kitchen/issues/704
 [#711]: https://github.com/test-kitchen/test-kitchen/issues/711
 [#728]: https://github.com/test-kitchen/test-kitchen/issues/728
@@ -769,13 +815,45 @@ The initial release.
 [#734]: https://github.com/test-kitchen/test-kitchen/issues/734
 [#736]: https://github.com/test-kitchen/test-kitchen/issues/736
 [#737]: https://github.com/test-kitchen/test-kitchen/issues/737
+[#741]: https://github.com/test-kitchen/test-kitchen/issues/741
+[#752]: https://github.com/test-kitchen/test-kitchen/issues/752
+[#753]: https://github.com/test-kitchen/test-kitchen/issues/753
+[#776]: https://github.com/test-kitchen/test-kitchen/issues/776
+[#782]: https://github.com/test-kitchen/test-kitchen/issues/782
 [#801]: https://github.com/test-kitchen/test-kitchen/issues/801
 [#802]: https://github.com/test-kitchen/test-kitchen/issues/802
+[#804]: https://github.com/test-kitchen/test-kitchen/issues/804
+[#813]: https://github.com/test-kitchen/test-kitchen/issues/813
+[#816]: https://github.com/test-kitchen/test-kitchen/issues/816
+[#824]: https://github.com/test-kitchen/test-kitchen/issues/824
+[#825]: https://github.com/test-kitchen/test-kitchen/issues/825
+[#827]: https://github.com/test-kitchen/test-kitchen/issues/827
+[#833]: https://github.com/test-kitchen/test-kitchen/issues/833
+[#835]: https://github.com/test-kitchen/test-kitchen/issues/835
+[#857]: https://github.com/test-kitchen/test-kitchen/issues/857
+[#864]: https://github.com/test-kitchen/test-kitchen/issues/864
+[#872]: https://github.com/test-kitchen/test-kitchen/issues/872
+[#878]: https://github.com/test-kitchen/test-kitchen/issues/878
+[#885]: https://github.com/test-kitchen/test-kitchen/issues/885
+[#892]: https://github.com/test-kitchen/test-kitchen/issues/892
+[#895]: https://github.com/test-kitchen/test-kitchen/issues/895
+[#896]: https://github.com/test-kitchen/test-kitchen/issues/896
+[#897]: https://github.com/test-kitchen/test-kitchen/issues/897
+[#901]: https://github.com/test-kitchen/test-kitchen/issues/901
+[#906]: https://github.com/test-kitchen/test-kitchen/issues/906
+[#908]: https://github.com/test-kitchen/test-kitchen/issues/908
+[#911]: https://github.com/test-kitchen/test-kitchen/issues/911
+[#912]: https://github.com/test-kitchen/test-kitchen/issues/912
+[#919]: https://github.com/test-kitchen/test-kitchen/issues/919
 [@Annih]: https://github.com/Annih
 [@ChrisLundquist]: https://github.com/ChrisLundquist
 [@MarkGibbons]: https://github.com/MarkGibbons
+[@Peuserik]: https://github.com/Peuserik
+[@Stift]: https://github.com/Stift
 [@adamhjk]: https://github.com/adamhjk
+[@adamleff]: https://github.com/adamleff
 [@afiune]: https://github.com/afiune
+[@andrewelizondo]: https://github.com/andrewelizondo
 [@arangamani]: https://github.com/arangamani
 [@arunthampi]: https://github.com/arunthampi
 [@benlangfeld]: https://github.com/benlangfeld
@@ -783,10 +861,14 @@ The initial release.
 [@bryanwb]: https://github.com/bryanwb
 [@caboteria]: https://github.com/caboteria
 [@calavera]: https://github.com/calavera
+[@cheeseplus]: https://github.com/cheeseplus
+[@chr4]: https://github.com/chr4
+[@chris-rock]: https://github.com/chris-rock
 [@chrishenry]: https://github.com/chrishenry
 [@coderanger]: https://github.com/coderanger
 [@curiositycasualty]: https://github.com/curiositycasualty
 [@daniellockard]: https://github.com/daniellockard
+[@dissonanz]: https://github.com/dissonanz
 [@ekrupnik]: https://github.com/ekrupnik
 [@fnichol]: https://github.com/fnichol
 [@fnordfish]: https://github.com/fnordfish
@@ -810,12 +892,14 @@ The initial release.
 [@juliandunn]: https://github.com/juliandunn
 [@justincampbell]: https://github.com/justincampbell
 [@kamalim]: https://github.com/kamalim
+[@kingpong]: https://github.com/kingpong
 [@kisoku]: https://github.com/kisoku
 [@lamont-granquist]: https://github.com/lamont-granquist
 [@lloydde]: https://github.com/lloydde
 [@manul]: https://github.com/manul
 [@martinb3]: https://github.com/martinb3
 [@mattray]: https://github.com/mattray
+[@mcallb]: https://github.com/mcallb
 [@mconigliaro]: https://github.com/mconigliaro
 [@mcquin]: https://github.com/mcquin
 [@metadave]: https://github.com/metadave
@@ -851,4 +935,4 @@ The initial release.
 [@tyler-ball]: https://github.com/tyler-ball
 [@whiteley]: https://github.com/whiteley
 [@zl4bv]: https://github.com/zl4bv
-[@zts]: https://github.com/zts
+[@zts]: https://github.com/zts

data/CONTRIBUTING.md

@@ -0,0 +1,17 @@
+# Release Process
+
+This release process applies to all Test Kitchen projects, but each project may have additional requirements.
+
+1. Perform a Github diff between master and the last released version.  Determine whether included PRs justify a patch, minor or major version release.
+2. Check out the master branch of the project being prepared for release.
+3. Branch into a release-branch of the form `150_release_prep`.
+4. Modify the `version.rb` file to specify the version for releasing.
+5. Update the changelog to include what is being released.
+  1. For these projects we use [PimpMyChangelog](https://github.com/pcreux/pimpmychangelog).  All this does is make the CHANGELOG look pretty - for now we manually import the PRs / Issues and categorize them.
+  2. Start a [diff](https://github.com/test-kitchen/test-kitchen/compare/v1.4.2...master) in Github between master and the last release
+  3. Look for all the merged PRs and add them to the CHANGELOG.md under the appropriate category.  They should have the form `* PR #999: PR Description (@author)`.
+  4. Install and run `pimpmychangelog`.  This should change all the PR numbers and @ mentions into links.
+6. `git commit` the `version.rb` and `CHANGELOG.md` changes to the branch and setup a PR for them.  Allow the PR to run any automated tests and review the CHANGELOG for accuracy.
+7. Merge the PR to master after review.
+8. Switch your local copy to the master branch and `git pull` to pull in the release preperation changes.
+9. Run `rake release` on the master branch.

data/Gemfile.proxy_tests

@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+eval_gemfile File.join(File.dirname(__FILE__), "Gemfile")
+
+gem "kitchen-ec2"
+gem "chef-config"

data/MAINTAINERS.md

@@ -0,0 +1,24 @@
+# Maintainers
+
+This file lists how the Test Kitchen project is maintained. When making changes
+to the system, this file tells you who needs to review your patch. You need a :+1: vote
+from at least 2 members of the project team listed below. Additionally, you need to not
+receive a veto from the Lieutenant or the Project Lead.
+
+## Project Lead
+
+* [Fletcher Nichol](https://github.com/fnichol)
+
+## Lieutenants
+* [Tyler Ball](https://github.com/tyler-ball)
+
+## Maintainers
+
+* [Seth Thomas](https://github.com/cheeseplus)
+* [Adam Leff](https://github.com/adamleff)
+* [Jennifer Davis](https://github.com/iennae)
+* [Matt Wrock](https://github.com/mwrock)
+* [Steven Murawski](http://github.com/smurawski)
+* [Chris Hartmann](https://github.com/chris-rock)
+* [Sean Omeara](http://github.com/someara)
+* [Robb Kidd](https://github.com/robbkidd)

data/features/kitchen_driver_discover_command.feature

@@ -17,3 +17,9 @@ Feature: Search RubyGems to discover new Test Kitchen Driver gems
     When I run `kitchen driver discover`
     Then the exit status should be 0
     And the output should contain "kitchen-bluebox"
+
+  Scenario: Running driver discover with the --chef-config-path parameter loads the chef config
+    Given an empty file named "kitchen_client.rb"
+    When I run `kitchen driver discover --chef-config-path=kitchen_client.rb`
+    Then the exit status should be 0
+    And the output should contain "kitchen-bluebox"

data/features/kitchen_init_command.feature

@@ -3,6 +3,9 @@ Feature: Add Test Kitchen support to an existing project
   As an operator
   I want to run a command to initialize my project
 
+  Background:
+    Given a sandboxed GEM_HOME directory named "kitchen-init"
+
   @spawn
   Scenario: Displaying help
     When I run `kitchen help init`
@@ -15,8 +18,7 @@ Feature: Add Test Kitchen support to an existing project
 
   @spawn
   Scenario: Running init with default values
-    Given a sandboxed GEM_HOME directory named "kitchen-init"
-    And I have a git repository
+    Given I have a git repository
     When I run `kitchen init`
     Then the exit status should be 0
     And a directory named "test/integration/default" should exist
@@ -165,15 +167,15 @@ Feature: Add Test Kitchen support to an existing project
     Then the file "Rakefile" should contain:
     """
     begin
-      require "kitchen/rake_tasks"
+      require 'kitchen/rake_tasks'
       Kitchen::RakeTasks.new
     rescue LoadError
-      puts ">>>>> Kitchen gem not loaded, omitting tasks" unless ENV["CI"]
+      puts '>>>>> Kitchen gem not loaded, omitting tasks' unless ENV['CI']
     end
     """
 
   Scenario: Running without git doesn't make a .gitignore
-    When I successfully run `kitchen init`
+    When I successfully run `kitchen init --no-driver`
     Then the exit status should be 0
     And a file named ".gitignore" should not exist
 
@@ -184,10 +186,10 @@ Feature: Add Test Kitchen support to an existing project
     Then the file "Thorfile" should contain:
     """
     begin
-      require "kitchen/thor_tasks"
+      require 'kitchen/thor_tasks'
       Kitchen::ThorTasks.new
     rescue LoadError
-      puts ">>>>> Kitchen gem not loaded, omitting tasks" unless ENV["CI"]
+      puts '>>>>> Kitchen gem not loaded, omitting tasks' unless ENV['CI']
     end
     """
 
@@ -224,3 +226,49 @@ Feature: Add Test Kitchen support to an existing project
         attributes:
 
     """
+
+  Scenario: Running init with an empty file metadata.rb sets an empty run list
+    Given an empty file named "metadata.rb"
+    When I successfully run `kitchen init`
+    Then the file ".kitchen.yml" should contain exactly:
+    """
+    ---
+    driver:
+      name: vagrant
+
+    provisioner:
+      name: chef_solo
+
+    platforms:
+      - name: ubuntu-14.04
+      - name: centos-7.1
+
+    suites:
+      - name: default
+        run_list:
+        attributes:
+
+    """
+
+  Scenario: Running init with no metadata.rb file sets an empty run list
+    Given a file named "metadata.rb" does not exist
+    When I successfully run `kitchen init`
+    Then the file ".kitchen.yml" should contain exactly:
+    """
+    ---
+    driver:
+      name: vagrant
+
+    provisioner:
+      name: chef_solo
+
+    platforms:
+      - name: ubuntu-14.04
+      - name: centos-7.1
+
+    suites:
+      - name: default
+        run_list:
+        attributes:
+
+    """

data/features/step_definitions/gem_steps.rb

@@ -10,19 +10,27 @@ Given(/^a sandboxed GEM_HOME directory named "(.*?)"$/) do |name|
   @aruba_timeout_seconds = 30
 
   gem_home = Pathname.new(Dir.mktmpdir(name))
-  ENV["GEM_HOME"] = gem_home.to_s
-  ENV["GEM_PATH"] = [gem_home.to_s, ENV["GEM_PATH"]].join(":")
+  aruba.environment["GEM_HOME"] = gem_home.to_s
+  aruba.environment["GEM_PATH"] = [gem_home.to_s, ENV["GEM_PATH"]].join(":")
   @cleanup_dirs << gem_home
 end
 
 Then(/^a gem named "(.*?)" is installed with version "(.*?)"$/) do |name, version|
   unbundlerize do
-    run_simple(unescape("gem list #{name} --version #{version} -i"), true, nil)
+    run_simple(
+      sanitize_text("gem list #{name} --version #{version} -i"),
+      :fail_on_error => true,
+      :exit_timeout => nil
+     )
   end
 end
 
 Then(/^a gem named "(.*?)" is installed$/) do |name|
   unbundlerize do
-    run_simple(unescape("gem list #{name} -i"), true, nil)
+    run_simple(
+      sanitize_text("gem list #{name} -i"),
+      :fail_on_error => true,
+      :exit_timeout => nil
+     )
   end
 end

data/features/step_definitions/git_steps.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 Given(/I have a git repository/) do
-  create_dir(".git")
+  create_directory(".git")
 end

data/features/step_definitions/output_steps.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 Then(/^the stdout should match \/([^\/]*)\/$/) do |expected|
-  assert_matching_output(expected, all_stdout)
+  expect(last_command_started).to have_output_on_stdout(Regexp.new(expected))
 end

data/features/support/env.rb

@@ -31,12 +31,12 @@ Before do
   @aruba_timeout_seconds = 15
   @cleanup_dirs = []
 
-  Aruba::Processes::InProcess.main_class = ArubaHelper
-  Aruba.process = Aruba::Processes::InProcess
+  aruba.config.command_launcher = :in_process
+  aruba.config.main_class = ArubaHelper
 end
 
 Before("@spawn") do
-  Aruba.process = Aruba::Processes::SpawnProcess
+  aruba.config.command_launcher = :spawn
 end
 
 After do |s|
@@ -47,25 +47,29 @@ After do |s|
 
   # Restore environment variables to their original settings, if they have
   # been saved off
-  ENV.keys.select { |key| key =~ /^_CUKE_/ }.each do |backup_key|
-    ENV[backup_key.sub(/^_CUKE_/, "")] = ENV.delete(backup_key)
-  end
+  env = aruba.environment
+  env.to_h.keys.select { |key| key =~ /^_CUKE_/ }.
+    each do |backup_key|
+      env[backup_key.sub(/^_CUKE_/, "")] = env[backup_key]
+      env.delete(backup_key)
+    end
 
   @cleanup_dirs.each { |dir| FileUtils.rm_rf(dir) }
 end
 
 def backup_envvar(key)
-  ENV["_CUKE_#{key}"] = ENV[key]
+  aruba.environment["_CUKE_#{key}"] = aruba.environment[key]
 end
 
 def restore_envvar(key)
-  ENV[key] = ENV.delete("_CUKE_#{key}")
+  aruba.environment[key] = aruba.environment["_CUKE_#{key}"]
+  aruba.environment.delete("_CUKE_#{key}")
 end
 
 def unbundlerize
   keys = %w[BUNDLER_EDITOR BUNDLE_BIN_PATH BUNDLE_GEMFILE RUBYOPT]
 
-  keys.each { |key| backup_envvar(key); ENV.delete(key) }
+  keys.each { |key| backup_envvar(key); aruba.environment.delete(key) }
   yield
   keys.each { |key| restore_envvar(key) }
 end

data/lib/kitchen/cli.rb

@@ -93,6 +93,14 @@ module Kitchen
         :type => :boolean
     end
 
+    # Sets the test_base_path method_options
+    # @api private
+    def self.test_base_path
+      method_option :test_base_path,
+        :aliases => "-t",
+        :desc => "Set the base path of the tests"
+    end
+
     desc "list [INSTANCE|REGEXP|all]", "Lists one or more instances"
     method_option :bare,
       :aliases => "-b",
@@ -165,6 +173,7 @@ module Kitchen
           [Future DEPRECATION, use --concurrency]
           Run a #{action} against all matching instances concurrently.
         DESC
+      test_base_path
       log_options
       define_method(action) do |*args|
         update_config!
@@ -210,6 +219,7 @@ module Kitchen
       :type => :boolean,
       :default => false,
       :desc => "Invoke init command if .kitchen.yml is missing"
+    test_base_path
     log_options
     def test(*args)
       update_config!
@@ -287,6 +297,9 @@ module Kitchen
         guarenteed that every result is a driver, but chances are good most
         relevant drivers will be returned.
       D
+      method_option :chef_config_path,
+        :default => nil,
+        :desc => "Path to chef config file containing proxy configuration to use"
       def discover
         perform("discover", "driver_discover", args)
       end
@@ -331,23 +344,51 @@ module Kitchen
     #
     # @api private
     def update_config!
-      if options[:log_level]
-        level = options[:log_level].downcase.to_sym
-        @config.log_level = level
-      end
+      @config.log_level = log_level if log_level
+
       unless options[:log_overwrite].nil?
         @config.log_overwrite = options[:log_overwrite]
       end
 
+      if options[:test_base_path]
+        # ensure we have an absolute path
+        @config.test_base_path = File.absolute_path(options[:test_base_path])
+      end
+
       # Now that we have required configs, lets create our file logger
       Kitchen.logger = Kitchen.default_file_logger(
-        level,
+        log_level,
         options[:log_overwrite]
       )
 
       update_parallel!
     end
 
+    # Validate the log level from the config / CLI options, defaulting
+    # to :info if the supplied level is empty or invalid
+    #
+    # @api private
+    def log_level
+      return unless options[:log_level]
+      return @log_level if @log_level
+
+      level = options[:log_level].downcase.to_sym
+      unless valid_log_level?(level)
+        level = :info
+        banner "WARNING - invalid log level specified: " \
+          "\"#{options[:log_level]}\" - reverting to :info log level."
+      end
+
+      @log_level = level
+    end
+
+    # Check to whether a provided log level is valid
+    #
+    # @api private
+    def valid_log_level?(level)
+      !Util.to_logger_level(level).nil?
+    end
+
     # Set parallel concurrency options for Thor
     #
     # @api private

data/lib/kitchen/command/driver_discover.rb

@@ -19,6 +19,8 @@
 require "kitchen/command"
 
 require "rubygems/spec_fetcher"
+require "chef-config/config"
+require "chef-config/workstation_config_loader"
 
 module Kitchen
 
@@ -31,6 +33,12 @@ module Kitchen
 
       # Invoke the command.
       def call
+        # We are introducing the idea of using the Chef configuration as a
+        # unified config for all the ChefDK tools.  The first practical
+        # implementation of this is 1 location to setup proxy configurations.
+        ChefConfig::WorkstationConfigLoader.new(options[:chef_config_path]).load
+        ChefConfig::Config.export_proxies
+
         specs = fetch_gem_specs.sort { |x, y| x[0] <=> y[0] }
         specs = specs[0, 49].push(["...", "..."]) if specs.size > 49
         specs = specs.unshift(["Gem Name", "Latest Stable Release"])

data/lib/kitchen/command.rb

@@ -174,6 +174,7 @@ module Kitchen
           threads << Thread.new do
             while instance = queue.pop
               instance.public_send(action, *args)
+              instance.cleanup!
             end
           end
         end

data/lib/kitchen/config.rb

@@ -77,6 +77,10 @@ module Kitchen
     # @api private
     attr_accessor :log_overwrite
 
+    # @return [String] an absolute path to the directory containing test suites
+    # @api private
+    attr_accessor :test_base_path
+
     # Creates a new configuration, representing a particular testing
     # configuration for a project.
     #