mixlib-shellout 3.2.7-universal-mingw32 → 3.3.3-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 322a0c09e04745ce5877340b00904669c65578b78e2bbbd3045bcf97b97005e3
-  data.tar.gz: dab21498740161cba2fa1baa7b2db4e461967732b9832b8c086bca54e8453523
+  metadata.gz: 3ffdff3b2db45006adab99c670f2059458c840b36b678c1c342c957cbe21e6a7
+  data.tar.gz: 1312451c4439639db479b85a6c827916b6d949c72696a055f454c605ddcf63c9
 SHA512:
-  metadata.gz: fa29831c3a6979b4855575462e1adafd02169f64a549b5339d39d1fa129cdd05e462219db090d228494eecb8d1b11a56358ca1c2b0329817be8d458603ab2b0f
-  data.tar.gz: fd095b907a0c83866ccd00fae9d13c942441395864dfbd85fd116479eb4cffa0a7166ee22645483c4dc52f1cbf3b3d9c1d1ab1afea9e3b64df48e2d68a2b43db
+  metadata.gz: b27a7b09db45fa03dc9f9aca9b39d7b1b941f155ad12c821b87d7de5ff581310bda534d211b19105a7fbdeffeefd58163e5f296944342bdf5a73933d2839bc99
+  data.tar.gz: 0ffac4252bf8df6c13e7a0111aaf84bb3ed6e1eb2ad8a8086bd372b3ba660534a01afda812a9be180c419377e25acd775aa0b8020b775d0885bb2bfdf5203a23

data/lib/mixlib/shellout/helper.rb

@@ -141,9 +141,36 @@ module Mixlib
         args.flatten.compact.map(&:to_s)
       end
 
+      # Join arguments into a string.
+      #
+      # If the argument ends with a whitespace, use it as-is. Otherwise, add
+      # a space at the end
+      #
+      # @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
+      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 +208,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.7".freeze
+    VERSION = "3.3.3".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.7
+  version: 3.3.3
 platform: universal-mingw32
 authors:
 - Chef Software Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-utils
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Run external commands on Unix or Windows