itimer 6 → 7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9303f43abb6d89f16d982ecd699badd4c2fcda54
-  data.tar.gz: 5a68f96c80393c9fe74f0240a051bcaea3a69c9b
+  metadata.gz: 03c7871d15f037b4eca089e3a450f11c9507f36a
+  data.tar.gz: e59146e12d5468383501dd68333441ee80db96c3
 SHA512:
-  metadata.gz: d03a296115e138ac991c9b23ba4c24fc8bc947253fbd23b337c97e8adddc240634e21fd2973fce8e25c288082cbdb134969c16c2fe2816a2d3ce43f0e0ddc95d
-  data.tar.gz: d7f583044bc06894247b146f7bdcb36e1ef2934ee85cf714463fd9ab467952670664a77abc23626b7907a55363519569a38e5624100fe8cfa3d0b63868aa58b4
+  metadata.gz: 1e0b85378dab98fde8370ed571ba7f42147837ab53937070bd4bf2693179db0a9aac9c2d09004383abb1ef735261e2c1edbfdf43793232316d85a3755d3f36a6
+  data.tar.gz: d0073c174fab5aa25cf8879f31ffaa1a03dd4e1289ed75e6a209f7aa7b73bd560639fb02a5a9ede0049a31622d5697f8cd3c9f9d0d85ce24f4ae323d29588933

data/README.md

@@ -1,4 +1,4 @@
-# Itimer [![Build Status](https://secure.travis-ci.org/nearbuy/ruby-itimer.png?branch=master)]
+# Itimer [![Build Status](https://travis-ci.org/nearbuy/ruby-itimer.png)](https://travis-ci.org/nearbuy/ruby-itimer)
 
 Drop-in replacement for stdlib Timeout that uses POSIX interval timers instead of threads.  Not as portable but much lighter weight.  Also includes low-level wrappers for setitimer and getitimer.
 
@@ -32,15 +32,15 @@ Signal.trap('VTALRM') { raise Itimer::Timeout }
 begin
   # set :real, :virtual and :prof
   Itimer.set(:virtual, 1)
-  do\_expensive\_computation()
+  do_expensive_computation()
 rescue Itimer::Timeout
   puts 'Execution time expired'
 end
 
 Signal.trap('ALRM') { print '.' }
 
-Itimer.set\_interval(:real, 0.5)
-do\_expensive\_computation()
+Itimer.set_interval(:real, 0.5)
+do_expensive_computation()
 puts 'Done'
 ```
 
@@ -55,10 +55,11 @@ getitimer(2), setitimer(2)
 ## Authors
 
 * Nate Mueller ([natemueller](https://github.com/natemueller))
+* Peter Sanford ([psanford](https://github.com/psanford))
 
 ## License
 
-Copyright (c) 2011 Nearbuy Systems
+Copyright (c) 2013 Nearbuy Systems
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/itimer.rb

@@ -5,8 +5,13 @@ module Itimer
   end
 
   def self.timeout(seconds, klass=Timeout)
-    Signal.trap 'ALRM' do
-      raise klass
+    @counter ||= 0
+    @counter += 1
+
+    catch_name = "itimer_#{@counter}"
+
+    prev_handler = Signal.trap 'ALRM' do
+      throw catch_name
     end
 
     prev = get(:real)
@@ -15,17 +20,28 @@ module Itimer
       seconds = [prev, seconds].min
     end
 
-    begin
+    timed_out = true
+
+    catch catch_name do
       set(:real, seconds)
-      ret = yield
-    ensure
-      if prev > 0
-        set(:real, [prev - (Time.now-start), 0.01].max)
-      else
-        set(:real, 0)
+      begin
+        ret = yield
+        timed_out = false
+      ensure
+        if prev > 0
+          set(:real, [prev - (Time.now-start), 0.01].max)
+        else
+          set(:real, 0)
+        end
+
+        Signal.trap('ALRM', prev_handler)
       end
     end
 
+    if timed_out
+      raise klass
+    end
+
     return ret
   end
 end

data/test/itimer.rb

@@ -3,19 +3,35 @@ require 'test/unit'
 require 'itimer/compat'
 
 class ItimerTest < Test::Unit::TestCase
+  def teardown
+    assert_equal( 0, Itimer.get(:real) )
+    assert_equal( 0, Itimer.get(:virtual) )
+    assert_equal( 0, Itimer.get(:prof) )
+  end
+
   def test_itimer
     Signal.trap 'ALRM' do
       raise Exception.new('ALRM')
     end
 
-    Signal.trap 'VTALRM' do
-      raise Exception.new('VTALRM')
-    end
-
     Signal.trap 'PROF' do
       raise Exception.new('PROF')
     end
 
+    can_trap_vtalrm = true
+    begin
+      # this fails on ruby >= 2.0.0
+      Signal.trap('VTALRM', 'default')
+    rescue ArgumentError
+      can_trap_vtalrm = false
+    end
+
+    if can_trap_vtalrm
+      Signal.trap 'VTALRM' do
+        raise Exception.new('VTALRM')
+      end
+    end
+
     assert_equal( 0, Itimer.get(:real) )
     assert_equal( 0, Itimer.get(:virtual) )
     assert_equal( 0, Itimer.get(:prof) )
@@ -67,6 +83,7 @@ class ItimerTest < Test::Unit::TestCase
     assert_equal( 'ALRM', wait_for_sig.call )
     assert_in_delta( Time.now-start, 1.2, 0.1 )
     Itimer.set_interval(:real, 0)
+    Itimer.set(:real, 0)
   end
 
   def test_timeout
@@ -101,7 +118,9 @@ class ItimerTest < Test::Unit::TestCase
       end
     end
     assert_in_delta( Time.now-start, 0.1, 0.1 )
+  end
 
+  def test_nested_timeouts_inner_rescue
     start = Time.now
     timeouts = false
     assert_raise( Itimer::Timeout ) do
@@ -118,6 +137,9 @@ class ItimerTest < Test::Unit::TestCase
     end
     assert( timeouts )
     assert_in_delta( Time.now-start, 0.25, 0.1 )
+  end
+
+  def test_nested_timeouts_larger_inner
 
     start = Time.now
     timeouts = false
@@ -154,4 +176,45 @@ class ItimerTest < Test::Unit::TestCase
 
     assert_equal( 0, Itimer.get(:real) )
   end
+
+  def test_exceptions_caught_at_right_level
+    inner_exception = false
+    outer_exception = false
+    begin
+      Itimer.timeout(0.25) do
+        begin
+          sleep 0.5
+        rescue Itimer::Timeout
+          inner_exception = true
+        end
+      end
+    rescue Itimer::Timeout
+      outer_exception = true
+    end
+
+    assert( outer_exception )
+    assert( !inner_exception )
+  end
+
+  def test_throwing_exception_in_nested_itimer
+    inner_exception = false
+    outer_exception = false
+    begin
+      Itimer.timeout(0.25) do
+        begin
+          Itimer.timeout(0.1) do
+            throw ArgumentError
+          end
+        rescue ArgumentError
+          inner_exception = true
+        end
+        sleep 0.5
+      end
+    rescue Itimer::Timeout
+      outer_exception = true
+    end
+
+    assert( inner_exception )
+    assert( outer_exception )
+  end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: itimer
 version: !ruby/object:Gem::Version
-  version: '6'
+  version: '7'
 platform: ruby
 authors:
 - Nate Mueller
+- Peter Sanford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler