test-kitchen 1.14.1 → 1.14.2

data/lib/kitchen/collection.rb

@@ -19,14 +19,12 @@
 require "delegate"
 
 module Kitchen
-
   # Delegate class which adds the ability to find single and multiple
   # objects by their #name in an Array. Hey, it's better than monkey-patching
   # Array, right?
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   class Collection < SimpleDelegator
-
     # Returns a single object by its name, or nil if none are found.
     #
     # @param name [String] name of object

data/lib/kitchen/color.rb

@@ -17,26 +17,24 @@
 # limitations under the License.
 
 module Kitchen
-
   # Utility methods to help ouput colorized text in a terminal. The
   # implementation is a compressed mashup of code from the Thor and Foreman
   # projects.
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   module Color
-
     ANSI = {
-      :reset => 0, :black => 30, :red => 31, :green => 32, :yellow => 33,
-      :blue => 34, :magenta => 35, :cyan => 36, :white => 37,
-      :bright_black => 90, :bright_red => 91, :bright_green => 92,
-      :bright_yellow => 93, :bright_blue => 94, :bright_magenta => 95,
-      :bright_cyan => 96, :bright_white => 97
+      reset: 0, black: 30, red: 31, green: 32, yellow: 33,
+      blue: 34, magenta: 35, cyan: 36, white: 37,
+      bright_black: 90, bright_red: 91, bright_green: 92,
+      bright_yellow: 93, bright_blue: 94, bright_magenta: 95,
+      bright_cyan: 96, bright_white: 97
     }.freeze
 
-    COLORS = %w[
+    COLORS = %w{
       cyan yellow green magenta blue bright_cyan bright_yellow
       bright_green bright_magenta bright_blue
-    ].freeze
+    }.freeze
 
     # Returns an ansi escaped string representing a color control sequence.
     #

data/lib/kitchen/command.rb

@@ -19,14 +19,11 @@
 require "thread"
 
 module Kitchen
-
   module Command
-
     # Base class for CLI commands.
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class Base
-
       include Logging
 
       # Contstructs a new Command object.
@@ -150,7 +147,6 @@ module Kitchen
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     module RunAction
-
       # Run an instance action (create, converge, setup, verify, destroy) on
       # a collection of instances. The instance actions will take place in a
       # seperate thread of execution which may or may not be running

data/lib/kitchen/command/action.rb

@@ -21,14 +21,11 @@ require "kitchen/command"
 require "benchmark"
 
 module Kitchen
-
   module Command
-
     # Command to run a single action one or more instances.
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class Action < Kitchen::Command::Base
-
       include RunAction
 
       # Invoke the command.

data/lib/kitchen/command/console.rb

@@ -19,18 +19,15 @@
 require "kitchen/command"
 
 module Kitchen
-
   module Command
-
     # Command to launch a Pry-based Kitchen console..
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class Console < Kitchen::Command::Base
-
       # Invoke the command.
       def call
         require "pry"
-        Pry.start(@config, :prompt => [prompt(">"), prompt("*")])
+        Pry.start(@config, prompt: [prompt(">"), prompt("*")])
       rescue LoadError
         warn %{Make sure you have the pry gem installed. You can install it with:}
         warn %{`gem install pry` or including 'gem "pry"' in your Gemfile.}
@@ -45,13 +42,13 @@ module Kitchen
       # @return [proc] a prompt proc
       # @api private
       def prompt(char)
-        proc { |target_self, nest_level, pry|
+        proc do |target_self, nest_level, pry|
           [
             "[#{pry.input_array.size}] ",
             "kc(#{Pry.view_clip(target_self.class)})",
-            "#{":#{nest_level}" unless nest_level.zero?}#{char} "
+            "#{":#{nest_level}" unless nest_level.zero?}#{char} ",
           ].join
-        }
+        end
       end
     end
   end

data/lib/kitchen/command/diagnose.rb

@@ -22,14 +22,11 @@ require "kitchen/diagnostic"
 require "yaml"
 
 module Kitchen
-
   module Command
-
     # Command to log into to instance.
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class Diagnose < Kitchen::Command::Base
-
       # Invoke the command.
       def call
         instances = record_failure { load_instances }
@@ -37,7 +34,7 @@ module Kitchen
         loader = record_failure { load_loader }
 
         puts Kitchen::Diagnostic.new(
-          :loader => loader, :instances => instances, :plugins => plugins?
+          loader: loader, instances: instances, plugins: plugins?
         ).read.to_yaml
       end
 
@@ -64,11 +61,7 @@ module Kitchen
       # @return [Hash,nil] a hash or nil
       # @api private
       def load_loader
-        if options[:all] || options[:loader]
-          @loader
-        else
-          nil
-        end
+        @loader if options[:all] || options[:loader]
       end
 
       # Returns a hash with exception detail if an exception is raised in the
@@ -80,11 +73,11 @@ module Kitchen
         yield
       rescue => e
         {
-          :error => {
-            :exception => e.inspect,
-            :message => e.message,
-            :backtrace => e.backtrace
-          }
+          error: {
+            exception: e.inspect,
+            message: e.message,
+            backtrace: e.backtrace,
+          },
         }
       end
     end

data/lib/kitchen/command/driver_discover.rb

@@ -27,14 +27,11 @@ rescue LoadError # rubocop:disable Lint/HandleExceptions
 end
 
 module Kitchen
-
   module Command
-
     # Command to discover drivers published on RubyGems.
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class DriverDiscover < Kitchen::Command::Base
-
       # Invoke the command.
       def call
         # We are introducing the idea of using the Chef configuration as a
@@ -48,7 +45,7 @@ module Kitchen
         specs = fetch_gem_specs.sort { |x, y| x[0] <=> y[0] }
         specs = specs[0, 49].push(["...", "..."]) if specs.size > 49
         specs = specs.unshift(["Gem Name", "Latest Stable Release"])
-        print_table(specs, :indent => 4)
+        print_table(specs, indent: 4)
       end
 
       private

data/lib/kitchen/command/exec.rb

@@ -19,14 +19,11 @@
 require "kitchen/command"
 
 module Kitchen
-
   module Command
-
     # Execute command on remote instance.
     #
     # @author SAWANOBORI Yukihiko (<sawanoboriyu@higanworks.com>)
     class Exec < Kitchen::Command::Base
-
       # Invoke the command.
       def call
         results = parse_subcommand(args.first)

data/lib/kitchen/command/list.rb

@@ -20,14 +20,11 @@ require "kitchen/command"
 require "json"
 
 module Kitchen
-
   module Command
-
     # Command to list one or more instances.
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class List < Kitchen::Command::Base
-
       # Invoke the command.
       def call
         result = parse_subcommand(args.first)
@@ -68,7 +65,7 @@ module Kitchen
           color_pad(instance.verifier.name),
           color_pad(instance.transport.name),
           format_last_action(instance.last_action),
-          format_last_error(instance.last_error)
+          format_last_error(instance.last_error),
         ]
       end
 
@@ -111,7 +108,7 @@ module Kitchen
             colorize("Provisioner", :green), colorize("Verifier", :green),
             colorize("Transport", :green), colorize("Last Action", :green),
             colorize("Last Error", :green)
-          ]
+          ],
         ]
         table += Array(result).map { |i| display_instance(i) }
         print_table(table)
@@ -123,13 +120,13 @@ module Kitchen
       # @api private
       def to_hash(result)
         {
-          :instance => result.name,
-          :driver => result.driver.name,
-          :provisioner => result.provisioner.name,
-          :verifier => result.verifier.name,
-          :transport => result.transport.name,
-          :last_action => result.last_action,
-          :last_error => result.last_error
+          instance: result.name,
+          driver: result.driver.name,
+          provisioner: result.provisioner.name,
+          verifier: result.verifier.name,
+          transport: result.transport.name,
+          last_action: result.last_action,
+          last_error: result.last_error,
         }
       end
 

data/lib/kitchen/command/login.rb

@@ -19,14 +19,11 @@
 require "kitchen/command"
 
 module Kitchen
-
   module Command
-
     # Command to log into to instance.
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class Login < Kitchen::Command::Base
-
       # Invoke the command.
       def call
         results = parse_subcommand(args.first)

data/lib/kitchen/command/package.rb

@@ -16,13 +16,10 @@
 require "kitchen/command"
 
 module Kitchen
-
   module Command
-
     # Execute command on remote instance.
     #
     class Package < Kitchen::Command::Base
-
       # Invoke the command.
       def call
         results = parse_subcommand(args.first)

data/lib/kitchen/command/sink.rb

@@ -19,34 +19,31 @@
 require "kitchen/command"
 
 module Kitchen
-
   module Command
-
     # Command to... include the sink.
     #
     # @author Seth Vargo <sethvargo@gmail.com>
     class Sink < Kitchen::Command::Base
