test-kitchen 1.14.1 → 1.14.2

data/lib/kitchen/configurable.rb

@@ -21,14 +21,12 @@ require "thor/util"
 require "kitchen/lazy_hash"
 
 module Kitchen
-
   # A mixin for providing configuration-related behavior such as default
   # config (static, computed, inherited), required config, local path
   # expansion, etc.
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   module Configurable
-
     def self.included(base)
       base.extend(ClassMethods)
     end
@@ -46,9 +44,7 @@ module Kitchen
     # @return [self] itself, for use in chaining
     # @raise [ClientError] if instance parameter is nil
     def finalize_config!(instance)
-      if instance.nil?
-        raise ClientError, "Instance must be provided to #{self}"
-      end
+      raise ClientError, "Instance must be provided to #{self}" if instance.nil?
 
       @instance = instance
       expand_paths!
@@ -102,7 +98,7 @@ module Kitchen
       [
         File.join(base, instance.suite.name, path),
         File.join(base, path),
-        File.join(Dir.pwd, path)
+        File.join(Dir.pwd, path),
       ].find do |candidate|
         type == :directory ? File.directory?(candidate) : File.file?(candidate)
       end
@@ -119,7 +115,7 @@ module Kitchen
     #
     # @return [Hash] a diagnostic hash
     def diagnose
-      result = Hash.new
+      result = {}
       config_keys.sort.each { |k| result[k] = config[k] }
       result
     end
@@ -130,7 +126,7 @@ module Kitchen
     #
     # @return [Hash] a diagnostic hash
     def diagnose_plugin
-      result = Hash.new
+      result = {}
       result[:name] = name
       result.merge!(self.class.diagnose)
       result
@@ -153,7 +149,7 @@ module Kitchen
     # @return [String] joined path for instance's os_type
     def remote_path_join(*parts)
       path = File.join(*parts)
-      windows_os? ? path.gsub("/", "\\") : path.gsub("\\", "/")
+      windows_os? ? path.tr("/", '\\') : path.tr('\\', "/")
     end
 
     # @return [TrueClass,FalseClass] true if `:os_type` is `"unix"` (or
@@ -210,10 +206,10 @@ module Kitchen
         next if !should_expand || config[key].nil? || config[key] == false
 
         config[key] = if config[key].is_a?(Array)
-          config[key].map { |path| File.expand_path(path, root_path) }
-        else
-          File.expand_path(config[key], root_path)
-        end
+                        config[key].map { |path| File.expand_path(path, root_path) }
+                      else
+                        File.expand_path(config[key], root_path)
+                      end
       end
     end
 
@@ -256,7 +252,7 @@ module Kitchen
       [
         "$env:PATH = try {",
         "[System.Environment]::GetEnvironmentVariable('PATH','Machine')",
-        "} catch { $env:PATH }\n\n"
+        "} catch { $env:PATH }\n\n",
       ].join("\n")
     end
 
@@ -329,8 +325,8 @@ module Kitchen
         if !config.key?(protocol) || config[protocol].nil?
           export_proxy(set_env, protocol)
         elsif proxy_config_setting_present?(protocol)
-          set_env << shell_env_var("#{protocol.downcase}", config[protocol])
-          set_env << shell_env_var("#{protocol.upcase}", config[protocol])
+          set_env << shell_env_var(protocol.downcase.to_s, config[protocol])
+          set_env << shell_env_var(protocol.upcase.to_s, config[protocol])
         end
       end
     end
@@ -356,7 +352,7 @@ module Kitchen
 
     def proxy_from_environment?
       proxy_setting_keys.any? do |protocol|
-        !ENV["#{protocol.downcase}"].nil? || !ENV["#{protocol.upcase}"].nil?
+        !ENV[protocol.downcase.to_s].nil? || !ENV[protocol.upcase.to_s].nil?
       end
     end
 
@@ -370,14 +366,13 @@ module Kitchen
     # @param code [String] the type of proxy to export, one of 'http', 'https' or 'ftp'
     # @api private
     def export_proxy(env, type)
-      env << shell_env_var("#{type}", ENV["#{type}"]) if ENV["#{type}"]
-      env << shell_env_var("#{type.upcase}", ENV["#{type.upcase}"]) if
-        ENV["#{type.upcase}"]
+      env << shell_env_var(type.to_s, ENV[type.to_s]) if ENV[type.to_s]
+      env << shell_env_var(type.upcase.to_s, ENV[type.upcase.to_s]) if
+        ENV[type.upcase.to_s]
     end
 
     # Class methods which will be mixed in on inclusion of Configurable module.
     module ClassMethods
-
       # Sets the loaded version of this plugin, usually corresponding to the
       # RubyGems version of the plugin's library. If the plugin does not set
       # this value, then `nil` will be used and reported.
@@ -407,9 +402,9 @@ module Kitchen
       # @return [Hash] a diagnostic hash
       def diagnose
         {
-          :class        => name,
-          :version      => @plugin_version,
-          :api_version  => @api_version
+          class: name,
+          version: @plugin_version,
+          api_version: @api_version,
         }
       end
 
@@ -489,7 +484,7 @@ module Kitchen
       # @yieldparam value [Object] the current value of the attribute
       # @yieldparam object [Object] a reference to the instantiated object
       def required_config(attr, &block)
-        if !block_given?
+        unless block_given?
           klass = self
           block = lambda do |_, value, thing|
             if value.nil? || value.to_s.empty?
@@ -505,7 +500,7 @@ module Kitchen
       #   been merged with any superclass defaults
       # @api private
       def defaults
-        @defaults ||= Hash.new.merge(super_defaults)
+        @defaults ||= {}.merge(super_defaults)
       end
 
       # @return [Hash] a hash of defaults from the included class' superclass
@@ -515,7 +510,7 @@ module Kitchen
         if superclass.respond_to?(:defaults)
           superclass.defaults
         else
-          Hash.new
+          {}
         end
       end
 
@@ -524,7 +519,7 @@ module Kitchen
       #   which has been merged with any superclass expanded paths
       # @api private
       def expanded_paths
-        @expanded_paths ||= Hash.new.merge(super_expanded_paths)
+        @expanded_paths ||= {}.merge(super_expanded_paths)
       end
 
       # @return [Hash] a hash of expanded paths from the included class'
@@ -534,7 +529,7 @@ module Kitchen
         if superclass.respond_to?(:expanded_paths)
           superclass.expanded_paths
         else
-          Hash.new
+          {}
         end
       end
 
@@ -542,7 +537,7 @@ module Kitchen
       #   which has been merged with any superclass valudations
       # @api private
       def validations
-        @validations ||= Hash.new.merge(super_validations)
+        @validations ||= {}.merge(super_validations)
       end
 
       # @return [Hash] a hash of validations from the included class'
@@ -552,7 +547,7 @@ module Kitchen
         if superclass.respond_to?(:validations)
           superclass.validations
         else
-          Hash.new
+          {}
         end
       end
     end

data/lib/kitchen/data_munger.rb

@@ -19,7 +19,6 @@
 require "vendor/hash_recursive_merge"
 
 module Kitchen
-
   # Class to handle recursive merging of configuration between platforms,
   # suites, and common data.
   #
@@ -32,7 +31,6 @@ module Kitchen
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   class DataMunger
-
     # Constructs a new DataMunger object.
     #
     # @param data [Hash] the incoming user data hash
@@ -135,9 +133,9 @@ module Kitchen
 
     def combine_arrays!(root, key, *namespaces)
       if root.key?(key)
-        root[key] = namespaces.
-          map { |namespace| root.fetch(key).fetch(namespace, []) }.flatten.
-          compact
+        root[key] = namespaces
+                    .map { |namespace| root.fetch(key).fetch(namespace, []) }.flatten
+                    .compact
       end
     end
 
@@ -219,11 +217,11 @@ module Kitchen
     def convert_legacy_busser_format_at!(root)
       if root.key?(:busser)
         bdata = root.delete(:busser)
-        bdata = { :version => bdata } if bdata.is_a?(String)
+        bdata = { version: bdata } if bdata.is_a?(String)
         bdata[:name] = "busser" if bdata[:name].nil?
 
-        vdata = root.fetch(:verifier, Hash.new)
-        vdata = { :name => vdata } if vdata.is_a?(String)
+        vdata = root.fetch(:verifier, {})
+        vdata = { name: vdata } if vdata.is_a?(String)
         root[:verifier] = bdata.rmerge(vdata)
       end
     end
@@ -275,10 +273,10 @@ module Kitchen
     # @api private
     def convert_legacy_chef_paths_format!
       data.fetch(:suites, []).each do |suite|
-        %w[
+        %w{
           data data_bags encrypted_data_bag_secret_key
           environments nodes roles
-        ].each do |key|
+        }.each do |key|
           move_chef_data_to_provisioner_at!(suite, "#{key}_path".to_sym)
         end
       end
@@ -364,15 +362,15 @@ module Kitchen
     # @api private
     def convert_legacy_driver_format_at!(root)
       if root.key?(:driver_config)
-        ddata = root.fetch(:driver, Hash.new)
-        ddata = { :name => ddata } if ddata.is_a?(String)
+        ddata = root.fetch(:driver, {})
+        ddata = { name: ddata } if ddata.is_a?(String)
         root[:driver] = root.delete(:driver_config).rmerge(ddata)
       end
 
       if root.key?(:driver_plugin)
-        ddata = root.fetch(:driver, Hash.new)
-        ddata = { :name => ddata } if ddata.is_a?(String)
-        root[:driver] = { :name => root.delete(:driver_plugin) }.rmerge(ddata)
+        ddata = root.fetch(:driver, {})
+        ddata = { name: ddata } if ddata.is_a?(String)
+        root[:driver] = { name: root.delete(:driver_plugin) }.rmerge(ddata)
       end
     end
 
@@ -485,17 +483,17 @@ module Kitchen
     #   longer are Drivers responsible for this.
     # @api private
     def convert_legacy_driver_http_proxy_format_at!(root)
-      ddata = root.fetch(:driver, Hash.new)
+      ddata = root.fetch(:driver, {})
 
       [:http_proxy, :https_proxy].each do |key|
         next unless ddata.is_a?(Hash) && ddata.key?(key)
 
-        pdata = root.fetch(:provisioner, Hash.new)
-        pdata = { :name => pdata } if pdata.is_a?(String)
+        pdata = root.fetch(:provisioner, {})
+        pdata = { name: pdata } if pdata.is_a?(String)
         root[:provisioner] = { key => ddata.fetch(key) }.rmerge(pdata)
 
-        vdata = root.fetch(:verifier, Hash.new)
-        vdata = { :name => vdata } if vdata.is_a?(String)
+        vdata = root.fetch(:verifier, {})
+        vdata = { name: vdata } if vdata.is_a?(String)
         root[:verifier] = { key => ddata.fetch(key) }.rmerge(vdata)
       end
     end
@@ -581,11 +579,11 @@ module Kitchen
     # @api private
     def convert_legacy_require_chef_omnibus_format_at!(root)
       key = :require_chef_omnibus
-      ddata = root.fetch(:driver, Hash.new)
+      ddata = root.fetch(:driver, {})
 
       if ddata.is_a?(Hash) && ddata.key?(key)
-        pdata = root.fetch(:provisioner, Hash.new)
-        pdata = { :name => pdata } if pdata.is_a?(String)
+        pdata = root.fetch(:provisioner, {})
+        pdata = { name: pdata } if pdata.is_a?(String)
         root[:provisioner] =
           { key => root.fetch(:driver).delete(key) }.rmerge(pdata)
       end
@@ -699,9 +697,9 @@ module Kitchen
     # @api private
     def move_chef_data_to_provisioner_at!(root, key)
       if root.key?(key)
-        pdata = root.fetch(:provisioner, Hash.new)
-        pdata = { :name => pdata } if pdata.is_a?(String)
-        if !root.fetch(key, nil).nil?
+        pdata = root.fetch(:provisioner, {})
+        pdata = { name: pdata } if pdata.is_a?(String)
+        unless root.fetch(key, nil).nil?
           root[:provisioner] = pdata.rmerge(key => root.delete(key))
         end
       end
@@ -755,8 +753,8 @@ module Kitchen
     #   new Hash otherwise
     # @api private
     def normalized_common_data(key, default_key)
-      cdata = data.fetch(key, Hash.new)
-      cdata = cdata.nil? ? Hash.new : cdata.dup
+      cdata = data.fetch(key, {})
+      cdata = cdata.nil? ? {} : cdata.dup
       cdata = { default_key => cdata } if cdata.is_a?(String)
       cdata
     end
@@ -799,7 +797,7 @@ module Kitchen
     #   new Hash otherwise
     # @api private
     def normalized_default_data(key, default_key, suite, platform)
-      ddata = kitchen_config.fetch(:defaults, Hash.new).fetch(key, Hash.new).dup
+      ddata = kitchen_config.fetch(:defaults, {}).fetch(key, {}).dup
       ddata = { default_key => ddata.call(suite, platform) } if ddata.is_a?(Proc)
       ddata = { default_key => ddata } if ddata.is_a?(String)
       ddata
@@ -853,8 +851,8 @@ module Kitchen
     #   new Hash otherwise
     # @api private
     def normalized_platform_data(key, default_key, platform)
-      pdata = platform_data_for(platform).fetch(key, Hash.new)
-      pdata = pdata.nil? ? Hash.new : pdata.dup
+      pdata = platform_data_for(platform).fetch(key, {})
+      pdata = pdata.nil? ? {} : pdata.dup
       pdata = { default_key => pdata } if pdata.is_a?(String)
       namespace_array!(pdata, :run_list, :platform)
       pdata
@@ -908,8 +906,8 @@ module Kitchen
     #   new Hash otherwise
     # @api private
     def normalized_suite_data(key, default_key, suite)
-      sdata = suite_data_for(suite).fetch(key, Hash.new)
-      sdata = sdata.nil? ? Hash.new : sdata.dup
+      sdata = suite_data_for(suite).fetch(key, {})
+      sdata = sdata.nil? ? {} : sdata.dup
       sdata = { default_key => sdata } if sdata.is_a?(String)
       namespace_array!(sdata, :run_list, :suite)
       sdata
@@ -923,7 +921,7 @@ module Kitchen
     #   Hash if not found
     # @api private
     def platform_data_for(name)
-      data.fetch(:platforms, Hash.new).find(-> { Hash.new }) do |platform|
+      data.fetch(:platforms, {}).find(-> { Hash.new }) do |platform|
         platform.fetch(:name, nil) == name
       end
     end
@@ -939,7 +937,7 @@ module Kitchen
     # @param key [Symbol] the key to search for
     # @api private
     def set_kitchen_config_at!(root, key)
-      kdata = data.fetch(:kitchen, Hash.new)
+      kdata = data.fetch(:kitchen, {})
 
       root.delete(key) if root.key?(key)
       root[key] = kitchen_config.fetch(key) if kitchen_config.key?(key)
@@ -954,7 +952,7 @@ module Kitchen
     #   Hash if not found
     # @api private
     def suite_data_for(name)
-      data.fetch(:suites, Hash.new).find(-> { Hash.new }) do |suite|
+      data.fetch(:suites, {}).find(-> { Hash.new }) do |suite|
         suite.fetch(:name, nil) == name
       end
     end

data/lib/kitchen/diagnostic.rb

@@ -20,13 +20,11 @@ require "kitchen/util"
 require "kitchen/version"
 
 module Kitchen
-
   # Combines and compiles diagnostic information about a Test Kitchen
   # configuration suitable for support and troubleshooting.
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   class Diagnostic
-
     # Constructs a new Diagnostic object with an optional loader and optional
     # instances array.
     #
@@ -41,7 +39,7 @@ module Kitchen
       @loader = options.fetch(:loader, nil)
       @instances = options.fetch(:instances, [])
       @plugins = options.fetch(:plugins, false)
-      @result = Hash.new
+      @result = {}
     end
 
     # Returns a Hash with stringified keys containing diagnostic information.
@@ -98,12 +96,12 @@ module Kitchen
       return unless @plugins
 
       if error_hash?(instances)
-        result[:plugins] = { :error => instances[:error] }
+        result[:plugins] = { error: instances[:error] }
       elsif instances.empty?
-        result[:plugins] = Hash.new
+        result[:plugins] = {}
       else
         plugins = {
-          :driver => [], :provisioner => [], :transport => [], :verifier => []
+          driver: [], provisioner: [], transport: [], verifier: []
         }
         instances.map(&:diagnose_plugins).each do |plugin_hash|
           plugin_hash.each { |type, plugin| plugins[type] << plugin }
@@ -120,7 +118,7 @@ module Kitchen
     #
     # @api private
     def prepare_instances
-      result[:instances] = Hash.new
+      result[:instances] = {}
       if error_hash?(instances)
         result[:instances][:error] = instances[:error]
       else

data/lib/kitchen/driver.rb

@@ -19,13 +19,11 @@
 require "thor/util"
 
 module Kitchen
-
   # A driver is responsible for carrying out the lifecycle activities of an
   # instance, such as creating and destroying an instance.
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   module Driver
-
     # Default driver plugin to use
     DEFAULT_PLUGIN = "dummy".freeze
 
@@ -48,9 +46,9 @@ module Kitchen
       raise
     rescue LoadError, NameError
       raise ClientError,
-        "Could not load the '#{plugin}' driver from the load path." \
-          " Please ensure that your driver is installed as a gem or included" \
-          " in your Gemfile if using Bundler."
+            "Could not load the '#{plugin}' driver from the load path." \
+              " Please ensure that your driver is installed as a gem or included" \
+              " in your Gemfile if using Bundler."
     end
   end
 end