0
@@ -8,7 +8,6 @@
0
   
0
   def initialize
0
     @callbacks = []
0
-    @running_callbacks = []
0
   end
0
   
0
   def on_output(&block)
0
@@ -20,7 +19,7 @@
0
       until stream.eof?
0
         data = stream.readpartial(1024)
0
         @callbacks.each do |e|
0
-          @running_callbacks << Thread.new(data, &e)
0
+          e.call(data)
0
         end
0
       end
0
     end
0
@@ -28,7 +27,6 @@
0
   
0
   def finish
0
     @thread.join
0
-    @running_callbacks.each { |t| t.join }
0
   end
0
   
0
 end

0
@@ -27,27 +27,24 @@
0
     @events.callbacks.should == [callback]
0
   end
0
   
0
-  it "should run collected events in parallel" do
0
+  it "should run collected events on a given stream" do
0
+    output = []
0
+    
0
     @stream.should_receive(:eof?).and_return(false, false, true)
0
     @stream.should_receive(:readpartial).with(an_instance_of(Numeric)).and_return("blah", "blee")
0
     
0
     @events.on_output do |line|
0
-      ThreadSafeStorage.instance.stuff << [1, line]
0
-      sleep 1
0
+      output << [1, line]
0
     end
0
     
0
     @events.on_output do |line|
0
-      ThreadSafeStorage.instance.stuff << [2, line]
0
-      sleep 2
0
+      output << [2, line]
0
     end
0
     
0
-    start_time = Time.now
0
     @events.run(@stream)
0
     @events.finish
0
-    elapsed_time = Time.now - start_time
0
-    elapsed_time.should < 2.1
0
-    elapsed_time.should > 1.9
0
-    ThreadSafeStorage.instance.stuff.transpose.last.should == ["blah", "blah", "blee", "blee"]
0
+    
0
+    output.transpose.last.should == ["blah", "blah", "blee", "blee"]
0
   end
0
   
0
 end