itimer 8 → 9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df5173d93aec0faedb0a3686f8c9509c7c1b9359
-  data.tar.gz: 7ebb17e6857fcbe7ed386f42b09a504da53d4398
+  metadata.gz: 5b571dc4407cd0e99f440b372bc6ac65238471ab
+  data.tar.gz: 7b9f195720f60ab1803dd3d11fc54db948b6854e
 SHA512:
-  metadata.gz: ddb3129bf814dff272dfd842b00e0d4017970fca04bbca5d096d72c458d18e5a24e0d1452a3df40b4e5b6c062591de45df1a1866a1599f6ce3cc56dba07883d9
-  data.tar.gz: 1f6922686455ba1a9fed363d4d88be18cecaa883a8fe97a0f4fa1ba9dd482d52ccb888a4d27c2fce93cbce4ab50c23402ca9a00f1c6071ff9d671fc4fab6318f
+  metadata.gz: e4c96589f93b7bf9ce7b07c7bfbf3a459afc3e3e411be51242d5cba7eb21b263c1cedd072e45ce1b99ccd80d761d6a5f50011c41e1c471f5b2fef5368d9da397
+  data.tar.gz: 275a8aa593509842980f00d0cbb509f8b4180c885edef8eedf316938f73416ceb0673975c2feae9190f4fbf6c8e3c1a54155e971261fc71fd35f6f1b5b976a02

data/README.md

@@ -44,6 +44,10 @@ do_expensive_computation()
 puts 'Done'
 ```
 
+## Known Issues
+
+This module is not designed to work with ruby threads. If you set timers in multiple ruby threads at the same time some of them will not fire.
+
 ## Support
 
 Please report issues at https://github.com/nearbuy/ruby-itimer/issues

data/lib/itimer.rb

@@ -5,42 +5,53 @@ module Itimer
   end
 
   def self.timeout(seconds, klass=Timeout)
-    @counter ||= 0
-    @counter += 1
-
-    catch_name = "itimer_#{@counter}"
-
-    prev_handler = Signal.trap 'ALRM' do
-      throw catch_name
-    end
-
-    prev = get(:real)
-    start = Time.now
-    if prev > 0
-      seconds = [prev, seconds].min
-    end
-
-    timed_out = true
     ret = nil
 
-    catch catch_name do
-      set(:real, seconds)
-      begin
-        ret = yield
-        timed_out = false
-      ensure
-        if prev > 0
-          set(:real, [prev - (Time.now-start), 0.01].max)
-        else
-          set(:real, 0)
+    prev_timeout = @active_timeout
+    start = Time.now
+    absolute_timeout = start + seconds
+
+    if prev_timeout && absolute_timeout > prev_timeout
+      # this timer is nested in another one that will timeout before it,
+      # it will never fire
+      ret = yield
+    else
+      @counter ||= 0
+      @counter += 1
+
+      catch_name = "itimer_#{@counter}"
+
+      prev_handler = Signal.trap 'ALRM' do
+        begin
+          raise klass
+        rescue klass
+          throw(catch_name, $!)
         end
+      end
 
-        Signal.trap('ALRM', prev_handler)
+      timed_out = true
+      @active_timeout = absolute_timeout
+
+      exception = catch(catch_name) do
+        set(:real, seconds)
+        begin
+          ret = yield
+          timed_out = false
+        ensure
+          @active_timeout = prev_timeout
+          if prev_timeout
+            set(:real, prev_timeout - Time.now)
+          else
+            set(:real, 0)
+          end
+
+          Signal.trap('ALRM', prev_handler)
+        end
       end
-    end
 
-    if timed_out
-      raise klass
+      if timed_out
+        raise exception
+      end
     end
 
     return ret

data/test/itimer.rb

@@ -140,22 +140,27 @@ class ItimerTest < Test::Unit::TestCase
   end
 
   def test_nested_timeouts_larger_inner
+    inner_exception = false
+    outer_exception = false
 
     start = Time.now
-    timeouts = false
-    assert_raise( Itimer::Timeout ) do
+    begin
       Itimer.timeout(0.25) do
         begin
           Itimer.timeout(3) do
             sleep 1
           end
         rescue Itimer::Timeout
-          timeouts = true
+          inner_exception = true
         end
         sleep 1
       end
+    rescue Itimer::Timeout
+      outer_exception = true
     end
-    assert( timeouts )
+
+    assert( outer_exception )
+    assert( !inner_exception )
     assert_in_delta( Time.now-start, 0.25, 0.1 )
   end
 
@@ -185,15 +190,17 @@ class ItimerTest < Test::Unit::TestCase
         begin
           sleep 0.5
         rescue Itimer::Timeout
-          inner_exception = true
+          inner_exception = $!
         end
       end
     rescue Itimer::Timeout
-      outer_exception = true
+      outer_exception = $!
     end
 
     assert( outer_exception )
     assert( !inner_exception )
+
+    assert( outer_exception.backtrace.find {|bt| bt.include?('sleep') } )
   end
 
   def test_throwing_exception_in_nested_itimer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itimer
 version: !ruby/object:Gem::Version
-  version: '8'
+  version: '9'
 platform: ruby
 authors:
 - Nate Mueller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler