mixlib-shellout 3.3.3 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75b13c5009a1396aa337d88ed6f510b35f0a31facbefc2abfbf2b0d467d8f40c
-  data.tar.gz: '0807d12b7d09345a96355dc1d835d8bbad269d690771306b14604e186a995a43'
+  metadata.gz: 4674064c548531f17b0385e89bbe7c658e03282c6929207f7742257de704ebaf
+  data.tar.gz: 0030753a06bcd1e0d87870c9da3bf3442921006f744fa01b2752643557e1e94e
 SHA512:
-  metadata.gz: 7300a1de75daa21a4f93e91eecd17ac99c010b6cbee2817b5bef6f3c9a008bc1c360fa15b0a2fa9df69ae128878ad126dfdb00f70f80064333987c2332039796
-  data.tar.gz: f90c59e72a231eaebdf59885702036d01fbb138b4d90639811e72312ba7ffcc6a9274d98a810b33b862c6e274fa0f2b068fe88caeefa7667458a6810117e1765
+  metadata.gz: 8530b282f56ddd4e9773267fb600353b5f99453682e4e7fe3a637df90f37d63287cb0574335b9377407627a30107f0dbf786a5626c80cde51d805fdb19311a74
+  data.tar.gz: bfd625a28bc20f1e8711f25c617096db088c6318a764103e507c45b174e5c0a900a86e0d80a179fe6bc89548ebdca2e48d0101d51aa8e18abbd7aff7686c6732

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: ruby
 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