mixlib-shellout 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 304f772cea76b9913e4354ee216f9171d89df4b0
-  data.tar.gz: a6d5cf525447578c32e64aaed36d64a322e103e4
+  metadata.gz: b4bc17fff8cee2442b8d414c7d05b375c136496b
+  data.tar.gz: 4ddd98eac40ec5f6ac45325662e768752c542f51
 SHA512:
-  metadata.gz: 69933eb3b6dbb1f9877e1b1c7eacd3062426d30482917217b597584241e2c0582cbc3822a3e35e81248ab2b1c2ec1c492bdc72fe6724a98f43ed6d68d33d8f3e
-  data.tar.gz: 2333d801858fa0a2dffca808a900ca7d0570dfeb5acc889914eb91f03c4f3a9d7b5d1dba31456b904d1d37570e1e2bf3cecb3fecdd1fb8c4f6c64e798f1209fc
+  metadata.gz: be5543b10efabb6cb3ed54cf977616624b7b7b7fefaf3ad5e7aa354c583254b378c3b8423575348d92832e79ad92b2b90463086820948dd2a91a078a16293cc1
+  data.tar.gz: af9a2b0c953e05c00d94e9b4f80a92c1ca29dbcccab448af91f63ce0c34d8f0190a2ece6ba6cc08136f26099c409a975f48f2e954758b5676c96caefbca42069

data/lib/mixlib/shellout/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class ShellOut
-    VERSION = "2.2.2"
+    VERSION = "2.2.3"
   end
 end

data/lib/mixlib/shellout/windows.rb

@@ -43,7 +43,6 @@ module Mixlib
       # Missing lots of features from the UNIX version, such as
       # uid, etc.
       def run_command
-
         #
         # Create pipes to capture stdout and stderr,
         #
@@ -79,6 +78,7 @@ module Mixlib
           # Start the process
           #
           process = Process.create(create_process_args)
+          logger.debug(Utils.format_process(process, app_name, command_line, timeout)) if logger
           begin
             # Start pushing data into input
             stdin_write << input if input
@@ -107,12 +107,19 @@ module Mixlib
                 # Kill the process
                 if (Time.now - start_wait) > timeout
                   begin
+                    require 'wmi-lite/wmi'
+                    wmi = WmiLite::Wmi.new
+                    Utils.kill_process_tree(process.process_id, wmi, logger)
                     Process.kill(:KILL, process.process_id)
-                  rescue Errno::EIO
+                  rescue Errno::EIO, SystemCallError
                     logger.warn("Failed to kill timed out process #{process.process_id}") if logger
                   end
 
-                  raise Mixlib::ShellOut::CommandTimeout, "command timed out:\n#{format_for_exception}"
+                  raise Mixlib::ShellOut::CommandTimeout, [
+                    "command timed out:",
+                    format_for_exception,
+                    Utils.format_process(process, app_name, command_line, timeout)
+                  ].join("\n")
                 end
 
                 consume_output(open_streams, stdout_read, stderr_read)
@@ -313,6 +320,42 @@ module Mixlib
         def self.executable?(path)
           File.executable?(path) && !File.directory?(path)
         end
+
+        # recursively kills all child processes of given pid
+        # calls itself querying for children child procs until
+        # none remain. Important that a single WmiLite instance
+        # is passed in since each creates its own WMI rpc process
+        def self.kill_process_tree(pid, wmi, logger)
+          wmi.query("select * from Win32_Process where ParentProcessID=#{pid}").each do |instance|
+            child_pid = instance.wmi_ole_object.processid
+            kill_process_tree(child_pid, wmi, logger)
+            begin
+              logger.debug([
+                "killing child process #{child_pid}::",
+                "#{instance.wmi_ole_object.Name} of parent #{pid}"
+                ].join) if logger
+              kill_process(instance)
+            rescue Errno::EIO, SystemCallError
+              logger.debug([
+                "Failed to kill child process #{child_pid}::",
+                "#{instance.wmi_ole_object.Name} of parent #{pid}"
+              ].join) if logger
+            end
+          end
+        end
+
+        def self.kill_process(instance)
+          Process.kill(:KILL, instance.wmi_ole_object.processid)
+        end
+
+        def self.format_process(process, app_name, command_line, timeout)
+          msg = []
+          msg << "ProcessId: #{process.process_id}"
+          msg << "app_name: #{app_name}"
+          msg << "command_line: #{command_line}"
+          msg << "timeout: #{timeout}"
+          msg.join("\n")
+        end
       end
     end # class
   end

data/mixlib-shellout-windows.gemspec

@@ -3,5 +3,6 @@ gemspec = eval(File.read(File.expand_path("../mixlib-shellout.gemspec", __FILE__
 gemspec.platform = Gem::Platform.new(["universal", "mingw32"])
 
 gemspec.add_dependency "win32-process", "~> 0.8.2"
+gemspec.add_dependency "wmi-lite", "~> 1.0"
 
 gemspec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-shellout
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Opscode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -63,8 +63,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Run external commands on Unix or Windows
 test_files: []
+has_rdoc: