SystemTimer 1.0 → 1.1

data/test/system_timer_unit_test.rb

@@ -0,0 +1,96 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+unit_tests do
+  
+  test "timeout_after registers a new timer in the timer pool" do
+    pool = stub_everything
+    Thread.stubs(:current).returns(:the_current_thread)
+    SystemTimer.stubs(:timer_pool).returns(pool)
+    SystemTimer.stubs(:install_next_timer)
+    SystemTimer.stubs(:restore_original_configuration)
+
+    pool.expects(:add_timer).with(5).returns(stub_everything)
+    SystemTimer.timeout_after(5) {}    
+  end
+
+  test "timeout_after installs a system timer saving the previous " +
+       "configuration when there is only one timer" do
+         
+    now = Time.now
+    Time.stubs(:now).returns(now)
+    SystemTimer.stubs(:restore_original_configuration)
+
+    SystemTimer.expects(:install_first_timer_and_save_original_configuration).with(24)
+    SystemTimer.timeout_after(24) {}    
+  end
+
+  test "timeout_after installs a system timer without saving the previous " +
+       "configuration when there is more than one timer" do
+         
+    now = Time.now
+    Time.stubs(:now).returns(now)
+    SystemTimer.timer_pool.register_timer now.to_i + 100, :a_thread
+    SystemTimer.stubs(:restore_original_configuration)
+    SystemTimer.stubs(:install_next_timer)
+
+    SystemTimer.expects(:install_next_timer).with(24)
+    SystemTimer.timeout_after(24) {}    
+  end
+
+  test "timeout_after installs a system timer with the interval before " +
+       "the next timer to expire" do
+         
+    now = Time.now
+    Time.stubs(:now).returns(now)
+    SystemTimer.timer_pool.register_timer now.to_i + 24, :a_thread
+    SystemTimer.stubs(:restore_original_configuration)
+    SystemTimer.stubs(:install_next_timer)
+
+    SystemTimer.expects(:install_next_timer).with(24)
+    SystemTimer.timeout_after(100) {}    
+  end
+  
+  test "timeout_after cancels the timer when the block completes without " +
+       "timeout" do
+         
+    now = Time.now
+    the_timer = stub_everything
+    Time.stubs(:now).returns(now)
+    SystemTimer.stubs(:restore_original_configuration)
+    SystemTimer.stubs(:install_first_timer_and_save_original_configuration)    
+    SystemTimer.timer_pool.stubs(:add_timer).returns(the_timer)
+    SystemTimer.timer_pool.stubs(:first_timer?).returns(true)
+    
+    SystemTimer.timer_pool.expects(:cancel).with(the_timer)
+    SystemTimer.timeout_after(24) {}    
+  end
+
+ test "debug does not output to stdout when debug is disabled"  do
+   SystemTimer.stubs(:debug_enabled?).returns(false)
+   original_stdout = $stdout
+   begin
+     stdout = StringIO.new
+     $stdout = stdout
+   
+     SystemTimer.send :debug, "a log message"
+     assert stdout.string.empty?
+   ensure
+     $stdout = original_stdout
+   end   
+ end
+
+ test "debug logs messaget to stdout when debug is enabled"  do
+   SystemTimer.stubs(:debug_enabled?).returns(true)
+   original_stdout = $stdout
+   begin
+     stdout = StringIO.new
+     $stdout = stdout
+   
+     SystemTimer.send :debug, "a log message"
+     assert_match /a log message/, stdout.string
+   ensure
+     $stdout = original_stdout
+   end   
+ end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,10 @@
+ $:.unshift File.dirname(__FILE__) + '/../lib'
+ $:.unshift File.dirname(__FILE__) + '/../ext/system_timer'
+ $: << File.dirname(__FILE__) + "/../vendor/gems/dust-0.1.6/lib"
+ $: << File.dirname(__FILE__) + "/../vendor/gems/mocha-0.9.1/lib"
+require 'test/unit'
+require 'dust'
+require 'mocha'
+require 'stringio'
+require "open-uri"
+require 'system_timer'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: SystemTimer
 version: !ruby/object:Gem::Version 
-  version: "1.0"
+  version: "1.1"
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire: system_timer
 bindir: bin
 cert_chain: []
 
-date: 2008-05-28 00:00:00 -07:00
+date: 2008-11-16 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -27,10 +27,16 @@ files:
 - ChangeLog
 - ext/system_timer/system_timer_native.c
 - ext/system_timer/extconf.rb
+- lib/system_timer/concurrent_timer_pool.rb
+- lib/system_timer/thread_timer.rb
 - lib/system_timer.rb
 - lib/system_timer_stub.rb
 - test/all_tests.rb
-- test/system_timer_test.rb
+- test/system_timer/concurrent_timer_pool_unit_test.rb
+- test/system_timer/thread_timer_test.rb
+- test/system_timer_functional_test.rb
+- test/system_timer_unit_test.rb
+- test/test_helper.rb
 - README
 has_rdoc: true
 homepage: 
@@ -58,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Set a Timeout based on signals, which are more reliable than Timeout. Timeout is based on green threads.

data/test/system_timer_test.rb

