test-kitchen 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0bfb5c1983b33e20f7925f0a16a11715722709f
-  data.tar.gz: 94e6416a2bd326c8af32f5f487d9ea03a3955c60
+  metadata.gz: 25811e79e5d135e683b432c2b949b6e33ee76468
+  data.tar.gz: 13989d7ee63d36e9d6fccd56b38b2e86b857f601
 SHA512:
-  metadata.gz: 915072c1d3a53cf5efd32f13b39e05265dc16b5784cc1c865e71a2e4aae0c040c52e605c0f98b58694379575ccee537ee4e34e51573972efa5720519a9809774
-  data.tar.gz: 8c66b2c4a90bfa708304a8174c834f6192f8721c7407137f71336f6a71cb79b380dcfa8bc417dec135731641e18fa24f81735d501fdaa3d6ca17e7850fcc8fa9
+  metadata.gz: 5aec60ff68922a79b5c09b7fdaf39dd54b4a91e6c487eeff72477b924113ff5292c48a9bf48885e60ea3e9e88ce244f0b48ecf5ea91d47fe01b734126abc6705
+  data.tar.gz: 969e6244b72135b1fbae2ba62c89818237c5dc8eb5b3c9e2a0a0d1906bedc3142b2ed775ab1c202a63e87561315b36e4942c84d355790680eba328e754e82b2c

data/CHANGELOG.md

@@ -1,7 +1,16 @@
 # Change Log
 
-## [1.9.0](https://github.com/test-kitchen/test-kitchen/tree/1.9.0) (2016-05-26)
-[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.8.0...1.9.0)
+## [v1.9.1](https://github.com/test-kitchen/test-kitchen/tree/v1.9.1) (2016-06-02)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.9.0...v1.9.1)
+
+**Implemented enhancements:**
+
+- Allow rake task to use env var [\#1046](https://github.com/test-kitchen/test-kitchen/pull/1046) ([smurawski](https://github.com/smurawski))
+- Add color options [\#1032](https://github.com/test-kitchen/test-kitchen/pull/1032) ([jorhett](https://github.com/jorhett))
+- Add support for SSH connection debugging. [\#990](https://github.com/test-kitchen/test-kitchen/pull/990) ([rhass](https://github.com/rhass))
+
+## [1.9.0](https://github.com/test-kitchen/test-kitchen/tree/v1.9.0) (2016-05-26)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.8.0...v1.9.0)
 
 **Implemented enhancements:**
 
@@ -17,24 +26,24 @@
 - Update `chef\_omnbius\_url` default value [\#1028](https://github.com/test-kitchen/test-kitchen/pull/1028) ([schisamo](https://github.com/schisamo))
 - Fix grammar in common\_sandbox warning message [\#1031](https://github.com/test-kitchen/test-kitchen/pull/1031) ([emachnic](https://github.com/emachnic))
 
-## [1.8.0](https://github.com/test-kitchen/test-kitchen/tree/1.8.0) (2016-05-05)
-[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.7.3...1.8.0)
+## [1.8.0](https://github.com/test-kitchen/test-kitchen/tree/v1.8.0) (2016-05-05)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.7.3...v1.8.0)
 
 **Implemented enhancements:**
 
 - Add native policyfile resolution support [\#1014](https://github.com/test-kitchen/test-kitchen/pull/1014) ([danielsdeleo](https://github.com/danielsdeleo))
 - Provide the option to run all winrm commands through a scheduled task [\#1012](https://github.com/test-kitchen/test-kitchen/pull/1012) ([mwrock](https://github.com/mwrock))
 
-## [1.7.3](https://github.com/test-kitchen/test-kitchen/tree/1.7.3) (2016-04-13)
-[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.7.2...1.7.3)
+## [1.7.3](https://github.com/test-kitchen/test-kitchen/tree/v1.7.3) (2016-04-13)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.7.2...v1.7.3)
 
 **Fixed bugs:**
 
 - Test Kitchen on windows fails to upload data bags [\#1006](https://github.com/test-kitchen/test-kitchen/issues/1006)
 - Fixes busser install for older omnibus windows installs [\#1003](https://github.com/test-kitchen/test-kitchen/pull/1003) ([mwrock](https://github.com/mwrock))
 
-## [1.7.2](https://github.com/test-kitchen/test-kitchen/tree/1.7.2) (2016-04-07)
-[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.7.1...1.7.2)
+## [1.7.2](https://github.com/test-kitchen/test-kitchen/tree/v1.7.2) (2016-04-07)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.7.1...v1.7.2)
 
 **Merged pull requests:**
 

data/MAINTAINERS.md

@@ -15,10 +15,11 @@ receive a veto from the Lieutenant or the Project Lead.
 ## Maintainers
 
 * [Adam Leff](https://github.com/adamleff)
+* [Chris Hartmann](https://github.com/chris-rock)
 * [Jennifer Davis](https://github.com/iennae)
+* [Kimball Johnson](https://github.com/drrk)
+* [Lamont Granquist](https://github.com/lamont-granquist)
 * [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)
-* [Kimball Johnson](https://github.com/drrk)
+* [Sean Omeara](http://github.com/someara)
+* [Steven Murawski](http://github.com/smurawski)

data/Rakefile

@@ -72,7 +72,7 @@ begin
   require "kitchen/version"
 
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    config.future_release = Kitchen::VERSION
+    config.future_release = "v#{Kitchen::VERSION}"
     config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature,Improvement".split(",")
     config.bug_labels = "bug,Bug".split(",")
     config.exclude_labels = %w[Duplicate Question Discussion No_Changelog]

data/lib/kitchen/cli.rb

@@ -91,6 +91,10 @@ module Kitchen
       method_option :log_overwrite,
         :desc => "Set to false to prevent log overwriting each time Test Kitchen runs",
         :type => :boolean
+      method_option :color,
+        :type => :boolean,
+        :lazy_default => $stdout.tty?,
+        :desc => "Toggle color output for STDOUT logger"
     end
 
     # Sets the test_base_path method_options
@@ -349,6 +353,7 @@ module Kitchen
       unless options[:log_overwrite].nil?
         @config.log_overwrite = options[:log_overwrite]
       end
+      @config.colorize = options[:color] unless options[:color].nil?
 
       if options[:test_base_path]
         # ensure we have an absolute path

data/lib/kitchen/config.rb

@@ -81,6 +81,10 @@ module Kitchen
     # @api private
     attr_accessor :test_base_path
 
+    # @return [Boolean] whether to force color output or not in logger
+    # @api private
+    attr_accessor :colorize
+
     # Creates a new configuration, representing a particular testing
     # configuration for a project.
     #
@@ -104,6 +108,7 @@ module Kitchen
       @kitchen_root   = options.fetch(:kitchen_root) { Dir.pwd }
       @log_level      = options.fetch(:log_level) { Kitchen::DEFAULT_LOG_LEVEL }
       @log_overwrite  = options.fetch(:log_overwrite) { Kitchen::DEFAULT_LOG_OVERWRITE }
+      @colorize       = options.fetch(:colorize) { Kitchen.tty? }
       @log_root       = options.fetch(:log_root) { default_log_root }
       @test_base_path = options.fetch(:test_base_path) { default_test_base_path }
     end
@@ -268,7 +273,8 @@ module Kitchen
         :logdev   => log_location,
         :level    => Util.to_logger_level(log_level),
         :log_overwrite => log_overwrite,
-        :progname => name
+        :progname => name,
+        :colorize => @colorize
       )
     end
 

data/lib/kitchen/logger.rb

@@ -54,8 +54,10 @@ module Kitchen
     #   messages (default: `"Kitchen"`)
     # @option options [IO] :stdout a standard out IO object to use
     #   (default: `$stdout`)
+    # @option options [Boolean] :colorize whether to colorize output
+    #   when Test Kitchen runs.
+    #   (default: `$stdout.tty?`)
     def initialize(options = {})
-      color = options[:color]
       @log_overwrite = if options[:log_overwrite].nil?
         default_log_overwrite
       else
@@ -64,7 +66,7 @@ module Kitchen
 
       @logdev = logdev_logger(options[:logdev], log_overwrite) if options[:logdev]
 
-      populate_loggers(color, options)
+      populate_loggers(options)
 
       # These setters cannot be called until @loggers are populated because
       # they are delegated
@@ -75,11 +77,13 @@ module Kitchen
     # Pulled out for Rubocop complexity issues
     #
     # @api private
-    def populate_loggers(color, options)
+    def populate_loggers(options)
       @loggers = []
       @loggers << logdev unless logdev.nil?
-      @loggers << stdout_logger(options[:stdout], color) if options[:stdout]
-      @loggers << stdout_logger($stdout, color) if @loggers.empty?
+      @loggers << stdout_logger(options[:stdout], options[:color], options[:colorize]) if
+        options[:stdout]
+      @loggers << stdout_logger($stdout, options[:color], options[:colorize]) if
+        @loggers.empty?
     end
     private :populate_loggers
 
@@ -286,11 +290,12 @@ module Kitchen
     #
     # @param stdout [IO] the IO object that represents stdout (or similar)
     # @param color [Symbol] color to use when outputing messages
+    # @param colorize [Boolean] whether to enable color
     # @return [StdoutLogger] a new logger
     # @api private
-    def stdout_logger(stdout, color)
+    def stdout_logger(stdout, color, colorize)
       logger = StdoutLogger.new(stdout)
-      if Kitchen.tty?
+      if colorize
         logger.formatter = proc do |_severity, _datetime, _progname, msg|
           Color.colorize("#{msg}", color).concat("\n")
         end

data/lib/kitchen/rake_tasks.rb

@@ -31,7 +31,14 @@ module Kitchen
     #
     # @yield [self] gives itself to the block
     def initialize
-      @config = Kitchen::Config.new
+      @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
+      )
       Kitchen.logger = Kitchen.default_file_logger(nil, false)
       yield self if block_given?
       define

data/lib/kitchen/transport/ssh.rb

@@ -319,7 +319,8 @@ module Kitchen
       # @param data [Hash] merged configuration and mutable state data
       # @return [Hash] hash of connection options
       # @api private
-      def connection_options(data) # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
+      def connection_options(data)
         opts = {
           :logger                 => logger,
           :user_known_hosts_file  => "/dev/null",
@@ -342,6 +343,7 @@ module Kitchen
         opts[:auth_methods] = ["publickey"]         if data[:ssh_key]
         opts[:password] = data[:password]           if data.key?(:password)
         opts[:forward_agent] = data[:forward_agent] if data.key?(:forward_agent)
+        opts[:verbose] = data[:verbose].to_sym      if data.key?(:verbose)
 
         opts
       end

data/lib/kitchen/version.rb

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

data/spec/kitchen/config_spec.rb

@@ -41,9 +41,14 @@ module Kitchen
       @data || Hash.new
     end
   end
+
 end
 
 describe Kitchen::Config do
+  # Explicitly enable tty to test colorize default option later
+  before do
+    Kitchen.stubs(:tty?).returns(true)
+  end
 
   let(:loader)  { Kitchen::DummyLoader.new }
   let(:config)  { Kitchen::Config.new(opts) }
@@ -55,7 +60,8 @@ describe Kitchen::Config do
       :log_root       => "/tmp/logs",
       :test_base_path => "/testing/yo",
       :log_level      => :debug,
-      :log_overwrite  => false
+      :log_overwrite  => false,
+      :colorize       => false
     }
   end
 
@@ -70,7 +76,8 @@ describe Kitchen::Config do
       :kitchen_root => "/tmp/that/place",
       :test_base_path => "/testing/yo",
       :log_level => :debug,
-      :log_overwrite  => false
+      :log_overwrite  => false,
+      :colorize => false
     }
   end
 
@@ -152,6 +159,19 @@ describe Kitchen::Config do
     end
   end
 
+  describe "#colorize" do
+
+    it "returns its colorize" do
+      config.colorize.must_equal false
+    end
+
+    it "uses true by default" do
+      opts.delete(:colorize)
+
+      config.colorize.must_equal true
+    end
+  end
+
   describe "#platforms" do
 
     before do
@@ -339,7 +359,8 @@ describe Kitchen::Config do
         :logdev => "/tmp/logs/tiny-unax.log",
         :log_overwrite => false,
         :level => 0,
-        :progname => "tiny-unax"
+        :progname => "tiny-unax",
+        :colorize => false
       )
 
       config.instances

data/spec/kitchen/logger_spec.rb

@@ -23,7 +23,6 @@ require "kitchen"
 describe Kitchen::Logger do
 
   before do
-    Kitchen.stubs(:tty?).returns(true)
     @orig_stdout = $stdout
     $stdout = StringIO.new
   end
@@ -37,7 +36,7 @@ describe Kitchen::Logger do
   end
 
   let(:opts) do
-    { :color => :red }
+    { :color => :red, :colorize => true }
   end
 
   let(:logger) do
@@ -110,7 +109,7 @@ describe Kitchen::Logger do
     end
 
     it "sets up a simple STDOUT logger by default with no color" do
-      Kitchen.stubs(:tty?).returns(false)
+      opts[:colorize] = false
       opts.delete(:stdout)
       logger.info("hello")
 
@@ -124,7 +123,7 @@ describe Kitchen::Logger do
     end
 
     it "accepts a :stdout option to redirect output with no color" do
-      Kitchen.stubs(:tty?).returns(false)
+      opts[:colorize] = false
       logger.info("hello")
 
       stdout.string.must_equal "       hello\n"
@@ -141,7 +140,7 @@ describe Kitchen::Logger do
       end
 
       it "logs to banner with no color" do
-        Kitchen.stubs(:tty?).returns(false)
+        opts[:colorize] = false
         logger.banner("yo")
 
         stdout.string.must_equal "-----> yo\n"
@@ -154,7 +153,7 @@ describe Kitchen::Logger do
       end
 
       it "logs to debug with no color" do
-        Kitchen.stubs(:tty?).returns(false)
+        opts[:colorize] = false
         logger.debug("yo")
 
         stdout.string.must_equal "D      yo\n"
@@ -167,7 +166,7 @@ describe Kitchen::Logger do
       end
 
       it "logs to info with no color" do
-        Kitchen.stubs(:tty?).returns(false)
+        opts[:colorize] = false
         logger.info("yo")
 
         stdout.string.must_equal "       yo\n"
@@ -180,7 +179,7 @@ describe Kitchen::Logger do
       end
 
       it "logs to error with no color" do
-        Kitchen.stubs(:tty?).returns(false)
+        opts[:colorize] = false
         logger.error("yo")
 
         stdout.string.must_equal ">>>>>> yo\n"
@@ -193,7 +192,7 @@ describe Kitchen::Logger do
       end
 
       it "logs to warn with no color" do
-        Kitchen.stubs(:tty?).returns(false)
+        opts[:colorize] = false
         logger.warn("yo")
 
         stdout.string.must_equal "$$$$$$ yo\n"
@@ -206,7 +205,7 @@ describe Kitchen::Logger do
       end
 
       it "logs to fatal with no color" do
-        Kitchen.stubs(:tty?).returns(false)
+        opts[:colorize] = false
         logger.fatal("yo")
 
         stdout.string.must_equal "!!!!!! yo\n"
@@ -219,7 +218,7 @@ describe Kitchen::Logger do
       end
 
       it "logs to unknown with no color" do
-        Kitchen.stubs(:tty?).returns(false)
+        opts[:colorize] = false
         logger.unknown("yo")
 
         stdout.string.must_equal "?????? yo\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout