tpool 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/tpool.rb

@@ -1,6 +1,10 @@
 require "thread"
 
 class Tpool
+  attr_reader :args
+  
+  ARGS_VALID = [:threads, :priority, :on_error]
+  
   def self.const_missing(name)
     require "#{File.dirname(__FILE__)}/tpool_#{name.to_s.downcase}.rb"
     raise "Still not defined: '#{name}'." if !Tpool.const_defined?(name)
@@ -15,10 +19,15 @@ class Tpool
   
   def initialize(args)
     @args = args
+    @args.each do |key, val|
+      raise "Invalid argument given: '#{key}'." if Tpool::ARGS_VALID.index(key) == nil
+    end
+    
     @queue = Queue.new
     self.start
   end
   
+  #Starts the thread-pool. This is automatically called on initialization.
   def start
     raise "Already started." if @pool and !@pool.empty?
     
@@ -57,6 +66,7 @@ class Tpool
     block = Tpool::Block.new(
       :args => args,
       :blk => blk,
+      :tpool => self,
       :thread_starts => [Thread.current]
     )
     @queue << block

data/lib/tpool_block.rb

@@ -5,6 +5,7 @@ class Tpool::Block
   def initialize(args)
     @args = args
     
+    @tpool = @args[:tpool]
     @running = false
     @done = false
     @error = nil
@@ -13,13 +14,14 @@ class Tpool::Block
   #Starts running whatever block it is holding.
   def run
     @thread_running = Thread.current
+    @thread_running.priority = @tpool.args[:priority] if @tpool.args.key?(:priority)
     @running = true
     
     begin
       @res = @args[:blk].call(*@args[:args], &@args[:blk])
     rescue Exception => e
       @error = e
-      @args[:tpool].on_error_call(:on_error, e)
+      @args[:tpool].on_error_call(:error => e, :block => self)
     ensure
       @running = false
       @done = true

data/spec/tpool_spec.rb

@@ -2,11 +2,22 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Tpool" do
   it "should work" do
-    tp = Tpool.new(:threads => 4)
+    errs = []
+    
+    tp = Tpool.new(
+      :threads => 4,
+      :priority => -3,
+      :on_error => lambda{|data|
+        errs << data[:error]
+      }
+    )
+    
     res = tp.run do
+      errs << "Expected thread priority to be -3 but it wasnt: '#{Thread.current.priority}'." if Thread.current.priority != -3
       "kasper"
     end
     
+    raise errs.first if !errs.empty?
     raise "Expected result to be 'kasper' but it wasnt: '#{res}'." if res != "kasper"
     
     
@@ -34,5 +45,7 @@ describe "Tpool" do
     end
     
     raise "Expected error but didnt get one." if !error
+    
+    raise errs.first if !errs.empty?
   end
 end

data/tpool.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tpool}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-19}
+  s.date = %q{2012-08-27}
   s.description = %q{A thread-pool for Ruby that supports joining, status-checking, stopping jobs and more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [

metadata

@@ -2,7 +2,7 @@
 name: tpool
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-19 00:00:00 +02:00
+date: 2012-08-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 733002826955008460
+      hash: -3322771653679867598
       segments: 
       - 0
       version: "0"