workqueue 0.1.2 → 0.1.3

data/lib/workqueue.rb

@@ -17,7 +17,6 @@ class WorkQueue
   def initialize(init_queue=[], opts={}, &job)
     @job = job
     @queue = Queue.new
-    @mutex = Mutex.new
 
     opts.each { |k, v| send(:"#{k}=", v) }
 
@@ -32,17 +31,9 @@ class WorkQueue
   def work!
     loop do
       begin
-        # initialize these here so they can be set in
-        # the synchronize block
-        payload, index = []
-
-        @mutex.synchronize {
-          unless @aborted or (@joined and queue.empty?)
-            payload, index = queue.shift
-          end
-        }
-
-        break if payload.nil?
+        break if @aborted
+        payload, index = queue.shift
+        break if payload == :__break!
 
         aggregate[index] = job.call(payload)
       rescue Exception
@@ -53,7 +44,7 @@ class WorkQueue
   end
 
   def abort!
-    @mutex.synchronize { @aborted = true }
+    @aborted = true
   end
 
   def run
@@ -76,7 +67,7 @@ class WorkQueue
   end
 
   def join
-    @mutex.synchronize { @joined = true }
+    concat([:__break!] * size)
 
     workers.each(&:join)
 

data/lib/workqueue/version.rb

@@ -1,5 +1,5 @@
 class WorkQueue
   def self.version
-    '0.1.2'
+    '0.1.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workqueue
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000Z
+date: 2011-11-09 00:00:00.000000000Z
 dependencies: []
 description: ! '    A description will be forthcoming
 
@@ -38,7 +38,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 705587981601975922
+      hash: 3748006813940409733
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -47,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 705587981601975922
+      hash: 3748006813940409733
 requirements: []
 rubyforge_project: workqueue
 rubygems_version: 1.8.10