childprocess 0.0.7 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.9

data/childprocess.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{childprocess}
-  s.version = "0.0.7"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jari Bakken"]
-  s.date = %q{2010-10-09}
+  s.date = %q{2010-10-16}
   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.rb

@@ -7,29 +7,53 @@ module ChildProcess
   autoload :JRuby,    'childprocess/jruby'
   autoload :IronRuby, 'childprocess/ironruby'
 
-  def self.build(*args)
-    case platform
-    when :jruby
-      JRuby::Process.new(args)
-    when :ironruby
-      IronRuby::Process.new(args)
-    when :windows
-      Windows::Process.new(args)
-    else
-      Unix::Process.new(args)
+  class << self
+
+    def new(*args)
+      case platform
+      when :jruby
+        JRuby::Process.new(args)
+      when :ironruby
+        IronRuby::Process.new(args)
+      when :windows
+        Windows::Process.new(args)
+      else
+        Unix::Process.new(args)
+      end
     end
-  end
+    alias_method :build, :new
 
-  def self.platform
-    if RUBY_PLATFORM == "java"
-      :jruby
-    elsif defined?(RUBY_ENGINE) && RUBY_ENGINE == "ironruby"
-      :ironruby
-    elsif RUBY_PLATFORM =~ /mswin|msys|mingw32/
-      :windows
-    else
-      :unix
+    def platform
+      if RUBY_PLATFORM == "java"
+        :jruby
+      elsif defined?(RUBY_ENGINE) && RUBY_ENGINE == "ironruby"
+        :ironruby
+      elsif RUBY_PLATFORM =~ /mswin|msys|mingw32/
+        :windows
+      else
+        os
+      end
     end
-  end
 
+    def os
+      @os ||= (
+        require "rbconfig"
+        host_os = RbConfig::CONFIG['host_os']
+
+        case host_os
+        when /mswin|msys|mingw32/
+          :windows
+        when /darwin|mac os/
+          :macosx
+        when /linux/
+          :linux
+        when /solaris|bsd/
+          :unix
+        else
+          raise Error, "unknown os: #{host_os.inspect}"
+        end
+      )
+    end
+
+  end
 end

data/lib/childprocess/abstract_process.rb

@@ -2,6 +2,19 @@ module ChildProcess
   class AbstractProcess
     attr_reader :exit_code
 
+    #
+    # Set this to true if you do not care about when or if the process quits.
+    #
+    attr_accessor :detach
+
+
+    #
+    # Create a new process with the given args.
+    #
+    # @api private
+    # @see ChildProcess.build
+    #
+
     def initialize(args)
       @args      = args
       @started   = false
@@ -48,7 +61,7 @@ module ChildProcess
     def alive?
       started? && !exited?
     end
-    
+
     def crashed?
       exited? && @exit_code != 0
     end

data/lib/childprocess/jruby/process.rb

@@ -3,7 +3,6 @@ require "java"
 module ChildProcess
   module JRuby
     class Process < AbstractProcess
-
       def exited?
         return true if @exit_code
 
@@ -27,6 +26,8 @@ module ChildProcess
       private
 
       def launch_process
+        backround_args! if @detach
+
         pb = java.lang.ProcessBuilder.new(@args)
 
         # not sure why this is necessary
@@ -44,6 +45,16 @@ module ChildProcess
         @process.getInputStream.close
       end
 
+      def background_args!
+        case ChildProcess.os
+        when :windows
+          args = %w[start /wait /b]
+          @args.unshift(*args) unless @args[0] == start
+        else
+          @args.push "&" unless @args.last == "&"
+        end
+      end
+
     end # Process
   end # JRuby
 end # ChildProcess

data/lib/childprocess/unix/process.rb

@@ -70,6 +70,8 @@ module ChildProcess
 
           exec(*@args)
         }
+
+        ::Process.detach(@pid) if @detach
       end
 
     end # Process

data/lib/childprocess/windows/constants.rb

@@ -17,6 +17,7 @@ module ChildProcess::Windows
   CTRL_C_EVENT                  = 0
   CTRL_BREAK_EVENT              = 1
 
+  DETACHED_PROCESS              = 0x00000008
 
   module Lib
     enum :wait_status, [ :wait_object_0,  0,

data/lib/childprocess/windows/functions.rb

@@ -2,25 +2,18 @@ module ChildProcess
   module Windows
     module Lib
 
-      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
-        )
-
-        buf.read_string(size).strip
-      end
-
       def self.create_proc(cmd, opts = {})
         cmd_ptr = FFI::MemoryPointer.from_string cmd
 
+        flags   = 0
+        inherit = !!opts[:inherit]
+
+        flags  |= DETACHED_PROCESS if opts[:detach]
+
         si = StartupInfo.new
         pi = ProcessInfo.new
 
-        ok = create_process(nil, cmd_ptr, nil, nil, !!opts[:inherit], 0, nil, nil, si, pi)
+        ok = create_process(nil, cmd_ptr, nil, nil, inherit, flags, nil, nil, si, pi)
         ok or raise Error, last_error_message
 
         close_handle pi[:hProcess]
@@ -29,6 +22,18 @@ module ChildProcess
         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
+        )
+
+        buf.read_string(size).strip
+      end
+
       #
       # BOOL WINAPI CreateProcess(
       #   __in_opt     LPCTSTR lpApplicationName,

data/lib/childprocess/windows/process.rb

@@ -33,7 +33,11 @@ module ChildProcess
       private
 
       def launch_process
-        @pid    = Lib.create_proc(@args.join(' '), :inherit => false)
+        @pid = Lib.create_proc(
+          @args.join(' '),
+          :inherit => false,
+          :detach  => @detach
+        )
         @handle = Handle.open(@pid)
 
         self

data/spec/childprocess_spec.rb

@@ -62,5 +62,9 @@ describe ChildProcess do
     end
   end
 
+  it "lets a detached child live on" do
+    # hmm. how do we spec this?
+  end
+
   it_should_behave_like "unix process" if ChildProcess.platform == :unix
 end

data/spec/spec_helper.rb

@@ -79,6 +79,10 @@ module ChildProcessSpecHelper
     raise last_error unless ok
   end
 
+  def ruby(code)
+    ruby_process(tmp_script(code))
+  end
+
 end # ChildProcessSpecHelper
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: childprocess
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Jari Bakken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 +02:00
+date: 2010-10-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency