test-kitchen 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64d47d36ddf40c8ecc6d85d959e3a57156532e47
-  data.tar.gz: 2c60df4e026b0f2cad64dc5b4c3c3ba1341ac2a6
+  metadata.gz: b3c4db1c478015e6304dfe1664f758171403be58
+  data.tar.gz: 61c4f294a642cf6d300e9388a97919f712875be5
 SHA512:
-  metadata.gz: a3de01b4c239c767b824c4d29b8645950ab2704f20c821dd42877d9034ec7024f9b669d4b1c41141ebb213f02f1fe33832adbd2eef804b089abdff78e1aa3d2f
-  data.tar.gz: 3b6ad9625a57724367af1de37712d39b9e2bd6c2115a3f5a66bda655b180797f319888d5ac916a4425b013bf390178d21398aba2198c125779c487f92658f1ad
+  metadata.gz: b5b814ee625daaf11b9105476bc1f3c32f8079f22ee19298d787ad1fa41e090253d4a894227f64b10bbaee67775d4e0e755b925f2f3f9199c97d246650584d2a
+  data.tar.gz: 395cd37b2a48b85ee8e2005e27a6038159c2655a920f9d1e466717dd177c9b8adc58a6a0b13063b94d0c70fdc510ecceadc058444be82692b15911d2d9e2159c

data/.cane

@@ -0,0 +1,5 @@
+--abc-max 20
+--style-measure 120
+--abc-exclude Kitchen::ThorTasks#define
+--style-exclude lib/vendor/**/*.rb
+--doc-exclude lib/vendor/**/.rb

data/.travis.yml

@@ -1,13 +1,16 @@
 language: ruby
 
 rvm:
-  - 1.9.3
+  - 2.1.0
   - 2.0.0
-  - jruby-19mode
+  - 1.9.3
+  - 1.9.2
   - ruby-head
+  - jruby-19mode
 
 env:
-  - RUBYGEMS_VERSION=2.0.3
+  - RUBYGEMS_VERSION=2.1.11
+  - RUBYGEMS_VERSION=2.0.14
   - RUBYGEMS_VERSION=1.8.25
 
 before_install:
@@ -23,3 +26,5 @@ matrix:
   exclude:
     - rvm: 2.0.0
       env: RUBYGEMS_VERSION=1.8.25
+    - rvm: 2.1.0-preview2
+      env: RUBYGEMS_VERSION=1.8.25

data/CHANGELOG.md

