win32-process 0.5.3 → 0.5.4

data/CHANGES

@@ -1,3 +1,11 @@
+== 0.5.4 - 23-Nov-2007
+* Changed ProcessError to Process::Error.
+* Now requires windows-pr 0.7.3 or later because of some reorganization in
+  that library with regards to thread functions.
+* Better cleanup of HANDLE's in a couple methods when failure occurs.
+* Added an additional require/include necessitated by a change in the method
+  organization in the windows-pr library.
+
 == 0.5.3 - 29-Jul-2007
 * Added a Rakefile with tasks for installation and testing.
 * Removed the install.rb file (now handled by the Rakefile).

data/lib/win32/process.rb

@@ -1,17 +1,19 @@
 require 'windows/error'
 require 'windows/process'
+require 'windows/thread'
 require 'windows/synchronize'
 require 'windows/handle'
 require 'windows/library'
 require 'windows/console'
 require 'windows/window'
 
-class ProcessError < RuntimeError; end
-
 module Process
-   WIN32_PROCESS_VERSION = '0.5.3'
+   class Error < RuntimeError; end
+   
+   WIN32_PROCESS_VERSION = '0.5.4'
    
    include Windows::Process
+   include Windows::Thread
    include Windows::Error
    include Windows::Library
    include Windows::Console
@@ -20,6 +22,7 @@ module Process
    include Windows::Window
    extend Windows::Error
    extend Windows::Process
+   extend Windows::Thread
    extend Windows::Synchronize
    extend Windows::Handle
    extend Windows::Library
@@ -46,14 +49,16 @@ module Process
       handle = OpenProcess(PROCESS_ALL_ACCESS, 0, pid)
       
       if handle == INVALID_HANDLE_VALUE
-         raise ProcessError, get_last_error
+         raise Error, get_last_error
       end
       
       # TODO: update the $? global variable (if/when possible)
       status = WaitForSingleObject(handle, INFINITE)
       
       unless GetExitCodeProcess(handle, exit_code)
-         raise ProcessError, get_last_error
+         error = get_last_error
+         CloseHandle(handle)
+         raise Error, error
       end
       
       CloseHandle(handle)
@@ -76,14 +81,16 @@ module Process
       handle    = OpenProcess(PROCESS_ALL_ACCESS, 0, pid)
       
       if handle == INVALID_HANDLE_VALUE
-         raise ProcessError, get_last_error
+         raise Error, get_last_error
       end
       
       # TODO: update the $? global variable (if/when possible)
       status = WaitForSingleObject(handle, INFINITE)
       
       unless GetExitCodeProcess(handle, exit_code)
-         raise ProcessError, get_last_error
+         error = get_last_error
+         CloseHandle(handle)
+         raise Error, errorast_error
       end
       
       CloseHandle(handle)
@@ -124,7 +131,7 @@ module Process
          when 0..9
             # Do nothing
          else
-            raise ProcessError, "Invalid signal '#{signal}'"
+            raise Error, "Invalid signal '#{signal}'"
       end
       
       killed_pids = []
@@ -153,7 +160,7 @@ module Process
                   if GetLastError() == ERROR_ACCESS_DENIED
                      killed_pids.push(pid)
                   else
-                     raise ProcessError, get_last_error
+                     raise Error, get_last_error
                   end
                end
             when 2
@@ -170,7 +177,7 @@ module Process
                   killed_pids.push(pid)
                   @child_pids.delete(pid)           
                else
-                  raise ProcessError, get_last_error
+                  raise Error, get_last_error
                end
             else
                if handle != 0
@@ -195,10 +202,10 @@ module Process
                      @child_pids.delete(pid)
                   else
                      CloseHandle(handle)
-                     raise ProcessError, get_last_error
+                     raise Error, get_last_error
                   end
                else
-                  raise ProcessError, get_last_error
+                  raise Error, get_last_error
                end
                @child_pids.delete(pid)
          end
@@ -211,7 +218,7 @@ module Process
    # 
    # This is a wrapper for the CreateProcess() function.  It executes a process,
    # returning a ProcessInfo struct.  It accepts a hash as an argument.
-   # There are six primary keys:
+   # There are eight primary keys:
 	#
    # * app_name         (mandatory)
    # * inherit          (default: false)
@@ -287,7 +294,7 @@ module Process
       args.each{ |key, val|
          key = key.to_s.downcase
          unless valid_keys.include?(key)
-            raise ProcessError, "invalid key '#{key}'"
+            raise Error, "invalid key '#{key}'"
          end
          
          # Convert true to 1 and nil/false to 0.
@@ -308,7 +315,7 @@ module Process
          hash['startup_info'].each{ |key, val|
             key = key.to_s.downcase
             unless valid_si_keys.include?(key)
-               raise ProcessError, "invalid startup_info key '#{key}'"
+               raise Error, "invalid startup_info key '#{key}'"
             end
             si_hash[key] = val
          }
@@ -316,7 +323,7 @@ module Process
       
       # The +app_name+ key is mandatory
       unless hash['app_name']
-         raise ProcessError, 'app_name must be specified'
+         raise Error, 'app_name must be specified'
       end
       
       # The environment string should be passed as a string of ';' separated
@@ -357,7 +364,7 @@ module Process
             end
             
             if handle == INVALID_HANDLE_VALUE
-               raise ProcessError, get_last_error
+               raise Error, get_last_error
             end
             
             si_hash[io] = handle
@@ -397,7 +404,7 @@ module Process
       )
       
       unless bool
-         raise ProcessError, "CreateProcess() failed: ", get_last_error
+         raise Error, "CreateProcess() failed: ", get_last_error
       end
       
       ProcessInfo.new(
@@ -430,7 +437,7 @@ module Process
          
          if handles[i] == INVALID_HANDLE_VALUE
             err = "unable to get HANDLE on process associated with pid #{pid}"
-            raise ProcessError, err
+            raise Error, err
          end
          
          unless defined? GetProcessId
@@ -485,7 +492,7 @@ module Process
          
          if handles[i] == INVALID_HANDLE_VALUE
             err = "unable to get HANDLE on process associated with pid #{pid}"
-            raise ProcessError, err
+            raise Error, err
          end
          
          unless defined? GetProcessId
@@ -565,7 +572,7 @@ module Process
       rv = CreateProcess(0, cmd, 0, 0, 1, 0, 0, 0, startinfo, procinfo)
       
       if rv == 0
-         raise ProcessError, get_last_error
+         raise Error, get_last_error
       end
       
       pid = procinfo[8,4].unpack('L').first
@@ -577,6 +584,9 @@ module Process
    module_function :kill, :wait, :wait2, :waitpid, :waitpid2, :create, :fork
 end
 
+# For backwards compatibility. Deprecated.
+ProcessError = Process::Error
+
 # Create a global fork method
 module Kernel
    def fork(&block)

data/test/tc_process.rb

@@ -43,7 +43,7 @@ class TC_Win32Process < Test::Unit::TestCase
    end
   
    def test_version
-      assert_equal('0.5.3', Process::WIN32_PROCESS_VERSION)
+      assert_equal('0.5.4', Process::WIN32_PROCESS_VERSION)
    end
    
    def test_kill
@@ -52,8 +52,8 @@ class TC_Win32Process < Test::Unit::TestCase
    
    def test_kill_expected_errors
       assert_raises(ArgumentError){ Process.kill }
-      assert_raises(ProcessError){ Process.kill('SIGBOGUS') }
-      assert_raises(ProcessError){ Process.kill(0,9999999) }
+      assert_raises(Process::Error){ Process.kill('SIGBOGUS') }
+      assert_raises(Process::Error){ Process.kill(0,9999999) }
    end
    
    def test_kill_signal_0
@@ -92,7 +92,9 @@ class TC_Win32Process < Test::Unit::TestCase
    
    def test_create_expected_errors
       assert_raises(TypeError){ Process.create("bogusapp.exe") }
-      assert_raises(ProcessError){ Process.create(:app_name => "bogusapp.exe") }
+      assert_raises(Process::Error){
+         Process.create(:app_name => "bogusapp.exe")
+      }
    end
    
    def test_wait

data/win32-process.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |gem|
    gem.name        = "win32-process"
-   gem.version     = "0.5.3"
+   gem.version     = "0.5.4"
    gem.author      = "Daniel J. Berger"
    gem.email       = "djberg96@gmail.com"
    gem.homepage    = "http://www.rubyforge.org/projects/win32utils"
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |gem|
    gem.files.reject! { |fn| fn.include? "CVS" }
    gem.require_path = "lib"
    gem.extra_rdoc_files = ["README", "CHANGES", "MANIFEST"]
-   gem.add_dependency("windows-pr", ">= 0.5.2")
+   gem.add_dependency("windows-pr", ">= 0.7.3")
 end
 
 if $0 == __FILE__

metadata

@@ -1,38 +1,40 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: win32-process
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
-date: 2007-07-29 00:00:00 -06:00
-summary: Adds fork, wait, wait2, waitpid, waitpid2 and a special kill method
-require_paths: 
-- lib
-email: djberg96@gmail.com
-homepage: http://www.rubyforge.org/projects/win32utils
-rubyforge_project: 
-description: Adds fork, wait, wait2, waitpid, waitpid2 and a special kill method
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.5.4
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Daniel J. Berger
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2007-11-23 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: windows-pr
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.3
+    version: 
+description: Adds fork, wait, wait2, waitpid, waitpid2 and a special kill method
+email: djberg96@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- CHANGES
+- MANIFEST
 files: 
 - lib/win32/process.rb
 - test/CVS
 - test/tc_process.rb
-- test/tc_process.rb~
 - CHANGES
 - CVS
 - examples
@@ -42,27 +44,31 @@ files:
 - README
 - test
 - win32-process.gemspec
-test_files: 
-- test/tc_process.rb
+has_rdoc: true
+homepage: http://www.rubyforge.org/projects/win32utils
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- CHANGES
-- MANIFEST
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: windows-pr
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.5.2
-    version: 
+rubyforge_project: 
+rubygems_version: 0.9.5
+signing_key: 
+specification_version: 2
+summary: Adds fork, wait, wait2, waitpid, waitpid2 and a special kill method
+test_files: 
+- test/tc_process.rb

data/test/tc_process.rb~

@@ -1,134 +0,0 @@
-###############################################################################
-# tc_process.rb
-#
-# Test suite for the win32-process package.  This test suite will start
-# at least two instances of Notepad on your system, which will then
-# be killed. Requires the sys-proctable package.
-#
-# I haven't added a lot of test cases for fork/wait because it's difficult
-# to run such tests without causing havoc with TestUnit itself.  Ideas
-# welcome.
-###############################################################################
-Dir.chdir('..') if File.basename(Dir.pwd) == 'test'
-$LOAD_PATH.unshift Dir.pwd
-$LOAD_PATH.unshift Dir.pwd + '/lib'
-Dir.chdir('test') rescue nil
-
-require 'test/unit'
-require 'win32/process'
-
-begin
-   require 'sys/proctable'
-rescue LoadError => e
-   site = 'http://www.rubyforge.org/projects/sysutils'
-   STDERR.puts "Stopping!"
-   STDERR.puts "The sys/proctable module is required to run this test suite."
-   STDERR.puts "You can find it at #{site} or the RAA"
-   exit!
-end   
-
-include Sys
-
-IO.popen("notepad")
-IO.popen("notepad")
-sleep 1
-
-$pids = []
-ProcTable.ps{ |s|
-   next unless s.comm =~ /notepad/i
-   $pids.push(s.pid)
-}
-
-class TC_Win32Process < Test::Unit::TestCase  
-   def setup
-      @pids = $pids
-      @pid = nil
-   end
-  
-   def test_version
-      assert_equal('0.5.3', Process::WIN32_PROCESS_VERSION)
-   end
-   
-   def test_kill
-      assert_respond_to(Process, :kill)
-   end
-   
-   def test_kill_expected_errors
-      assert_raises(ArgumentError){ Process.kill }
-      assert_raises(ProcessError){ Process.kill('SIGBOGUS') }
-      assert_raises(ProcessError){ Process.kill(0,9999999) }
-   end
-   
-   def test_kill_signal_0
-      pid = @pids.first
-      assert_nothing_raised{ Process.kill(0, pid) }
-   end
-   
-   def test_kill_signal_1
-      pid = @pids.shift
-      assert_nothing_raised{ Process.kill(1, pid) }
-   end
-   
-   def test_kill_signal_9
-      pid = @pids.pop
-      msg = "Could not find pid #{pid}"
-      assert_nothing_raised(msg){ Process.kill(9,pid) }
-   end
-
-   def test_fork
-      assert_respond_to(Process, :fork)
-   end
-      	
-   def test_create
-      assert_respond_to(Process, :create)
-      assert_nothing_raised{
-         @pid = Process.create(
-            :app_name         => "notepad.exe",
-            :creation_flags   => Process::DETACHED_PROCESS,
-            :process_inherit  => false,
-            :thread_inherit   => true,
-            :cwd              => "C:\\"
-         ).process_id
-      }
-      assert_nothing_raised{ Process.kill(1, @pid) }
-   end
-   
-   def test_create_expected_errors
-      assert_raises(TypeError){ Process.create("bogusapp.exe") }
-      assert_raises(ProcessError){ Process.create(:app_name => "bogusapp.exe") }
-   end
-   
-   def test_wait
-      assert_respond_to(Process, :wait)
-   end
-   
-   def test_wait2
-      assert_respond_to(Process, :wait2)
-   end
-   
-   def test_waitpid
-      assert_respond_to(Process, :waitpid)
-   end
-   
-   def test_waitpid2
-      assert_respond_to(Process, :waitpid2)
-   end
-  	
-   def test_creation_constants
-      assert_not_nil(Process::CREATE_DEFAULT_ERROR_MODE)
-      assert_not_nil(Process::CREATE_NEW_CONSOLE)
-      assert_not_nil(Process::CREATE_NEW_PROCESS_GROUP)
-      assert_not_nil(Process::CREATE_NO_WINDOW)
-      assert_not_nil(Process::CREATE_SEPARATE_WOW_VDM)
-      assert_not_nil(Process::CREATE_SHARED_WOW_VDM)
-      assert_not_nil(Process::CREATE_SUSPENDED)
-      assert_not_nil(Process::CREATE_UNICODE_ENVIRONMENT)
-      assert_not_nil(Process::DEBUG_ONLY_THIS_PROCESS)
-      assert_not_nil(Process::DEBUG_PROCESS)
-      assert_not_nil(Process::DETACHED_PROCESS)
-   end
-   
-   def teardown
-      @pids = []
-   end     
-end