-
       # Invoke the command.
       def call
         puts [
           "",
           "                    ___              ",
           "                   ' _ '.            ",
-          "                 / /` `\\ \\         ",
+          '                 / /` `\\ \\         ',
           "                 | |   [__]          ",
           "                 | |    {{           ",
           "                 | |    }}           ",
           "              _  | |  _ {{           ",
           "  ___________<_>_| |_<_>}}________   ",
           "      .=======^=(___)=^={{====.      ",
-          "     / .----------------}}---. \\    ",
-          "    / /                 {{    \\ \\  ",
-          "   / /                  }}     \\ \\ ",
+          '     / .----------------}}---. \\    ',
+          '    / /                 {{    \\ \\  ',
+          '   / /                  }}     \\ \\ ',
           "  (  '========================='  )  ",
           "   '-----------------------------'   ",
-          "                                     ",  # necessary newline
-          ""
+          "                                     ", # necessary newline
+          "",
         ].map(&:rstrip).join("\n")
       end
     end

data/lib/kitchen/command/test.rb

@@ -21,19 +21,16 @@ require "kitchen/command"
 require "benchmark"
 
 module Kitchen
-
   module Command
-
     # Command to test one or more instances.
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class Test < Kitchen::Command::Base
-
       include RunAction
 
       # Invoke the command.
       def call
-        if !%w[passing always never].include?(options[:destroy])
+        unless %w{passing always never}.include?(options[:destroy])
           raise ArgumentError, "Destroy mode must be passing, always, or never."
         end
 

data/lib/kitchen/config.rb

@@ -17,7 +17,6 @@
 # limitations under the License.
 
 module Kitchen
-
   # Base configuration class for Kitchen. This class exposes configuration such
   # as the location of the Kitchen config file, instances, log_levels, etc.
   # This object is a factory object, meaning that it is responsible for
@@ -48,7 +47,6 @@ module Kitchen
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   class Config
-
     # @return [String] the absolute path to the root of a Test Kitchen project
     # @api private
     attr_reader :kitchen_root
@@ -209,18 +207,18 @@ module Kitchen
     # @api private
     def kitchen_config
       @kitchen_config ||= {
-        :defaults => {
-          :driver       => Driver::DEFAULT_PLUGIN,
-          :provisioner  => Provisioner::DEFAULT_PLUGIN,
-          :verifier     => Verifier::DEFAULT_PLUGIN,
-          :transport    => lambda { |_suite, platform|
+        defaults: {
+          driver: Driver::DEFAULT_PLUGIN,
+          provisioner: Provisioner::DEFAULT_PLUGIN,
+          verifier: Verifier::DEFAULT_PLUGIN,
+          transport: lambda do |_suite, platform|
             platform =~ /^win/i ? "winrm" : Transport::DEFAULT_PLUGIN
-          }
+          end,
         },
-        :kitchen_root   => kitchen_root,
-        :test_base_path => test_base_path,
-        :log_level      => log_level,
-        :log_overwrite  => log_overwrite
+        kitchen_root: kitchen_root,
+        test_base_path: test_base_path,
+        log_level: log_level,
+        log_overwrite: log_overwrite,
       }
     end
 
@@ -245,14 +243,14 @@ module Kitchen
     # @api private
     def new_instance(suite, platform, index)
       Instance.new(
-        :driver       => new_driver(suite, platform),
-        :logger       => new_instance_logger(suite, platform, index),
-        :suite        => suite,
-        :platform     => platform,
-        :provisioner  => new_provisioner(suite, platform),
-        :transport    => new_transport(suite, platform),
-        :verifier     => new_verifier(suite, platform),
-        :state_file   => new_state_file(suite, platform)
+        driver: new_driver(suite, platform),
+        logger: new_instance_logger(suite, platform, index),
+        suite: suite,
+        platform: platform,
+        provisioner: new_provisioner(suite, platform),
+        transport: new_transport(suite, platform),
+        verifier: new_verifier(suite, platform),
+        state_file: new_state_file(suite, platform)
       )
     end
 
@@ -268,13 +266,13 @@ module Kitchen
       name = instance_name(suite, platform)
       log_location = File.join(log_root, "#{name}.log").to_s
       Logger.new(
-        :stdout   => STDOUT,
-        :color    => Color::COLORS[index % Color::COLORS.size].to_sym,
-        :logdev   => log_location,
-        :level    => Util.to_logger_level(log_level),
-        :log_overwrite => log_overwrite,
-        :progname => name,
-        :colorize => @colorize
+        stdout: STDOUT,
+        color: Color::COLORS[index % Color::COLORS.size].to_sym,
+        logdev: log_location,
+        level: Util.to_logger_level(log_level),
+        log_overwrite: log_overwrite,
+        progname: name,
+        colorize: @colorize
       )
     end