test-kitchen 2.2.5 → 2.3.0

data/lib/kitchen/provisioner/chef_solo.rb

@@ -50,7 +50,7 @@ module Kitchen
       # (see Base#run_command)
       def run_command
         cmd = sudo(config[:chef_solo_path]).dup
-                                           .tap { |str| str.insert(0, "& ") if powershell_shell? }
+          .tap { |str| str.insert(0, "& ") if powershell_shell? }
 
         chef_cmd(cmd)
       end
@@ -67,7 +67,7 @@ module Kitchen
           "--log_level #{config[:log_level]}",
           "--force-formatter",
           "--no-color",
-          "--json-attributes #{remote_path_join(config[:root_path], 'dna.json')}",
+          "--json-attributes #{remote_path_join(config[:root_path], "dna.json")}",
         ]
         args << "--logfile #{config[:log_file]}" if config[:log_file]
         args << "--profile-ruby" if config[:profile_ruby]

data/lib/kitchen/provisioner/chef_zero.rb

@@ -128,7 +128,7 @@ module Kitchen
         debug("Using a dummy validation.pem")
 
         source = File.join(File.dirname(__FILE__),
-                           %w{.. .. .. support dummy-validation.pem})
+          %w{.. .. .. support dummy-validation.pem})
         FileUtils.cp(source, File.join(sandbox_path, "validation.pem"))
       end
 
@@ -139,7 +139,7 @@ module Kitchen
       # @api private
       def shim_command
         ruby = remote_path_join(config[:ruby_bindir], "ruby")
-               .tap { |path| path.concat(".exe") if windows_os? }
+          .tap { |path| path.concat(".exe") if windows_os? }
         shim = remote_path_join(config[:root_path], "chef-client-zero.rb")
 
         "#{chef_client_zero_env}\n#{sudo(ruby)} #{shim}"

data/lib/kitchen/provisioner/shell.rb

@@ -58,6 +58,7 @@ module Kitchen
       # (see Base#init_command)
       def init_command
         return nil if config[:command]
+
         root = config[:root_path]
         data = remote_path_join(root, "data")
 
@@ -71,7 +72,7 @@ module Kitchen
             }
                  POWERSHELL
                else
-                 "#{sudo('rm')} -rf #{data} ; mkdir -p #{root}"
+                 "#{sudo("rm")} -rf #{data} ; mkdir -p #{root}"
                end
 
         prefix_command(wrap_shell_code(code))
@@ -97,6 +98,7 @@ module Kitchen
       def run_command
         return prefix_command(wrap_shell_code(config[:command])) if config[:command]
         return unless config[:script]
+
         script = remote_path_join(
           config[:root_path],
           File.basename(config[:script])

data/lib/kitchen/shell_out.rb

@@ -57,9 +57,9 @@ module Kitchen
     # @raise [Error] for all other unexpected exceptions
     def run_command(cmd, options = {})
       if options.fetch(:use_sudo, false)
-        cmd = "#{options.fetch(:sudo_command, 'sudo -E')} #{cmd}"
+        cmd = "#{options.fetch(:sudo_command, "sudo -E")} #{cmd}"
       end
-      subject = "[#{options.fetch(:log_subject, 'local')} command]"
+      subject = "[#{options.fetch(:log_subject, "local")} command]"
 
       debug("#{subject} BEGIN (#{cmd})")
       sh = Mixlib::ShellOut.new(cmd, shell_opts(options))
@@ -83,7 +83,7 @@ module Kitchen
     # @api private
     def shell_opts(options)
       filtered_opts = options.reject do |key, _value|
-        [:use_sudo, :sudo_command, :log_subject, :quiet].include?(key)
+        %i{use_sudo sudo_command log_subject quiet}.include?(key)
       end
       { live_stream: logger, timeout: 60_000 }.merge(filtered_opts)
     end

data/lib/kitchen/ssh.rb

@@ -154,9 +154,9 @@ module Kitchen
       args  = %w{ -o UserKnownHostsFile=/dev/null }
       args += %w{ -o StrictHostKeyChecking=no }
       args += %w{ -o IdentitiesOnly=yes } if options[:keys]
-      args += %W{ -o LogLevel=#{logger.debug? ? 'VERBOSE' : 'ERROR'} }
+      args += %W{ -o LogLevel=#{logger.debug? ? "VERBOSE" : "ERROR"} }
       if options.key?(:forward_agent)
-        args += %W{ -o ForwardAgent=#{options[:forward_agent] ? 'yes' : 'no'} }
+        args += %W{ -o ForwardAgent=#{options[:forward_agent] ? "yes" : "no"} }
       end
       Array(options[:keys]).each { |ssh_key| args += %W{ -i #{ssh_key} } }
       args += %W{ -p #{port} }

data/lib/kitchen/transport/exec.rb

@@ -40,6 +40,7 @@ module Kitchen
         # (see Base#execute)
         def execute(command)
           return if command.nil?
+
           run_command(command)
         end
 

data/lib/kitchen/transport/ssh.rb

@@ -134,6 +134,7 @@ module Kitchen
         # (see Base::Connection#execute)
         def execute(command)
           return if command.nil?
+
           logger.debug("[SSH] #{self} (#{command})")
           exit_code = execute_with_exit_code(command)
 
@@ -152,9 +153,9 @@ module Kitchen
           args  = %w{ -o UserKnownHostsFile=/dev/null }
           args += %w{ -o StrictHostKeyChecking=no }
           args += %w{ -o IdentitiesOnly=yes } if options[:keys]
-          args += %W{ -o LogLevel=#{logger.debug? ? 'VERBOSE' : 'ERROR'} }
+          args += %W{ -o LogLevel=#{logger.debug? ? "VERBOSE" : "ERROR"} }
           if options.key?(:forward_agent)
-            args += %W{ -o ForwardAgent=#{options[:forward_agent] ? 'yes' : 'no'} }
+            args += %W{ -o ForwardAgent=#{options[:forward_agent] ? "yes" : "no"} }
           end
           if ssh_gateway
             gateway_command = "ssh -q #{ssh_gateway_username}@#{ssh_gateway} nc #{hostname} #{port}"
@@ -316,7 +317,7 @@ module Kitchen
           retry_connection(opts) do
             gateway_options = options.merge(port: ssh_gateway_port)
             Net::SSH::Gateway.new(ssh_gateway,
-                                  ssh_gateway_username, gateway_options).ssh(hostname, username, options)
+              ssh_gateway_username, gateway_options).ssh(hostname, username, options)
           end
         end
 

data/lib/kitchen/transport/winrm.rb

@@ -103,6 +103,7 @@ module Kitchen
         # (see Base::Connection#execute)
         def execute(command)
           return if command.nil?
+
           logger.debug("[WinRM] #{self} (#{command})")
 
           exit_code, stderr = execute_with_exit_code(command)
@@ -129,7 +130,7 @@ module Kitchen
             login_command_for_linux
           else
             raise ActionFailed, "Remote login not supported in #{self.class} " \
-              "from host OS '#{RbConfig::CONFIG['host_os']}'."
+              "from host OS '#{RbConfig::CONFIG["host_os"]}'."
           end
         end
 
@@ -165,6 +166,7 @@ module Kitchen
         rescue *RESCUE_EXCEPTIONS_ON_ESTABLISH => e
           retries ||= connection_retries.to_i
           raise e if (retries -= 1) < 0
+
           logger.debug("[WinRM] PING_COMMAND failed. Retrying...")
           logger.debug("#{e.class}::#{e.message}")
           sleep(connection_retry_sleep.to_i)
@@ -296,7 +298,7 @@ module Kitchen
           if error_regexp.match(stderr)
             stderr
               .split(error_regexp)[1..-2]
-              .map! { |line| line.sub(/_x000D__x000A_<\/S>/, "").rstrip }
+              .map! { |line| line.sub(%r{_x000D__x000A_</S>}, "").rstrip }
               .each { |line| logger.warn(line) }
           else
             stderr
@@ -495,10 +497,10 @@ module Kitchen
         end
       rescue LoadError => e
         message = fail_to_load_gem_message(gem_name,
-                                           spec_version)
+          spec_version)
         logger.fatal(message)
         raise UserError,
-              "Could not load or activate #{gem_name}. (#{e.message})"
+          "Could not load or activate #{gem_name}. (#{e.message})"
       end
 
       def fail_to_load_gem_message(name, version = nil)

data/lib/kitchen/util.rb

@@ -33,7 +33,7 @@ module Kitchen
     # @return [Integer] Logger::Severity constant value or nil if input is not
     #   valid
     def self.to_logger_level(symbol)
-      return nil unless [:debug, :info, :warn, :error, :fatal].include?(symbol)
+      return nil unless %i{debug info warn error fatal}.include?(symbol)
 
       Logger.const_get(symbol.to_s.upcase)
     end
@@ -141,7 +141,7 @@ module Kitchen
     # @return [String] a string representation of useful helper functions
     def self.shell_helpers
       IO.read(File.join(
-                File.dirname(__FILE__), %w{.. .. support download_helpers.sh}
+        File.dirname(__FILE__), %w{.. .. support download_helpers.sh}
       ))
     end
 
@@ -164,7 +164,7 @@ module Kitchen
     def self.list_directory(path, include_dot: false, recurse: false)
       # Things (such as tests) are relying on this to not blow up if
       # the directory does not exist
-      return [] if !Dir.exist?(path)
+      return [] unless Dir.exist?(path)
 
       Kitchen.mutex_chdir.synchronize do
         Dir.chdir(path) do
@@ -200,7 +200,7 @@ module Kitchen
     # @note Dir.chdir is applied to the process, thus it is not thread-safe
     # and must be synchronized.
     def self.safe_glob(path, pattern, *flags)
-      return [] if !Dir.exist?(path)
+      return [] unless Dir.exist?(path)
 
       Kitchen.mutex_chdir.synchronize do
         Dir.chdir(path) do

data/lib/kitchen/verifier/base.rb

@@ -130,8 +130,7 @@ module Kitchen
       # will be returned.
       #
       # @return [String] a command string
-      def install_command
-      end
+      def install_command; end
 
       # Generates a command string which will perform any data initialization
       # or configuration required after the verifier software is installed
@@ -139,8 +138,7 @@ module Kitchen
       # is required, then `nil` will be returned.
       #
       # @return [String] a command string
-      def init_command
-      end
+      def init_command; end
 
       # Generates a command string which will perform any commands or
       # configuration required just before the main verifier run command but
@@ -148,16 +146,14 @@ module Kitchen
       # required, then `nil` will be returned.
       #
       # @return [String] a command string
-      def prepare_command
-      end
+      def prepare_command; end
 
       # Generates a command string which will invoke the main verifier
       # command on the prepared instance. If no work is required, then `nil`
       # will be returned.
       #
       # @return [String] a command string
-      def run_command
-      end
+      def run_command; end
 
       # Returns the absolute path to the sandbox directory or raises an
       # exception if `#create_sandbox` has not yet been called.

data/lib/kitchen/verifier/busser.rb

@@ -71,7 +71,7 @@ module Kitchen
         return if local_suite_files.empty?
 
         cmd = sudo(config[:busser_bin]).dup
-                                       .tap { |str| str.insert(0, "& ") if powershell_shell? }
+          .tap { |str| str.insert(0, "& ") if powershell_shell? }
 
         prefix_command(wrap_shell_code(Util.outdent!(<<-CMD)))
           #{busser_env}
@@ -94,7 +94,7 @@ module Kitchen
         return if local_suite_files.empty?
 
         cmd = sudo(config[:busser_bin]).dup
-                                       .tap { |str| str.insert(0, "& ") if powershell_shell? }
+          .tap { |str| str.insert(0, "& ") if powershell_shell? }
 
         prefix_command(wrap_shell_code(Util.outdent!(<<-CMD)))
           #{busser_env}
@@ -199,7 +199,7 @@ module Kitchen
 
       def install_command_vars
         ruby = remote_path_join(config[:ruby_bindir], "ruby")
-               .tap { |path| path.concat(".exe") if windows_os? }
+          .tap { |path| path.concat(".exe") if windows_os? }
         gem = remote_path_join(config[:ruby_bindir], "gem")
 
         [

data/lib/kitchen/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "2.2.5".freeze
+  VERSION = "2.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.3.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout