open4 0.8.0 → 0.9.0

data/README

@@ -10,6 +10,47 @@ SYNOPSIS
 
 HISTORY
 
+  0.9.0:
+    - added the ability for open4.spawn to take either an array of arguments
+      or multiple arguments in order to specify the argv for the command run.
+      for example
+
+        open4.spawn ['touch', 'difficult to "quote"'], :stdout=>STDOUT
+
+      same thing
+
+        open4.spawn 'touch', 'difficult to "quote"', :stdout=>STDOUT
+
+      thanks to jordan breeding for this suggestion
+
+
+    - added 'cwd'/:cwd keyword.  usage is pretty obivous
+
+        open4.spawn 'pwd', 1=>STDOUT, :cwd=>'/tmp'   #=> /tmp
+
+      this one also from jordan
+
+  0.8.0:
+
+    - fixed a critical bug whereby a process producing tons of stdout, but for
+      which the stdout was not handled, would cause the child process to
+      become blocked/hung writing to the pipe.  eg, this command would cause a
+      hang
+
+        include Open4
+
+        spawn 'ruby -e"  puts Array.new(65536){ 42 }  "'
+
+      whereas this one would not
+
+        include Open4
+
+        spawn 'ruby -e"  puts Array.new(65536){ 42 }  "', :stdout=>StringIO.new
+
+      this version handles the former by spawning a 'null' thread which reads,
+      but does not process stdout/stderr.  that way commands which generate
+      tons of output will never become blocked.
+
   0.7.0:
     - merged functionality of exitstatus/status keywords:
 

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

@@ -4,7 +4,7 @@ require 'thread'
 
 module Open4
 #--{{{
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
   def self.version() VERSION end
 
   class Error < ::StandardError; end
@@ -235,8 +235,14 @@ module Open4
   end
   module_function :relay
 
-  def spawn cmd, opts = {} 
+  def spawn arg, *argv 
 #--{{{
+    argv.unshift(arg)
+    opts = ((argv.size > 1 and Hash === argv.last) ? argv.pop : {})
+    argv.flatten!
+    cmd = argv.join(' ')
+
+
     getopt = getopts opts
 
     ignore_exit_failure = getopt[ 'ignore_exit_failure', getopt['quiet', false] ]
@@ -251,6 +257,7 @@ module Open4
     stdout_timeout = getopt[ %w( stdout_timeout io_timeout ) ]
     stderr_timeout = getopt[ %w( stderr_timeout ) ]
     status = getopt[ %w( status ) ]
+    cwd = getopt[ %w( cwd dir ), Dir.pwd ]
 
     exitstatus =
       case exitstatus
@@ -269,30 +276,32 @@ module Open4
 
     status =
       begin
-        Timeout::timeout(timeout) do
-          popen4(cmd) do |c, i, o, e|
-            started = true
+        Dir.chdir(cwd) do
+          Timeout::timeout(timeout) do
+            popen4(*argv) do |c, i, o, e|
+              started = true
 
-            %w( replace pid= << push update ).each do |msg|
-              break(pid.send(msg, c)) if pid.respond_to? msg 
-            end
+              %w( replace pid= << push update ).each do |msg|
+                break(pid.send(msg, c)) if pid.respond_to? msg 
+              end
 
-            te = ThreadEnsemble.new c
+              te = ThreadEnsemble.new c
 
-            te.add_thread(i, stdin) do |i, stdin|
-              relay stdin, i, stdin_timeout
-              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
-            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
-            end
+              te.add_thread(e, stderr) do |o, stderr|
+                relay e, stderr, stderr_timeout
+              end
 
-            te.run
+              te.run
+            end
           end
         end
       rescue
@@ -307,12 +316,12 @@ module Open4
   end
   module_function :spawn
 
-  def background cmd, opts = {}
+  def background arg, *argv 
 #--{{{
     require 'thread'
     q = Queue.new
     opts['pid'] = opts[:pid] = q
-    thread = Thread.new(cmd, opts){|cmd, opts| spawn cmd, opts}
+    thread = Thread.new(arg, argv){|arg, argv| spawn arg, *argv}
     pid = q.pop
     sc = class << thread; self; end
     sc.module_eval {

data/lib/open4.rb

@@ -4,7 +4,7 @@ require 'thread'
 
 module Open4
 #--{{{
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
   def self.version() VERSION end
 
   class Error < ::StandardError; end
@@ -235,8 +235,14 @@ module Open4
   end
   module_function :relay
 
-  def spawn cmd, opts = {} 
+  def spawn arg, *argv 
 #--{{{
+    argv.unshift(arg)
+    opts = ((argv.size > 1 and Hash === argv.last) ? argv.pop : {})
+    argv.flatten!
+    cmd = argv.join(' ')
+
+
     getopt = getopts opts
 
     ignore_exit_failure = getopt[ 'ignore_exit_failure', getopt['quiet', false] ]
@@ -251,6 +257,7 @@ module Open4
     stdout_timeout = getopt[ %w( stdout_timeout io_timeout ) ]
     stderr_timeout = getopt[ %w( stderr_timeout ) ]
     status = getopt[ %w( status ) ]
+    cwd = getopt[ %w( cwd dir ), Dir.pwd ]
 
     exitstatus =
       case exitstatus
@@ -269,30 +276,32 @@ module Open4
 
     status =
       begin
-        Timeout::timeout(timeout) do
-          popen4(cmd) do |c, i, o, e|
-            started = true
+        Dir.chdir(cwd) do
+          Timeout::timeout(timeout) do
+            popen4(*argv) do |c, i, o, e|
+              started = true
 
-            %w( replace pid= << push update ).each do |msg|
-              break(pid.send(msg, c)) if pid.respond_to? msg 
-            end
+              %w( replace pid= << push update ).each do |msg|
+                break(pid.send(msg, c)) if pid.respond_to? msg 
+              end
 
-            te = ThreadEnsemble.new c
+              te = ThreadEnsemble.new c
 
-            te.add_thread(i, stdin) do |i, stdin|
-              relay stdin, i, stdin_timeout
-              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
-            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
-            end
+              te.add_thread(e, stderr) do |o, stderr|
+                relay e, stderr, stderr_timeout
+              end
 
-            te.run
+              te.run
+            end
           end
         end
       rescue
@@ -307,12 +316,12 @@ module Open4
   end
   module_function :spawn
 
-  def background cmd, opts = {}
+  def background arg, *argv 
 #--{{{
     require 'thread'
     q = Queue.new
     opts['pid'] = opts[:pid] = q
-    thread = Thread.new(cmd, opts){|cmd, opts| spawn cmd, opts}
+    thread = Thread.new(arg, argv){|arg, argv| spawn arg, *argv}
     pid = q.pop
     sc = class << thread; self; end
     sc.module_eval {

metadata

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