subexec 0.0.3 → 0.0.4

data/README.rdoc

@@ -25,5 +25,5 @@ and never returns control back to the original process. Enter Subexec.
 
 === Limitations
 
-Supports only Ruby 1.9.
-
+Only Ruby 1.9 can spawn non-blocking subprocesses, via Process.spawn.
+So Ruby 1.8 support is sheerly for backwards compatibility. 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/subexec.rb

@@ -35,52 +35,69 @@ class Subexec
   attr_accessor :exitstatus
 
   def self.run(command, options={})
-    new(command, options)
+    sub = new(command, options)
+    sub.run!
+    sub
   end
   
   def initialize(command, options={})
     self.command  = command
     self.timeout  = options[:timeout] || -1 # default is to never timeout
-    run!
   end
   
   def run!
-    r, w = IO.pipe
-    self.pid = Process.spawn(command, STDERR=>w, STDOUT=>w)
-    w.close
-    
-    self.timer = Time.now + timeout
-    timed_out = false
+    if timeout > 0 && RUBY_VERSION >= '1.9'
+      spawn
+    else
+      exec
+    end
+  end
+
+
+  private
+  
+    def spawn
+      r, w = IO.pipe
+      self.pid = Process.spawn(command, STDERR=>w, STDOUT=>w)
+      w.close
 
-    loop do
-      begin
-        flags = (timeout > 0 ? Process::WUNTRACED|Process::WNOHANG : 0)
-        ret = Process.waitpid(pid, flags)
-      rescue Errno::ECHILD
-        break
+      self.timer = Time.now + timeout
+      timed_out = false
+
+      loop do
+        begin
+          flags = (timeout > 0 ? Process::WUNTRACED|Process::WNOHANG : 0)
+          ret = Process.waitpid(pid, flags)
+        rescue Errno::ECHILD
+          break
+        end
+
+        break if ret == pid
+        sleep 0.01
+        if Time.now > timer
+          timed_out = true
+          break
+        end
       end
 
-      break if ret == pid
-      sleep 0.01
-      if Time.now > timer
-        timed_out = true
-        break
+      if timed_out
+        # The subprocess timed out -- kill it
+        Process.kill(9, pid) rescue Errno::ESRCH
+        self.exitstatus = nil
+      else
+        # The subprocess exited on its own
+        self.exitstatus = $?.exitstatus
+        self.output = r.readlines.join("")
       end
+      r.close
+      
+      self
     end
-    
-    if timed_out
-      # The subprocess timed out -- kill it
-      Process.kill(9, pid) rescue Errno::ESRCH
-      self.exitstatus = nil
-    else
-      # The subprocess exited on its own
+  
+    def exec
+      self.output = `#{command} 2>&1`
       self.exitstatus = $?.exitstatus
-      self.output = r.readlines.join("")
     end
-    r.close
-    
-    self
-  end
 
 end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: subexec
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Peter Kieltyka
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 -04:00
+date: 2010-07-07 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -46,7 +45,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -55,7 +53,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"