0
@@ -22,19 +22,12 @@
0
   def run
0
     initialize_streams
0
     pid = fork do
0
-      @stdin.bind_input(STDIN)
0
-      @stdout.bind_output(STDOUT)
0
-      @stderr.bind_output(STDERR)
0
+      redirect_streams
0
       exec(@executable, *@arguments)
0
     end
0
-    stdin, stdout, stderr = open_streams(pid)
0
-    @stdin_io = stdin
0
-    @stdout_events.run(stdout)
0
-    @stderr_events.run(stderr)
0
-    @stdin_spool.replay(stdin)
0
-    [@stdout_events, @stderr_events].each { |e| e.finish }
0
-    Process.waitpid(pid)
0
-    return @exit_status = $?
0
+    stdin, stdout, stderr = open_streams
0
+    process_streams(stdin, stdout, stderr, pid)
0
+    return @exit_status
0
   ensure
0
     finalize_streams
0
   end
0
0
0
0
@@ -53,31 +46,36 @@
0
   
0
 private
0
   
0
-  def check_executable(executable)
0
-    unless File.exist?(@executable)
0
-      raise Ropen::InvalidExecutableError.new("#{executable} does not exist")
0
-    end
0
-    
0
-    unless File.executable?(@executable)
0
-      raise Ropen::InvalidExecutableError.new("#{executable} is not executable")
0
-    end
0
-  end
0
-  
0
   def initialize_streams
0
     @stdin  = Ropen::Pipe.new
0
     @stdout = Ropen::Pipe.new
0
     @stderr = Ropen::Pipe.new
0
   end
0
   
0
-  def open_streams(pid)
0
+  def open_streams
0
     @stdin.close_reader
0
     @stdout.close_writer
0
     @stderr.close_writer
0
-#    Process.waitpid(pid)
0
     @stdin.writer.sync = true
0
     return [@stdin.writer, @stdout.reader, @stderr.reader]
0
   end
0
   
0
+  def redirect_streams
0
+    @stdin.bind_input(STDIN)
0
+    @stdout.bind_output(STDOUT)
0
+    @stderr.bind_output(STDERR)
0
+  end
0
+  
0
+  def process_streams(stdin, stdout, stderr, child_pid)
0
+    @stdin_io = stdin
0
+    @stdout_events.run(stdout)
0
+    @stderr_events.run(stderr)
0
+    @stdin_spool.replay(stdin)
0
+    [@stdout_events, @stderr_events].each { |e| e.finish }
0
+    Process.waitpid(child_pid)
0
+    @exit_status = $?
0
+  end
0
+  
0
   def finalize_streams
0
     [@stdin, @stdout, @stderr].each { |s| s.close }
0
     @stdin = nil
0
@@ -86,5 +84,15 @@
0
     @stderr = nil
0
   end
0
   
0
+  def check_executable(executable_name)
0
+    unless File.exist?(@executable)
0
+      raise Ropen::InvalidExecutableError.new("#{executable_name} does not exist")
0
+    end
0
+    
0
+    unless File.executable?(@executable)
0
+      raise Ropen::InvalidExecutableError.new("#{executable_name} is not executable")
0
+    end
0
+  end
0
+
0
 end