@@ -1,121 +0,0 @@
-# $: << File.dirname(__FILE__) + '/../ext/xray'
- $: << File.dirname(__FILE__) + '/../lib'
- $: << File.dirname(__FILE__) + '/../ext/system_timer'
- $: << File.dirname(__FILE__) + "/../../../vendor/gems/dust-0.1.4/lib"
- $: << File.dirname(__FILE__) + "/../../../vendor/gems/mocha-0.5.3/lib"
-require 'test/unit'
-require 'system_timer'
-require 'dust'
-require 'mocha'
-require 'stringio'
-
-functional_tests do
-      
-  test "original_ruby_sigalrm_handler is nil after reset" do
-    SystemTimer.send(:install_ruby_sigalrm_handler)
-    SystemTimer.send(:reset_original_ruby_sigalrm_handler)
-    assert_nil SystemTimer.send(:original_ruby_sigalrm_handler)
-  end  
-  
-  test "original_ruby_sigalrm_handler is set to existing handler after install_ruby_sigalrm_handler" do
-    SystemTimer.expects(:trap).with('SIGALRM').returns(:an_existing_handler)
-    SystemTimer.send(:install_ruby_sigalrm_handler)
-    assert_equal :an_existing_handler, SystemTimer.send(:original_ruby_sigalrm_handler)
-  end
-  
-  test "restore_original_ruby_sigalrm_handler traps sigalrm using original_ruby_sigalrm_handler" do
-    SystemTimer.stubs(:original_ruby_sigalrm_handler).returns(:the_original_handler)
-    SystemTimer.expects(:trap).with('SIGALRM', :the_original_handler)
-    SystemTimer.send :restore_original_ruby_sigalrm_handler
-  end  
-
-  test "restore_original_ruby_sigalrm_handler resets original_ruby_sigalrm_handler" do
-    SystemTimer.stubs(:trap)
-    SystemTimer.expects(:reset_original_ruby_sigalrm_handler)
-    SystemTimer.send :restore_original_ruby_sigalrm_handler
-  end  
-
-  test "restore_original_ruby_sigalrm_handler reset SIGALRM handler to default when original_ruby_sigalrm_handler is nil" do
-    SystemTimer.stubs(:original_ruby_sigalrm_handler)
-    SystemTimer.expects(:trap).with('SIGALRM', 'DEFAULT')
-    SystemTimer.stubs(:reset_original_ruby_sigalrm_handler)
-    SystemTimer.send :restore_original_ruby_sigalrm_handler
-  end  
-  
-  test "restore_original_ruby_sigalrm_handler resets original_ruby_sigalrm_handler when trap raises" do
-    SystemTimer.stubs(:trap).returns(:the_original_handler)
-    SystemTimer.send(:install_ruby_sigalrm_handler)
-    SystemTimer.expects(:trap).raises("next time maybe...")
-    SystemTimer.expects(:reset_original_ruby_sigalrm_handler)
-
-    SystemTimer.send(:restore_original_ruby_sigalrm_handler) rescue nil
-  end  
-
-  test "timeout_after raises TimeoutError if block takes too long" do
-    assert_raises(Timeout::Error) do
-      SystemTimer.timeout_after(1) {sleep 5}
-    end
-  end
-  
-  test "timeout_after does not raises Timeout Error if block completes in time" do
-    SystemTimer.timeout_after(5) {sleep 1}
-  end
-  
-  test "timeout_after returns the value returned by the black" do
-    assert_equal :block_value, SystemTimer.timeout_after(1) {:block_value}
-  end
-
-  test "timeout_after raises TimeoutError in thread that called timeout_after" do
-    raised_thread = nil
-    other_thread = Thread.new do 
-      begin
-        SystemTimer.timeout_after(1) {sleep 5}
-        flunk "Should have timed out"
-      rescue Timeout::Error
-        raised_thread = Thread.current
-      end
-    end
-    
-    other_thread.join 
-    assert_equal other_thread, raised_thread
-  end
-  
-  test "cancelling a timer that was installed restores previous ruby handler for SIG_ALRM" do    
-    begin
-      fake_original_ruby_handler = proc {}
-      initial_ruby_handler = trap "SIGALRM", fake_original_ruby_handler
-      SystemTimer.install_timer(3)
-      SystemTimer.cleanup_timer
-      assert_equal fake_original_ruby_handler, trap("SIGALRM", "IGNORE")    
-    ensure  # avoid interfering with test infrastructure
-      trap("SIGALRM", initial_ruby_handler) if initial_ruby_handler  
-    end
-  end
-   
-  test "debug_enabled returns true after enabling debug" do
-    begin
-      SystemTimer.disable_debug
-      SystemTimer.enable_debug
-      assert_equal true, SystemTimer.debug_enabled?
-    ensure
-      SystemTimer.disable_debug
-    end
-  end 
-  
-  test "debug_enabled returns false after disable debug" do
-    begin
-      SystemTimer.enable_debug
-      SystemTimer.disable_debug
-      assert_equal false, SystemTimer.debug_enabled?
-    ensure
-      SystemTimer.disable_debug
-    end 
-  end
-  
-  test "timeout offers an API fully compatible with timeout.rb" do
-    assert_raises(Timeout::Error) do
-      SystemTimer.timeout(1) {sleep 5}
-    end
-  end
-  
-end