childprocess 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/childprocess.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{childprocess}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jari Bakken"]
-  s.date = %q{2010-10-17}
+  s.date = %q{2010-11-08}
   s.description = %q{This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.}
   s.email = %q{jari.bakken@gmail.com}
   s.extra_rdoc_files = [

data/lib/childprocess/abstract_process.rb

@@ -19,6 +19,7 @@ module ChildProcess
       @args      = args
       @started   = false
       @exit_code = nil
+      @detach    = false
     end
 
     #
@@ -112,6 +113,10 @@ module ChildProcess
       @started
     end
 
+    def detach?
+      @detach
+    end
+
     def log(*args)
       $stderr.puts "#{self.inspect} : #{args.inspect}" if $DEBUG
     end

data/lib/childprocess/unix/process.rb

@@ -79,7 +79,7 @@ module ChildProcess
           exec(*@args)
         }
 
-        ::Process.detach(@pid) if @detach
+        ::Process.detach(@pid) if detach?
       end
 
     end # Process

data/lib/childprocess/windows/api.rb

@@ -28,6 +28,17 @@ module ChildProcess
         [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.get_os_file_handle(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)

data/lib/childprocess/windows/constants.rb

@@ -21,7 +21,7 @@ module ChildProcess::Windows
 
   STARTF_USESTDHANDLES          = 0x00000100
   INVALID_HANDLE_VALUE          = 0xFFFFFFFF
-
+  HANDLE_FLAG_INHERIT           = 0x00000001
 
   module Lib
     enum :wait_status, [ :wait_object_0,  0,

data/lib/childprocess/windows/functions.rb

@@ -8,7 +8,7 @@ module ChildProcess
         flags   = 0
         inherit = !!opts[:inherit]
 
-        flags  |= DETACHED_PROCESS if opts[:detach]
+        flags |= DETACHED_PROCESS if opts[:detach]
 
         si = StartupInfo.new
         pi = ProcessInfo.new
@@ -183,6 +183,14 @@ module ChildProcess
 
       attach_function :_get_osfhandle, :_get_osfhandle, [:int], :long
 
+      # BOOL WINAPI SetHandleInformation(
+      #   __in  HANDLE hObject,
+      #   __in  DWORD dwMask,
+      #   __in  DWORD dwFlags
+      # );
+
+      attach_function :set_handle_information, :SetHandleInformation, [:long, :ulong, :ulong], :bool
+
     end # Lib
   end # Windows
 end # ChildProcess

data/lib/childprocess/windows/process.rb

@@ -39,7 +39,7 @@ module ChildProcess
       def launch_process
         opts = {
           :inherit => false,
-          :detach  => @detach,
+          :detach  => detach?,
         }
 
         if @io

data/lib/childprocess.rb

@@ -1,6 +1,7 @@
 require 'childprocess/errors'
 require 'childprocess/abstract_process'
 require 'childprocess/abstract_io'
+require "fcntl"
 
 module ChildProcess
   autoload :Unix,     'childprocess/unix'
@@ -67,6 +68,21 @@ module ChildProcess
         end
       )
     end
+    
+    #
+    # By default, a child process will inherit open files and sockets from the parent process.
+    # This helper provides a cross-platform way of making sure that doesn't happen for the given file.
+    # 
 
-  end
-end
+    def close_on_exec(file)
+      if windows?
+        Windows.dont_inherit file
+      elsif file.respond_to?(:fcntl) && defined?(Fcntl::FD_CLOEXEC)
+        file.fcntl Fcntl::F_SETFD, Fcntl::FD_CLOEXEC
+      else
+        raise Error, "not sure how to set close-on-exec for #{file.inspect} on #{platform}"
+      end
+    end
+
+  end # class << self
+end # ChildProcess

data/spec/childprocess_spec.rb

@@ -96,4 +96,17 @@ describe ChildProcess do
     end
   end
 
+  it "can set close-on-exec when IO is inherited" do
+    server = TCPServer.new("localhost", 4433)
+    ChildProcess.close_on_exec server
+
+    process = sleeping_ruby
+    process.io.inherit!
+
+    process.start
+    server.close
+
+    lambda { TCPServer.new("localhost", 4433).close }.should_not raise_error
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'childprocess'
 require 'spec'
 require 'spec/autorun'
 require 'tempfile'
+require "socket"
 
 module ChildProcessSpecHelper
   RUBY = defined?(Gem) ? Gem.ruby : 'ruby'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jari Bakken
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 +02:00
+date: 2010-11-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency