childprocess 0.2.5 → 0.2.6

data/spec/spec_helper.rb

@@ -111,13 +111,21 @@ module ChildProcessSpecHelper
     ruby_process(tmp_script(code))
   end
 
+  def exit_timeout
+    10
+  end
+
 end # ChildProcessSpecHelper
 
 Thread.abort_on_exception = true
 
-RSpec.configure do |config|
-  config.include(ChildProcessSpecHelper)
-  config.after(:each) {
+RSpec.configure do |c|
+  c.include(ChildProcessSpecHelper)
+  c.after(:each) {
     @process && @process.alive? && @process.stop
   }
+
+  if defined?(JRUBY_VERSION)
+    c.filter_run_excluding :jruby => false
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: childprocess
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Jari Bakken
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-04 00:00:00 Z
+date: 2012-01-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +30,11 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  type: :development
+  prerelease: false
+  name: rspec
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +44,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
+  name: yard
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,11 +60,11 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  type: :development
+  prerelease: false
+  name: rake
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: ffi
-  prerelease: false
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,7 +76,8 @@ dependencies:
         - 0
         - 6
         version: 1.0.6
-  type: :runtime
+  prerelease: false
+  name: ffi
   version_requirements: *id004
 description: This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.
 email: 
@@ -111,15 +111,15 @@ files:
 - lib/childprocess/unix/process.rb
 - lib/childprocess/version.rb
 - lib/childprocess/windows.rb
-- lib/childprocess/windows/api.rb
-- lib/childprocess/windows/constants.rb
-- lib/childprocess/windows/functions.rb
 - lib/childprocess/windows/handle.rb
 - lib/childprocess/windows/io.rb
+- lib/childprocess/windows/lib.rb
 - lib/childprocess/windows/process.rb
+- lib/childprocess/windows/process_builder.rb
 - lib/childprocess/windows/structs.rb
 - spec/abstract_io_spec.rb
 - spec/childprocess_spec.rb
+- spec/io_spec.rb
 - spec/jruby_spec.rb
 - spec/pid_behavior.rb
 - spec/spec_helper.rb
@@ -154,15 +154,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: childprocess
-rubygems_version: 1.8.9
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.
 test_files: 
 - spec/abstract_io_spec.rb
 - spec/childprocess_spec.rb
+- spec/io_spec.rb
 - spec/jruby_spec.rb
 - spec/pid_behavior.rb
 - spec/spec_helper.rb
 - spec/unix_spec.rb
 - spec/windows_spec.rb
+has_rdoc: 

data/lib/childprocess/windows/api.rb

@@ -1,59 +0,0 @@
-module ChildProcess
-  module Windows
-    class << self
-      def kill(signal, *pids)
-        case signal
-        when 'SIGINT', 'INT', :SIGINT, :INT
-          signal = WIN_SIGINT
-        when 'SIGBRK', 'BRK', :SIGBREAK, :BRK
-          signal = WIN_SIGBREAK
-        when 'SIGKILL', 'KILL', :SIGKILL, :KILL
-          signal = WIN_SIGKILL
-        when 0..9
-          # Do nothing
-        else
-          raise Error, "invalid signal #{signal.inspect}"
-        end
-
-        pids.map { |pid| pid if send_signal(signal, pid) }.compact
-      end
-
-      def waitpid(pid, flags = 0)
-        wait_for_pid(pid, no_hang?(flags))
-      end
-
-      def waitpid2(pid, flags = 0)
-        code = wait_for_pid(pid, no_hang?(flags))
-
-        [pid, code] if code
-      end
-
-      def dont_inherit(file)
-        unless file.respond_to?(:fileno)
-          raise ArgumentError, "expected #{file.inspect} to respond to :fileno"
-        end
-
-        handle = Lib.handle_for(file.fileno)
-
-        ok = Lib.set_handle_information(handle, HANDLE_FLAG_INHERIT, 0)
-        ok or raise Error, Lib.last_error_message
-      end
-
-      private
-
-      def no_hang?(flags)
-        (flags & Process::WNOHANG) == Process::WNOHANG
-      end
-
-      def wait_for_pid(pid, no_hang)
-        code = Handle.open(pid) { |handle|
-          handle.wait unless no_hang
-          handle.exit_code
-        }
-
-        code if code != PROCESS_STILL_ACTIVE
-      end
-
-    end # class << self
-  end # Windows
-end # ChildProcess

data/lib/childprocess/windows/constants.rb

@@ -1,36 +0,0 @@
-module ChildProcess::Windows
-
-  FORMAT_MESSAGE_FROM_SYSTEM    = 0x00001000
-  FORMAT_MESSAGE_ARGUMENT_ARRAY = 0x00002000
-
-  PROCESS_ALL_ACCESS            = 0x1F0FFF
-  PROCESS_QUERY_INFORMATION     = 0x0400
-  PROCESS_VM_READ               = 0x0010
-  PROCESS_STILL_ACTIVE          = 259
-
-  INFINITE                      = 0xFFFFFFFF
-
-  WIN_SIGINT                    = 2
-  WIN_SIGBREAK                  = 3
-  WIN_SIGKILL                   = 9
-
-  CTRL_C_EVENT                  = 0
-  CTRL_BREAK_EVENT              = 1
-
-  DETACHED_PROCESS              = 0x00000008
-
-  STARTF_USESTDHANDLES          = 0x00000100
-  INVALID_HANDLE_VALUE          = 0xFFFFFFFF
-  HANDLE_FLAG_INHERIT           = 0x00000001
-
-  DUPLICATE_SAME_ACCESS         = 0x00000002
-
-  CREATE_UNICODE_ENVIRONMENT    = 0x00000400
-
-  module Lib
-    enum :wait_status, [ :wait_object_0,  0,
-                         :wait_timeout,   0x102,
-                         :wait_abandoned, 0x80,
-                         :wait_failed,    0xFFFFFFFF ]
-  end # Lib
-end # ChildProcess::Windows

data/lib/childprocess/windows/functions.rb

@@ -1,322 +0,0 @@
-module ChildProcess
-  module Windows
-    module Lib
-
-      def self.create_proc(cmd, opts = {})
-        cmd_ptr = FFI::MemoryPointer.from_string cmd
-        env_ptr = environment_pointer_for(opts[:environment])
-
-        flags   = 0
-        inherit = !!opts[:inherit]
-
-        flags |= DETACHED_PROCESS if opts[:detach]
-
-        si = StartupInfo.new
-        pi = ProcessInfo.new
-
-        if opts[:stdout] || opts[:stderr]
-          si[:dwFlags] ||= 0
-          si[:dwFlags] |= STARTF_USESTDHANDLES
-          inherit = true
-
-          si[:hStdOutput] = handle_for(opts[:stdout].fileno) if opts[:stdout]
-          si[:hStdError]  = handle_for(opts[:stderr].fileno) if opts[:stderr]
-        end
-
-        if opts[:duplex]
-          read_pipe_ptr  = FFI::MemoryPointer.new(:pointer)
-          write_pipe_ptr = FFI::MemoryPointer.new(:pointer)
-          sa             = SecurityAttributes.new(:inherit => true)
-
-          ok = create_pipe(read_pipe_ptr, write_pipe_ptr, sa, 0)
-          ok or raise Error, last_error_message
-
-          read_pipe = read_pipe_ptr.read_pointer
-          write_pipe = write_pipe_ptr.read_pointer
-
-          ok = set_handle_information(write_pipe.address, HANDLE_FLAG_INHERIT, 0)
-          ok or raise Error, last_error_message
-
-          si[:hStdInput] = read_pipe
-        end
-
-        ok = create_process(
-          nil,      # application name
-          cmd_ptr,  # command line
-          nil,      # process attributes
-          nil,      # thread attributes
-          inherit,  # inherit handles
-          flags,    # creation flags
-          env_ptr,  # environment
-          nil,      # current directory
-          si,       # startup info
-          pi        # process info
-        )
-
-        ok or raise LaunchError, last_error_message
-
-        close_handle pi[:hProcess]
-        close_handle pi[:hThread]
-
-        if opts[:duplex]
-          opts[:stdin] = io_for(duplicate_handle(write_pipe), File::WRONLY)
-          close_handle read_pipe
-          close_handle write_pipe
-        end
-
-        pi[:dwProcessId]
-      end
-
-      def self.last_error_message
-        errnum = get_last_error
-        buf = FFI::MemoryPointer.new :char, 512
-
-        size = format_message(
-          FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY,
-          nil, errnum, 0, buf, buf.size, nil
-        )
-
-        str = buf.read_string(size).strip
-        "#{str} (#{errnum})"
-      end
-
-      def self.handle_for(fd_or_io)
-        case fd_or_io
-        when IO
-          handle = get_osfhandle(fd_or_io.fileno)
-        when Fixnum
-          handle = get_osfhandle(fd_or_io)
-        else
-          if fd_or_io.respond_to?(:to_io)
-            io = fd_or_io.to_io
-
-            unless io.kind_of?(IO)
-              raise TypeError, "expected #to_io to return an instance of IO"
-            end
-
-            handle = get_osfhandle(io.fileno)
-          else
-            raise TypeError, "invalid type: #{fd_or_io.inspect}"
-          end
-        end
-
-        if handle == INVALID_HANDLE_VALUE
-          raise Error, last_error_message
-        end
-
-        handle
-      end
-
-      def self.io_for(handle, flags = File::RDONLY)
-        fd = open_osfhandle(handle, flags)
-        if fd == -1
-          raise Error, last_error_message
-        end
-
-        ::IO.for_fd fd, flags
-      end
-
-      def self.duplicate_handle(handle)
-        dup  = FFI::MemoryPointer.new(:pointer)
-        proc = current_process
-
-        ok = _duplicate_handle(
-          proc, handle, proc, dup, 0, false, DUPLICATE_SAME_ACCESS)
-
-        ok or raise Error, last_error_message
-
-        dup.read_pointer
-      ensure
-        close_handle proc
-      end
-
-      def self.environment_pointer_for(env)
-        return unless env.kind_of?(Hash) && env.any?
-
-        strings = ENV.map { |k,v| "#{k}=#{v}\0" }
-        env.each do |key, value|
-          if key.include?("=")
-            raise InvalidEnvironmentVariableName, key
-          end
-
-          strings << "#{key}=#{value}\0"
-        end
-
-        strings << "\0" # terminate the env block
-        env_str = strings.join
-
-        ptr = FFI::MemoryPointer.new(:long, env_str.bytesize)
-        ptr.write_bytes env_str, 0, env_str.bytesize
-
-        ptr
-      end
-
-      #
-      # BOOL WINAPI CreateProcess(
-      #   __in_opt     LPCTSTR lpApplicationName,
-      #   __inout_opt  LPTSTR lpCommandLine,
-      #   __in_opt     LPSECURITY_ATTRIBUTES lpProcessAttributes,
-      #   __in_opt     LPSECURITY_ATTRIBUTES lpThreadAttributes,
-      #   __in         BOOL bInheritHandles,
-      #   __in         DWORD dwCreationFlags,
-      #   __in_opt     LPVOID lpEnvironment,
-      #   __in_opt     LPCTSTR lpCurrentDirectory,
-      #   __in         LPSTARTUPINFO lpStartupInfo,
-      #   __out        LPPROCESS_INFORMATION lpProcessInformation
-      # );
-      #
-
-      attach_function :create_process, :CreateProcessA, [
-                        :pointer,
-                        :pointer,
-                        :pointer,
-                        :pointer,
-                        :bool,
-                        :ulong,
-                        :pointer,
-                        :pointer,
-                        :pointer,
-                        :pointer],
-                        :bool
-
-      #
-      # DWORD WINAPI GetLastError(void);
-      #
-
-      attach_function :get_last_error, :GetLastError, [], :ulong
-
-      #
-      #   DWORD WINAPI FormatMessage(
-      #   __in      DWORD dwFlags,
-      #   __in_opt  LPCVOID lpSource,
-      #   __in      DWORD dwMessageId,
-      #   __in      DWORD dwLanguageId,
-      #   __out     LPTSTR lpBuffer,
-      #   __in      DWORD nSize,
-      #   __in_opt  va_list *Arguments
-      # );
-      #
-
-      attach_function :format_message, :FormatMessageA, [
-                        :ulong,
-                        :pointer,
-                        :ulong,
-                        :ulong,
-                        :pointer,
-                        :ulong,
-                        :pointer],
-                        :ulong
-
-
-      attach_function :close_handle, :CloseHandle, [:pointer], :bool
-
-      #
-      # HANDLE WINAPI OpenProcess(
-      #   __in  DWORD dwDesiredAccess,
-      #   __in  BOOL bInheritHandle,
-      #   __in  DWORD dwProcessId
-      # );
-      #
-
-      attach_function :open_process, :OpenProcess, [:ulong, :bool, :ulong], :pointer
-
-      #
-      # DWORD WINAPI WaitForSingleObject(
-      #   __in  HANDLE hHandle,
-      #   __in  DWORD dwMilliseconds
-      # );
-      #
-
-      attach_function :wait_for_single_object, :WaitForSingleObject, [:pointer, :ulong], :wait_status
-
-      #
-      # BOOL WINAPI GetExitCodeProcess(
-      #   __in   HANDLE hProcess,
-      #   __out  LPDWORD lpExitCode
-      # );
-      #
-
-      attach_function :get_exit_code, :GetExitCodeProcess, [:pointer, :pointer], :bool
-
-      #
-      # BOOL WINAPI GenerateConsoleCtrlEvent(
-      #   __in  DWORD dwCtrlEvent,
-      #   __in  DWORD dwProcessGroupId
-      # );
-      #
-
-      attach_function :generate_console_ctrl_event, :GenerateConsoleCtrlEvent, [:ulong, :ulong], :bool
-
-      #
-      # BOOL WINAPI TerminateProcess(
-      #   __in  HANDLE hProcess,
-      #   __in  UINT uExitCode
-      # );
-      #
-
-      attach_function :terminate_process, :TerminateProcess, [:pointer, :uint], :bool
-
-      #
-      # long _get_osfhandle(
-      #    int fd
-      # );
-      #
-
-      attach_function :get_osfhandle, :_get_osfhandle, [:int], :long
-
-      #
-      # int _open_osfhandle (
-      #    intptr_t osfhandle,
-      #    int flags
-      # );
-      #
-
-      attach_function :open_osfhandle, :_open_osfhandle, [:pointer, :int], :int
-
-      # BOOL WINAPI SetHandleInformation(
-      #   __in  HANDLE hObject,
-      #   __in  DWORD dwMask,
-      #   __in  DWORD dwFlags
-      # );
-
-      attach_function :set_handle_information, :SetHandleInformation, [:long, :ulong, :ulong], :bool
-
-      # BOOL WINAPI CreatePipe(
-      #   __out     PHANDLE hReadPipe,
-      #   __out     PHANDLE hWritePipe,
-      #   __in_opt  LPSECURITY_ATTRIBUTES lpPipeAttributes,
-      #   __in      DWORD nSize
-      # );
-
-      attach_function :create_pipe, :CreatePipe, [:pointer, :pointer, :pointer, :ulong], :bool
-
-      #
-      # HANDLE WINAPI GetCurrentProcess(void);
-      #
-
-      attach_function :current_process, :GetCurrentProcess, [], :pointer
-
-      #
-      # BOOL WINAPI DuplicateHandle(
-      #   __in   HANDLE hSourceProcessHandle,
-      #   __in   HANDLE hSourceHandle,
-      #   __in   HANDLE hTargetProcessHandle,
-      #   __out  LPHANDLE lpTargetHandle,
-      #   __in   DWORD dwDesiredAccess,
-      #   __in   BOOL bInheritHandle,
-      #   __in   DWORD dwOptions
-      # );
-      #
-
-      attach_function :_duplicate_handle, :DuplicateHandle, [
-                         :pointer,
-                         :pointer,
-                         :pointer,
-                         :pointer,
-                         :ulong,
-                         :bool,
-                         :ulong
-                      ], :bool
-    end # Lib
-  end # Windows
-end # ChildProcess