test-kitchen 1.14.1 → 1.14.2

data/lib/kitchen/transport/winrm.rb

@@ -120,8 +120,8 @@ module Kitchen
           when /linux/
             login_command_for_linux
           else
-            fail ActionFailed, "Remote login not supported in #{self.class} " \
-              "from host OS '#{RbConfig::CONFIG["host_os"]}'."
+            raise ActionFailed, "Remote login not supported in #{self.class} " \
+              "from host OS '#{RbConfig::CONFIG['host_os']}'."
           end
         end
 
@@ -134,8 +134,8 @@ module Kitchen
         def wait_until_ready
           delay = 3
           unelevated_session(
-            :retry_limit => max_wait_until_ready / delay,
-            :retry_delay => delay
+            retry_limit: max_wait_until_ready / delay,
+            retry_delay: delay
           )
           execute(PING_COMMAND.dup)
         end
@@ -195,7 +195,7 @@ module Kitchen
           if logger.debug?
             debug("Creating RDP document for #{instance_name} (#{rdp_doc_path})")
             debug("------------")
-            IO.read(rdp_doc_path).each_line { |l| debug("#{l.chomp}") }
+            IO.read(rdp_doc_path).each_line { |l| debug(l.chomp.to_s) }
             debug("------------")
           end
         end
@@ -251,14 +251,14 @@ module Kitchen
           error_regexp = /<S S=\"Error\">/
 
           if error_regexp.match(stderr)
-            stderr.
-              split(error_regexp)[1..-2].
-              map! { |line| line.sub(/_x000D__x000A_<\/S>/, "").rstrip }.
-              each { |line| logger.warn(line) }
+            stderr
+              .split(error_regexp)[1..-2]
+              .map! { |line| line.sub(/_x000D__x000A_<\/S>/, "").rstrip }
+              .each { |line| logger.warn(line) }
           else
-            stderr.
-              split("\r\n").
-              each { |line| logger.warn(line) }
+            stderr
+              .split("\r\n")
+              .each { |line| logger.warn(line) }
           end
         end
 
@@ -269,9 +269,9 @@ module Kitchen
         # @return [LoginCommand] a login command
         # @api private
         def login_command_for_linux
-          args  = %W[-u #{options[:user]}]
-          args += %W[-p #{options[:password]}] if options.key?(:password)
-          args += %W[#{URI.parse(options[:endpoint]).host}:#{rdp_port}]
+          args  = %W{-u #{options[:user]}}
+          args += %W{-p #{options[:password]}} if options.key?(:password)
+          args += %W{#{URI.parse(options[:endpoint]).host}:#{rdp_port}}
 
           LoginCommand.new("rdesktop", args)
         end
@@ -281,7 +281,7 @@ module Kitchen
         # @return [LoginCommand] a login command
         # @api private
         def login_command_for_mac
-          create_rdp_doc(:mac => true)
+          create_rdp_doc(mac: true)
 
           LoginCommand.new("open", rdp_doc_path)
         end
@@ -333,8 +333,8 @@ module Kitchen
         def connection(retry_options = {})
           @connection ||= begin
             opts = {
-              :retry_limit => connection_retries.to_i,
-              :retry_delay   => connection_retry_sleep.to_i
+              retry_limit: connection_retries.to_i,
+              retry_delay: connection_retry_sleep.to_i,
             }.merge(retry_options)
 
             ::WinRM::Connection.new(options.merge(opts)).tap do |conn|
@@ -369,20 +369,20 @@ module Kitchen
         elevated_password = data[:elevated_password] if data.key?(:elevated_password)
 
         opts = {
-          :instance_name => instance.name,
-          :kitchen_root => data[:kitchen_root],
-          :logger => logger,
-          :endpoint => data[:endpoint_template] % data,
-          :user => data[:username],
-          :password => data[:password],
-          :rdp_port => data[:rdp_port],
-          :connection_retries => data[:connection_retries],
-          :connection_retry_sleep => data[:connection_retry_sleep],
-          :max_wait_until_ready => data[:max_wait_until_ready],
-          :transport => data[:winrm_transport],
-          :elevated => data[:elevated],
-          :elevated_username => data[:elevated_username] || data[:username],
-          :elevated_password => elevated_password
+          instance_name: instance.name,
+          kitchen_root: data[:kitchen_root],
+          logger: logger,
+          endpoint: data[:endpoint_template] % data,
+          user: data[:username],
+          password: data[:password],
+          rdp_port: data[:rdp_port],
+          connection_retries: data[:connection_retries],
+          connection_retry_sleep: data[:connection_retry_sleep],
+          max_wait_until_ready: data[:max_wait_until_ready],
+          transport: data[:winrm_transport],
+          elevated: data[:elevated],
+          elevated_username: data[:elevated_username] || data[:username],
+          elevated_password: elevated_password,
         }
         opts.merge!(additional_transport_args(opts[:transport]))
         opts
@@ -392,14 +392,14 @@ module Kitchen
         case transport_type.to_sym
         when :ssl, :negotiate
           {
-            :no_ssl_peer_verification => true,
-            :disable_sspi => false,
-            :basic_auth_only => false
+            no_ssl_peer_verification: true,
+            disable_sspi: false,
+            basic_auth_only: false,
           }
         when :plaintext
           {
-            :disable_sspi => true,
-            :basic_auth_only => true
+            disable_sspi: true,
+            basic_auth_only: true,
           }
         else
           {}
@@ -443,10 +443,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)
@@ -480,7 +480,8 @@ module Kitchen
       end
 
       def silence_warnings
-        old_verbose, $VERBOSE = $VERBOSE, nil
+        old_verbose = $VERBOSE
+        $VERBOSE = nil
         yield
       ensure
         $VERBOSE = old_verbose

data/lib/kitchen/util.rb

@@ -17,13 +17,11 @@
 # limitations under the License.
 
 module Kitchen
-
   # Stateless utility methods used in different contexts. Essentially a mini
   # PassiveSupport library.
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   module Util
-
     # Returns the standard library Logger level constants for a given symbol
     # representation.
     #
@@ -140,7 +138,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
   end

data/lib/kitchen/verifier.rb

@@ -21,13 +21,11 @@ require "thor/util"
 require "kitchen/errors"
 
 module Kitchen
-
   # A verifier is responsible for running tests post-converge to confirm that
   # the instance is in a known/consistent state.
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   module Verifier
-
     # Default verifier to use
     DEFAULT_PLUGIN = "busser".freeze
 
@@ -47,9 +45,9 @@ module Kitchen
       object
     rescue LoadError, NameError
       raise ClientError,
-        "Could not load the '#{plugin}' verifier from the load path." \
-          " Please ensure that your transport is installed as a gem or" \
-          " included in your Gemfile if using Bundler."
+            "Could not load the '#{plugin}' verifier from the load path." \
+              " Please ensure that your transport is installed as a gem or" \
+              " included in your Gemfile if using Bundler."
     end
   end
 end

data/lib/kitchen/verifier/base.rb

@@ -21,14 +21,11 @@ require "kitchen/configurable"
 require "kitchen/logging"
 
 module Kitchen
-
   module Verifier
-
     # Base class for a verifier.
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class Base
-
       include Configurable
       include Logging
 
@@ -37,7 +34,7 @@ module Kitchen
       default_config :ftp_proxy, nil
 
       default_config :root_path do |verifier|
-        verifier.windows_os? ? "$env:TEMP\\verifier" : "/tmp/verifier"
+        verifier.windows_os? ? '$env:TEMP\\verifier' : "/tmp/verifier"
       end
 
       default_config :sudo do |verifier|
@@ -202,7 +199,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/verifier/busser.rb

@@ -22,31 +22,28 @@ require "digest"
 require "kitchen/verifier/base"
 
 module Kitchen
-
   module Verifier
-
     # Command string generator to interface with Busser. The commands that are
     # generated are safe to pass to an SSH command or as an unix command
     # argument (escaped in single quotes).
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class Busser < Kitchen::Verifier::Base
-
       kitchen_verifier_api_version 1
 
       plugin_version Kitchen::VERSION
 
       default_config :busser_bin do |verifier|
-        verifier.
-          remote_path_join(%W[#{verifier[:root_path]} bin busser]).
-          tap { |path| path.concat(".bat") if verifier.windows_os? }
+        verifier
+          .remote_path_join(%W{#{verifier[:root_path]} bin busser})
+          .tap { |path| path.concat(".bat") if verifier.windows_os? }
       end
 
       default_config :ruby_bindir do |verifier|
         if verifier.windows_os?
-          "$env:systemdrive\\opscode\\chef\\embedded\\bin"
+          '$env:systemdrive\\opscode\\chef\\embedded\\bin'
         else
-          verifier.remote_path_join(%W[#{verifier[:chef_omnibus_root]} embedded bin])
+          verifier.remote_path_join(%W{#{verifier[:chef_omnibus_root]} embedded bin})
         end
       end
 
@@ -73,8 +70,8 @@ module Kitchen
       def init_command
         return if local_suite_files.empty?
 
-        cmd = sudo(config[:busser_bin]).dup.
-          tap { |str| str.insert(0, "& ") if powershell_shell? }
+        cmd = sudo(config[:busser_bin]).dup
+                                       .tap { |str| str.insert(0, "& ") if powershell_shell? }
 
         prefix_command(wrap_shell_code(Util.outdent!(<<-CMD)))
           #{busser_env}
@@ -96,8 +93,8 @@ module Kitchen
       def run_command
         return if local_suite_files.empty?
 
-        cmd = sudo(config[:busser_bin]).dup.
-          tap { |str| str.insert(0, "& ") if powershell_shell? }
+        cmd = sudo(config[:busser_bin]).dup
+                                       .tap { |str| str.insert(0, "& ") if powershell_shell? }
 
         prefix_command(wrap_shell_code(Util.outdent!(<<-CMD)))
           #{busser_env}
@@ -150,9 +147,9 @@ module Kitchen
           shell_env_var("BUSSER_ROOT", root),
           shell_env_var("GEM_HOME", gem_home),
           shell_env_var("GEM_PATH", gem_path),
-          shell_env_var("GEM_CACHE", gem_cache)
-        ].join("\n").
-          tap { |str| str.insert(0, reload_ps1_path) if windows_os? }
+          shell_env_var("GEM_CACHE", gem_cache),
+        ].join("\n")
+          .tap { |str| str.insert(0, reload_ps1_path) if windows_os? }
       end
 
       # Determines whether or not a local workstation file exists under a
@@ -172,7 +169,10 @@ module Kitchen
       # @api private
       def gem_install_args
         gem, version = config[:version].split("@")
-        gem, version = "busser", gem if gem =~ /^\d+\.\d+\.\d+/
+        if gem =~ /^\d+\.\d+\.\d+/
+          version = gem
+          gem = "busser"
+        end
 
         root = config[:root_path]
         gem_bin = remote_path_join(root, "bin")
@@ -198,8 +198,8 @@ module Kitchen
       end
 
       def install_command_vars
-        ruby = remote_path_join(config[:ruby_bindir], "ruby").
-          tap { |path| path.concat(".exe") if windows_os? }
+        ruby = remote_path_join(config[:ruby_bindir], "ruby")
+               .tap { |path| path.concat(".exe") if windows_os? }
         gem = remote_path_join(config[:ruby_bindir], "gem")
 
         [
@@ -209,7 +209,7 @@ module Kitchen
           shell_var("version", config[:version]),
           shell_var("gem_install_args", gem_install_args),
           shell_var("busser", sudo(config[:busser_bin])),
-          shell_var("plugins", plugins.join(" "))
+          shell_var("plugins", plugins.join(" ")),
         ].join("\n")
       end
 
@@ -234,11 +234,11 @@ module Kitchen
       #   plugin gem names
       # @api private
       def plugins
-        non_suite_dirs = %w[data data_bags environments nodes roles]
+        non_suite_dirs = %w{data data_bags environments nodes roles}
         glob = File.join(config[:test_base_path], config[:suite_name], "*")
-        Dir.glob(glob).reject { |d|
+        Dir.glob(glob).reject do |d|
           !File.directory?(d) || non_suite_dirs.include?(File.basename(d))
-        }.map { |d| "busser-#{File.basename(d)}" }.sort.uniq
+        end.map { |d| "busser-#{File.basename(d)}" }.sort.uniq
       end
 
       # Copies all common testing helper files into the suites directory in
@@ -251,7 +251,7 @@ module Kitchen
         helper_files.each do |src|
           dest = File.join(sandbox_suites_dir, src.sub("#{base}/", ""))
           FileUtils.mkdir_p(File.dirname(dest))
-          FileUtils.cp(src, dest, :preserve => true)
+          FileUtils.cp(src, dest, preserve: true)
         end
       end
 
@@ -264,7 +264,7 @@ module Kitchen
         local_suite_files.each do |src|
           dest = File.join(sandbox_suites_dir, src.sub("#{base}/", ""))
           FileUtils.mkdir_p(File.dirname(dest))
-          FileUtils.cp(src, dest, :preserve => true)
+          FileUtils.cp(src, dest, preserve: true)
         end
       end
 

data/lib/kitchen/verifier/dummy.rb

@@ -19,9 +19,7 @@
 require "kitchen/verifier/base"
 
 module Kitchen
-
   module Verifier
-
     # Dummy verifier for Kitchen. This verifier does nothing but report what
     # would happen if this verifier did anything of consequence. As a result
     # it may be a useful verifier to use when debugging or developing new
@@ -29,7 +27,6 @@ module Kitchen
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class Dummy < Kitchen::Verifier::Base
-
       kitchen_verifier_api_version 1
 
       plugin_version Kitchen::VERSION

data/lib/kitchen/verifier/shell.rb

@@ -19,9 +19,7 @@
 require "kitchen/verifier/base"
 
 module Kitchen
-
   module Verifier
-
     # Shell verifier for Kitchen. This verifier just execute shell command from local.
     #
     # @author SAWANOBORI Yukihiko (<sawanoboriyu@higanworks.com>)
@@ -87,7 +85,7 @@ module Kitchen
       end
 
       def merge_state_to_env(state)
-        env_state = { :environment => {} }
+        env_state = { environment: {} }
         env_state[:environment]["KITCHEN_INSTANCE"] = instance.name
         env_state[:environment]["KITCHEN_PLATFORM"] = instance.platform.name
         env_state[:environment]["KITCHEN_SUITE"] = instance.suite.name

data/lib/kitchen/version.rb

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

data/lib/vendor/hash_recursive_merge.rb

@@ -14,7 +14,6 @@
 # Source::      http://gist.github.com/gists/6391/
 #
 module HashRecursiveMerge
-
   #
   # Recursive version of Hash#merge!
   #
@@ -74,7 +73,6 @@ module HashRecursiveMerge
       r[key] = oldval.class == self.class ? oldval.rmerge(newval) : newval
     end
   end
-
 end
 
 class Hash

data/spec/kitchen/base64_stream_spec.rb

@@ -24,11 +24,9 @@ require "securerandom"
 require "kitchen/base64_stream"
 
 describe Kitchen::Base64Stream do
-
-  SHORT_BODIES = %w[you test wakkawakkawakka]
+  SHORT_BODIES = %w{you test wakkawakkawakka}.freeze
 
   describe ".strict_encode" do
-
     SHORT_BODIES.each do |body|
       it "encodes short payload ('#{body}') from input IO to output IO" do
         output = StringIO.new("", "wb")
@@ -41,7 +39,7 @@ describe Kitchen::Base64Stream do
     end
 
     it "encodes a large payload from input IO to output IO" do
-      body = SecureRandom.random_bytes(1048576 * 8)
+      body = SecureRandom.random_bytes(1_048_576 * 8)
       output = StringIO.new("", "wb")
       StringIO.open(body) do |input|
         Kitchen::Base64Stream.strict_encode(input, output)
@@ -52,7 +50,6 @@ describe Kitchen::Base64Stream do
   end
 
   describe ".strict_decode" do
-
     SHORT_BODIES.map { |b| Base64.strict_encode64(b) }.each do |body|
       it "decodes short payload ('#{body}') from input IO to output IO" do
         output = StringIO.new("", "wb")
@@ -65,7 +62,7 @@ describe Kitchen::Base64Stream do
     end
 
     it "decodes a large payload from input IO to output IO" do
-      body = Base64.strict_encode64(SecureRandom.hex(1048576 * 8))
+      body = Base64.strict_encode64(SecureRandom.hex(1_048_576 * 8))
       output = StringIO.new("", "wb")
       StringIO.open(body) do |input|
         Kitchen::Base64Stream.strict_decode(input, output)