test-kitchen 1.0.0.alpha.1 → 1.0.0.alpha.2

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 1.0.0.alpha.2 / 2013-03-28
+
+### Bug fixes
+
+* Remove catch-all rescue in Driver.for_plugin (reason provided in commit message). ([@fnichol][])
+
+### New features
+
+* Add --log-level flag to CLI for test, create, converge, setup, verify, destroy, and login actions. The environment variable `KITCHEN_LOG` may still be used to also set the logging level. ([@fnichol][])
+* Driver::SSHBase and subclass drivers now support setting a :port number in .kitchen.yml or in instance state. ([@fnichol][])
+
+### Improvements
+
+* Support thor 0.16.0 and 0.17.0+. ([@fnichol][])
+* Support SSH config from #state & #config in Driver::SSHBase, helping drivers such as kitchen-vagrant. ([@fnichol][])
+
+
 ## 1.0.0.alpha.1 / 2013-03-22
 
 ### Bug fixes
@@ -32,4 +49,4 @@ The initial release.
 [@ChrisLundquist]: https://github.com/ChrisLundquist
 [@fnichol]: https://github.com/fnichol
 [@mattray]: https://github.com/mattray
-[@reset]: https://github.com/reset
+[@reset]: https://github.com/reset

data/features/kitchen_init_command.feature

@@ -12,19 +12,19 @@ Feature: Add Test Kitchen support to an existing project
     """
     And the exit status should be 0
 
-  # Scenario: Running init with default values
-  #   Given a sandboxed GEM_HOME directory named "kitchen-init"
-  #   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"
-  #   And the file ".kitchen.yml" should contain "driver_plugin: vagrant"
-  #   And a file named "Gemfile" should not exist
-  #   And a file named "Rakefile" should not exist
-  #   And a file named "Thorfile" should not exist
-  #   And a gem named "kitchen-vagrant" is installed
+  Scenario: Running init with default values
+    Given a sandboxed GEM_HOME directory named "kitchen-init"
+    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"
+    And the file ".kitchen.yml" should contain "driver_plugin: vagrant"
+    And a file named "Gemfile" should not exist
+    And a file named "Rakefile" should not exist
+    And a file named "Thorfile" should not exist
+    And a gem named "kitchen-vagrant" is installed
 
   Scenario: Running init that creates a Gemfile
     When I successfully run `kitchen init --create-gemfile`

data/features/support/env.rb

@@ -3,7 +3,7 @@ require 'aruba/cucumber'
 require 'kitchen'
 
 Before do
-  @aruba_timeout_seconds = 5
+  @aruba_timeout_seconds = 15
   @cleanup_dirs = []
 end
 

data/lib/kitchen/cli.rb

@@ -70,6 +70,8 @@ module Kitchen
       )
       method_option :parallel, :aliases => "-p", :type => :boolean,
         :desc => "Perform action against all matching instances in parallel"
+      method_option :log_level, :aliases => "-l",
+        :desc => "Set the log level (debug, info, warn, error, fatal)"
       define_method(action) { |*args| exec_action(action) }
     end
 
@@ -86,6 +88,8 @@ module Kitchen
     DESC
     method_option :parallel, :aliases => "-p", :type => :boolean,
       :desc => "Perform action against all matching instances in parallel"
+    method_option :log_level, :aliases => "-l",
+      :desc => "Set the log level (debug, info, warn, error, fatal)"
     method_option :destroy, :aliases => "-d", :default => "passing",
       :desc => "Destroy strategy to use after testing (passing, always, never)."
     def test(*args)
@@ -93,6 +97,7 @@ module Kitchen
         raise ArgumentError, "Destroy mode must be passing, always, or never."
       end
 
+      update_config!
       banner "Starting Kitchen"
       elapsed = Benchmark.measure do
         destroy_mode = options[:destroy].to_sym
@@ -109,7 +114,10 @@ module Kitchen
     end
 
     desc "login (['REGEX']|[INSTANCE])", "Log in to one instance"
+    method_option :log_level, :aliases => "-l",
+      :desc => "Set the log level (debug, info, warn, error, fatal)"
     def login(regexp)
+      update_config!
       results = get_filtered_instances(regexp)
       if results.size > 1
         die task, "Argument `#{regexp}' returned multiple results:\n" +
@@ -214,13 +222,14 @@ module Kitchen
       "driver", "Driver subcommands"
 
     no_tasks do
-      def invoke_task(task, *args)
-        if task.name == "help" && args.first.first == "driver"
+      def invoke_task(command, *args)
+        if command.name == "help" && args.first.first == "driver"
           Kitchen::CLI::Driver.task_help(shell, args.first.last)
         else
           super
         end
       end
+      alias_method :invoke_command, :invoke_task
     end
 
     private
@@ -232,6 +241,7 @@ module Kitchen
     end
 
     def exec_action(action)
+      update_config!
       banner "Starting Kitchen"
       elapsed = Benchmark.measure do
         @task = action
@@ -289,6 +299,12 @@ module Kitchen
       [set_color(instance.name, :white), action]
     end
 
+    def update_config!
+      if options[:log_level]
+        @config.log_level = options[:log_level].downcase.to_sym
+      end
+    end
+
     def die(task, msg)
       error "\n#{msg}\n\n"
       help(task)

data/lib/kitchen/driver.rb

@@ -37,8 +37,6 @@ module Kitchen
       raise
     rescue LoadError
       raise ClientError, "Could not require '#{plugin}' plugin from load path"
-    rescue
-      raise ClientError, "Failed to create a driver for '#{plugin}' plugin"
     end
   end
 end

data/lib/kitchen/driver/ssh_base.rb

@@ -66,10 +66,14 @@ module Kitchen
       end
 
       def login_command(state)
+        combined = config.merge(state)
+
         args  = %W{ -o UserKnownHostsFile=/dev/null }
         args += %W{ -o StrictHostKeyChecking=no }
-        args += %W{ -i #{config[:ssh_key]}} if config[:ssh_key]
-        args += %W{ #{config[:username]}@#{state[:hostname]}}
+        args += %W{ -o LogLevel=#{logger.debug? ? "VERBOSE" : "ERROR"} }
+        args += %W{ -i #{combined[:ssh_key]}} if combined[:ssh_key]
+        args += %W{ -p #{combined[:port]}} if combined[:port]
+        args += %W{ #{combined[:username]}@#{combined[:hostname]}}
 
         Driver::LoginCommand.new(["ssh", *args])
       end
@@ -77,13 +81,16 @@ module Kitchen
       protected
 
       def build_ssh_args(state)
+        combined = config.merge(state)
+
         opts = Hash.new
         opts[:user_known_hosts_file] = "/dev/null"
         opts[:paranoid] = false
-        opts[:password] = config[:password] if config[:password]
-        opts[:keys] = Array(config[:ssh_key]) if config[:ssh_key]
+        opts[:password] = combined[:password] if combined[:password]
+        opts[:port] = combined[:port] if combined[:port]
+        opts[:keys] = Array(combined[:ssh_key]) if combined[:ssh_key]
 
-        [state[:hostname], config[:username], opts]
+        [combined[:hostname], combined[:username], opts]
       end
 
       def chef_home

data/lib/kitchen/version.rb

@@ -18,5 +18,5 @@
 
 module Kitchen
 
-  VERSION = "1.0.0.alpha.1"
+  VERSION = "1.0.0.alpha.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.1
+  version: 1.0.0.alpha.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid