test-kitchen 3.1.0 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc5e05dc50e7052b2002a94e950f5691d953c78d5e408b80a0f7f977ab63eb35
-  data.tar.gz: 43bc1979cc77277d4a3219f82d8fead18e7aa3cf068fb7484f5176ce422c8767
+  metadata.gz: 8b57d5ccdfe054fcd290b2a6f4490f92e626d93d3b7c7bdc8704b3029e723392
+  data.tar.gz: 4d20fdf60ea362f63918232cf57bcbaebc8cc61d5732d71a80cbbf20961a057e
 SHA512:
-  metadata.gz: 12453b3cbf1ef1dfb49b683667fca52502b10a888e9cf953d58c22589ce99dffc9864d550463c80341049f7073aa3c3fb98eb76c4e432aa266956b6a0a86c332
-  data.tar.gz: bc19f713f60acc0b5437c5b29ab241255a7a82de2b206ba714596bf2a251c0e9a3c21bc152a18e171461ca24d9291098b55baeec474e495f46824782487350b8
+  metadata.gz: adc9ea69942bc0938b8da3340ae0abe1ce78f409170c9d3e1d081179121db9508d072fb18232982e16e377d8f5bddbee9b90b887c22cc9039729b3cdc5daf494
+  data.tar.gz: eb8caaaf52882d104ff01f46283325f5455cfaf4f0e8a8a4cfa4792430dac560c2fb556727f8cc9f0fc6af877ba06fee687f763b58c0f3f17cac77841526f968

data/lib/kitchen/configurable.rb

@@ -241,7 +241,7 @@ module Kitchen
           #{deprecated_config.keys.join("\n")}
           Run 'kitchen doctor' for details.
         MSG
-        warn(warning)
+        Error.warn_on_stderr(warning)
 
         # Set global var that the deprecation message has been printed
         @@has_been_warned_of_deprecations = true

data/lib/kitchen/errors.rb

@@ -94,6 +94,19 @@ module Kitchen
         "".center(22, "-"),
       ]
     end
+
+    # Log a warn message on STDERR device.
+    # This will help to distinguish between the errors and
+    # output when parsing the output from the commands like
+    # kitchen diagnose.
+    #
+    # @params lines [Array<String>] Array of lines that needs to be printed
+    def self.warn_on_stderr(lines)
+      Array(lines).each do |line|
+        line = Color.colorize(line, :blue) if Kitchen.tty?
+        $stderr.puts(line)
+      end
+    end
   end
 
   # Base exception class from which all Kitchen exceptions derive. This class

data/lib/kitchen/provisioner/chef_base.rb

@@ -69,7 +69,7 @@ module Kitchen
         README.* VERSION metadata.{json,rb} attributes.rb recipe.rb
         attributes/**/* definitions/**/* files/**/* libraries/**/*
         providers/**/* recipes/**/* resources/**/* templates/**/*
-        ohai/**/*
+        ohai/**/* compliance/**/*
       ).join(",")
       # to ease upgrades, allow the user to turn deprecation warnings into errors
       default_config :deprecations_as_errors, false
@@ -681,25 +681,42 @@ module Kitchen
         chef_cmds(base_cmd).join(separator)
       end
 
-      # Gives an array of command
+      # Gives an array of commands
       # @api private
       def chef_cmds(base_cmd)
-        cmd = prefix_command(wrap_shell_code(
-          [base_cmd, *chef_args(config_filename), last_exit_code].join(" ")
-          .tap { |str| str.insert(0, reload_ps1_path) if windows_os? }
-        ))
-
-        cmds = [cmd].cycle(config[:multiple_converge].to_i).to_a
-
-        if config[:enforce_idempotency]
-          idempotent_cmd = prefix_command(wrap_shell_code(
-            [base_cmd, *chef_args("client_no_updated_resources.rb"), last_exit_code].join(" ")
-            .tap { |str| str.insert(0, reload_ps1_path) if windows_os? }
-          ))
-          cmds[-1] = idempotent_cmd
+        cmds = []
+        num_converges = config[:multiple_converge].to_i
+        idempotency   = config[:enforce_idempotency]
+
+        # Execute Chef Client n-1 times, without exiting
+        (num_converges - 1).times do
+          cmds << wrapped_chef_cmd(base_cmd, config_filename)
         end
+
+        # Append another execution with Windows specific Exit code helper or (for
+        # idempotency check) a specific config file which assures no changed resources.
+        cmds << unless idempotency
+                  wrapped_chef_cmd(base_cmd, config_filename, append: last_exit_code)
+                else
+                  wrapped_chef_cmd(base_cmd, "client_no_updated_resources.rb", append: last_exit_code)
+                end
         cmds
       end
+
+      # Concatenate all arguments and wrap it with shell-specifics
+      # @api private
+      def wrapped_chef_cmd(base_cmd, configfile, append: "")
+        args = []
+
+        args << base_cmd
+        args << chef_args(configfile)
+        args << append
+
+        shell_cmd = args.flatten.join(" ")
+        shell_cmd = shell_cmd.prepend(reload_ps1_path) if windows_os?
+
+        prefix_command(wrap_shell_code(shell_cmd))
+      end
     end
   end
 end

data/lib/kitchen/transport/ssh.rb

@@ -176,9 +176,11 @@ module Kitchen
             Array(locals).map do |local|
               opts = File.directory?(local) ? { recursive: true } : {}
 
-              waits.push session.scp.upload(local, remote, opts) do |_ch, name, sent, total|
-                logger.debug("Async Uploaded #{name} (#{total} bytes)") if sent == total
-              end
+              waits.push(
+                session.scp.upload(local, remote, opts) do |_ch, name, sent, total|
+                  logger.debug("Async Uploaded #{name} (#{total} bytes)") if sent == total
+                end
+              )
               waits.shift.wait while waits.length >= max_ssh_sessions
             end
             waits.each(&:wait)

data/lib/kitchen/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "3.1.0".freeze
+  VERSION = "3.2.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.2
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-02 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -520,7 +520,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Test Kitchen is an integration tool for developing and testing infrastructure