test-kitchen 1.14.1 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8ccafe4e398360bb727601769ea1ddfed256a55
-  data.tar.gz: abd5306dc5701626a6acd0e1e2fe58898d528af5
+  metadata.gz: 5c05ebc3b72de7bada3043bbc959dfab446719f2
+  data.tar.gz: d3f771be84d3b0f462e043f2555f2e7c6650bf8c
 SHA512:
-  metadata.gz: a3b4df81176556959785509f27c18b3936e8c32bcc8db7935f1b9ad8bfebae99cebd6d2076275accc0d49ff2553a21059c512efac66c47ae5f213654bff8e3c2
-  data.tar.gz: 2fc0aecc71a0eb17060c276bbb6f543962db4b9508f1aeeb65dc0e8a932fae786b7814a16369c11b041f45c84db0a3991681cbd9eb22660b3818937925c02e81
+  metadata.gz: f22ea5175f699bd9832c55fa728748dcda32b47fa51febb7bc6d5840e6aaa11851279236c0e6abbce7f7975b031a4162e837e5dc0a9a127dc252661c4db0d623
+  data.tar.gz: 03babbdee7eea8a7d2e9852b01485dfeeb0ba03ba700993fb75a13c4f72e7bcd18b8bdc73b541ebd57e19be6934366b512c6fc9d85b2888ea1380cb9b38e8d4d

data/Berksfile

@@ -1,3 +1,3 @@
 source "https://supermarket.chef.io"
 
-cookbook "test_cookbook", :path => "./test/cookbooks/test_cookbook"
+cookbook "test_cookbook", path: "./test/cookbooks/test_cookbook"

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v1.14.2](https://github.com/test-kitchen/test-kitchen/tree/v1.14.2) (2016-12-09)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.14.1...v1.14.2)
+
+**Merged pull requests:**
+
+- Replace finstyle in favor of chefstyle [\#1166](https://github.com/test-kitchen/test-kitchen/pull/1166) ([afiune](https://github.com/afiune))
+
 ## [v1.14.1](https://github.com/test-kitchen/test-kitchen/tree/v1.14.1) (2016-12-08)
 [Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.14.0...v1.14.1)
 

data/Gemfile

@@ -11,5 +11,5 @@ group :integration do
 end
 
 group :test do
-  gem "codeclimate-test-reporter", "~> 1.0", ">= 1.0.3", :require => nil
+  gem "codeclimate-test-reporter", "~> 1.0", ">= 1.0.3", require: nil
 end

data/Guardfile

@@ -2,21 +2,21 @@
 ignore %r{^\.gem/}
 
 def rubocop_opts
-  { :all_on_start => false, :keep_failed => false, :cli => "-r finstyle" }
+  { all_on_start: false, keep_failed: false, cli: "-r finstyle" }
 end
 
 def cucumber_opts
   cucumber_cli = "--no-profile --color --format progress --strict"
   cucumber_cli += " --tags ~@spawn" if RUBY_PLATFORM =~ /mswin|mingw|windows/
 
-  { :all_on_start => false, :cli => cucumber_cli }
+  { all_on_start: false, cli: cucumber_cli }
 end
 
 def yard_opts
-  { :port => "8808" }
+  { port: "8808" }
 end
 
-group :red_green_refactor, :halt_on_fail => true do
+group :red_green_refactor, halt_on_fail: true do
   guard :minitest do
     watch(%r{^spec/(.*)_spec\.rb})
     watch(%r{^lib/(.*)([^/]+)\.rb})     { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
@@ -24,7 +24,7 @@ group :red_green_refactor, :halt_on_fail => true do
   end
 
   guard :rubocop, rubocop_opts do
-    watch(%r{.+\.rb$})
+    watch(/.+\.rb$/)
     watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
   end
 end

data/Rakefile

@@ -20,7 +20,7 @@ rescue LoadError
 end
 
 desc "Run all test suites"
-task :test => [:unit, :features]
+task test: [:unit, :features]
 
 desc "Display LOC stats"
 task :stats do
@@ -31,7 +31,7 @@ task :stats do
 end
 
 begin
-  require "finstyle"
+  require "chefstyle"
   require "rubocop/rake_task"
   RuboCop::RakeTask.new(:style) do |task|
     task.options += ["--display-cop-names", "--no-color"]
@@ -41,7 +41,7 @@ rescue LoadError
 end
 
 desc "Run all quality tasks"
-task :quality => [:style, :stats]
+task quality: [:style, :stats]
 
 begin
   require "yard"
@@ -50,7 +50,7 @@ rescue LoadError
   puts "yard is not available. (sudo) gem install yard to generate yard documentation."
 end
 
-task :default => [:test, :quality]
+task default: [:test, :quality]
 
 begin
   require "github_changelog_generator/task"
@@ -60,7 +60,7 @@ begin
     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]
+    config.exclude_labels = %w{Duplicate Question Discussion No_Changelog}
   end
 rescue LoadError
   puts "github_changelog_generator is not available." \

data/bin/kitchen

@@ -5,7 +5,7 @@
 # https://twitter.com/mitchellh/status/283014103189053442
 Signal.trap("INT") { exit 1 }
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), %w[.. lib])
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), %w{.. lib})
 require "rubygems"
 require "kitchen/cli"
 require "kitchen/errors"

data/features/step_definitions/gem_steps.rb

@@ -19,9 +19,9 @@ Then(/^a gem named "(.*?)" is installed with version "(.*?)"$/) do |name, versio
   unbundlerize do
     run_simple(
       sanitize_text("gem list #{name} --version #{version} -i"),
-      :fail_on_error => true,
-      :exit_timeout => nil
-     )
+      fail_on_error: true,
+      exit_timeout: nil
+    )
   end
 end
 
@@ -29,8 +29,8 @@ Then(/^a gem named "(.*?)" is installed$/) do |name|
   unbundlerize do
     run_simple(
       sanitize_text("gem list #{name} -i"),
-      :fail_on_error => true,
-      :exit_timeout => nil
-     )
+      fail_on_error: true,
+      exit_timeout: nil
+    )
   end
 end

data/features/support/env.rb

@@ -8,7 +8,6 @@ require "kitchen"
 require "kitchen/cli"
 
 class ArubaHelper
-
   def initialize(argv, stdin = STDIN, stdout = STDOUT, stderr = STDERR, kernel = Kernel)
     @argv = argv
     @stdin = stdin
@@ -48,11 +47,11 @@ After do |s|
   # Restore environment variables to their original settings, if they have
   # been saved off
   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
+  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
@@ -67,7 +66,7 @@ def restore_envvar(key)
 end
 
 def unbundlerize
-  keys = %w[BUNDLER_EDITOR BUNDLE_BIN_PATH BUNDLE_GEMFILE RUBYOPT]
+  keys = %w{BUNDLER_EDITOR BUNDLE_BIN_PATH BUNDLE_GEMFILE RUBYOPT}
 
   keys.each { |key| backup_envvar(key); aruba.environment.delete(key) }
   yield

data/lib/kitchen.rb

@@ -53,9 +53,7 @@ require "kitchen/version"
 #
 # @author Fletcher Nichol <fnichol@nichol.ca>
 module Kitchen
-
   class << self
-
     # @return [Logger] the common Kitchen logger
     attr_accessor :logger
 
@@ -73,7 +71,7 @@ module Kitchen
     #
     # @return [Logger] a logger
     def default_logger
-      Logger.new(:stdout => $stdout, :level => Util.to_logger_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
@@ -89,10 +87,10 @@ module Kitchen
       log_location = log_location.to_s
 
       Logger.new(
-        :stdout => $stdout,
-        :logdev => log_location,
-        :level => Util.to_logger_level(level),
-        :log_overwrite => log_overwrite
+        stdout: $stdout,
+        logdev: log_location,
+        level: Util.to_logger_level(level),
+        log_overwrite: log_overwrite
       )
     end
 

data/lib/kitchen/base64_stream.rb

@@ -17,13 +17,11 @@
 # limitations under the License.
 
 module Kitchen
-
   # Base64 encoder/decoder that operates on IO objects so as to minimize
   # memory allocations on large payloads.
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   module Base64Stream
-
     # Encodes an input stream into a Base64 output stream. The input and ouput
     # objects must be opened IO resources. In other words, opening and closing
     # the resources are not the responsibilty of this method.
@@ -32,9 +30,7 @@ module Kitchen
     # @param io_out [#write] output stream
     def self.strict_encode(io_in, io_out)
       buffer = ""
-      while io_in.read(3 * 1000, buffer)
-        io_out.write([buffer].pack("m0"))
-      end
+      io_out.write([buffer].pack("m0")) while io_in.read(3 * 1000, buffer)
       buffer = nil # rubocop:disable Lint/UselessAssignment
     end
 
@@ -46,9 +42,7 @@ module Kitchen
     # @param io_out [#write] output stream
     def self.strict_decode(io_in, io_out)
       buffer = ""
-      while io_in.read(3 * 1000, buffer)
-        io_out.write(buffer.unpack("m0").first)
-      end
+      io_out.write(buffer.unpack("m0").first) while io_in.read(3 * 1000, buffer)
       buffer = nil # rubocop:disable Lint/UselessAssignment
     end
   end

data/lib/kitchen/cli.rb

@@ -23,15 +23,12 @@ require "kitchen/generator/driver_create"
 require "kitchen/generator/init"
 
 module Kitchen
-
   # The command line runner for Kitchen.
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   class CLI < Thor
-
     # Common module to load and invoke a CLI-implementation agnostic command.
     module PerformCommand
-
       # Perform a CLI subcommand.
       #
       # @param task [String] action to take, usually corresponding to the
@@ -45,10 +42,10 @@ module Kitchen
         require "kitchen/command/#{command}"
 
         command_options = {
-          :action => task,
-          :help => -> { help(task) },
-          :config => @config,
-          :shell => shell
+          action: task,
+          help: -> { help(task) },
+          config: @config,
+          shell: shell,
         }.merge(additional_options)
 
         str_const = Thor::Util.camel_case(command)
@@ -71,12 +68,12 @@ module Kitchen
       super
       $stdout.sync = true
       @loader = Kitchen::Loader::YAML.new(
-        :project_config => ENV["KITCHEN_YAML"],
-        :local_config => ENV["KITCHEN_LOCAL_YAML"],
-        :global_config => ENV["KITCHEN_GLOBAL_YAML"]
+        project_config: ENV["KITCHEN_YAML"],
+        local_config: ENV["KITCHEN_LOCAL_YAML"],
+        global_config: ENV["KITCHEN_GLOBAL_YAML"]
       )
       @config = Kitchen::Config.new(
-        :loader     => @loader
+        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?
@@ -86,78 +83,78 @@ module Kitchen
     # @api private
     def self.log_options
       method_option :log_level,
-        :aliases => "-l",
-        :desc => "Set the log level (debug, info, warn, error, fatal)"
+                    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
+                    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"
+                    type: :boolean,
+                    lazy_default: $stdout.tty?,
+                    desc: "Toggle color output for STDOUT logger"
     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"
+                    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",
-      :type => :boolean,
-      :desc => "List the name of each instance only, one per line"
+                  aliases: "-b",
+                  type: :boolean,
+                  desc: "List the name of each instance only, one per line"
     method_option :json,
-      :aliases => "-j",
-      :type => :boolean,
-      :desc => "Print data as JSON"
+                  aliases: "-j",
+                  type: :boolean,
+                  desc: "Print data as JSON"
     method_option :debug,
-      :aliases => "-d",
-      :type => :boolean,
-      :desc => "[Deprecated] Please use `kitchen diagnose'"
+                  aliases: "-d",
+                  type: :boolean,
+                  desc: "[Deprecated] Please use `kitchen diagnose'"
     log_options
     def list(*args)
       update_config!
       perform("list", "list", args)
     end
-    map :status => :list
+    map status: :list
 
     desc "diagnose [INSTANCE|REGEXP|all]", "Show computed diagnostic configuration"
     method_option :loader,
-      :type => :boolean,
-      :desc => "Include data loader diagnostics"
+                  type: :boolean,
+                  desc: "Include data loader diagnostics"
     method_option :plugins,
-      :type => :boolean,
-      :desc => "Include plugin diagnostics"
+                  type: :boolean,
+                  desc: "Include plugin diagnostics"
     method_option :instances,
-      :type => :boolean,
-      :default => true,
-      :desc => "Include instances diagnostics"
+                  type: :boolean,
+                  default: true,
+                  desc: "Include instances diagnostics"
     method_option :all,
-      :type => :boolean,
-      :desc => "Include all diagnostics"
+                  type: :boolean,
+                  desc: "Include all diagnostics"
     log_options
     test_base_path
     def diagnose(*args)
       update_config!
-      perform("diagnose", "diagnose", args, :loader => @loader)
+      perform("diagnose", "diagnose", args, loader: @loader)
     end
 
     {
-      :create   => "Change instance state to create. " \
+      create: "Change instance state to create. " \
                    "Start one or more instances",
-      :converge => "Change instance state to converge. " \
+      converge: "Change instance state to converge. " \
                    "Use a provisioner to configure one or more instances",
-      :setup    => "Change instance state to setup. " \
+      setup: "Change instance state to setup. " \
                    "Prepare to run automated tests. " \
                    "Install busser and related gems on one or more instances",
-      :verify   => "Change instance state to verify. " \
+      verify: "Change instance state to verify. " \
                    "Run automated tests on one or more instances",
-      :destroy  => "Change instance state to destroy. " \
-                   "Delete all information for one or more instances"
+      destroy: "Change instance state to destroy. " \
+                   "Delete all information for one or more instances",
     }.each do |action, short_desc|
       desc(
         "#{action} [INSTANCE|REGEXP|all]",
@@ -169,17 +166,17 @@ module Kitchen
         intermediate states will be executed. See http://kitchen.ci for further explanation.
       DESC
       method_option :concurrency,
-        :aliases => "-c",
-        :type => :numeric,
-        :lazy_default => MAX_CONCURRENCY,
-        :desc => <<-DESC.gsub(/^\s+/, "").gsub(/\n/, " ")
+                    aliases: "-c",
+                    type: :numeric,
+                    lazy_default: MAX_CONCURRENCY,
+                    desc: <<-DESC.gsub(/^\s+/, "").tr("\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 => <<-DESC.gsub(/^\s+/, "").gsub(/\n/, " ")
+                    aliases: "-p",
+                    type: :boolean,
+                    desc: <<-DESC.gsub(/^\s+/, "").tr("\n", " ")
           [Future DEPRECATION, use --concurrency]
           Run a #{action} against all matching instances concurrently.
         DESC
@@ -192,7 +189,7 @@ module Kitchen
     end
 
     desc "test [INSTANCE|REGEXP|all]",
-      "Test (destroy, create, converge, setup, verify and destroy) one or more instances"
+         "Test (destroy, create, converge, setup, verify and destroy) one or more instances"
     long_desc <<-DESC
       The instance states are in order: destroy, create, converge, setup, verify, destroy.
       Test changes the state of one or more instances to destroyed, then executes
@@ -207,28 +204,28 @@ module Kitchen
       * 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/, " ")
+                  aliases: "-c",
+                  type: :numeric,
+                  lazy_default: MAX_CONCURRENCY,
+                  desc: <<-DESC.gsub(/^\s+/, "").tr("\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 => <<-DESC.gsub(/^\s+/, "").gsub(/\n/, " ")
+                  aliases: "-p",
+                  type: :boolean,
+                  desc: <<-DESC.gsub(/^\s+/, "").tr("\n", " ")
         [Future DEPRECATION, use --concurrency]
         Run a test against all matching instances concurrently.
       DESC
     method_option :destroy,
-      :aliases => "-d",
-      :default => "passing",
-      :desc => "Destroy strategy to use after testing (passing, always, never)."
+                  aliases: "-d",
+                  default: "passing",
+                  desc: "Destroy strategy to use after testing (passing, always, never)."
     method_option :auto_init,
-      :type => :boolean,
-      :default => false,
-      :desc => "Invoke init command if .kitchen.yml is missing"
+                  type: :boolean,
+                  default: false,
+                  desc: "Invoke init command if .kitchen.yml is missing"
     test_base_path
     log_options
     def test(*args)
@@ -252,10 +249,10 @@ module Kitchen
     end
 
     desc "exec INSTANCE|REGEXP -c REMOTE_COMMAND",
-      "Execute command on one or more instance"
+         "Execute command on one or more instance"
     method_option :command,
-      :aliases => "-c",
-      :desc => "execute via ssh"
+                  aliases: "-c",
+                  desc: "execute via ssh"
     log_options
     def exec(*args)
       update_config!
@@ -266,9 +263,9 @@ module Kitchen
     def version
       puts "Test Kitchen version #{Kitchen::VERSION}"
     end
-    map %w[-v --version] => :version
+    map %w{-v --version} => :version
 
-    desc "sink", "Show the Kitchen sink!", :hide => true
+    desc "sink", "Show the Kitchen sink!", hide: true
     def sink
       perform("sink", "sink")
     end
@@ -279,8 +276,8 @@ module Kitchen
     end
 
     register Kitchen::Generator::Init, "init",
-      "init", "Adds some configuration to your cookbook so Kitchen can rock"
-    long_desc <<-D, :for => "init"
+             "init", "Adds some configuration to your cookbook so Kitchen can rock"
+    long_desc <<-D, for: "init"
       Init will add Test Kitchen support to an existing project for
       convergence integration testing. A default .kitchen.yml file (which is
       intended to be customized) is created in the project's root directory
@@ -292,12 +289,11 @@ 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"
+               "create [NAME]", "Create a new Kitchen Driver gem project"
+      long_desc <<-D, for: "create"
         Create will generate a project scaffold for a brand new Test Kitchen
         Driver RubyGem. For example:
 
@@ -315,8 +311,8 @@ module Kitchen
         relevant drivers will be returned.
       D
       method_option :chef_config_path,
-        :default => nil,
-        :desc => "Path to chef config file containing proxy configuration to use"
+                    default: nil,
+                    desc: "Path to chef config file containing proxy configuration to use"
       def discover
         perform("discover", "driver_discover", args)
       end
@@ -328,7 +324,7 @@ module Kitchen
     end
 
     register Kitchen::CLI::Driver, "driver",
-      "driver", "Driver subcommands"
+             "driver", "Driver subcommands"
 
     no_tasks do
       def invoke_task(command, *args)