mixlib-shellout 3.2.7 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c70c0efff260d729cbd9ed200fb824c14ec521fc57fcf58d66fe53f21b2c0fe1
-  data.tar.gz: 2c340db1c7c3529f9fe321a3ff2b42c2fd7d1be64b424abc6726caa27e9cae85
+  metadata.gz: 75b13c5009a1396aa337d88ed6f510b35f0a31facbefc2abfbf2b0d467d8f40c
+  data.tar.gz: '0807d12b7d09345a96355dc1d835d8bbad269d690771306b14604e186a995a43'
 SHA512:
-  metadata.gz: 2fe9a96aaa123f871454b4db107be1ae76fd584a80474917618e34ab4f67e6cf495ebaf86f22176d3835ca6a92391c6252413ca7e9d7c87fbd577468db85672e
-  data.tar.gz: 9d4f203cfa208c0714323b8cc723fc9e3c02b99f4165b6bfed04de7114c53f950768ed73d37999fdb50ec68da5405aad225967fe80b0e69a94cc8b5b14ea7562
+  metadata.gz: 7300a1de75daa21a4f93e91eecd17ac99c010b6cbee2817b5bef6f3c9a008bc1c360fa15b0a2fa9df69ae128878ad126dfdb00f70f80064333987c2332039796
+  data.tar.gz: f90c59e72a231eaebdf59885702036d01fbb138b4d90639811e72312ba7ffcc6a9274d98a810b33b862c6e274fa0f2b068fe88caeefa7667458a6810117e1765

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: ruby
 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
@@ -57,7 +57,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