mixlib-shellout 2.2.2-universal-mingw32 → 2.2.3-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cadbef0918a7fec08ca405f56a5cd329f54660ca
-  data.tar.gz: baf26f7055af2c88854e9ea08f903cba4b433181
+  metadata.gz: 0fe50b48e3831e8cee3693baca5b59de3365f7d6
+  data.tar.gz: b9fbbf0761c40d333de217178f8bcc54a3722cbe
 SHA512:
-  metadata.gz: b0b1948708503dd9d9d78eaee8ef82482a13460f6f4af30dd533fa861c6e3d8af0f387df7e70d3eb7eeab3f6eda81121aac7c2bf0c9b0695b0a1a71d53be820b
-  data.tar.gz: aaf5ba1761ff3fe90afbd6f2b40fae823fff038dded0648b36269c7225f140355b15eb7cc72235d047879e156e72ab32225182af7e9881f127d54a7435c17a9c
+  metadata.gz: 6c8618cf2e31b4215aac4278fd6a793d9c38aa40edbf6291dbf3c4e4bac3f20afa9d39f29640427207f958c2e7d82cb7016dc5b0469c6a923178d3dbf3eaea50
+  data.tar.gz: 6242df9234b5dda6a68a89dfed789244b3b0e3d362801ca419d07c361b56497246d5a0b382b7f06136688d00ce20ad3ce0ffef8714779a362108604b6344ba22

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: universal-mingw32
 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
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: wmi-lite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Run external commands on Unix or Windows
 email: info@opscode.com
 executables: []
@@ -77,8 +91,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: