concurrent-sequential 0.1 → 0.2

data/lib/concurrent/sequential/mock-sequencer.rb

@@ -35,7 +35,7 @@ class MockSequencer
     @queue = []
   end
 
-  def soon(&block)
+  def later(&block)
     raise ArgumentError, "No block given" unless block
     @queue << block
     self

data/lib/concurrent/sequential/thread-sequencer.rb

@@ -39,27 +39,33 @@ module Sequential
 class ThreadSequencer
   def initialize
     @queue = Queue.new
-    @running = true
+    @shutdown = false
     @thread = Thread.new { run }
   end
 
-  def soon(&block)
+  def later(&block)
     raise ArgumentError, "No block given" unless block
     @queue << block
     self
   end
 
   def shutdown(timeout=nil)
-    soon { @running = false } if @thread.alive?
+    later { @shutdown = true } if @thread.alive?
     @thread.join(timeout)
     self
   end
 
   def run
-    while @running
+    until @shutdown and @queue.empty?
       begin
         @queue.shift.call
-      rescue Exception
+      rescue Exception => e
+        if $DEBUG
+          $stderr.puts "Exception in sequencer loop:"
+          $stderr.puts "${e.class}: #{e}"
+          $stderr.puts e.backtrace
+          $stderr.puts "---"
+        end
       end
     end
     self

data/spec/sequential/mock-sequencer_spec.rb

@@ -7,21 +7,21 @@ describe mock_sequencer do
     @sequencer = mock_sequencer.new
   end
 
-  it "should accept blocks via #{mock_sequencer}#soon" do
-    @sequencer.soon { }
+  it "should accept blocks via #{mock_sequencer}#later" do
+    @sequencer.later { }
   end
 
   it "should execute submitted blocks after submission" do
     calls = mock("calls")
-    @sequencer.soon { calls.a }
+    @sequencer.later { calls.a }
     calls.should_receive(:a)
     @sequencer.run
   end
 
   it "should execute reentrant blocks completely and in submission order" do
     calls = mock("calls")
-    @sequencer.soon do
-      @sequencer.soon { calls.b }
+    @sequencer.later do
+      @sequencer.later { calls.b }
       calls.a
     end
     calls.should_receive(:a).ordered

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: concurrent-sequential
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2008-06-03 00:00:00 -04:00
+  version: "0.2"
+date: 2008-06-07 00:00:00 -04:00
 summary: Sequenced asynchronous actions
 require_paths: 
 - lib