work_queue 2.5.3 → 2.5.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f26271fcef114e2b126329e98c5805a73f67e397
+  data.tar.gz: 9b57c49e5f8a361f823b8fbabfc693782b1f5f89
+SHA512:
+  metadata.gz: 6e1249bf45fc675d1a3cc80488e2c3912080a449fcd84df15342f24026ca65c69b7ce62244774920e031a4a4a23d5c3ef9deb76b7b4af73eaedee5aec0a1c560
+  data.tar.gz: 0b3da201d24636d7982c971502db6200d21a7147c2964657ad219a41d4c4ebc14bf1caf70064b6ae331c7a1f4f7bf660353825431b1e5f41c7db8900863f403a

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Miguel Fonseca
+Copyright (c) 2014 Miguel Fonseca
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/Rakefile

@@ -1,10 +1,10 @@
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'lib/work_queue'
+require "rubygems"
+require "rake"
+require "rake/clean"
+require_relative "lib/work_queue"
 
 # Load all rakefile extensions
 Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].each { |ext| load ext }
 
 # Set default task
-task :default => ["test:unit"]
+task :default => ["test:unit"]

data/lib/work_queue.rb

@@ -1,11 +1,11 @@
-require 'thread'
-require 'monitor'
+require "thread"
+require "monitor"
 
 ##
 # A tunable work queue, designed to coordinate work between a producer and a pool of worker threads.
 #
 class WorkQueue
-  VERSION = "2.5.3"
+  VERSION = "2.5.4"
 
   ##
   # Creates an empty work queue with the desired parameters.
@@ -20,13 +20,13 @@ class WorkQueue
   #  wq = WorkQueue.new nil, 20
   #  wq = WorkQueue.new 10, 20
   #
-  def initialize(max_threads=nil, max_tasks=nil)
+  def initialize(max_threads = nil, max_tasks = nil)
     self.max_threads = max_threads
     self.max_tasks = max_tasks
-    @threads = Array.new
+    @threads = []
     @threads_waiting = 0
     @threads.extend MonitorMixin
-    @tasks = Array.new
+    @tasks = []
     @tasks.extend MonitorMixin
     @task_enqueued = @tasks.new_cond
     @task_dequeued = @tasks.new_cond
@@ -148,7 +148,7 @@ class WorkQueue
   def kill
     @tasks.synchronize do
       @threads.synchronize do
-        @threads.each { |thread| thread.exit }
+        @threads.each(&:exit)
         @threads.clear
         @threads_waiting = 0
       end
@@ -165,16 +165,16 @@ class WorkQueue
   # Sets the maximum number of worker threads.
   #
   def max_threads=(value)
-    raise ArgumentError, "the maximum number of threads must be positive" if value and value <= 0
-    @max_threads = value || 1.0/0
+    fail ArgumentError, "the maximum number of threads must be positive" if value && value <= 0
+    @max_threads = value || 1.0 / 0
   end
 
   ##
   # Sets the maximum number of queued tasks.
   #
   def max_tasks=(value)
-    raise ArgumentError, "the maximum number of tasks must be positive" if value and value <= 0
-    @max_tasks = value || 1.0/0
+    fail ArgumentError, "the maximum number of tasks must be positive" if value && value <= 0
+    @max_tasks = value || 1.0 / 0
   end
 
   ##
@@ -207,20 +207,18 @@ class WorkQueue
   # Repeatedly process the tasks queue.
   #
   def run
-    begin
-      loop do
-        proc, params = dequeue
-        begin
-          proc.call(*params)
-        rescue Exception => e
-          # Suppress Exception
-        end
-        conclude
-      end
-    ensure
-      @threads.synchronize do
-        @threads.delete Thread.current
+    loop do
+      proc, params = dequeue
+      begin
+        proc.call(*params)
+      rescue => e
+        STDERR.puts e
       end
+      conclude
+    end
+  ensure
+    @threads.synchronize do
+      @threads.delete Thread.current
     end
   end
 
@@ -247,4 +245,4 @@ class WorkQueue
       @task_completed.broadcast
     end
   end
-end
+end

data/tasks/test.rake

@@ -1,11 +1,11 @@
-require 'rake/testtask'
+require "rake/testtask"
 
 namespace(:test) do
   # For a list of all attributes refer to http://rake.rubyforge.org/classes/Rake/TestTask.html
   Rake::TestTask.new(:unit) do |t|
     t.libs << "test"
-    t.test_files = FileList['test/tc_*.rb']
+    t.test_files = FileList["test/tc_*.rb"]
     t.verbose = true
     t.warning = true
   end
-end
+end

data/test/tc_work_queue.rb

@@ -1,17 +1,17 @@
-require 'test/unit'
-require 'lib/work_queue'
+require "test/unit"
+require_relative "../lib/work_queue"
 
-class TC_WorkQueue < Test::Unit::TestCase
+class TestWorkQueue < Test::Unit::TestCase
   def test_enqueue_proc
-    s = String.new
+    s = ""
     wq = WorkQueue.new
-    wq.enqueue_p(Proc.new { |str| str.replace "Hello Proc" }, s)
+    wq.enqueue_p(proc { |str| str.replace "Hello Proc" }, s)
     wq.join
     assert_equal "Hello Proc", s
   end
 
   def test_enqueue_block
-    s = String.new
+    s = ""
     wq = WorkQueue.new
     wq.enqueue_b(s) { |str| str.replace "Hello Block" }
     wq.join
@@ -19,7 +19,7 @@ class TC_WorkQueue < Test::Unit::TestCase
   end
 
   def test_inner_enqueue
-    s = String.new
+    s = ""
     wq = WorkQueue.new
     wq.enqueue_b do
       sleep 0.01
@@ -41,7 +41,7 @@ class TC_WorkQueue < Test::Unit::TestCase
   end
 
   def test_max_threads
-    wq = WorkQueue.new 1
+    wq = WorkQueue.new(1)
     assert_equal 0, wq.cur_threads
     wq.enqueue_b { sleep 0.01 }
     assert_equal 1, wq.cur_threads
@@ -53,12 +53,12 @@ class TC_WorkQueue < Test::Unit::TestCase
   end
 
   def test_max_threads_validation
-    assert_raise(ArgumentError) { WorkQueue.new 0, nil }
-    assert_raise(ArgumentError) { WorkQueue.new -1, nil }
+    assert_raise(ArgumentError) { WorkQueue.new(0, nil) }
+    assert_raise(ArgumentError) { WorkQueue.new(-1, nil) }
   end
 
   def test_max_tasks
-    wq = WorkQueue.new 1, 1
+    wq = WorkQueue.new(1, 1)
     wq.enqueue_b { sleep 0.01 }
     wq.enqueue_b { sleep 0.01 }
     assert_equal 1, wq.cur_tasks
@@ -68,45 +68,45 @@ class TC_WorkQueue < Test::Unit::TestCase
   end
 
   def test_max_tasks_validation
-    assert_raise(ArgumentError) { WorkQueue.new nil, 0 }
-    assert_raise(ArgumentError) { WorkQueue.new nil, -1 }
+    assert_raise(ArgumentError) { WorkQueue.new(nil, 0) }
+    assert_raise(ArgumentError) { WorkQueue.new(nil, -1) }
   end
 
   def test_stress
     i = 0
     m = Mutex.new
-    wq = WorkQueue.new 100, 200
-    (1..1000).each do
-      wq.enqueue_b {
+    wq = WorkQueue.new(100, 200)
+    (1..10_000).each do
+      wq.enqueue_b do
         sleep 0.01
         m.synchronize { i += 1 }
-      }
+      end
     end
     wq.join
-    assert_equal 1000, i
+    assert_equal 10_000, i
   end
 
   def test_stress_prolonged
     i = 0
     m = Mutex.new
-    wq = WorkQueue.new 100, 200
-    (1..1000).each do
-      wq.enqueue_b {
+    wq = WorkQueue.new(100, 200)
+    (1..10_000).each do
+      wq.enqueue_b do
         sleep rand(5)
         m.synchronize { i += 1 }
-      }
+      end
     end
     wq.join
-    assert_equal 1000, i
+    assert_equal 10_000, i
   end
 
   def test_kill
-    s = String.new
+    s = ""
     wq = WorkQueue.new
-    wq.enqueue_b(s) { |str|
+    wq.enqueue_b(s) do |str|
       sleep 0.1
       str.replace "Hello"
-    }
+    end
     wq.kill
     assert(s.empty?)
   end

metadata

@@ -1,77 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: work_queue
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
-  segments: 
-  - 2
-  - 5
-  - 3
-  version: 2.5.3
+version: !ruby/object:Gem::Version
+  version: 2.5.4
 platform: ruby
-authors: 
+authors:
 - Miguel Fonseca
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-23 00:00:00 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: contact@miguelfonseca.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - LICENSE
-files: 
+files:
 - LICENSE
 - Rakefile
 - README.rdoc
 - tasks/test.rake
-- lib/test.rb
 - lib/work_queue.rb
 - test/tc_work_queue.rb
 homepage: http://github.com/fmmfonseca/work_queue
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
-      version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: 1.9.3
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
-summary: A tunable work queue, designed to coordinate work between a producer and a pool of worker threads.
-test_files: 
+specification_version: 4
+summary: A tunable work queue, designed to coordinate work between a producer and
+  a pool of worker threads.
+test_files:
 - test/tc_work_queue.rb

data/lib/test.rb

@@ -1,12 +0,0 @@
-require_relative 'work_queue'
-
-work_queue = WorkQueue.new(1000)
-
-# Force threads to be available - the work_queue gem seems to not always create the threads
-10000.times do |i|
-work_queue.enqueue_b do
-  a = 2
-end
-end
-
-puts "ola"