test-kitchen 1.3.1 → 1.4.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 665e48e9f78d624f8aa062b4ca790ebca42acaf4
-  data.tar.gz: b962301704633bb76408ae13ad354cbbee216371
+  metadata.gz: 882640379092b0732cc6d313bad0789817f6ad6a
+  data.tar.gz: 3bc38f11004420059c9674972e6f4205508b55bf
 SHA512:
-  metadata.gz: a9b4dc5ae5d985f1674c65b9823cf1f0979f731aadbea863c565e057e93147c2d62ef7650afcb8db361f0c3557ad4647a991ac7095878ef26790c6ec1ee86909
-  data.tar.gz: 18e1cbc9626ab891381425303685f9525791f9313d2a1dbbb3df002d061cebaf6b1f8898ab8ce19994ba5d8fe2d3e7aee2e9cfc4d91939152f339b3d3e3d3c8f
+  metadata.gz: 898fe17d662c7b9af006bd9b711a3e0305b2bebe8e1aaa5b2ea91ae8c9b73dc7f7ed7bcaa7721888e20a6cae1b90f79431033d4cefb079f88c1b7772dcd036cd
+  data.tar.gz: 7f8eff2f17d9796033dca9f6bc8e9f71fdddc7d3386d2c788573920cb4c0e297abc23e18958bfbd6de6d7f4b103bf64984f7a41ec485255a04e195b60417c65b

data/.cane

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

data/.gitignore

@@ -19,3 +19,7 @@ tmp
 .rbenv-version
 .ruby-version
 .project
+.DS_Store
+.kitchen/
+.kitchen.yml
+.kitchen.local.yml

data/CHANGELOG.md

@@ -1,3 +1,37 @@
+## 1.4.0.beta.1 / 2015-03-24
+
+### Potentially breaking changes
+
+**Note::** while a huge amount of effort has gone into preserving backwards compatibility, there could be issues when running this release using certain Drivers and Provisioners, especially ones that are deeply customized. Drivers that inherit directly from `Kitchen::Driver::Base` may need to be updated, while Driver that inherit directly from `Kitchen::Driver::SSHBase` should continue to operate as before. Other libraries/addons/plugins which patch internals of Test Kitchen's code may break or work differently and would be extremely hard to preserve while adding new functionality. Sadly, this is a tradeoff.
+
+* Drivers are no longer responsible for `converge`, `setup`, `verify`, and `login` actions. The updated Driver API contract ([Driver::Base](https://github.com/test-kitchen/test-kitchen/blob/master/lib/kitchen/driver/base.rb)) only requires implementing the `#create` and `#destroy` methods, same as before. However, for Drivers that directly inherit from `Kitchen::Driver::Base`, any custom `#converge`, `#setup`, `#verify`, or `#login_command` methods will no longer be called. ([@fnichol][])
+* Drivers which inherit directly from `Kitchen::Driver::SSHBase` are now considered "Legacy Drivers" as further improvements for these Drivers may not be available in future releases. The previous behavior is preserved, i.e. the Driver's `#converge`, `#setup`, and `#verify` methods are called and all methods signatures (and relative behavior) is preserved. ([Driver::SSHBase](https://github.com/test-kitchen/test-kitchen/blob/master/lib/kitchen/driver/ssh_base.rb), [Commit notes](https://github.com/test-kitchen/test-kitchen/commit/d816d6fd1bd21548b485ca91e0ff9303e99a6fbc)) ([@fnichol][])
+* Provisioners are now self-aware, completely owning the `converge` action. The original public methods of the Base Provisioner are maintained but are now invoked with a `#call(state)` method on the Provisioner object. Provisioner authors may elect to implement the command and sandbox methods, or re-implement the `#call` method which may not call any of the previously mentioned methods. ([Provisioner::Base](https://github.com/test-kitchen/test-kitchen/blob/master/lib/kitchen/provisioner/base.rb), [Commit notes](https://github.com/test-kitchen/test-kitchen/commit/3196675e519a2fb97af4bcac80ef11f5e37f2537)) ([@fnichol][])
+* Transport are not responsible for the `login` command. ([Commit notes](https://github.com/test-kitchen/test-kitchen/commit/ae360a11d8c18ff5d1086ee19b099db1d0422024)) ([@fnichol][])
+* Busser is now a plugin of type Verifier (see below for details on Verifiers). Any external code that directly creates a `Kitchen::Busser` object will fail as the class has moved to `Kitchen::Verifier::Busser`. Any external code that directly invokes Busser's `#sync_cmd` will log a warning and will **not** transfer test files (authors of plugins may now call `instance.transport(state).upload(locals, remote)` in its place). ([@fnichol][])
+* Verifiers are responsible for the `verify` action. ([Commit notes](https://github.com/test-kitchen/test-kitchen/commit/d62f577003c1920259eb627cc4479c0b21e0c374)) ([@fnichol][])
+
+
+### New features
+
+* ChefZero Provisioner supports Windows paths and PowerShell commands and works with the WinRM Transport (default behavior for Platform names starting with `/^win/`). ([Provisioner::ChefZero](https://github.com/test-kitchen/test-kitchen/blob/master/lib/kitchen/provisioner/chef_zero.rb)) ([@fnichol][])
+* ChefSolo Provisioner supports Windows paths and PowerShell commands and works with the WinRM Transport (default behavior for Platform names starting with `/^win/`). ([Provisioner::ChefSolo](https://github.com/test-kitchen/test-kitchen/blob/master/lib/kitchen/provisioner/chef_solo.rb)) ([@fnichol][])
+* Shell Provisioner supports PowerShell scripts in addition to Bourne shell scripts ([Provisioner::Shell](https://github.com/test-kitchen/test-kitchen/blob/master/lib/kitchen/provisioner/shell.rb)) ([@fnichol][])
+* Platform operating system and shell hinting: By default, Windows platform names (case insensitive platform names starting with `/^win/`) will have `:os_type` set to `"windows"` and `:shell_type` set to `"powershell"`. By default, non-Windows platform names will have `:os_type` set to `"unix"` and `:shell_type` set to `"bourne"`. The methods `#windows_os?`, `#unix_os?`, `#powershell_shell?`, `#bourne_shell?`, and `#remote_path_join` are available for all Driver, Provisioner, Verifier, and Transport authors. ([@fnichol][])
+* New plugin type: Transport, which executes commands and transfers files to remote instances. ([Transport::Base](https://github.com/test-kitchen/test-kitchen/blob/master/lib/kitchen/transport/base.rb)) ([@afiune][], [@mwrock][], [@fnichol][])
+* New Transport: WinRM: which re-uses a remote shell to execute commands and upload files over WinRM. Currently non-SSL/plaintext authentication only. ([Transport::Winrm](https://github.com/test-kitchen/test-kitchen/blob/master/lib/kitchen/transport/winrm.rb)) ([@afiune][], [@mwrock][], [@fnichol][])
+* New Transport: SSH, which re-uses one SSH connection where possible. Improvements such as keepalive, retries, and further configuration attributes are included. This replaces the more general `Kitchen:SSH` class, which remains in the codebase for plugins that call this class directly. ([Transport::Ssh](https://github.com/test-kitchen/test-kitchen/blob/master/lib/kitchen/transport/ssh.rb)) ([@fnichol][])
+* New plugin type: Verifier, which executes post-convergence tests on the instance. Busser is now a Verifier. ([Verifier::Base](https://github.com/test-kitchen/test-kitchen/blob/master/lib/kitchen/verifier/base.rb)) ([@fnichol][])
+
+#### Improvements
+
+* In addition to supporting setting `http_proxy` and `https_proxy` environment variables when `:http_proxy` and `:https_proxy` are set in Provisioner and Verifier blocks, `HTTP_PROXY` and `HTTPS_PROXY` environment variables will also be set/exported in ChefZero/ChefSolo Provisioners and Busser Verifier. ([@fnichol][])
+* Pull request [#600][], pull request [#633][], issue [#85][]: Add `--log-overwrite` flag to CLI anywhere `--log-level` is accepted.  By default it is true and will clear out the log every time Test Kitchen runs. To disable this behavior pass `--log-overwrite=false` or `--no-log-overwrite`.  You can also configure this with the environment variable `KITCHEN_LOG_OVERWRITE`. ([@tyler-ball][])
+* Refactor "non-trivial" (i.e. more than a line or two) Bourne and PowerShell code bodies into static files under support/ for better code review by domain experts. ([@fnichol][])
+* Pull request [#530][], issue [#429][]: Stop uploading empty directories. ([@whiteley][])
+* Pull request [#588][]: Change getchef.com to chef.io in ChefZero and ChefSolo Provisioners. ([@jdmundrawala][])
+
+
 ## 1.3.1 / 2015-01-16
 
 ### Bug fixes
@@ -437,6 +471,7 @@ The initial release.
 [#81]: https://github.com/test-kitchen/test-kitchen/issues/81
 [#82]: https://github.com/test-kitchen/test-kitchen/issues/82
 [#84]: https://github.com/test-kitchen/test-kitchen/issues/84
+[#85]: https://github.com/test-kitchen/test-kitchen/issues/85
 [#90]: https://github.com/test-kitchen/test-kitchen/issues/90
 [#92]: https://github.com/test-kitchen/test-kitchen/issues/92
 [#94]: https://github.com/test-kitchen/test-kitchen/issues/94
@@ -545,6 +580,7 @@ The initial release.
 [#399]: https://github.com/test-kitchen/test-kitchen/issues/399
 [#416]: https://github.com/test-kitchen/test-kitchen/issues/416
 [#427]: https://github.com/test-kitchen/test-kitchen/issues/427
+[#429]: https://github.com/test-kitchen/test-kitchen/issues/429
 [#431]: https://github.com/test-kitchen/test-kitchen/issues/431
 [#433]: https://github.com/test-kitchen/test-kitchen/issues/433
 [#450]: https://github.com/test-kitchen/test-kitchen/issues/450
@@ -564,6 +600,7 @@ The initial release.
 [#524]: https://github.com/test-kitchen/test-kitchen/issues/524
 [#526]: https://github.com/test-kitchen/test-kitchen/issues/526
 [#527]: https://github.com/test-kitchen/test-kitchen/issues/527
+[#530]: https://github.com/test-kitchen/test-kitchen/issues/530
 [#531]: https://github.com/test-kitchen/test-kitchen/issues/531
 [#543]: https://github.com/test-kitchen/test-kitchen/issues/543
 [#549]: https://github.com/test-kitchen/test-kitchen/issues/549
@@ -575,9 +612,13 @@ The initial release.
 [#579]: https://github.com/test-kitchen/test-kitchen/issues/579
 [#580]: https://github.com/test-kitchen/test-kitchen/issues/580
 [#581]: https://github.com/test-kitchen/test-kitchen/issues/581
+[#588]: https://github.com/test-kitchen/test-kitchen/issues/588
+[#600]: https://github.com/test-kitchen/test-kitchen/issues/600
+[#633]: https://github.com/test-kitchen/test-kitchen/issues/633
 [@ChrisLundquist]: https://github.com/ChrisLundquist
 [@MarkGibbons]: https://github.com/MarkGibbons
 [@adamhjk]: https://github.com/adamhjk
+[@afiune]: https://github.com/afiune
 [@arangamani]: https://github.com/arangamani
 [@arunthampi]: https://github.com/arunthampi
 [@benlangfeld]: https://github.com/benlangfeld
@@ -598,6 +639,7 @@ The initial release.
 [@hollow]: https://github.com/hollow
 [@jaimegildesagredo]: https://github.com/jaimegildesagredo
 [@jasonroelofs]: https://github.com/jasonroelofs
+[@jdmundrawala]: https://github.com/jdmundrawala
 [@jgoldschrafe]: https://github.com/jgoldschrafe
 [@jochenseeber]: https://github.com/jochenseeber
 [@jonsmorrow]: https://github.com/jonsmorrow
@@ -620,6 +662,7 @@ The initial release.
 [@michaelkirk]: https://github.com/michaelkirk
 [@miketheman]: https://github.com/miketheman
 [@mthssdrbrg]: https://github.com/mthssdrbrg
+[@mwrock]: https://github.com/mwrock
 [@oferrigni]: https://github.com/oferrigni
 [@patcon]: https://github.com/patcon
 [@portertech]: https://github.com/portertech
@@ -643,4 +686,6 @@ The initial release.
 [@stevendanna]: https://github.com/stevendanna
 [@thommay]: https://github.com/thommay
 [@tknerr]: https://github.com/tknerr
+[@tyler-ball]: https://github.com/tyler-ball
+[@whiteley]: https://github.com/whiteley
 [@zts]: https://github.com/zts

data/Rakefile

@@ -50,3 +50,18 @@ require "yard"
 YARD::Rake::YardocTask.new
 
 task :default => [:test, :quality]
+
+task :deploy_over_dk do
+  if RUBY_PLATFORM =~ /mswin|mingw|windows/
+    dk_path = File.join(ENV["SYSTEMDRIVE"], "opscode", "chefdk")
+  else
+    dk_path = "/opt/chefdk"
+  end
+
+  dk_app_path = File.join(dk_path, %w[embedded apps test-kitchen])
+  FileUtils.copy_entry(File.dirname(__FILE__), dk_app_path)
+  git_dir = File.join(dk_app_path, ".git")
+  FileUtils.rm_rf(git_dir) if Dir.exist?(git_dir)
+end
+
+task :dk_install => [:deploy_over_dk, :install]

data/features/kitchen_action_commands.feature

@@ -13,6 +13,9 @@ Feature: Running instance actions
     provisioner:
       name: dummy
 
+    verifier:
+      name: dummy
+
     platforms:
       - name: cool
       - name: beans
@@ -64,8 +67,8 @@ Feature: Running instance actions
     Given a file named ".kitchen.local.yml" with:
     """
     ---
-    driver:
-      fail_converge: true
+    provisioner:
+      fail: true
     """
     When I successfully run `kitchen create client-beans`
     And I successfully run `kitchen list client-beans`
@@ -92,17 +95,17 @@ Feature: Running instance actions
     Given a file named ".kitchen.local.yml" with:
     """
     ---
-    driver:
-      fail_setup: true
+    verifier:
+      fail: true
     """
     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/
-    When I run `kitchen setup client-beans`
-    Then the output should contain "Setup failed on instance <client-beans>"
+    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+Converged\Z/
+    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
 
   @spawn
   Scenario: Verifying a single instance
@@ -120,8 +123,8 @@ Feature: Running instance actions
     Given a file named ".kitchen.local.yml" with:
     """
     ---
-    driver:
-      fail_verify: true
+    verifier:
+      fail: true
     """
     When I successfully run `kitchen setup client-beans`
     And I successfully run `kitchen list client-beans`

data/features/kitchen_defaults.feature

@@ -0,0 +1,38 @@
+Feature: Test Kitchen defaults
+  In order to have a more pleasant out of the box experience
+  As a user of Test Kitchen
+  I want to have some common defaults handled for me
+
+  Scenario: Windows platforms get the Winrm Transport by default
+    Given a file named ".kitchen.yml" with:
+    """
+    ---
+    driver: dummy
+    provisioner: dummy
+    verifier: dummy
+
+    platforms:
+      - name: win-8.1
+
+    suites:
+      - 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\>$/
+
+  Scenario: Non-Windows platforms get the Ssh Transport by default
+    Given a file named ".kitchen.yml" with:
+    """
+    ---
+    driver: dummy
+    provisioner: dummy
+    verifier: dummy
+
+    platforms:
+      - name: ubuntu-14.04
+
+    suites:
+      - 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\>$/

data/features/kitchen_init_command.feature

@@ -19,7 +19,6 @@ Feature: Add Test Kitchen support to an existing project
     And I have a git repository
     When I run `kitchen init`
     Then the exit status should be 0
-    And a directory named ".kitchen" should exist
     And a directory named "test/integration/default" should exist
     And the file ".gitignore" should contain ".kitchen/"
     And the file ".gitignore" should contain ".kitchen.local.yml"

data/features/kitchen_list_command.feature

@@ -22,8 +22,8 @@ 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+\<Not Created\>$/
-    And the output should match /^foobar-centos-64\s+Dummy\s+ChefSolo\s+\<Not Created\>$/
+    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\>$/
 
   Scenario: Listing instances with the --bare option
     When I run `kitchen list --bare`

data/features/kitchen_login_command.feature

@@ -10,6 +10,9 @@ Feature: Logging into a Kitchen instance
     driver:
       name: dummy
 
+    transport:
+      name: dummy
+
     provisioner:
       name: dummy
 
@@ -25,7 +28,10 @@ Feature: Logging into a Kitchen instance
   @spawn
   Scenario: Logging in to an instance
     When I run `kitchen login default-flebian`
-    Then the output should contain "Remote login is not supported in this driver."
+    Then the output should contain:
+    """
+    Remote login not supported in Kitchen::Transport::Dummy::Connection.
+    """
     And the exit status should not be 0
 
   @spawn

data/features/kitchen_test_command.feature

@@ -43,8 +43,8 @@ Feature: Running a full test instance test
     Given a file named ".kitchen.local.yml" with:
     """
     ---
-    driver:
-      fail_converge: true
+    provisioner:
+      fail: true
     """
     When I run `kitchen test client-beans --destroy=always`
     Then the exit status should not be 0
@@ -56,8 +56,8 @@ Feature: Running a full test instance test
     Given a file named ".kitchen.local.yml" with:
     """
     ---
-    driver:
-      fail_converge: true
+    provisioner:
+      fail: true
     """
     When I run `kitchen test client-beans --destroy=passing`
     Then the exit status should not be 0

data/lib/kitchen.rb

@@ -28,7 +28,6 @@ require "kitchen/util"
 
 require "kitchen/provisioner"
 require "kitchen/provisioner/base"
-require "kitchen/busser"
 require "kitchen/color"
 require "kitchen/collection"
 require "kitchen/config"
@@ -38,12 +37,16 @@ require "kitchen/driver/base"
 require "kitchen/driver/ssh_base"
 require "kitchen/driver/proxy"
 require "kitchen/instance"
+require "kitchen/transport"
+require "kitchen/transport/base"
 require "kitchen/loader/yaml"
 require "kitchen/metadata_chopper"
 require "kitchen/platform"
 require "kitchen/state_file"
 require "kitchen/ssh"
 require "kitchen/suite"
+require "kitchen/verifier"
+require "kitchen/verifier/base"
 require "kitchen/version"
 
 # Test Kitchen base module.
@@ -70,16 +73,27 @@ module Kitchen
     #
     # @return [Logger] a logger
     def default_logger
-      Logger.new(:stdout => $stdout, :level => env_log)
+      Logger.new(:stdout => $stdout, :level => Util.to_logger_level(env_log))
     end
 
     # Returns a default file logger which emits on standard output and to a
     # log file.
     #
+    # @param [Symbol] level logging level
+    # @param [Boolean] log_overwrite logging level
     # @return [Logger] a logger
-    def default_file_logger
-      logfile = File.expand_path(File.join(".kitchen", "logs", "kitchen.log"))
-      Logger.new(:stdout => $stdout, :logdev => logfile, :level => env_log)
+    def default_file_logger(level = nil, log_overwrite = nil)
+      level ||= env_log
+      log_overwrite = log_overwrite.nil? ? env_log_overwrite : log_overwrite
+      log_location = File.expand_path(File.join(DEFAULT_LOG_DIR, "kitchen.log"))
+      log_location = log_location.to_s
+
+      Logger.new(
+          :stdout => $stdout,
+          :logdev => log_location,
+          :level => Util.to_logger_level(level),
+          :log_overwrite => log_overwrite
+      )
     end
 
     # Returns whether or not standard output is associated with a terminal
@@ -90,23 +104,38 @@ module Kitchen
       $stdout.tty?
     end
 
-    private
-
     # Determine the default log level from an environment variable, if it is
     # set.
     #
-    # @return [Integer,nil] a log level or nil if not set
+    # @return [Symbol,nil] a log level or nil if not set
     # @api private
     def env_log
-      level = ENV["KITCHEN_LOG"] && ENV["KITCHEN_LOG"].downcase.to_sym
-      level = Util.to_logger_level(level) unless level.nil?
-      level
+      ENV["KITCHEN_LOG"] && ENV["KITCHEN_LOG"].downcase.to_sym
+    end
+
+    # Determine the log overwriting logic from an environment variable,
+    # if it is set.
+    #
+    # @return [Boolean,nil]
+    # @api private
+    def env_log_overwrite
+      case ENV["KITCHEN_LOG_OVERWRITE"] && ENV["KITCHEN_LOG_OVERWRITE"].downcase
+      when nil, ""
+        nil
+      when "false", "f", "no"
+        false
+      else
+        true
+      end
     end
   end
 
   # Default log level verbosity
   DEFAULT_LOG_LEVEL = :info
 
+  # Overwrite the log file when Test Kitchen runs
+  DEFAULT_LOG_OVERWRITE = true
+
   # Default base directory for integration tests, fixtures, etc.
   DEFAULT_TEST_DIR = "test/integration".freeze
 

data/lib/kitchen/cli.rb

@@ -64,20 +64,33 @@ module Kitchen
     # high
     MAX_CONCURRENCY = 9999
 
+    attr_reader :config
+
     # Constructs a new instance.
     def initialize(*args)
       super
       $stdout.sync = true
-      Kitchen.logger = Kitchen.default_file_logger
       @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
+        :loader     => @loader
       )
+      @config.log_level = Kitchen.env_log unless Kitchen.env_log.nil?
+      @config.log_overwrite = Kitchen.env_log_overwrite unless Kitchen.env_log_overwrite.nil?
+    end
+
+    # Sets the logging method_options
+    # @api private
+    def self.log_options
+      method_option :log_level,
+        :aliases => "-l",
+        :desc => "Set the log level (debug, info, warn, error, fatal)"
+      method_option :log_overwrite,
+        :desc => "Set to false to prevent log overwriting each time Test Kitchen runs",
+        :type => :boolean
     end
 
     desc "list [INSTANCE|REGEXP|all]", "Lists one or more instances"
@@ -89,18 +102,13 @@ module Kitchen
       :aliases => "-d",
       :type => :boolean,
       :desc => "[Deprecated] Please use `kitchen diagnose'"
-    method_option :log_level,
-      :aliases => "-l",
-      :desc => "Set the log level (debug, info, warn, error, fatal)"
+    log_options
     def list(*args)
       update_config!
       perform("list", "list", args)
     end
 
     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,
       :desc => "Include data loader diagnostics"
@@ -111,6 +119,7 @@ module Kitchen
     method_option :all,
       :type => :boolean,
       :desc => "Include all diagnostics"
+    log_options
     def diagnose(*args)
       update_config!
       perform("diagnose", "diagnose", args, :loader => @loader)
@@ -153,9 +162,7 @@ module Kitchen
           [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)"
+      log_options
       define_method(action) do |*args|
         update_config!
         perform(action, "action", args)
@@ -192,9 +199,6 @@ module Kitchen
         [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",
@@ -203,6 +207,7 @@ module Kitchen
       :type => :boolean,
       :default => false,
       :desc => "Invoke init command if .kitchen.yml is missing"
+    log_options
     def test(*args)
       update_config!
       ensure_initialized
@@ -210,9 +215,7 @@ module Kitchen
     end
 
     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)"
+    log_options
     def login(*args)
       update_config!
       perform("login", "login", args)
@@ -220,12 +223,10 @@ module Kitchen
 
     desc "exec INSTANCE|REGEXP -c REMOTE_COMMAND",
       "Execute command on one or more instance"
-    method_option :log_level,
-      :aliases => "-l",
-      :desc => "Set the log level (debug, info, warn, error, fatal)"
     method_option :command,
       :aliases => "-c",
       :desc => "execute via ssh"
+    log_options
     def exec(*args)
       update_config!
       perform("exec", "exec", args)
@@ -330,9 +331,24 @@ module Kitchen
       if options[:log_level]
         level = options[:log_level].downcase.to_sym
         @config.log_level = level
-        Kitchen.logger.level = Util.to_logger_level(level)
       end
+      unless options[:log_overwrite].nil?
+        @config.log_overwrite = options[:log_overwrite]
+      end
+
+      # Now that we have required configs, lets create our file logger
+      Kitchen.logger = Kitchen.default_file_logger(
+        level,
+        options[:log_overwrite]
+      )
 
+      update_parallel!
+    end
+
+    # Set parallel concurrency options for Thor
+    #
+    # @api private
+    def update_parallel!
       if options[:parallel]
         # warn here in a future release when option is used
         @options = Thor::CoreExt::HashWithIndifferentAccess.new(options.to_hash)