@@ -1,3 +1,39 @@
+## 1.2.0 / 2014-02-11
+
+### Upstream changes
+
+* Pull request [#288][]: Update omnibus URL to getchef.com. ([@juliandunn][])
+
+### Bug fixes
+
+* Pull request [#353][]: Ensure that a chef-client failure returns non-zero exit code for chef-client-zero.rb shim script. ([@kamalim][])
+* Pull request [#318][]: Upload chef clients data. ([@jtimberman][])
+* Issue [#282][], issue [#316][]: [CLI] Match a specific instance before trying to find with a regexp. ([@fnichol][])
+* Issue [#305][]: Ensure that `kitchen help` exits non-zero on failure. ([@fnichol][])
+* Pull request [#296][]: Fixing error when using more than one helper. ([@jschneiderhan][])
+* Pull request [#313][]: Allow files in subdirectories in "helpers" directory. ([@mthssdrbrg][])
+* Pull request [#309][]: Add `/opt/local/bin` to instance path when installing Chef Omnibus package. Smartmachines need this otherwise curl can't find certificates. ([@someara][])
+* Pull request [#283][], pull request [#287][], pull request [#310][]: Fix failing minitest test on Windows. ([@rarenerd][])
+* Fix testing regressions for Ruby 1.9.2 around YAML parsing. ([@fnichol][])
+
+### New features
+
+* Pull request [#286][]: **Experimental** Basic shell provisioner, first non-Chef addition! Still considered experimental, that is subject to change between releases until APIs stabilize. ([@ChrisLundquist][])
+* Pull request [#293][], pull request [#277][], issue [#176][]: Add `--concurrency` option to specify number of multiple actions to perform at a time. ([@ryotarai][], [@bkw][])
+* Support `--concurrency` without value, defaulting to all instances and begin to deprecate `--parallel` flag. ([@fnichol][])
+* Pull request [#306][], issue [#304][]: Add local & global file locations with environment variables (`KITCHEN_LOCAL_YAML` and `KITCHEN_GLOBAL_YAML`). ([@fnichol][])
+* Pull request [#298][]: Base provisioner refactoring to start accommodating other provisioners. For more details, see [#298][]. ([@fnichol][])
+
+### Improvements
+
+* Pull request [#280][]: Add `json_attributes: true` config option to ChefZero provisioner. This option allows a user to invoke chef-client without passing the generated JSON file in the `--json-attributes` option. ([@fnichol][])
+* Make `kitchen login` work without args if there is only one instance (thank goodness). ([@fnichol][])
+* Issue [#285][]: Greatly improved error recovery & reporting in Kitchen::Loader::YAML. ([@fnichol][])
+* Pull request [#303][]: Use SafeYAML.load to avoid YAML monkeypatch in safe_yaml. This will leave YAML loading in Test Kitchen as implementation detail and avoid polluting other Ruby objects. ([@fnichol][])
+* Pull request [#302][]: CLI refactoring to remove logic from cli.rb. ([@fnichol][])
+* Add Ruby 2.1.0 to TravisCI testing matrix. ([@fnichol][])
+
+
 ## 1.1.1 / 2013-12-08
 
 ### Bug fixes
@@ -372,6 +408,7 @@ The initial release.
 [#170]: https://github.com/opscode/test-kitchen/issues/170
 [#171]: https://github.com/opscode/test-kitchen/issues/171
 [#172]: https://github.com/opscode/test-kitchen/issues/172
+[#176]: https://github.com/opscode/test-kitchen/issues/176
 [#178]: https://github.com/opscode/test-kitchen/issues/178
 [#179]: https://github.com/opscode/test-kitchen/issues/179
 [#187]: https://github.com/opscode/test-kitchen/issues/187
@@ -399,11 +436,34 @@ The initial release.
 [#272]: https://github.com/opscode/test-kitchen/issues/272
 [#275]: https://github.com/opscode/test-kitchen/issues/275
 [#276]: https://github.com/opscode/test-kitchen/issues/276
+[#277]: https://github.com/opscode/test-kitchen/issues/277
 [#278]: https://github.com/opscode/test-kitchen/issues/278
+[#280]: https://github.com/opscode/test-kitchen/issues/280
+[#282]: https://github.com/opscode/test-kitchen/issues/282
+[#283]: https://github.com/opscode/test-kitchen/issues/283
+[#285]: https://github.com/opscode/test-kitchen/issues/285
+[#286]: https://github.com/opscode/test-kitchen/issues/286
+[#287]: https://github.com/opscode/test-kitchen/issues/287
+[#288]: https://github.com/opscode/test-kitchen/issues/288
+[#293]: https://github.com/opscode/test-kitchen/issues/293
+[#296]: https://github.com/opscode/test-kitchen/issues/296
+[#298]: https://github.com/opscode/test-kitchen/issues/298
+[#302]: https://github.com/opscode/test-kitchen/issues/302
+[#303]: https://github.com/opscode/test-kitchen/issues/303
+[#304]: https://github.com/opscode/test-kitchen/issues/304
+[#305]: https://github.com/opscode/test-kitchen/issues/305
+[#306]: https://github.com/opscode/test-kitchen/issues/306
+[#309]: https://github.com/opscode/test-kitchen/issues/309
+[#310]: https://github.com/opscode/test-kitchen/issues/310
+[#313]: https://github.com/opscode/test-kitchen/issues/313
+[#316]: https://github.com/opscode/test-kitchen/issues/316
+[#318]: https://github.com/opscode/test-kitchen/issues/318
+[#353]: https://github.com/opscode/test-kitchen/issues/353
 [@ChrisLundquist]: https://github.com/ChrisLundquist
 [@adamhjk]: https://github.com/adamhjk
 [@arangamani]: https://github.com/arangamani
 [@arunthampi]: https://github.com/arunthampi
+[@bkw]: https://github.com/bkw
 [@bryanwb]: https://github.com/bryanwb
 [@calavera]: https://github.com/calavera
 [@ekrupnik]: https://github.com/ekrupnik
@@ -417,24 +477,30 @@ The initial release.
 [@jonsmorrow]: https://github.com/jonsmorrow
 [@josephholsten]: https://github.com/josephholsten
 [@jrwesolo]: https://github.com/jrwesolo
+[@jschneiderhan]: https://github.com/jschneiderhan
 [@jtimberman]: https://github.com/jtimberman
 [@juliandunn]: https://github.com/juliandunn
+[@kamalim]: https://github.com/kamalim
 [@kisoku]: https://github.com/kisoku
 [@manul]: https://github.com/manul
 [@mattray]: https://github.com/mattray
 [@mconigliaro]: https://github.com/mconigliaro
+[@mthssdrbrg]: https://github.com/mthssdrbrg
 [@oferrigni]: https://github.com/oferrigni
 [@patcon]: https://github.com/patcon
 [@portertech]: https://github.com/portertech
+[@rarenerd]: https://github.com/rarenerd
 [@reset]: https://github.com/reset
 [@rteabeault]: https://github.com/rteabeault
 [@ryansouza]: https://github.com/ryansouza
+[@ryotarai]: https://github.com/ryotarai
 [@saketoba]: https://github.com/saketoba
 [@scarolan]: https://github.com/scarolan
 [@schisamo]: https://github.com/schisamo
 [@scotthain]: https://github.com/scotthain
 [@sethvargo]: https://github.com/sethvargo
 [@smith]: https://github.com/smith
+[@someara]: https://github.com/someara
 [@stevendanna]: https://github.com/stevendanna
 [@thommay]: https://github.com/thommay
 [@zts]: https://github.com/zts

data/Guardfile

@@ -4,7 +4,9 @@ guard 'minitest' do
   watch(%r|^spec/spec_helper\.rb|)    { "spec" }
 end
 
-guard 'cucumber' do
+cucumber_cli = '--no-profile --color --format progress --strict'
+cucumber_cli += ' --tags ~@spawn' if RUBY_PLATFORM =~ /mswin|mingw|windows/
+guard 'cucumber', cli: cucumber_cli do
   watch(%r{^features/.+\.feature$})
   watch(%r{^features/support/.+$})          { 'features' }
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }

data/README.md

@@ -9,7 +9,7 @@
 |-------------|-----------------------------------------------|
 | Website     | http://kitchen.ci                             |
 | Source Code | http://kitchen.ci/docs/getting-started/       |
-| IRC         | [#kitchenci][irc] channel on Freenode         |
+| IRC         | [#kitchenci][irc] channel on Freenode, [transcript][irc_log] thanks to [BotBot.me][botbotme] |
 | Twitter     | [@kitchenci][twitter]                         |
 
 > **Test Kitchen is an integration tool for developing and testing
@@ -111,10 +111,12 @@ a growing community of [contributors][contributors].
 
 Apache License, Version 2.0 (see [LICENSE][license])
 
+[botbotme]: https://botbot.me/
 [contributors]: https://github.com/test-kitchen/test-kitchen/graphs/contributors
 [fnichol]: https://github.com/fnichol
 [guide]: http://kitchen.ci/docs/getting-started/
 [irc]: http://webchat.freenode.net/?channels=kitchenci
+[irc_log]: https://botbot.me/freenode/kitchenci/
 [issues]: https://github.com/test-kitchen/test-kitchen/issues
 [license]: https://github.com/test-kitchen/test-kitchen/blob/master/LICENSE
 [repo]: https://github.com/test-kitchen/test-kitchen

data/Rakefile

@@ -30,22 +30,7 @@ unless RUBY_ENGINE == 'jruby'
 
   desc "Run cane to check quality metrics"
   Cane::RakeTask.new do |cane|
-    cane.abc_max = 20
-    cane.abc_exclude = %w(
-      Kitchen::RakeTasks#define
-      Kitchen::ThorTasks#define
-      Kitchen::CLI#pry_prompts
-      Kitchen::CLI#debug_instance
-      Kitchen::Instance#synchronize_or_call
-      Kitchen::Driver::SSHBase#converge
-    )
-    cane.style_exclude = %w(
-      lib/vendor/hash_recursive_merge.rb
-    )
-    cane.doc_exclude = %w(
-      lib/vendor/hash_recursive_merge.rb
-    )
-    cane.style_measure = 160
+    cane.canefile = './.cane'
   end
 
   Tailor::RakeTask.new do |task|

data/features/kitchen_command.feature

@@ -3,6 +3,7 @@ Feature: A command line interface for Test Kitchen
   As a Test Kitchen user
   I want a command line interface that has sane defaults and built in help
 
+  @spawn
   Scenario: Displaying help
     When I run `kitchen help`
     Then the exit status should be 0

data/features/kitchen_driver_create_command.feature

@@ -3,6 +3,7 @@ Feature: Create a new Test Kitchen Driver project
   As a user of Test Kitchen
   I want a command to run that will give me a driver gem project scaffold
 
+  @spawn
   Scenario: Displaying help
     When I run `kitchen help driver create`
     Then the output should contain:

data/features/kitchen_driver_discover_command.feature

@@ -3,6 +3,7 @@ Feature: Search RubyGems to discover new Test Kitchen Driver gems
   As a Test Kitchen user
   I want to run a command which returns candidate Kitchen drivers
 
+  @spawn
   Scenario: Displaying help
     When I run `kitchen help driver discover`
     Then the output should contain:

data/features/kitchen_help_command.feature

@@ -0,0 +1,16 @@
+Feature: Using Test Kitchen CLI help
+  In order to access the self describing documentation
+  As a user of Test Kitchen
+  I want to run a command help help for kitchen commands
+
+  @spawn
+  Scenario: Printing help
+    When I run `kitchen help`
+    Then the exit status should be 0
+    And the output should contain "kitchen help [COMMAND]"
+
+  @spawn
+  Scenario: Bad arugments should exit nonzero
+    When I run `kitchen help -d always -c`
+    Then the exit status should not be 0
+    And the output should contain "Usage: "

data/features/kitchen_init_command.feature

@@ -3,6 +3,7 @@ Feature: Add Test Kitchen support to an existing project
   As an operator
   I want to run a command to initialize my project
 
+  @spawn
   Scenario: Displaying help
     When I run `kitchen help init`
     Then the output should contain:
@@ -12,6 +13,7 @@ Feature: Add Test Kitchen support to an existing project
     """
     And the exit status should be 0
 
+  @spawn
   Scenario: Running init with default values
     Given a sandboxed GEM_HOME directory named "kitchen-init"
     And I have a git repository

data/features/kitchen_list_command.feature

@@ -13,6 +13,7 @@ Feature: Listing Test Kitchen instances
     platforms:
       - name: ubuntu-13.04
       - name: centos-6.4
+      - name: centos-6.4-with-small-mem
 
     suites:
       - name: foobar
@@ -31,6 +32,7 @@ Feature: Listing Test Kitchen instances
     """
     foobar-ubuntu-1304
     foobar-centos-64
+    foobar-centos-64-with-small-mem
 
     """
 
@@ -51,12 +53,52 @@ Feature: Listing Test Kitchen instances
 
     """
 
+  @spawn
   Scenario: Listing instances with a regular expression yielding no results
     When I run `kitchen list freebsd --bare`
     Then the exit status should not be 0
     And the output should contain "No instances for regex `freebsd', try running `kitchen list'"
 
+  @spawn
   Scenario: Listing instances with a bad regular expression
     When I run `kitchen list *centos* --bare`
     Then the exit status should not be 0
     And the output should contain "Invalid Ruby regular expression"
+
+  Scenario: Listing a full instance name returns an exact match, not fuzzy matches
+    When I successfully run `kitchen list  foobar-centos-64 --bare`
+    Then the output should contain exactly:
+    """
+    foobar-centos-64
+
+    """
+
+  Scenario: Listing a full instance name returns an exact match, not fuzzy matches at start
+    Given a file named ".kitchen.yml" with:
+    """
+    ---
+    driver: dummy
+    provisioner: chef_solo
+
+    platforms:
+      - name: ubuntu-12.04
+
+    suites:
+      - name: gdb01-master
+      - name: logdb01-master
+    """
+    When I successfully run `kitchen list gdb01-master-ubuntu-1204 --bare`
+    Then the output should contain exactly:
+    """
+    gdb01-master-ubuntu-1204
+
+    """
+
+  Scenario: Listing a full instance with regex returns all regex matches
+    When I successfully run `kitchen list  'foobar-centos-64.*' --bare`
+    Then the output should contain exactly:
+    """
+    foobar-centos-64
+    foobar-centos-64-with-small-mem
+
+    """

data/features/support/env.rb

@@ -1,10 +1,35 @@
 # Set up the environment for testing
 require 'aruba/cucumber'
+require 'aruba/in_process'
+require 'aruba/spawn_process'
 require 'kitchen'
+require 'kitchen/cli'
+
+class ArubaHelper
+  def initialize(argv, stdin=STDIN, stdout=STDOUT, stderr=STDERR, kernel=Kernel)
+    @argv, @stdin, @stdout, @stderr, @kernel = argv, stdin, stdout, stderr, kernel
+  end
+
+  def execute!
+    $stdout = @stdout
+    $stdin = @stdin
+
+    kitchen_cli = Kitchen::CLI
+    kitchen_cli.start(@argv)
+    @kernel.exit(0)
+  end
+end
 
 Before do
   @aruba_timeout_seconds = 15
   @cleanup_dirs = []
+
+  Aruba::InProcess.main_class = ArubaHelper
+  Aruba.process = Aruba::InProcess
+end
+
+Before('@spawn') do
+  Aruba.process = Aruba::SpawnProcess
 end
 
 After do |s|

data/lib/kitchen.rb

@@ -32,7 +32,6 @@ require 'kitchen/color'
 require 'kitchen/collection'
 require 'kitchen/config'
 require 'kitchen/data_munger'
-require 'kitchen/diagnostic'
 require 'kitchen/driver'
 require 'kitchen/driver/base'
 require 'kitchen/driver/proxy'

data/lib/kitchen/busser.rb

@@ -128,7 +128,7 @@ module Kitchen
         sync_cmd << busser_setup_env
         sync_cmd << "#{sudo}#{config[:busser_bin]} suite cleanup"
         sync_cmd << "#{local_suite_files.map { |f| stream_file(f, remote_file(f, config[:suite_name])) }.join("; ")}"
-        sync_cmd << "#{helper_files.map { |f| stream_file(f, remote_file(f, "helpers")) }.join}"
+        sync_cmd << "#{helper_files.map { |f| stream_file(f, remote_file(f, "helpers")) }.join("; ")}"
 
         # use Bourne (/bin/sh) as Bash does not exist on all Unix flavors
         "sh -c '#{sync_cmd.join('; ')}'"
@@ -193,7 +193,7 @@ module Kitchen
     end
 
     def helper_files
-      Dir.glob(File.join(config[:test_base_path], "helpers", "*/**/*"))
+      Dir.glob(File.join(config[:test_base_path], "helpers", "*/**/*")).reject { |f| File.directory?(f) }
     end
 
     def remote_file(file, dir)

data/lib/kitchen/cli.rb

@@ -16,11 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'benchmark'
-require 'erb'
-require 'ostruct'
 require 'thor'
-require 'thread'
 
 require 'kitchen'
 require 'kitchen/generator/driver_create'
@@ -33,22 +29,47 @@ module Kitchen
   # @author Fletcher Nichol <fnichol@nichol.ca>
   class CLI < Thor
 
-    include Thor::Actions
+    # Common module to load and invoke a CLI-implementation agnostic command.
+    module PerformCommand
+
+      def perform(task, command, args = nil, additional_options = {})
+        require "kitchen/command/#{command}"
+
+        command_options = {
+          :action => task,
+          :help => lambda { help(task) },
+          :config => @config,
+          :shell => shell
+        }.merge(additional_options)
+
+        str_const = Thor::Util.camel_case(command)
+        klass = ::Kitchen::Command.const_get(str_const)
+        klass.new(args, options, command_options).call
+      end
+    end
+
     include Logging
+    include PerformCommand
+
+    MAX_CONCURRENCY = 9999
 
     # Constructs a new instance.
     def initialize(*args)
       super
       $stdout.sync = true
       Kitchen.logger = Kitchen.default_file_logger
-      @loader = Kitchen::Loader::YAML.new(ENV['KITCHEN_YAML'])
+      @loader = Kitchen::Loader::YAML.new(
+        :project_config => ENV['KITCHEN_YAML'],
+        :local_config => ENV['KITCHEN_LOCAL_YAML'],
+        :global_config => ENV['KITCHEN_GLOBAL_YAML']
+      )
       @config = Kitchen::Config.new(
         :loader     => @loader,
         :log_level  => ENV.fetch('KITCHEN_LOG', "info").downcase.to_sym
       )
     end
 
-    desc "list [(all|<REGEX>)]", "List all instances"
+    desc "list [INSTANCE|REGEXP|all]", "Lists one or more instances"
     method_option :bare, :aliases => "-b", :type => :boolean,
       :desc => "List the name of each instance only, one per line"
     method_option :debug, :aliases => "-d", :type => :boolean,
@@ -57,18 +78,10 @@ module Kitchen
       :desc => "Set the log level (debug, info, warn, error, fatal)"
     def list(*args)
       update_config!
-      result = parse_subcommand(args.first)
-      if options[:debug]
-        die task, "The --debug flag on the list subcommand is deprecated, " +
-          "please use `kitchen diagnose'."
-      elsif options[:bare]
-        say Array(result).map { |i| i.name }.join("\n")
-      else
-        list_table(result)
-      end
+      perform("list", "list", args)
     end
 
-    desc "diagnose [(all|<REGEX>)]", "Show computed diagnostic configuration"
+    desc "diagnose [INSTANCE|REGEXP|all]", "Show computed diagnostic configuration"
     method_option :log_level, :aliases => "-l",
       :desc => "Set the log level (debug, info, warn, error, fatal)"
     method_option :loader, :type => :boolean,
@@ -79,36 +92,34 @@ module Kitchen
       :desc => "Include all diagnostics"
     def diagnose(*args)
       update_config!
-
-      loader = if options[:all] || options[:loader]
-        @loader
-      else
-        nil
-      end
-      instances = if options[:all] || options[:instances]
-        parse_subcommand(args.first)
-      else
-        []
-      end
-
-      require 'yaml'
-      Kitchen::Diagnostic.new(:loader => loader, :instances => instances).
-        read.to_yaml.each_line { |line| say(line) }
+      perform("diagnose", "diagnose", args, :loader => @loader)
     end
 
     [:create, :converge, :setup, :verify, :destroy].each do |action|
       desc(
-        "#{action} [(all|<REGEX>)] [opts]",
+        "#{action} [INSTANCE|REGEXP|all]",
         "#{action.capitalize} one or more instances"
       )
+      method_option :concurrency, :aliases => "-c",
+        :type => :numeric, :lazy_default => MAX_CONCURRENCY,
+        :desc => <<-DESC.gsub(/^\s+/, '').gsub(/\n/, ' ')
+          Run a #{action} against all matching instances concurrently. Only N
+          instances will run at the same time if a number is given.
+        DESC
       method_option :parallel, :aliases => "-p", :type => :boolean,
-        :desc => "Perform action against all matching instances in parallel"
+        :desc => <<-DESC.gsub(/^\s+/, '').gsub(/\n/, ' ')
+          [Future DEPRECATION, use --concurrency]
+          Run a #{action} against all matching instances concurrently.
+        DESC
       method_option :log_level, :aliases => "-l",
         :desc => "Set the log level (debug, info, warn, error, fatal)"
-      define_method(action) { |*args| exec_action(action) }
+      define_method(action) do |*args|
+        update_config!
+        perform(action, "action", args)
+      end
     end
 
-    desc "test [all|<REGEX>)] [opts]", "Test one or more instances"
+    desc "test [INSTANCE|REGEXP|all]", "Test one or more instances"
     long_desc <<-DESC
       Test one or more instances
 
@@ -119,8 +130,17 @@ module Kitchen
       * always: instances will always be destroyed afterwards.\n
       * never: instances will never be destroyed afterwards.
     DESC
+    method_option :concurrency, :aliases => "-c",
+      :type => :numeric, :lazy_default => MAX_CONCURRENCY,
+      :desc => <<-DESC.gsub(/^\s+/, '').gsub(/\n/, ' ')
+        Run a test against all matching instances concurrently. Only N
+        instances will run at the same time if a number is given.
+      DESC
     method_option :parallel, :aliases => "-p", :type => :boolean,
-      :desc => "Perform action against all matching instances in parallel"
+      :desc => <<-DESC.gsub(/^\s+/, '').gsub(/\n/, ' ')
+        [Future DEPRECATION, use --concurrency]
+        Run a test against all matching instances concurrently.
+      DESC
     method_option :log_level, :aliases => "-l",
       :desc => "Set the log level (debug, info, warn, error, fatal)"
     method_option :destroy, :aliases => "-d", :default => "passing",
@@ -128,79 +148,33 @@ module Kitchen
     method_option :auto_init, :type => :boolean, :default => false,
       :desc => "Invoke init command if .kitchen.yml is missing"
     def test(*args)
-      if ! %w{passing always never}.include?(options[:destroy])
-        raise ArgumentError, "Destroy mode must be passing, always, or never."
-      end
-
       update_config!
-      banner "Starting Kitchen (v#{Kitchen::VERSION})"
-      elapsed = Benchmark.measure do
-        ensure_initialized
-        destroy_mode = options[:destroy].to_sym
-        @task = :test
-        results = parse_subcommand(args.join('|'))
-
-        if options[:parallel]
-          run_parallel(results, destroy_mode)
-        else
-          run_serial(results, destroy_mode)
-        end
-      end
-      banner "Kitchen is finished. #{Util.duration(elapsed.real)}"
+      ensure_initialized
+      perform("test", "test", args)
     end
 
-    desc "login (['REGEX']|[INSTANCE])", "Log in to one instance"
+    desc "login INSTANCE|REGEXP", "Log in to one instance"
     method_option :log_level, :aliases => "-l",
       :desc => "Set the log level (debug, info, warn, error, fatal)"
-    def login(regexp)
+    def login(*args)
       update_config!
-      results = get_filtered_instances(regexp)
-      if results.size > 1
-        die task, "Argument `#{regexp}' returned multiple results:\n" +
-          results.map { |i| "  * #{i.name}" }.join("\n")
-      end
-      instance = results.pop
-
-      instance.login
+      perform("login", "login", args)
     end
 
     desc "version", "Print Kitchen's version information"
     def version
-      say "Test Kitchen version #{Kitchen::VERSION}"
+      puts "Test Kitchen version #{Kitchen::VERSION}"
     end
     map %w(-v --version) => :version
 
     desc "sink", "Show the Kitchen sink!", :hide => true
     def sink
-      say [
-        "",
-        "                    ___              ",
-        "                   ' _ '.            ",
-        "                 / /` `\\ \\         ",
-        "                 | |   [__]          ",
-        "                 | |    {{           ",
-        "                 | |    }}           ",
-        "              _  | |  _ {{           ",
-        "  ___________<_>_| |_<_>}}________   ",
-        "      .=======^=(___)=^={{====.      ",
-        "     / .----------------}}---. \\    ",
-        "    / /                 {{    \\ \\  ",
-        "   / /                  }}     \\ \\ ",
-        "  (  '========================='  )  ",
-        "   '-----------------------------'   ",
-        "                                     ",  # necessary newline
-        ""
-      ].map(&:rstrip).join("\n")
+      perform("sink", "sink")
     end
 
     desc "console", "Kitchen Console!"
     def console
-      require 'pry'
-      Pry.start(@config, :prompt => pry_prompts)
-    rescue LoadError => e
-      warn %{Make sure you have the pry gem installed. You can install it with:}
-      warn %{`gem install pry` or including 'gem "pry"' in your Gemfile.}
-      exit 1
+      perform("console", "console")
     end
 
     register Kitchen::Generator::Init, "init",
@@ -218,6 +192,8 @@ module Kitchen
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class Driver < Thor
 
+      include PerformCommand
+
       register Kitchen::Generator::DriverCreate, "create",
         "create [NAME]", "Create a new Kitchen Driver gem project"
       long_desc <<-D, :for => "create"
@@ -238,43 +214,12 @@ module Kitchen
         relevant drivers will be returned.
       D
       def discover
-        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"])
-        print_table(specs, :indent => 4)
+        perform("discover", "driver_discover", args)
       end
 
       def self.basename
         super + " driver"
       end
-
-      private
-
-      def fetch_gem_specs
-        require 'rubygems/spec_fetcher'
-        SafeYAML::OPTIONS[:suppress_warnings] = true
-        req = Gem::Requirement.default
-        dep = Gem::Deprecate.skip_during do
-          Gem::Dependency.new(/kitchen-/i, req)
-        end
-        fetcher = Gem::SpecFetcher.fetcher
-
-        specs = if fetcher.respond_to?(:find_matching)
-          fetch_gem_specs_pre_rubygems_2(fetcher, dep)
-        else
-          fetch_gem_specs_post_rubygems_2(fetcher, dep)
-        end
-      end
-
-      def fetch_gem_specs_pre_rubygems_2(fetcher, dep)
-        specs = fetcher.find_matching(dep, false, false, false)
-        specs.map { |t| t.first }.map { |t| t[0, 2] }
-      end
-
-      def fetch_gem_specs_post_rubygems_2(fetcher, dep)
-        specs = fetcher.spec_for_dependency(dep, false)
-        specs.first.map { |t| [t.first.name, t.first.version] }
-      end
     end
 
     register Kitchen::CLI::Driver, "driver",
@@ -293,111 +238,30 @@ module Kitchen
 
     private
 
-    attr_reader :task
+    def self.exit_on_failure?
+      true
+    end
 
     def logger
       Kitchen.logger
     end
 
-    def exec_action(action)
-      update_config!
-      banner "Starting Kitchen (v#{Kitchen::VERSION})"
-      elapsed = Benchmark.measure do
-        @task = action
-        results = parse_subcommand(args.first)
-        options[:parallel] ? run_parallel(results) : run_serial(results)
-      end
-      banner "Kitchen is finished. #{Util.duration(elapsed.real)}"
-    end
-
-    def run_serial(instances, *args)
-      Array(instances).map { |i| i.public_send(task, *args) }
-    end
-
-    def run_parallel(instances, *args)
-      threads = Array(instances).map do |i|
-        Thread.new do
-          i.public_send(task, *args)
-        end
-      end
-      threads.map { |i| i.join }
-    end
-
-    def parse_subcommand(arg = nil)
-      arg == "all" ? get_all_instances : get_filtered_instances(arg)
-    end
-
-    def get_all_instances
-      result = @config.instances
-
-      if result.empty?
-        die task, "No instances defined"
-      else
-        result
-      end
-    end
-
-    def get_filtered_instances(regexp)
-      result = begin
-        @config.instances.get_all(/#{regexp}/)
-      rescue RegexpError => e
-        die task, "Invalid Ruby regular expression, " +
-          "you may need to single quote the argument. " +
-          "Please try again or consult http://rubular.com/ (#{e.message})"
-      end
-
-      if result.empty?
-        die task, "No instances for regex `#{regexp}', try running `kitchen list'"
-      else
-        result
-      end
-    end
-
-    def list_table(result)
-      table = [
-        [set_color("Instance", :green), set_color("Driver", :green),
-          set_color("Provisioner", :green), set_color("Last Action", :green)]
-      ]
-      table += Array(result).map { |i| display_instance(i) }
-      print_table(table)
-    end
-
-    def display_instance(instance)
-      [
-        color_pad(instance.name),
-        color_pad(instance.driver.name),
-        color_pad(instance.provisioner.name),
-        format_last_action(instance.last_action)
-      ]
-    end
-
-    def color_pad(string)
-      string + set_color("", :white)
-    end
-
-    def format_last_action(last_action)
-      case last_action
-      when 'create' then set_color("Created", :cyan)
-      when 'converge' then set_color("Converged", :magenta)
-      when 'setup' then set_color("Set Up", :blue)
-      when 'verify' then set_color("Verified", :yellow)
-      when nil then set_color("<Not Created>", :red)
-      else set_color("<Unknown>", :white)
-      end
-    end
-
     def update_config!
       if options[:log_level]
         level = options[:log_level].downcase.to_sym
         @config.log_level = level
         Kitchen.logger.level = Util.to_logger_level(level)
       end
-    end
 
-    def die(task, msg)
-      error "\n#{msg}\n\n"
-      help(task)
-      exit 1
+      if options[:parallel]
+        # warn here in a future release when option is used
+        @options = Thor::CoreExt::HashWithIndifferentAccess.new(options.to_hash)
+        if options[:parallel] && !options[:concurrency]
+          options[:concurrency] = MAX_CONCURRENCY
+        end
+        options.delete(:parallel)
+        options.freeze
+      end
     end
 
     def ensure_initialized
@@ -408,22 +272,5 @@ module Kitchen
         invoke "init"
       end
     end
-
-    def pry_prompts
-      [
-        proc { |target_self, nest_level, pry|
-          ["[#{pry.input_array.size}] ",
-            "kc(#{Pry.view_clip(target_self.class)})",
-            "#{":#{nest_level}" unless nest_level.zero?}> "
-          ].join
-        },
-        proc { |target_self, nest_level, pry|
-          ["[#{pry.input_array.size}] ",
-            "kc(#{Pry.view_clip(target_self.class)})",
-            "#{":#{nest_level}" unless nest_level.zero?}* "
-          ].join
-        },
-      ]
-    end
   end
 end