frugal_timeout 0.0.2 → 0.0.3

data/lib/frugal_timeout.rb

@@ -14,8 +14,8 @@ module FrugalTimeout
 
     attr_reader :at, :thread
 
-    def initialize thread, at
-      @thread, @at = thread, at
+    def initialize thread, at, klass
+      @thread, @at, @klass = thread, at, klass
     end
 
     def <=>(other)
@@ -31,7 +31,7 @@ module FrugalTimeout
     end
 
     def enforceTimeout
-      @thread.raise Error, 'execution expired' unless done?
+      @thread.raise @klass || Error, 'execution expired' unless done?
     end
   end
 
@@ -94,9 +94,8 @@ module FrugalTimeout
       }
       start = Time.now
       sleepFor ? sleep(sleepFor) : sleep
-      slept = Time.now - start
       @sleeperMutex.synchronize {
-	@in.push :expired if sleepFor && slept >= sleepFor
+	@in.push :expired if sleepFor && Time.now - start >= sleepFor
       }
     }
   }
@@ -119,7 +118,7 @@ module FrugalTimeout
   end
 
   def self.timeout t, klass=nil
-    @in.push request = Request.new(Thread.current, Time.now + t)
+    @in.push request = Request.new(Thread.current, Time.now + t, klass)
     begin
       yield t
     ensure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frugal_timeout
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: