systemu 1.0.0 → 1.1.0

data/a.rb

@@ -0,0 +1,15 @@
+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
+end
+
+threads.map{|t| p t.value}
+

data/lib/systemu.rb

@@ -3,6 +3,7 @@ require 'socket'
 require 'fileutils'
 require 'rbconfig'
 require 'thread'
+require 'yaml'
 
 class Object
   def systemu(*a, &b) SystemUniversal.new(*a, &b).systemu end
@@ -10,7 +11,10 @@ end
 
 class SystemUniversal
 #--{{{
-  VERSION = '1.0.0'
+#
+# constants
+#
+  SystemUniversal::VERSION = '1.1.0' unless defined?  SystemUniversal::VERSION
   def version() VERSION end
 #
 # class methods
@@ -19,6 +23,7 @@ class SystemUniversal
   @host = Socket.gethostname
   @ppid = Process.ppid
   @pid = Process.pid
+  @turd = ENV['SYSTEMU_TURD']
 
   c = ::Config::CONFIG
   ruby = File.join(c['bindir'], c['ruby_install_name']) << c['EXEEXT']
@@ -29,7 +34,7 @@ class SystemUniversal
   end
 
   class << self
-    %w( host ppid pid ruby ).each{|a| attr_accessor a}
+    %w( host ppid pid ruby turd ).each{|a| attr_accessor a}
   end
 
 #
@@ -64,13 +69,28 @@ class SystemUniversal
 
       if @block
         q = Queue.new
-        t = Thread.new{ @block[ q.pop ] }
+        t = Thread.new{ Thread.current_abort_on_exception = true; @block[ q.pop ] }
       end
 
       begin
         quietly{
           IO.popen "#{ @ruby } #{ c['program'] }", 'r+' do |pipe|
-            cid = pipe.gets.to_i
+            line = pipe.gets
+            case line
+              when %r/^pid: \d+$/
+                cid = Integer line[%r/\d+/] 
+              else
+                begin
+                  buf = pipe.read
+                  buf = "#{ line }#{ buf }"
+                  e = Marshal.load buf
+                  raise unless Exception === e
+                  raise e
+                rescue
+                  raise "wtf?\n#{ buf }\n"
+                end
+            end
+            cid = Integer pipe.gets
             q.push cid if @block
             pipe.read rescue nil
           end
@@ -115,7 +135,7 @@ class SystemUniversal
     c['stdout'] = stdout 
     c['stderr'] = stderr 
     c['program'] = program 
-    open(config, 'w'){|f| Marshal.dump c, f}
+    open(config, 'w'){|f| YAML.dump c, f}
 
     open(program, 'w'){|f| f.write child_program(config)}
 
@@ -136,8 +156,11 @@ class SystemUniversal
   def child_program config
 #--{{{
     <<-program
+      PIPE = STDOUT.dup
       begin
-        config = Marshal.load(IO.read('#{ config }'))
+        require 'yaml'
+
+        config = YAML.load(IO.read('#{ config }'))
 
         argv = config['argv']
         env = config['env']
@@ -148,19 +171,20 @@ class SystemUniversal
 
         Dir.chdir cwd if cwd
         env.each{|k,v| ENV[k.to_s] = v.to_s} if env
-      rescue Exception => e
-        STDERR.warn e
-        exit 42
-      end
 
-      STDOUT.puts Process.pid
-      STDOUT.flush
+        STDIN.reopen stdin
+        STDOUT.reopen stdout
+        STDERR.reopen stderr
 
-      STDIN.reopen stdin
-      STDOUT.reopen stdout
-      STDERR.reopen stderr
+        PIPE.puts "pid: #{ Process.pid }"
+        PIPE.flush                        ### the process is ready yo! 
+        PIPE.close
 
-      exec *argv
+        exec *argv
+      rescue Exception => e
+        PIPE.write Marshal.dump(e) rescue nil
+        exit 42
+      end
     program
 #--}}}
   end
@@ -176,26 +200,27 @@ class SystemUniversal
 #--}}}
   end
 
-  def tmpdir d = Dir.tmpdir, &b
+  def tmpdir d = Dir.tmpdir, max = 42, &b
 #--{{{
     i = -1 and loop{
+      i += 1
+
       tmp = File.join d, "systemu_#{ @host }_#{ @ppid }_#{ @pid }_#{ rand }_#{ i += 1 }"
 
       begin
         Dir.mkdir tmp 
       rescue Errno::EEXIST
+        raise if i >= max 
         next
       end
 
-      scrub = lambda do |t|
-        FileUtils.rm_rf t
-        scrub = lambda{ 42 }
-      end
-      at_exit{ scrub[tmp] }
-
       break(
         if b
-          begin; b[ tmp ]; ensure; scrub[ tmp ]; end
+          begin
+            b.call tmp
+          ensure
+            FileUtils.rm_rf tmp unless SystemU.turd 
+          end
         else
           tmp
         end
@@ -222,6 +247,8 @@ class SystemUniversal
 #--}}}
 end
 
+SystemU = SystemUniversal unless defined? SystemU
+
 
 if $0 == __FILE__
 #

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.2
 specification_version: 1
 name: systemu
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2006-11-03 00:00:00.000000 -07:00
+  version: 1.1.0
+date: 2007-07-19 00:00:00 -06:00
 summary: systemu
 require_paths: 
-  - lib
+- lib
 email: ara.t.howard@noaa.gov
 homepage: http://codeforpeople.com/lib/ruby/systemu/
 rubyforge_project: 
@@ -18,36 +18,44 @@ bindir: bin
 has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
-  - Ara T. Howard
+- Ara T. Howard
 files: 
-  - lib
-  - samples
-  - gen_readme.rb
-  - gemspec.rb
-  - install.rb
-  - README
-  - README.tmpl
-  - lib/systemu.rb
-  - lib/systemu-1.0.0.rb
-  - samples/a.rb
-  - samples/b.rb
-  - samples/c.rb
-  - samples/d.rb
-  - samples/e.rb
-  - samples/f.rb
+- a.rb
+- gemspec.rb
+- gen_readme.rb
+- install.rb
+- lib
+- lib/systemu.rb
+- README
+- README.tmpl
+- samples
+- samples/a.rb
+- samples/b.rb
+- samples/c.rb
+- samples/d.rb
+- samples/e.rb
+- samples/f.rb
+- systemu-1.1.0.gem
 test_files: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: []
+
 extensions: []
+
 requirements: []
-dependencies: []
+
+dependencies: []
+

data/lib/systemu-1.0.0.rb

@@ -1,262 +0,0 @@
-require 'tmpdir'
-require 'socket'
-require 'fileutils'
-require 'rbconfig'
-require 'thread'
-
-class Object
-  def systemu(*a, &b) SystemUniversal.new(*a, &b).systemu end
-end
-
-class SystemUniversal
-#--{{{
-  VERSION = '1.0.0'
-  def version() VERSION end
-#
-# class methods
-#
-
-  @host = Socket.gethostname
-  @ppid = Process.ppid
-  @pid = Process.pid
-
-  c = ::Config::CONFIG
-  ruby = File.join(c['bindir'], c['ruby_install_name']) << c['EXEEXT']
-  @ruby = if system('%s -e 42' % ruby)
-    ruby
-  else
-    system('%s -e 42' % 'ruby') ? 'ruby' : warn('no ruby in PATH/CONFIG')
-  end
-
-  class << self
-    %w( host ppid pid ruby ).each{|a| attr_accessor a}
-  end
-
-#
-# instance methods
-#
-
-  def initialize argv, opts = {}, &block
-#--{{{
-    getopt = getopts opts
-
-    @argv = argv
-    @block = block
-
-    @stdin = getopt[ ['stdin', 'in', '0', 0] ]
-    @stdout = getopt[ ['stdout', 'out', '1', 1] ]
-    @stderr = getopt[ ['stderr', 'err', '2', 2] ]
-    @env = getopt[ 'env' ]
-    @cwd = getopt[ 'cwd' ]
-
-    @host = getopt[ 'host', self.class.host ]
-    @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{ @block[ q.pop ] }
-      end
-
-      begin
-        quietly{
-          IO.popen "#{ @ruby } #{ c['program'] }", 'r+' do |pipe|
-            cid = pipe.gets.to_i
-            q.push cid if @block
-            pipe.read rescue nil
-          end
-        }
-        status = $?
-      ensure
-        t.kill rescue nil if t
-      end
-
-      if @stdout or @stderr
-        open(c['stdout']){|f| relay f => @stdout} if @stdout
-        open(c['stderr']){|f| relay f => @stderr} if @stderr
-        status
-      else
-        [status, IO.read(c['stdout']), IO.read(c['stderr'])]
-      end
-    end
-#--}}}
-  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'))
-    program = File.expand_path(File.join(tmp, 'program'))
-    config = File.expand_path(File.join(tmp, 'config'))
-
-    if @stdin
-      open(stdin, 'w'){|f| relay @stdin => f}
-    else
-      FileUtils.touch stdin
-    end
-    FileUtils.touch stdout
-    FileUtils.touch stderr
-
-    c = {}
-    c['argv'] = @argv
-    c['env'] = @env
-    c['cwd'] = @cwd
-    c['stdin'] = stdin 
-    c['stdout'] = stdout 
-    c['stderr'] = stderr 
-    c['program'] = program 
-    open(config, 'w'){|f| Marshal.dump c, f}
-
-    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
-      begin
-        config = Marshal.load(IO.read('#{ config }'))
-
-        argv = config['argv']
-        env = config['env']
-        cwd = config['cwd']
-        stdin = config['stdin']
-        stdout = config['stdout']
-        stderr = config['stderr']
-
-        Dir.chdir cwd if cwd
-        env.each{|k,v| ENV[k.to_s] = v.to_s} if env
-      rescue Exception => e
-        STDERR.warn e
-        exit 42
-      end
-
-      STDOUT.puts Process.pid
-      STDOUT.flush
-
-      STDIN.reopen stdin
-      STDOUT.reopen stdout
-      STDERR.reopen stderr
-
-      exec *argv
-    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, &b
-#--{{{
-    i = -1 and loop{
-      tmp = File.join d, "systemu_#{ @host }_#{ @ppid }_#{ @pid }_#{ rand }_#{ i += 1 }"
-
-      begin
-        Dir.mkdir tmp 
-      rescue Errno::EEXIST
-        next
-      end
-
-      scrub = lambda do |t|
-        FileUtils.rm_rf t
-        scrub = lambda{ 42 }
-      end
-      at_exit{ scrub[tmp] }
-
-      break(
-        if b
-          begin; b[ tmp ]; ensure; scrub[ tmp ]; end
-        else
-          tmp
-        end
-      )
-    }
-#--}}}
-  end
-
-  def getopts opts = {}
-#--{{{
-    lambda do |*args|
-      keys, default, ignored = args
-      catch('opt') do
-        [keys].flatten.each do |key|
-          [key, key.to_s, key.to_s.intern].each do |key|
-            throw 'opt', opts[key] if opts.has_key?(key)
-          end
-        end
-        default
-      end
-    end
-#--}}}
-  end
-#--}}}
-end
-
-
-if $0 == __FILE__
-#
-# date
-#
-  date = %q( ruby -e"  t = Time.now; STDOUT.puts t; STDERR.puts t  " )
-
-  status, stdout, stderr = systemu date
-  p [status, stdout, stderr]
-
-  status = systemu date, 1=>(stdout = '')
-  p [status, stdout]
-
-  status = systemu date, 2=>(stderr = '')
-  p [status, stderr]
-#
-# sleep
-#
-  sleep = %q( ruby -e"  p(sleep(1))  " )
-  status, stdout, stderr = systemu sleep 
-  p [status, stdout, stderr]
-
-  sleep = %q( ruby -e"  p(sleep(42))  " )
-  status, stdout, stderr = systemu(sleep){|cid| Process.kill 9, cid}
-  p [status, stdout, stderr]
-#
-# env 
-#
-  env = %q( ruby -e"  p ENV['A']  " )
-  status, stdout, stderr = systemu env, :env => {'A' => 42} 
-  p [status, stdout, stderr]
-#
-# cwd 
-#
-  env = %q( ruby -e"  p Dir.pwd  " )
-  status, stdout, stderr = systemu env, :cwd => Dir.tmpdir
-  p [status, stdout, stderr]
-end