itimer 4 → 5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0927c46f3b34be6e9ceada8e734dfba266d0a8bd
+  data.tar.gz: 31c702637cbfb192eea372550f3031f7776ab21b
+SHA512:
+  metadata.gz: 09a998ea7e59e6b62a96f07a01080afdae3ff826e18a0449664f08fe0a7560dd338964dae254881b15f38c5d50e406db24c82d6d6d0e7ce9974f4e2dbef3e6dd
+  data.tar.gz: 4b3cffe76bb62e01823f95b66b20ce0e90e66480c524646be720164f2a42c99b00357446b1ecdcdb609e9a1cddb0d320a2c3b69a926d8b452c7686a5b562ab1d

data/lib/itimer.rb

@@ -9,11 +9,21 @@ module Itimer
       raise klass
     end
 
+    prev = get(:real)
+    start = Time.now
+    if prev > 0
+      seconds = [prev, seconds].min
+    end
+
     begin
       set(:real, seconds)
       ret = yield
     ensure
-      set(:real, 0)
+      if prev > 0
+        set(:real, [prev - (Time.now-start), 0].max)
+      else
+        set(:real, 0)
+      end
     end
 
     return ret

data/test/itimer.rb

@@ -81,6 +81,43 @@ class ItimerTest < Test::Unit::TestCase
       Itimer.timeout(0.25, RuntimeError) { sleep 5 }
     end
     assert_in_delta( Time.now-start, 0.25, 0.1 )
+
+    # nesting
+    start = Time.now
+    assert_raise( Itimer::Timeout ) do
+      Itimer.timeout(0.25) do
+        Itimer.timeout(0.5) do
+          sleep 6
+        end
+      end
+    end
+
+    start = Time.now
+    assert_raise( RuntimeError ) do
+      Itimer.timeout(0.25) do
+        Itimer.timeout(0.1, RuntimeError) do
+          sleep 1
+        end
+      end
+    end
+    assert_in_delta( Time.now-start, 0.1, 0.1 )
+
+    start = Time.now
+    timeouts = false
+    assert_raise( Itimer::Timeout ) do
+      Itimer.timeout(0.25) do
+        begin
+          Itimer.timeout(0.1) do
+            sleep 1
+          end
+        rescue Itimer::Timeout
+          timeouts = true
+        end
+        sleep 1
+      end
+    end
+    assert( timeouts )
+    assert_in_delta( Time.now-start, 0.25, 0.1 )
   end
 
   def test_compat

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: itimer
 version: !ruby/object:Gem::Version
-  version: '4'
-  prerelease: 
+  version: '5'
 platform: ruby
 authors:
 - Nate Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -45,26 +42,25 @@ files:
 - ext/itimer_native.c
 homepage: http://github.com/nearbuy/ruby-itimer
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Timeout replacement using POSIX interval timers
 test_files: []