test-kitchen 2.2.5 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25783a8b110ce3743a0da21ee576b2a83dd9cc218bfba75e0f86e350d5a429cb
-  data.tar.gz: 8dc2c81284b6a7152b95155225078d8e85ccd0b3742e40a4b0c4daef3ecb1151
+  metadata.gz: 42bf489a9ab86a4c1c88cc74e8a257ce2b6241a199fcd337b59a1b7ee32f321f
+  data.tar.gz: 1c89f445f99ceec9e677ba75cdbbd662b150b36ebbecaadccbf1378d57edca0d
 SHA512:
-  metadata.gz: 4d7270665bf6fbab9f7876a5347f97bb821a0bc9ece8a14378ce625fea305e3b7145de6f6409c9b7cf20f27ca481f368671a66c48ba694777056d80ce6fe11a9
-  data.tar.gz: 4d072e0b670d1b9b583f746b5850885bfa0484ece4f8b6826e33019110685e6be3daea984067801182fcdf75d45d93937e9a8b09103b83551f2374b6c4c37fd9
+  metadata.gz: f81c55631f7f772e3f0a3a1d6ef25116632b5500ad3e782f8f2e97dfcb691c6c397f2a5589248dac7a90a95459558cde767398e052c322b48525dd896f389388
+  data.tar.gz: 57e8f9a2ea674ee43f2e589a52b5e259c749840f122a9094a997c6968bf4e35143c4fc20d8e4accf44454c1d03d252429c8b4272c205328a01f56be6d16dcce5

data/Rakefile

@@ -20,7 +20,7 @@ rescue LoadError
 end
 
 desc "Run all test suites"
-task test: [:unit, :features]
+task test: %i{unit features}
 
 desc "Display LOC stats"
 task :stats do
@@ -41,7 +41,7 @@ rescue LoadError
 end
 
 desc "Run all quality tasks"
-task quality: [:style, :stats]
+task quality: %i{style stats}
 
 begin
   require "yard"
@@ -50,7 +50,7 @@ rescue LoadError
   puts "yard is not available. (sudo) gem install yard to generate yard documentation."
 end
 
-task default: [:test, :quality]
+task default: %i{test quality}
 
 begin
   require "github_changelog_generator/task"

data/lib/kitchen/cli.rb

@@ -82,38 +82,38 @@ module Kitchen
     # @api private
     def self.log_options
       method_option :log_level,
-                    aliases: "-l",
-                    desc: "Set the log level (debug, info, warn, error, fatal)"
+        aliases: "-l",
+        desc: "Set the log level (debug, info, warn, error, fatal)"
       method_option :log_overwrite,
-                    desc: "Set to false to prevent log overwriting each time Test Kitchen runs",
-                    type: :boolean
+        desc: "Set to false to prevent log overwriting each time Test Kitchen runs",
+        type: :boolean
       method_option :color,
-                    type: :boolean,
-                    lazy_default: $stdout.tty?,
-                    desc: "Toggle color output for STDOUT logger"
+        type: :boolean,
+        lazy_default: $stdout.tty?,
+        desc: "Toggle color output for STDOUT logger"
     end
 
     # Sets the test_base_path method_options
     # @api private
     def self.test_base_path
       method_option :test_base_path,
-                    aliases: "-t",
-                    desc: "Set the base path of the tests"
+        aliases: "-t",
+        desc: "Set the base path of the tests"
     end
 
     desc "list [INSTANCE|REGEXP|all]", "Lists one or more instances"
     method_option :bare,
-                  aliases: "-b",
-                  type: :boolean,
-                  desc: "List the name of each instance only, one per line"
+      aliases: "-b",
+      type: :boolean,
+      desc: "List the name of each instance only, one per line"
     method_option :json,
-                  aliases: "-j",
-                  type: :boolean,
-                  desc: "Print data as JSON"
+      aliases: "-j",
+      type: :boolean,
+      desc: "Print data as JSON"
     method_option :debug,
-                  aliases: "-d",
-                  type: :boolean,
-                  desc: "[Deprecated] Please use `kitchen diagnose'"
+      aliases: "-d",
+      type: :boolean,
+      desc: "[Deprecated] Please use `kitchen diagnose'"
     log_options
     def list(*args)
       update_config!
@@ -123,18 +123,18 @@ module Kitchen
 
     desc "diagnose [INSTANCE|REGEXP|all]", "Show computed diagnostic configuration"
     method_option :loader,
-                  type: :boolean,
-                  desc: "Include data loader diagnostics"
+      type: :boolean,
+      desc: "Include data loader diagnostics"
     method_option :plugins,
-                  type: :boolean,
-                  desc: "Include plugin diagnostics"
+      type: :boolean,
+      desc: "Include plugin diagnostics"
     method_option :instances,
-                  type: :boolean,
-                  default: true,
-                  desc: "Include instances diagnostics"
+      type: :boolean,
+      default: true,
+      desc: "Include instances diagnostics"
     method_option :all,
-                  type: :boolean,
-                  desc: "Include all diagnostics"
+      type: :boolean,
+      desc: "Include all diagnostics"
     log_options
     test_base_path
     def diagnose(*args)
@@ -165,27 +165,32 @@ module Kitchen
         intermediate states will be executed. See http://kitchen.ci for further explanation.
       DESC
       method_option :concurrency,
-                    aliases: "-c",
-                    type: :numeric,
-                    lazy_default: MAX_CONCURRENCY,
-                    desc: <<-DESC.gsub(/^\s+/, "").tr("\n", " ")
+        aliases: "-c",
+        type: :numeric,
+        lazy_default: MAX_CONCURRENCY,
+        desc: <<-DESC.gsub(/^\s+/, "").tr("\n", " ")
           Run a #{action} against all matching instances concurrently. Only N
           instances will run at the same time if a number is given.
-                    DESC
+        DESC
       method_option :parallel,
-                    aliases: "-p",
-                    type: :boolean,
-                    desc: <<-DESC.gsub(/^\s+/, "").tr("\n", " ")
+        aliases: "-p",
+        type: :boolean,
+        desc: <<-DESC.gsub(/^\s+/, "").tr("\n", " ")
           [Future DEPRECATION, use --concurrency]
           Run a #{action} against all matching instances concurrently.
-                    DESC
+        DESC
       if action == :converge || action == :verify
         method_option :debug,
-                      aliases: "-D",
-                      type: :boolean,
-                      default: false,
-                      desc: "Run the #{action} with debugging enabled."
+          aliases: "-D",
+          type: :boolean,
+          default: false,
+          desc: "Run the #{action} with debugging enabled."
       end
+      method_option :fail_fast,
+        aliases: "-f",
+        type: :boolean,
+        desc: "Fail immediately when errors occur in concurrency mode"
+
       test_base_path
       log_options
       define_method(action) do |*args|
@@ -195,7 +200,7 @@ module Kitchen
     end
 
     desc "test [INSTANCE|REGEXP|all]",
-         "Test (destroy, create, converge, setup, verify and destroy) one or more instances"
+      "Test (destroy, create, converge, setup, verify and destroy) one or more instances"
     long_desc <<-DESC
       The instance states are in order: destroy, create, converge, setup, verify, destroy.
       Test changes the state of one or more instances to destroyed, then executes
@@ -210,33 +215,33 @@ module Kitchen
       * never: instances will never be destroyed afterwards.
     DESC
     method_option :concurrency,
-                  aliases: "-c",
-                  type: :numeric,
-                  lazy_default: MAX_CONCURRENCY,
-                  desc: <<-DESC.gsub(/^\s+/, "").tr("\n", " ")
+      aliases: "-c",
+      type: :numeric,
+      lazy_default: MAX_CONCURRENCY,
+      desc: <<-DESC.gsub(/^\s+/, "").tr("\n", " ")
         Run a test against all matching instances concurrently. Only N
         instances will run at the same time if a number is given.
-                  DESC
+      DESC
     method_option :parallel,
-                  aliases: "-p",
-                  type: :boolean,
-                  desc: <<-DESC.gsub(/^\s+/, "").tr("\n", " ")
+      aliases: "-p",
+      type: :boolean,
+      desc: <<-DESC.gsub(/^\s+/, "").tr("\n", " ")
         [Future DEPRECATION, use --concurrency]
         Run a test against all matching instances concurrently.
-                  DESC
+      DESC
     method_option :destroy,
-                  aliases: "-d",
-                  default: "passing",
-                  desc: "Destroy strategy to use after testing (passing, always, never)."
+      aliases: "-d",
+      default: "passing",
+      desc: "Destroy strategy to use after testing (passing, always, never)."
     method_option :auto_init,
-                  type: :boolean,
-                  default: false,
-                  desc: "Invoke init command if .kitchen.yml is missing"
+      type: :boolean,
+      default: false,
+      desc: "Invoke init command if .kitchen.yml is missing"
     method_option :debug,
-                  aliases: "-D",
-                  type: :boolean,
-                  default: false,
-                  desc: "Run the converge and verify with debugging enabled."
+      aliases: "-D",
+      type: :boolean,
+      default: false,
+      desc: "Run the converge and verify with debugging enabled."
     test_base_path
     log_options
     def test(*args)
@@ -262,18 +267,18 @@ module Kitchen
     desc "doctor INSTANCE|REGEXP", "Check for common system problems"
     log_options
     method_option :all,
-                  aliases: "-a",
-                  desc: "Check all instances"
+      aliases: "-a",
+      desc: "Check all instances"
     def doctor(*args)
       update_config!
       perform("doctor", "doctor", args)
     end
 
     desc "exec INSTANCE|REGEXP -c REMOTE_COMMAND",
-         "Execute command on one or more instance"
+      "Execute command on one or more instance"
     method_option :command,
-                  aliases: "-c",
-                  desc: "execute via ssh"
+      aliases: "-c",
+      desc: "execute via ssh"
     log_options
     def exec(*args)
       update_config!
@@ -297,7 +302,7 @@ module Kitchen
     end
 
     register Kitchen::Generator::Init, "init",
-             "init", "Adds some configuration to your cookbook so Kitchen can rock"
+      "init", "Adds some configuration to your cookbook so Kitchen can rock"
     long_desc <<-D, for: "init"
       Init will add Test Kitchen support to an existing project for
       convergence integration testing. A default kitchen.yml file (which is

data/lib/kitchen/color.rb

@@ -45,6 +45,7 @@ module Kitchen
     def self.escape(name)
       return "" if name.nil?
       return "" unless ANSI[name]
+
       "\e[#{ANSI[name]}m"
     end
 

data/lib/kitchen/command.rb

@@ -170,6 +170,7 @@ module Kitchen
             end
           end
         end
+        Thread.abort_on_exception = true if options[:fail_fast]
         threads.map(&:join)
         report_errors
       end

data/lib/kitchen/config.rb

@@ -121,14 +121,16 @@ module Kitchen
     #   in convergence integration
     def platforms
       @platforms ||= Collection.new(
-        data.platform_data.map { |pdata| Platform.new(pdata) })
+        data.platform_data.map { |pdata| Platform.new(pdata) }
+      )
     end
 
     # @return [Collection<Suite>] all defined suites which will be used in
     #   convergence integration
     def suites
       @suites ||= Collection.new(
-        data.suite_data.map { |sdata| Suite.new(sdata) })
+        data.suite_data.map { |sdata| Suite.new(sdata) }
+      )
     end
 
     private

data/lib/kitchen/configurable.rb

@@ -236,7 +236,7 @@ module Kitchen
       # Remove items from hash when not provided in the loaded config or when the rendered message is nil
       @deprecated_config = deprecated_attributes.delete_if { |attr, obj| !provided_config.key?(attr) || obj.nil? }
 
-      if !deprecated_config.empty?
+      unless deprecated_config.empty?
         warning = Util.outdent!(<<-MSG)
           Deprecated configuration detected:
           #{deprecated_config.keys.join("\n")}
@@ -341,6 +341,7 @@ module Kitchen
     # @api private
     def wrap_shell_code(code)
       return env_wrapped(code) if powershell_shell?
+
       Util.wrap_command((env_wrapped code))
     end
 
@@ -353,7 +354,7 @@ module Kitchen
     end
 
     def proxy_setting_keys
-      [:http_proxy, :https_proxy, :ftp_proxy, :no_proxy]
+      %i{http_proxy https_proxy ftp_proxy no_proxy}
     end
 
     def resolve_proxy_settings_from_config

data/lib/kitchen/data_munger.rb

@@ -156,8 +156,8 @@ module Kitchen
     def combine_arrays!(root, key, *namespaces)
       if root.key?(key)
         root[key] = namespaces
-                    .map { |namespace| root.fetch(key).fetch(namespace, []) }.flatten
-                    .compact
+          .map { |namespace| root.fetch(key).fetch(namespace, []) }.flatten
+          .compact
       end
     end
 
@@ -299,7 +299,7 @@ module Kitchen
           data data_bags encrypted_data_bag_secret_key
           environments nodes roles
         }.each do |key|
-          move_chef_data_to_provisioner_at!(suite, "#{key}_path".to_sym)
+          move_data_to!(:provisioner, suite, "#{key}_path".to_sym)
         end
       end
     end
@@ -507,7 +507,7 @@ module Kitchen
     def convert_legacy_driver_http_proxy_format_at!(root)
       ddata = root.fetch(:driver, {})
 
-      [:http_proxy, :https_proxy].each do |key|
+      %i{http_proxy https_proxy}.each do |key|
         next unless ddata.is_a?(Hash) && ddata.key?(key)
 
         pdata = root.fetch(:provisioner, {})
@@ -718,15 +718,15 @@ module Kitchen
     # @api private
     def move_chef_data_to_provisioner!
       data.fetch(:suites, []).each do |suite|
-        move_chef_data_to_provisioner_at!(suite, :attributes)
-        move_chef_data_to_provisioner_at!(suite, :run_list)
-        move_chef_data_to_provisioner_at!(suite, :named_run_list)
+        move_data_to!(:provisioner, suite, :attributes)
+        move_data_to!(:provisioner, suite, :run_list)
+        move_data_to!(:provisioner, suite, :named_run_list)
       end
 
       data.fetch(:platforms, []).each do |platform|
-        move_chef_data_to_provisioner_at!(platform, :attributes)
-        move_chef_data_to_provisioner_at!(platform, :run_list)
-        move_chef_data_to_provisioner_at!(platform, :named_run_list)
+        move_data_to!(:provisioner, platform, :attributes)
+        move_data_to!(:provisioner, platform, :run_list)
+        move_data_to!(:provisioner, platform, :named_run_list)
       end
     end
 
@@ -738,12 +738,12 @@ module Kitchen
     # @param key [Symbol] a key in the root hash to move into a `:provisioner`
     #   sub-hash block
     # @api private
-    def move_chef_data_to_provisioner_at!(root, key)
+    def move_data_to!(to, root, key)
       if root.key?(key)
-        pdata = root.fetch(:provisioner, {})
+        pdata = root.fetch(to, {})
         pdata = { name: pdata } if pdata.is_a?(String)
         unless root.fetch(key, nil).nil?
-          root[:provisioner] = pdata.rmerge(key => root.delete(key))
+          root[to] = pdata.rmerge(key => root.delete(key))
         end
       end
     end
@@ -984,7 +984,7 @@ module Kitchen
     #   Hash if not found
     # @api private
     def platform_data_for(name)
-      data.fetch(:platforms, {}).find(-> { Hash.new }) do |platform|
+      data.fetch(:platforms, {}).find(-> { {} }) do |platform|
         platform.fetch(:name, nil) == name
       end
     end
@@ -1015,7 +1015,7 @@ module Kitchen
     #   Hash if not found
     # @api private
     def suite_data_for(name)
-      data.fetch(:suites, {}).find(-> { Hash.new }) do |suite|
+      data.fetch(:suites, {}).find(-> { {} }) do |suite|
         suite.fetch(:name, nil) == name
       end
     end

data/lib/kitchen/driver/base.rb

@@ -54,15 +54,13 @@ module Kitchen
       #
       # @param state [Hash] mutable instance and driver state
       # @raise [ActionFailed] if the action could not be completed
-      def destroy(state) # rubocop:disable Lint/UnusedMethodArgument
-      end
+      def destroy(state); end
 
       # Package an instance.
       #
       # @param state [Hash] mutable instance and driver state
       # @raise [ActionFailed] if the action could not be completed
-      def package(state) # rubocop:disable Lint/UnusedMethodArgument
-      end
+      def package(state); end
 
       # Check system and configuration for common errors.
       #
@@ -97,7 +95,7 @@ module Kitchen
       # @param methods [Array<Symbol>] one or more actions as symbols
       # @raise [ClientError] if any method is not a valid action method name
       def self.no_parallel_for(*methods)
-        action_methods = [:create, :setup, :converge, :verify, :destroy]
+        action_methods = %i{create setup converge verify destroy}
 
         Array(methods).each do |meth|
           next if action_methods.include?(meth)
@@ -136,8 +134,7 @@ module Kitchen
       # that it can leverage it internally
       #
       # @return path [String] a path of the cache directory
-      def cache_directory
-      end
+      def cache_directory; end
 
       private
 

data/lib/kitchen/driver/proxy.rb

@@ -48,6 +48,7 @@ module Kitchen
       # (see Base#destroy)
       def destroy(state)
         return if state[:hostname].nil?
+
         reset_instance(state)
         state.delete(:hostname)
       end