mixlib-shellout 3.2.8-universal-mingw32 → 3.3.4-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ecae29284f78e58c184f2ef87e800f05d08f7146910b35626b52577d20557a7
-  data.tar.gz: a37029ce24c884aecc29916c4a723bce7aa1a52cf297bf0e0ec169b41ae7d76a
+  metadata.gz: 5ce03266c7c25e063524e1ea83e431a15a0bbe8613b23bc11f0f2f4d5e8e7973
+  data.tar.gz: de2b250d95c976d0bf057ae0a1aff77e945a4db9b02a3afc3de0d9db80ce5c1e
 SHA512:
-  metadata.gz: 3ca9c04dd881a615f25398d1e9d3f96e9712153b4c6e41ede5a6d9c8c3df4f60a6b97f586cf984b8237cb8fef3a0bdc0935804745a32cacc5f281299fa1b5f91
-  data.tar.gz: e5f5b8272ea0222d70cb5a859b88a91c9c457ca8a2595676d2f8b648d31dcf10f871b28d506e06c7c7b14ed170611d4b7cbed04f0ffa7870b1cf61d0a0382afa
+  metadata.gz: 067133c65ac5941022338b606481fddba6f7b98a7807a656d9d23e9a1b2ca8d6bdf8288164034ed02db294247e901f03d56f5d5a164514ee3f62cdc0511b7c04
+  data.tar.gz: f83b79d951da8abfa8655c8c96bdfbdffb3be738c385963926402af0d072976b1556dfa868f02c243cb2269baf9798f36189932a20e9cd2309ed8bc08616f35c

data/lib/mixlib/shellout/helper.rb

@@ -141,9 +141,39 @@ module Mixlib
         args.flatten.compact.map(&:to_s)
       end
 
+      # Join arguments into a string.
+      #
+      # 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 do |arg|
+          arg.strip!
+          arg.include?(" ") ? sprintf('"%s"', arg) : arg
+        end.join(" ")
+      end
+
       def __shell_out_command(*args, **options)
         if __transport_connection
-          FakeShellOut.new(args, options, __transport_connection.run_command(args.join(" "))) # FIXME: train should accept run_command(*args)
+          command = __join_whitespace(args)
+          unless ChefUtils.windows?
+            if options[:cwd]
+              # as `timeout` is used, commands need to be executed in a subshell
+              command = "sh -c 'cd #{options[:cwd]}; #{command}'"
+            end
+
+            if options[:input]
+              command.concat "<<'COMMANDINPUT'\n"
+              command.concat __join_whitespace(options[:input])
+              command.concat "COMMANDINPUT\n"
+            end
+          end
+
+          # FIXME: train should accept run_command(*args)
+          FakeShellOut.new(args, options, __transport_connection.run_command(command, options))
         else
           cmd = if options.empty?
                   Mixlib::ShellOut.new(*args)
@@ -181,15 +211,16 @@ module Mixlib
           @stdout = result.stdout
           @stderr = result.stderr
           @exitstatus = result.exit_status
-          @status = OpenStruct.new(success?: ( exitstatus == 0 ))
+          @valid_exit_codes = Array(options[:returns] || 0)
+          @status = OpenStruct.new(success?: (@valid_exit_codes.include? exitstatus))
         end
 
         def error?
-          exitstatus != 0
+          @valid_exit_codes.none?(exitstatus)
         end
 
         def error!
-          raise Mixlib::ShellOut::ShellCommandFailed, "Unexpected exit status of #{exitstatus} running #{@args}" if error?
+          raise Mixlib::ShellOut::ShellCommandFailed, "Unexpected exit status of #{exitstatus} running #{@args}: #{stderr}" if error?
         end
       end
     end

data/lib/mixlib/shellout/unix.rb

@@ -20,11 +20,6 @@ module Mixlib
   class ShellOut
     module Unix
 
-      # "1.8.7" as a frozen string. We use this with a hack that disables GC to
-      # avoid segfaults on Ruby 1.8.7, so we need to allocate the fewest
-      # objects we possibly can.
-      ONE_DOT_EIGHT_DOT_SEVEN = "1.8.7".freeze
-
       # Option validation that is unix specific
       def validate_options(opts)
         if opts[:elevated]
@@ -99,12 +94,6 @@ module Mixlib
 
         configure_parent_process_file_descriptors
 
-        # Ruby 1.8.7 and 1.8.6 from mid 2009 try to allocate objects during GC
-        # when calling IO.select and IO#read. Disabling GC works around the
-        # segfault, but obviously it's a bad workaround. We no longer support
-        # 1.8.6 so we only need this hack for 1.8.7.
-        GC.disable if RUBY_VERSION == ONE_DOT_EIGHT_DOT_SEVEN
-
         # CHEF-3390: Marshall.load on Ruby < 1.8.7p369 also has a GC bug related
         # to Marshall.load, so try disabling GC first.
         propagate_pre_exec_failure

data/lib/mixlib/shellout/version.rb

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

data/lib/mixlib/shellout/windows.rb

@@ -60,6 +60,7 @@ module Mixlib
         stderr_read, stderr_write = IO.pipe
         stdin_read, stdin_write = IO.pipe
         open_streams = [ stdout_read, stderr_read ]
+        @execution_time = 0
 
         begin
 
@@ -105,6 +106,8 @@ module Mixlib
               wait_status = WaitForSingleObject(process.process_handle, 0)
               case wait_status
               when WAIT_OBJECT_0
+                # Save the execution time
+                @execution_time = Time.now - start_wait
                 # Get process exit code
                 exit_code = [0].pack("l")
                 unless GetExitCodeProcess(process.process_handle, exit_code)
@@ -127,6 +130,9 @@ module Mixlib
                     logger&.warn("Failed to kill timed out process #{process.process_id}")
                   end
 
+                  # Save the execution time
+                  @execution_time = Time.now - start_wait
+
                   raise Mixlib::ShellOut::CommandTimeout, [
                     "command timed out:",
                     format_for_exception,

metadata

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