mixlib-shellout 3.3.4-x64-mingw-ucrt → 3.3.8-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8789e8a7e29294efe48b370f762e0ba347cc08779a1ebd2e087c1ae434c464ea
-  data.tar.gz: 3c2ac142acb8d1dd8e4966daaef3a3026005346e996cafa19dacc3d0d1ef3255
+  metadata.gz: b84ca3d9ea62bbabc402ac741dcda9eff32495378a27c27fa0ec0fef6076b887
+  data.tar.gz: 8cc11e8c014e0b77d67b273c6117d4163b09f5e7614850873dd8f9d62168fd56
 SHA512:
-  metadata.gz: 755126fd263dbcb3ac582ec9f40b9e6a8937d6ed13e4621814b410adea18af6cdfaba089b65ac2a6c2d6987c4296b034be9438fbca331f8d79f0cbcfcbc3fa2b
-  data.tar.gz: a63cb8adc5c005a104dbf6786eda1e66898012b29611623c4806f94b601ef11db8d5f3db1d4eb6a1142a7b14a06b5afa387488f7357cfa5b2ecbdb93f63bf468
+  metadata.gz: b0bee8a9ff62a013149b920b10f7eda9d51bc2d65345ecca5b5c3e449cc462dbe3addb161f1c8953372ffb4093aaf40db148296ce21b7acba84b1c01b39c8bd7
+  data.tar.gz: 909d566f81db461a35287e82cac8c3a5595046bda3c305c7deb2ed2f97ff5408f54d116c709fab5b2aa61d26ab28e5c4382204b3dcf90b606890d111aa45301f

data/lib/mixlib/shellout/helper.rb

@@ -149,10 +149,14 @@ module Mixlib
       # @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
+      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
 
@@ -168,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/unix.rb

@@ -16,6 +16,8 @@
 # limitations under the License.
 #
 
+require "fileutils" unless defined?(FileUtils)
+
 module Mixlib
   class ShellOut
     module Unix
@@ -131,7 +133,7 @@ module Mixlib
         reap_errant_child if should_reap?
         # make one more pass to get the last of the output after the
         # child process dies
-        attempt_buffer_read
+        attempt_buffer_read(0)
         # no matter what happens, turn the GC back on, and hope whatever busted
         # version of ruby we're on doesn't allocate some objects during the next
         # GC run.
@@ -176,6 +178,16 @@ module Mixlib
         Dir.chdir(cwd) if cwd
       end
 
+      def set_cgroup
+        new_cgroup_path = "/sys/fs/cgroup/#{cgroup}"
+        # Create cgroup if missing
+        unless Dir.exist?(new_cgroup_path)
+          FileUtils.mkdir_p new_cgroup_path
+        end
+        # Migrate current process to newly cgroup, any subprocesses will run inside new cgroup
+        File.write("#{new_cgroup_path}/cgroup.procs", Process.pid.to_s)
+      end
+
       # Since we call setsid the child_pgid will be the child_pid, set to negative here
       # so it can be directly used in arguments to kill, wait, etc.
       def child_pgid
@@ -265,8 +277,8 @@ module Mixlib
         child_stdin.close # Kick things off
       end
 
-      def attempt_buffer_read
-        ready = IO.select(open_pipes, nil, nil, READ_WAIT_TIME)
+      def attempt_buffer_read(timeout = READ_WAIT_TIME)
+        ready = IO.select(open_pipes, nil, nil, timeout)
         if ready
           read_stdout_to_buffer if ready.first.include?(child_stdout)
           read_stderr_to_buffer if ready.first.include?(child_stderr)
@@ -304,6 +316,10 @@ module Mixlib
         open_pipes.delete(child_process_status)
       end
 
+      def cgroupv2_available?
+        File.read("/proc/mounts").match?(%r{^cgroup2 /sys/fs/cgroup})
+      end
+
       def fork_subprocess
         initialize_ipc
 
@@ -321,6 +337,10 @@ module Mixlib
 
           configure_subprocess_file_descriptors
 
+          if cgroup && cgroupv2_available?
+            set_cgroup
+          end
+
           set_secondarygroups
           set_group
           set_user

data/lib/mixlib/shellout/version.rb

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

data/lib/mixlib/shellout.rb

@@ -114,6 +114,9 @@ module Mixlib
 
     attr_accessor :sensitive
 
+    # Path to cgroupv2 that the process should run on
+    attr_accessor :cgroup
+
     # === Arguments:
     # Takes a single command, or a list of command fragments. These are used
     # as arguments to Kernel.exec. See the Kernel.exec documentation for more
@@ -179,6 +182,7 @@ module Mixlib
       @timeout = nil
       @elevated = false
       @sensitive = false
+      @cgroup = nil
 
       if command_args.last.is_a?(Hash)
         parse_options(command_args.pop)
@@ -303,7 +307,8 @@ module Mixlib
     def inspect
       "<#{self.class.name}##{object_id}: command: '#{@command}' process_status: #{@status.inspect} " +
         "stdout: '#{stdout.strip}' stderr: '#{stderr.strip}' child_pid: #{@child_pid.inspect} " +
-        "environment: #{@environment.inspect} timeout: #{timeout} user: #{@user} group: #{@group} working_dir: #{@cwd} >"
+        "environment: #{@environment.inspect} timeout: #{timeout} user: #{@user} group: #{@group} working_dir: #{@cwd} " +
+        "cgroup: #{@cgroup} >"
     end
 
     private
@@ -354,6 +359,8 @@ module Mixlib
           self.elevated = setting
         when "sensitive"
           self.sensitive = setting
+        when "cgroup"
+          self.cgroup = setting
         else
           raise InvalidCommandOption, "option '#{option.inspect}' is not a valid option for #{self.class.name}"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-shellout
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.3.8
 platform: x64-mingw-ucrt
 authors:
 - Chef Software Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2025-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-utils