open4 0.7.0 → 0.8.0

data/lib/{open4-0.7.0.rb → open4-0.8.0.rb}

@@ -4,7 +4,7 @@ require 'thread'
 
 module Open4
 #--{{{
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
   def self.version() VERSION end
 
   class Error < ::StandardError; end
@@ -76,8 +76,6 @@ module Open4
   module_function :popen4
   module_function :open4
 
-
-
   class SpawnError < Error
 #--{{{
     attr 'cmd'
@@ -103,16 +101,26 @@ module Open4
 #--{{{
     attr 'threads'
 
-    def initialize
-      @threads, @argv, @done, @running = [], [], Queue.new, false
+    def initialize cid
+      @cid, @threads, @argv, @done, @running = @cid, [], [], Queue.new, false
+      @killed = false
     end
 
     def add_thread *a, &b
       @running ? raise : (@argv << [a, b])
     end
 
+#
+# take down process more nicely
+#
     def killall
-      (@threads - [Thread.current]).each{|t| t.kill rescue nil} if @running
+      c = Thread.critical
+      return nil if @killed
+      Thread.critical = true
+      (@threads - [Thread.current]).each{|t| t.kill rescue nil}
+      @killed = true
+    ensure
+      Thread.critical = c
     end
 
     def run
@@ -185,41 +193,43 @@ module Open4
 
   def relay src, dst = nil, t = nil
 #--{{{
-    if src.respond_to? :gets
-      while buf = to(t){ src.gets }
-        dst << buf if dst
-      end
+    unless src.nil?
+      if src.respond_to? :gets
+        while buf = to(t){ src.gets }
+          dst << buf if dst
+        end
 
-    elsif src.respond_to? :each
-      q = Queue.new
-      th = nil
+      elsif src.respond_to? :each
+        q = Queue.new
+        th = nil
 
-      timer_set = lambda do |t|
-        th = new_thread{ to(t){ q.pop } }
-      end
+        timer_set = lambda do |t|
+          th = new_thread{ to(t){ q.pop } }
+        end
 
-      timer_cancel = lambda do |t|
-        th.kill if th rescue nil
-      end
+        timer_cancel = lambda do |t|
+          th.kill if th rescue nil
+        end
 
-      timer_set[t]
-      begin
-        src.each do |buf|
+        timer_set[t]
+        begin
+          src.each do |buf|
+            timer_cancel[t]
+            dst << buf if dst
+            timer_set[t]
+          end
+        ensure
           timer_cancel[t]
-          dst << buf if dst
-          timer_set[t]
         end
-      ensure
-        timer_cancel[t]
-      end
 
-    elsif src.respond_to? :read
-      buf = to(t){ src.read }
-      dst << buf if dst 
+      elsif src.respond_to? :read
+        buf = to(t){ src.read }
+        dst << buf if dst 
 
-    else
-      buf = to(t){ src.to_s }
-      dst << buf if dst 
+      else
+        buf = to(t){ src.to_s }
+        dst << buf if dst 
+      end
     end
 #--}}}
   end
@@ -263,26 +273,26 @@ module Open4
           popen4(cmd) do |c, i, o, e|
             started = true
 
-            %w( pid= << push update ).each do |msg|
+            %w( replace pid= << push update ).each do |msg|
               break(pid.send(msg, c)) if pid.respond_to? msg 
             end
 
-              te = ThreadEnsemble.new
+            te = ThreadEnsemble.new c
 
-              te.add_thread(i, stdin) do |i, stdin|
-                relay stdin, i, stdin_timeout if stdin
-                i.close rescue nil
-              end
+            te.add_thread(i, stdin) do |i, stdin|
+              relay stdin, i, stdin_timeout
+              i.close rescue nil
+            end
 
-              te.add_thread(o, stdout) do |o, stdout|
-                relay o, stdout, stdout_timeout if stdout
-              end
+            te.add_thread(o, stdout) do |o, stdout|
+              relay o, stdout, stdout_timeout
+            end
 
-              te.add_thread(e, stderr) do |o, stderr|
-                relay e, stderr, stderr_timeout if stderr
-              end
+            te.add_thread(e, stderr) do |o, stderr|
+              relay e, stderr, stderr_timeout
+            end
 
-              te.run
+            te.run
           end
         end
       rescue
@@ -316,6 +326,44 @@ module Open4
   alias bg background
   module_function :background
   module_function :bg
+
+  def maim pid, opts = {}
+#--{{{
+    getopt = getopts opts
+    sigs = getopt[ 'signals', %w(SIGTERM SIGQUIT SIGKILL) ]
+    suspend = getopt[ 'suspend', 4 ]
+    pid = Integer pid
+    existed = false
+    sigs.each do |sig|
+      begin
+        Process.kill sig, pid
+        existed = true 
+      rescue Errno::ESRCH
+        return(existed ? nil : true)
+      end
+      return true unless alive? pid
+      sleep suspend
+      return true unless alive? pid
+    end
+    return(not alive?(pid)) 
+#--}}}
+  end
+  module_function :maim
+
+  def alive pid
+#--{{{
+    pid = Integer pid
+    begin
+      Process.kill 0, pid
+      true
+    rescue Errno::ESRCH
+      false
+    end
+#--}}}
+  end
+  alias alive? alive
+  module_function :alive
+  module_function :'alive?'
 #--}}}
 end
 

data/lib/open4.rb

@@ -4,7 +4,7 @@ require 'thread'
 
 module Open4
 #--{{{
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
   def self.version() VERSION end
 
   class Error < ::StandardError; end
@@ -76,8 +76,6 @@ module Open4
   module_function :popen4
   module_function :open4
 
-
-
   class SpawnError < Error
 #--{{{
     attr 'cmd'
@@ -103,16 +101,26 @@ module Open4
 #--{{{
     attr 'threads'
 
-    def initialize
-      @threads, @argv, @done, @running = [], [], Queue.new, false
+    def initialize cid
+      @cid, @threads, @argv, @done, @running = @cid, [], [], Queue.new, false
+      @killed = false
     end
 
     def add_thread *a, &b
       @running ? raise : (@argv << [a, b])
     end
 
+#
+# take down process more nicely
+#
     def killall
-      (@threads - [Thread.current]).each{|t| t.kill rescue nil} if @running
+      c = Thread.critical
+      return nil if @killed
+      Thread.critical = true
+      (@threads - [Thread.current]).each{|t| t.kill rescue nil}
+      @killed = true
+    ensure
+      Thread.critical = c
     end
 
     def run
@@ -185,41 +193,43 @@ module Open4
 
   def relay src, dst = nil, t = nil
 #--{{{
-    if src.respond_to? :gets
-      while buf = to(t){ src.gets }
-        dst << buf if dst
-      end
+    unless src.nil?
+      if src.respond_to? :gets
+        while buf = to(t){ src.gets }
+          dst << buf if dst
+        end
 
-    elsif src.respond_to? :each
-      q = Queue.new
-      th = nil
+      elsif src.respond_to? :each
+        q = Queue.new
+        th = nil
 
-      timer_set = lambda do |t|
-        th = new_thread{ to(t){ q.pop } }
-      end
+        timer_set = lambda do |t|
+          th = new_thread{ to(t){ q.pop } }
+        end
 
-      timer_cancel = lambda do |t|
-        th.kill if th rescue nil
-      end
+        timer_cancel = lambda do |t|
+          th.kill if th rescue nil
+        end
 
-      timer_set[t]
-      begin
-        src.each do |buf|
+        timer_set[t]
+        begin
+          src.each do |buf|
+            timer_cancel[t]
+            dst << buf if dst
+            timer_set[t]
+          end
+        ensure
           timer_cancel[t]
-          dst << buf if dst
-          timer_set[t]
         end
-      ensure
-        timer_cancel[t]
-      end
 
-    elsif src.respond_to? :read
-      buf = to(t){ src.read }
-      dst << buf if dst 
+      elsif src.respond_to? :read
+        buf = to(t){ src.read }
+        dst << buf if dst 
 
-    else
-      buf = to(t){ src.to_s }
-      dst << buf if dst 
+      else
+        buf = to(t){ src.to_s }
+        dst << buf if dst 
+      end
     end
 #--}}}
   end
@@ -263,26 +273,26 @@ module Open4
           popen4(cmd) do |c, i, o, e|
             started = true
 
-            %w( pid= << push update ).each do |msg|
+            %w( replace pid= << push update ).each do |msg|
               break(pid.send(msg, c)) if pid.respond_to? msg 
             end
 
-              te = ThreadEnsemble.new
+            te = ThreadEnsemble.new c
 
-              te.add_thread(i, stdin) do |i, stdin|
-                relay stdin, i, stdin_timeout if stdin
-                i.close rescue nil
-              end
+            te.add_thread(i, stdin) do |i, stdin|
+              relay stdin, i, stdin_timeout
+              i.close rescue nil
+            end
 
-              te.add_thread(o, stdout) do |o, stdout|
-                relay o, stdout, stdout_timeout if stdout
-              end
+            te.add_thread(o, stdout) do |o, stdout|
+              relay o, stdout, stdout_timeout
+            end
 
-              te.add_thread(e, stderr) do |o, stderr|
-                relay e, stderr, stderr_timeout if stderr
-              end
+            te.add_thread(e, stderr) do |o, stderr|
+              relay e, stderr, stderr_timeout
+            end
 
-              te.run
+            te.run
           end
         end
       rescue
@@ -316,6 +326,44 @@ module Open4
   alias bg background
   module_function :background
   module_function :bg
+
+  def maim pid, opts = {}
+#--{{{
+    getopt = getopts opts
+    sigs = getopt[ 'signals', %w(SIGTERM SIGQUIT SIGKILL) ]
+    suspend = getopt[ 'suspend', 4 ]
+    pid = Integer pid
+    existed = false
+    sigs.each do |sig|
+      begin
+        Process.kill sig, pid
+        existed = true 
+      rescue Errno::ESRCH
+        return(existed ? nil : true)
+      end
+      return true unless alive? pid
+      sleep suspend
+      return true unless alive? pid
+    end
+    return(not alive?(pid)) 
+#--}}}
+  end
+  module_function :maim
+
+  def alive pid
+#--{{{
+    pid = Integer pid
+    begin
+      Process.kill 0, pid
+      true
+    rescue Errno::ESRCH
+      false
+    end
+#--}}}
+  end
+  alias alive? alive
+  module_function :alive
+  module_function :'alive?'
 #--}}}
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: open4
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
-date: 2006-09-01 00:00:00.000000 -06:00
+  version: 0.8.0
+date: 2006-09-25 00:00:00.000000 -06:00
 summary: open4
 require_paths: 
   - lib
@@ -34,6 +34,7 @@ files:
   - lib
   - README
   - gemspec.rb
+  - open4-0.8.0.gem
   - sample/block.rb
   - sample/simple.rb
   - sample/exception.rb
@@ -42,7 +43,7 @@ files:
   - sample/timeout.rb
   - sample/stdin_timeout.rb
   - lib/open4.rb
-  - lib/open4-0.7.0.rb
+  - lib/open4-0.8.0.rb
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []