systemu 1.1.0 → 1.2.0

data/README

@@ -1,6 +1,6 @@
 NAME
 
-  systemu.rb
+  systemu
 
 SYNOPSIS
 
@@ -10,11 +10,21 @@ URIS
 
   http://rubyforge.org/projects/codeforpeople/
   http://codeforpeople.com/lib/ruby/
+  http://codeforpeople.rubyforge.org/svn/
 
 INSTALL
 
   gem install systemu
 
+HISTORY
+
+  1.2.0
+
+    - fixed handling of background thread management - needed
+      Thread.current.abort_on_exception = true
+
+    - fixed reporting of child pid, it was reported as the parent's pid before
+
 SAMPLES
 
   <========< samples/a.rb >========>
@@ -35,7 +45,7 @@ SAMPLES
 
   ~ > ruby samples/a.rb
 
-    [#<Process::Status: pid=9960,exited(0)>, "Fri Nov 03 17:22:23 MST 2006\n", "Fri Nov 03 17:22:23 MST 2006\n"]
+    [#<Process::Status: pid=987,exited(0)>, "Thu Dec 06 16:01:59 -0700 2007\n", "Thu Dec 06 16:01:59 -0700 2007\n"]
 
 
   <========< samples/b.rb >========>
@@ -57,7 +67,7 @@ SAMPLES
 
   ~ > ruby samples/b.rb
 
-    [#<Process::Status: pid=9965,exited(0)>, "Fri Nov 03 17:22:23 MST 2006\n", "Fri Nov 03 17:22:23 MST 2006\n"]
+    [#<Process::Status: pid=992,exited(0)>, "Thu Dec 06 16:01:59 -0700 2007\n", "Thu Dec 06 16:01:59 -0700 2007\n"]
 
 
   <========< samples/c.rb >========>
@@ -98,7 +108,7 @@ SAMPLES
 
   ~ > ruby samples/d.rb
 
-    /tmp
+    /private/tmp
 
 
   <========< samples/e.rb >========>
@@ -140,10 +150,11 @@ SAMPLES
           Process.kill 9, cid
         end
     
-      p [ status, stdout, stderr ]
-    
+      p status
+      p stderr
 
   ~ > ruby samples/f.rb
 
-    [#<Process::Status: pid=9985,signaled(SIGKILL=9)>, "", "1162599744\n1162599745\n1162599746\n1162599747\n"]
+    #<Process::Status: pid=1012,signaled(SIGKILL=9)>
+    "1196982119\n1196982120\n1196982121\n"
 

data/README.tmpl

@@ -1,6 +1,6 @@
 NAME
 
-  systemu.rb
+  systemu
 
 SYNOPSIS
 
@@ -10,11 +10,21 @@ URIS
 
   http://rubyforge.org/projects/codeforpeople/
   http://codeforpeople.com/lib/ruby/
+  http://codeforpeople.rubyforge.org/svn/
 
 INSTALL
 
   gem install systemu
 
+HISTORY
+
+  1.2.0
+
+    - fixed handling of background thread management - needed
+      Thread.current.abort_on_exception = true
+
+    - fixed reporting of child pid, it was reported as the parent's pid before
+
 SAMPLES
 
   @samples

data/a.rb

@@ -1,15 +1,6 @@
-require 'rubygems'
 require 'systemu'
 
-threads = []
 
-(ARGV.shift || 10).to_i.times do
-  t = Thread.new do
-    status, stdout, stderr = systemu 'cat', :stdin => ('42' * 1024)
-    [status, stdout[0..15]]
-  end
-  threads << t
+systemu 'date' do |cid|
+  p cid
 end
-
-threads.map{|t| p t.value}
-

data/lib/systemu.rb

@@ -1,3 +1,4 @@
+# vim: ts=2:sw=2:sts=2:et:fdm=marker
 require 'tmpdir'
 require 'socket'
 require 'fileutils'
@@ -10,12 +11,11 @@ class Object
 end
 
 class SystemUniversal
-#--{{{
 #
 # constants
 #
-  SystemUniversal::VERSION = '1.1.0' unless defined?  SystemUniversal::VERSION
-  def version() VERSION end
+  SystemUniversal::VERSION = '1.2.0' unless defined?  SystemUniversal::VERSION
+  def version() SystemUniversal::VERSION end
 #
 # class methods
 #
@@ -42,7 +42,6 @@ class SystemUniversal
 #
 
   def initialize argv, opts = {}, &block
-#--{{{
     getopt = getopts opts
 
     @argv = argv
@@ -58,21 +57,16 @@ class SystemUniversal
     @ppid = getopt[ 'ppid', self.class.ppid ]
     @pid = getopt[ 'pid', self.class.pid ]
     @ruby = getopt[ 'ruby', self.class.ruby ]
-#--}}}
   end
 
   def systemu
-#--{{{
     tmpdir do |tmp|
       c = child_setup tmp
       status = nil
 
-      if @block
-        q = Queue.new
-        t = Thread.new{ Thread.current_abort_on_exception = true; @block[ q.pop ] }
-      end
-
       begin
+        thread = nil
+
         quietly{
           IO.popen "#{ @ruby } #{ c['program'] }", 'r+' do |pipe|
             line = pipe.gets
@@ -90,14 +84,22 @@ class SystemUniversal
                   raise "wtf?\n#{ buf }\n"
                 end
             end
-            cid = Integer pipe.gets
-            q.push cid if @block
+            thread = new_thread cid, @block if @block
             pipe.read rescue nil
           end
         }
         status = $?
       ensure
-        t.kill rescue nil if t
+        if thread
+          begin
+            class << status
+              attr 'thread'
+            end
+            status.instance_eval{ @thread = thread }
+          rescue
+            42
+          end
+        end
       end
 
       if @stdout or @stderr
@@ -108,11 +110,20 @@ class SystemUniversal
         [status, IO.read(c['stdout']), IO.read(c['stderr'])]
       end
     end
-#--}}}
+  end
+
+  def new_thread cid, block 
+    q = Queue.new
+    Thread.new(cid) do |cid| 
+      current = Thread.current 
+      current.abort_on_exception = true
+      q.push current 
+      block.call cid
+    end
+    q.pop
   end
 
   def child_setup tmp
-#--{{{
     stdin = File.expand_path(File.join(tmp, 'stdin'))
     stdout = File.expand_path(File.join(tmp, 'stdout'))
     stderr = File.expand_path(File.join(tmp, 'stderr'))
@@ -140,21 +151,17 @@ class SystemUniversal
     open(program, 'w'){|f| f.write child_program(config)}
 
     c
-#--}}}
   end
 
   def quietly
-#--{{{
     v = $VERBOSE
     $VERBOSE = nil
     yield
   ensure
     $VERBOSE = v
-#--}}}
   end
 
   def child_program config
-#--{{{
     <<-program
       PIPE = STDOUT.dup
       begin
@@ -176,7 +183,7 @@ class SystemUniversal
         STDOUT.reopen stdout
         STDERR.reopen stderr
 
-        PIPE.puts "pid: #{ Process.pid }"
+        PIPE.puts "pid: \#{ Process.pid }"
         PIPE.flush                        ### the process is ready yo! 
         PIPE.close
 
@@ -186,22 +193,18 @@ class SystemUniversal
         exit 42
       end
     program
-#--}}}
   end
 
   def relay srcdst
-#--{{{
     src, dst, ignored = srcdst.to_a.first
     if src.respond_to? 'read'
       while((buf = src.read(8192))); dst << buf; end
     else
       src.each{|buf| dst << buf}
     end
-#--}}}
   end
 
   def tmpdir d = Dir.tmpdir, max = 42, &b
-#--{{{
     i = -1 and loop{
       i += 1
 
@@ -226,11 +229,9 @@ class SystemUniversal
         end
       )
     }
-#--}}}
   end
 
   def getopts opts = {}
-#--{{{
     lambda do |*args|
       keys, default, ignored = args
       catch('opt') do
@@ -242,14 +243,23 @@ class SystemUniversal
         default
       end
     end
-#--}}}
   end
-#--}}}
 end
 
 SystemU = SystemUniversal unless defined? SystemU
 
 
+
+
+
+
+
+
+
+
+
+
+
 if $0 == __FILE__
 #
 # date

data/samples/f.rb

@@ -14,5 +14,5 @@
       Process.kill 9, cid
     end
 
-  p [ status, stdout, stderr ]
-
+  p status
+  p stderr

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: systemu
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2007-07-19 00:00:00 -06:00
+  version: 1.2.0
+date: 2007-12-06 00:00:00 -07:00
 summary: systemu
 require_paths: 
 - lib
@@ -44,7 +44,6 @@ files:
 - samples/d.rb
 - samples/e.rb
 - samples/f.rb
-- systemu-1.1.0.gem
 test_files: []
 
 rdoc_options: []