test-kitchen 1.14.1 → 1.14.2

data/lib/kitchen/lazy_hash.rb

@@ -19,7 +19,6 @@
 require "delegate"
 
 module Kitchen
-
   # A modifed Hash object that may contain callables as a value which must be
   # executed in the context of another object. This allows for delayed
   # evaluation of a hash value while still looking and largely feeling like a
@@ -101,7 +100,7 @@ module Kitchen
     #
     # @return [Hash] a new hash
     def to_hash
-      hash = Hash.new
+      hash = {}
       __getobj__.keys.each { |key| hash[key] = self[key] }
       hash
     end

data/lib/kitchen/loader/yaml.rb

@@ -27,9 +27,7 @@ end
 require "safe_yaml/load"
 
 module Kitchen
-
   module Loader
-
     # YAML file loader for Test Kitchen configuration. This class is
     # responisble for parsing the main YAML file and the local YAML if it
     # exists. Local file configuration will win over the default configuration.
@@ -38,7 +36,6 @@ module Kitchen
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class YAML
-
       # Creates a new loader that can parse and load YAML files.
       #
       # @param options [Hash] configuration for a new loader
@@ -70,7 +67,7 @@ module Kitchen
       #
       # @return [Hash] merged configuration data
       def read
-        if !File.exist?(config_file)
+        unless File.exist?(config_file)
           raise UserError, "Kitchen YAML file #{config_file} does not exist."
         end
 
@@ -81,7 +78,7 @@ module Kitchen
       #
       # @return [Hash] a diagnostic hash
       def diagnose
-        result = Hash.new
+        result = {}
         result[:process_erb] = @process_erb
         result[:process_local] = @process_local
         result[:process_global] = @process_global
@@ -123,10 +120,10 @@ module Kitchen
       # @api private
       def combined_hash
         y = if @process_global
-          normalize(global_yaml).rmerge(normalize(yaml))
-        else
-          normalize(yaml)
-        end
+              normalize(global_yaml).rmerge(normalize(yaml))
+            else
+              normalize(yaml)
+            end
         @process_local ? y.rmerge(normalize(local_yaml)) : y
       end
 
@@ -239,7 +236,7 @@ module Kitchen
           failure_hash(e, file)
         end
 
-        { :filename => file, :raw_data => hash }
+        { filename: file, raw_data: hash }
       end
 
       # Generates a Hash respresenting a failure, given an Exception object.
@@ -250,11 +247,11 @@ module Kitchen
       # @api private
       def failure_hash(e, file = nil)
         result = {
-          :error => {
-            :exception => e.inspect,
-            :message => e.message,
-            :backtrace => e.backtrace
-          }
+          error: {
+            exception: e.inspect,
+            message: e.message,
+            backtrace: e.backtrace,
+          },
         }
         result[:error][:raw_file] = IO.read(file) unless file.nil?
         result
@@ -268,7 +265,7 @@ module Kitchen
       # @api private
       def normalize(obj)
         if obj.is_a?(Hash)
-          obj.inject(Hash.new) { |h, (k, v)| normalize_hash(h, k, v); h }
+          obj.inject({}) { |h, (k, v)| normalize_hash(h, k, v); h }
         else
           obj
         end
@@ -308,13 +305,13 @@ module Kitchen
         case key
         when "driver", "provisioner", "busser"
           hash[key] = if value.nil?
-            Hash.new
-          elsif value.is_a?(String)
-            default_key = key == "busser" ? "version" : "name"
-            { default_key => value }
-          else
-            normalize(value)
-          end
+                        {}
+                      elsif value.is_a?(String)
+                        default_key = key == "busser" ? "version" : "name"
+                        { default_key => value }
+                      else
+                        normalize(value)
+                      end
         else
           hash[key] = normalize(value)
         end
@@ -329,9 +326,9 @@ module Kitchen
       # @raise [UserError] if the string document cannot be parsed
       # @api private
       def parse_yaml_string(string, file_name)
-        return Hash.new if string.nil? || string.empty?
+        return {} if string.nil? || string.empty?
 
-        result = SafeYAML.load(string) || Hash.new
+        result = SafeYAML.load(string) || {}
         unless result.is_a?(Hash)
           raise UserError, "Error parsing #{file_name} as YAML " \
             "(Result of parse was not a Hash, but was a #{result.class}).\n" \

data/lib/kitchen/logger.rb

@@ -20,7 +20,6 @@ require "fileutils"
 require "logger"
 
 module Kitchen
-
   # Logging implementation for Kitchen. By default the console/stdout output
   # will be displayed differently than the file log output. Therefor, this
   # class wraps multiple loggers that conform to the stdlib `Logger` class
@@ -28,7 +27,6 @@ module Kitchen
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   class Logger
-
     include ::Logger::Severity
 
     # @return [IO] the log device
@@ -59,10 +57,10 @@ module Kitchen
     #   (default: `$stdout.tty?`)
     def initialize(options = {})
       @log_overwrite = if options[:log_overwrite].nil?
-        default_log_overwrite
-      else
-        options[:log_overwrite]
-      end
+                         default_log_overwrite
+                       else
+                         options[:log_overwrite]
+                       end
 
       @logdev = logdev_logger(options[:logdev], log_overwrite) if options[:logdev]
 
@@ -88,7 +86,6 @@ module Kitchen
     private :populate_loggers
 
     class << self
-
       private
 
       # @api private
@@ -297,7 +294,7 @@ module Kitchen
       logger = StdoutLogger.new(stdout)
       if colorize
         logger.formatter = proc do |_severity, _datetime, _progname, msg|
-          Color.colorize("#{msg}", color).concat("\n")
+          Color.colorize(msg.to_s, color).concat("\n")
         end
       else
         logger.formatter = proc do |_severity, _datetime, _progname, msg|
@@ -340,8 +337,7 @@ module Kitchen
     # Internal class which adds a #banner method call that displays the
     # message with a callout arrow.
     class LogdevLogger < ::Logger
-
-      alias_method :super_info, :info
+      alias super_info info
 
       # Dump one or more messages to info.
       #
@@ -370,9 +366,9 @@ module Kitchen
       # @api private
       def format_line(line)
         case line
-        when %r{^-----> } then banner(line.gsub(%r{^[ >-]{6} }, ""))
-        when %r{^>>>>>> } then error(line.gsub(%r{^[ >-]{6} }, ""))
-        when %r{^       } then info(line.gsub(%r{^[ >-]{6} }, ""))
+        when /^-----> / then banner(line.gsub(/^[ >-]{6} /, ""))
+        when /^>>>>>> / then error(line.gsub(/^[ >-]{6} /, ""))
+        when /^       / then info(line.gsub(/^[ >-]{6} /, ""))
         else info(line)
         end
       end
@@ -381,7 +377,6 @@ module Kitchen
     # Internal class which reformats logging methods for display as console
     # output.
     class StdoutLogger < LogdevLogger
-
       # Log a debug message
       #
       # @param msg [String] a message

data/lib/kitchen/logging.rb

@@ -17,14 +17,11 @@
 # limitations under the License.
 
 module Kitchen
-
   # Mixin module that delegates logging methods to a local `#logger`.
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   module Logging
-
     class << self
-
       private
 
       # @api private

data/lib/kitchen/login_command.rb

@@ -17,13 +17,11 @@
 # limitations under the License.
 
 module Kitchen
-
   # Value object to track a shell command that will be passed to Kernel.exec
   # for execution.
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   class LoginCommand
-
     # @return [String] login command
     attr_reader :command
 

data/lib/kitchen/metadata_chopper.rb

@@ -17,14 +17,12 @@
 # limitations under the License.
 
 module Kitchen
-
   # A rather insane and questionable class to quickly consume a metadata.rb
   # file and return the cookbook name and version attributes.
   #
   # @see https://twitter.com/fnichol/status/281650077901144064
   # @see https://gist.github.com/4343327
   class MetadataChopper < Hash
-
     # Return an Array containing the cookbook name and version attributes,
     # or nil values if they could not be parsed.
     #

data/lib/kitchen/platform.rb

@@ -17,14 +17,12 @@
 # limitations under the License.
 
 module Kitchen
-
   # A target operating system environment in which convergence integration
   # will take place. This may represent a specific operating system, version,
   # and machine architecture.
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   class Platform
-
     # @return [String] logical name of this platform
     attr_reader :name
 
@@ -61,7 +59,7 @@ module Kitchen
     #
     # @return [Hash] a diagnostic hash
     def diagnose
-      { :os_type => os_type, :shell_type => shell_type }
+      { os_type: os_type, shell_type: shell_type }
     end
   end
 end

data/lib/kitchen/provisioner.rb

@@ -19,14 +19,12 @@
 require "thor/util"
 
 module Kitchen
-
   # A provisioner is responsible for generating the commands necessary to
   # install set up and use a configuration management tool such as Chef and
   # Puppet.
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   module Provisioner
-
     # Default provisioner to use
     DEFAULT_PLUGIN = "chef_solo".freeze
 
@@ -46,9 +44,9 @@ module Kitchen
       object
     rescue LoadError, NameError
       raise ClientError,
-        "Could not load the '#{plugin}' provisioner from the load path." \
-          " Please ensure that your provisioner is installed as a gem or" \
-          " included in your Gemfile if using Bundler."
+            "Could not load the '#{plugin}' provisioner from the load path." \
+              " Please ensure that your provisioner is installed as a gem or" \
+              " included in your Gemfile if using Bundler."
     end
   end
 end

data/lib/kitchen/provisioner/base.rb

@@ -17,14 +17,11 @@
 # limitations under the License.
 
 module Kitchen
-
   module Provisioner
-
     # Base class for a provisioner.
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class Base
-
       include Configurable
       include Logging
 
@@ -37,7 +34,7 @@ module Kitchen
       default_config :wait_for_retry, 30
 
       default_config :root_path do |provisioner|
-        provisioner.windows_os? ? "$env:TEMP\\kitchen" : "/tmp/kitchen"
+        provisioner.windows_os? ? '$env:TEMP\\kitchen' : "/tmp/kitchen"
       end
 
       default_config :sudo do |provisioner|
@@ -205,7 +202,7 @@ module Kitchen
       def shell_code_from_file(vars, file)
         src_file = File.join(
           File.dirname(__FILE__),
-          %w[.. .. .. support],
+          %w{.. .. .. support},
           file + (powershell_shell? ? ".ps1" : ".sh")
         )
 

data/lib/kitchen/provisioner/chef/berkshelf.rb

@@ -20,17 +20,13 @@ require "kitchen/errors"
 require "kitchen/logging"
 
 module Kitchen
-
   module Provisioner
-
     module Chef
-
       # Chef cookbook resolver that uses Berkshelf and a Berksfile to calculate
       # dependencies.
       #
       # @author Fletcher Nichol <fnichol@nichol.ca>
       class Berkshelf
-
         include Logging
 
         # Creates a new cookbook resolver.
@@ -109,7 +105,7 @@ module Kitchen
             " `gem install berkshelf` or add the following to your" \
             " Gemfile if you are using Bundler: `gem 'berkshelf'`.")
           raise UserError,
-            "Could not load or activate Berkshelf (#{e.message})"
+                "Could not load or activate Berkshelf (#{e.message})"
         end
       end
     end

data/lib/kitchen/provisioner/chef/common_sandbox.rb

@@ -19,18 +19,14 @@
 require "json"
 
 module Kitchen
-
   module Provisioner
-
     module Chef
-
       # Internal object to manage common sandbox preparation for
       # Chef-related provisioners.
       #
       # @author Fletcher Nichol <fnichol@nichol.ca>
       # @api private
       class CommonSandbox
-
         include Logging
 
         # Constructs a new object, taking config, a sandbox path, and an
@@ -58,9 +54,9 @@ module Kitchen
           prepare(:clients)
           prepare(
             :secret,
-            :type => :file,
-            :dest_name => "encrypted_data_bag_secret",
-            :key_name => :encrypted_data_bag_secret_key_path
+            type: :file,
+            dest_name: "encrypted_data_bag_secret",
+            key_name: :encrypted_data_bag_secret_key_path
           )
         end
 
@@ -84,8 +80,8 @@ module Kitchen
         # @return [Array<String>] an array of absolute paths to files
         # @api private
         def all_files_in_cookbooks
-          Dir.glob(File.join(tmpbooks_dir, "**/*"), File::FNM_DOTMATCH).
-            select { |fn| File.file?(fn) && ! %w[. ..].include?(fn) }
+          Dir.glob(File.join(tmpbooks_dir, "**/*"), File::FNM_DOTMATCH)
+             .select { |fn| File.file?(fn) && ! %w{. ..}.include?(fn) }
         end
 
         # @return [String] an absolute path to a Policyfile, relative to the
@@ -151,8 +147,8 @@ module Kitchen
           debug("Using metadata.rb from #{metadata_rb}")
 
           cb_name = MetadataChopper.extract(metadata_rb).first || raise(UserError,
-            "The metadata.rb does not define the 'name' key." \
-              " Please add: `name '<cookbook_name>'` to metadata.rb and retry")
+                                                                        "The metadata.rb does not define the 'name' key." \
+                                                                          " Please add: `name '<cookbook_name>'` to metadata.rb and retry")
 
           cb_path = File.join(tmpbooks_dir, cb_name)
 
@@ -168,8 +164,8 @@ module Kitchen
         def filter_only_cookbook_files
           info("Removing non-cookbook files before transfer")
           FileUtils.rm(all_files_in_cookbooks - only_cookbook_files)
-          Dir.glob(File.join(tmpbooks_dir, "**/"), File::FNM_PATHNAME).
-            reverse_each { |fn| FileUtils.rmdir(fn) if Dir.entries(fn).size == 2 }
+          Dir.glob(File.join(tmpbooks_dir, "**/"), File::FNM_PATHNAME)
+             .reverse_each { |fn| FileUtils.rmdir(fn) if Dir.entries(fn).size == 2 }
         end
 
         # @return [Logger] the instance's logger or Test Kitchen's common
@@ -208,8 +204,8 @@ module Kitchen
         def only_cookbook_files
           glob = File.join(tmpbooks_dir, "*", "{#{config[:cookbook_files_glob]}}")
 
-          Dir.glob(glob, File::FNM_DOTMATCH).
-            select { |fn| File.file?(fn) && ! %w[. ..].include?(fn) }
+          Dir.glob(glob, File::FNM_DOTMATCH)
+             .select { |fn| File.file?(fn) && ! %w{. ..}.include?(fn) }
         end
 
         # Prepares a generic Chef component source directory or file for
@@ -226,7 +222,7 @@ module Kitchen
         #   basename in the sandbox path (default: `component.to_s`)
         # @api private
         def prepare(component, opts = {})
-          opts = { :type => :directory }.merge(opts)
+          opts = { type: :directory }.merge(opts)
           key_name = opts.fetch(:key_name, "#{component}_path")
           src = config[key_name.to_sym]
           return if src.nil?
@@ -282,10 +278,10 @@ module Kitchen
         # @api private
         def prepare_json
           dna = if File.exist?(policyfile)
-            update_dna_for_policyfile
-          else
-            config[:attributes].merge(:run_list => config[:run_list])
-          end
+                  update_dna_for_policyfile
+                else
+                  config[:attributes].merge(run_list: config[:run_list])
+                end
 
           info("Preparing dna.json")
           debug("Creating dna.json from #{dna.inspect}")
@@ -302,14 +298,14 @@ module Kitchen
             warn("Ignored run_list: #{config[:run_list].inspect}")
           end
           policy = Chef::Policyfile.new(policyfile, sandbox_path,
-            :logger => logger,
-            :always_update => config[:always_update_cookbooks])
+                                        logger: logger,
+                                        always_update: config[:always_update_cookbooks])
           Kitchen.mutex.synchronize do
             policy.compile
           end
           policy_name = JSON.parse(IO.read(policy.lockfile))["name"]
           policy_group = "local"
-          config[:attributes].merge(:policy_name => policy_name, :policy_group => policy_group)
+          config[:attributes].merge(policy_name: policy_name, policy_group: policy_group)
         end
 
         # Performs a Policyfile cookbook resolution inside a common mutex.
@@ -318,8 +314,8 @@ module Kitchen
         def resolve_with_policyfile
           Kitchen.mutex.synchronize do
             Chef::Policyfile.new(policyfile, sandbox_path,
-              :logger => logger,
-              :always_update => config[:always_update_cookbooks]).resolve
+                                 logger: logger,
+                                 always_update: config[:always_update_cookbooks]).resolve
           end
         end
 
@@ -329,8 +325,8 @@ module Kitchen
         def resolve_with_berkshelf
           Kitchen.mutex.synchronize do
             Chef::Berkshelf.new(berksfile, tmpbooks_dir,
-              :logger => logger,
-              :always_update => config[:always_update_cookbooks]).resolve
+                                logger: logger,
+                                always_update: config[:always_update_cookbooks]).resolve
           end
         end
 
@@ -339,7 +335,7 @@ module Kitchen
         # @api private
         def resolve_with_librarian
           Kitchen.mutex.synchronize do
-            Chef::Librarian.new(cheffile, tmpbooks_dir, :logger => logger).resolve
+            Chef::Librarian.new(cheffile, tmpbooks_dir, logger: logger).resolve
           end
         end
 
@@ -363,7 +359,6 @@ module Kitchen
         def tmpsitebooks_dir
           File.join(sandbox_path, "cookbooks")
         end
-
       end
     end
   end