mixlib-shellout 3.3.3-universal-mingw32 → 3.3.6-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ffdff3b2db45006adab99c670f2059458c840b36b678c1c342c957cbe21e6a7
-  data.tar.gz: 1312451c4439639db479b85a6c827916b6d949c72696a055f454c605ddcf63c9
+  metadata.gz: a2ca6b80894e80f19e886100bc1d243046f866eeb2ae14a8f386bfe512f9f762
+  data.tar.gz: 0ce25e6f0aa5fca6177c998366c2eae8b46f3e9f4da42ac0b4be3ffa59e13b3c
 SHA512:
-  metadata.gz: b27a7b09db45fa03dc9f9aca9b39d7b1b941f155ad12c821b87d7de5ff581310bda534d211b19105a7fbdeffeefd58163e5f296944342bdf5a73933d2839bc99
-  data.tar.gz: 0ffac4252bf8df6c13e7a0111aaf84bb3ed6e1eb2ad8a8086bd372b3ba660534a01afda812a9be180c419377e25acd775aa0b8020b775d0885bb2bfdf5203a23
+  metadata.gz: 82bb0343f22fce3b166bb3b94770941514cb591e4cc4c4fc91d72204239bb68c2ce7f27147b39aabdbfd0ab0e608cb548bb47719f0449e15c76485664ed79bf8
+  data.tar.gz: 5897bd1d4e07244b268e90d872e4be802967f7268da98647ad6a5898a15d50ffc56ff784dbd176de2483830097db51cf8e049f70ab55344780ceb4eb3eb6e069

data/lib/mixlib/shellout/helper.rb

@@ -143,14 +143,21 @@ module Mixlib
 
       # Join arguments into a string.
       #
-      # If the argument ends with a whitespace, use it as-is. Otherwise, add
-      # a space at the end
+      # Strips leading/trailing spaces from each argument. If an argument contains
+      # a space, it is quoted. Join into a single string with spaces between each argument.
       #
       # @param args [String] variable number of string arguments
       # @return [String] merged string
       #
-      def __join_whitespace(*args)
-        args.flatten.map { |e| e + (e.rstrip == e ? " " : "") }.join
+      def __join_whitespace(*args, quote: false)
+        args.map do |arg|
+          if arg.is_a?(Array)
+            __join_whitespace(*arg, quote: arg.count > 1)
+          else
+            arg = arg.include?(" ") ? sprintf('"%s"', arg) : arg if quote
+            arg.strip
+          end
+        end.join(" ")
       end
 
       def __shell_out_command(*args, **options)
@@ -165,7 +172,7 @@ module Mixlib
             if options[:input]
               command.concat "<<'COMMANDINPUT'\n"
               command.concat __join_whitespace(options[:input])
-              command.concat "COMMANDINPUT\n"
+              command.concat "\nCOMMANDINPUT\n"
             end
           end
 

data/lib/mixlib/shellout/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class ShellOut
-    VERSION = "3.3.3".freeze
+    VERSION = "3.3.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-shellout
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.6
 platform: universal-mingw32
 authors:
 - Chef Software Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-utils