timers 0.0.0 → 1.0.0.pre

data/.travis.yml

@@ -5,8 +5,6 @@ rvm:
   - ruby-head
   - jruby-18mode
   - jruby-19mode
-  - jruby-head
-
-# Sporadically failing :(
-#  - rbx-18mode
-#  - rbx-19mode
+#  - jruby-head segving o_O
+  - rbx-18mode
+  - rbx-19mode

data/lib/timers.rb

@@ -1,27 +1,30 @@
-require "timers/version"
+require 'set'
+require 'timers/version'
 
 # Low precision timers implemented in pure Ruby
 class Timers
+  extend  Forwardable
+  include Enumerable
+  def_delegators :@timers, :add, :delete, :each, :empty?
+
   def initialize
-    @timers = []
+    @timers = SortedSet.new
   end
 
   # Call the given block after the given interval
   def after(interval, &block)
-    Timer.new(self, interval, false, block)
+    Timer.new(self, interval, false, &block)
   end
 
   # Call the given block periodically at the given interval
   def every(interval, &block)
-    Timer.new(self, interval, true, block)
+    Timer.new(self, interval, true, &block)
   end
 
   # Wait for the next timer and fire it
   def wait
     return if @timers.empty?
-
-    interval = wait_interval
-    sleep interval if interval >= Timer::QUANTUM
+    sleep wait_interval
     fire
   end
 
@@ -34,55 +37,23 @@ class Timers
   def fire
     return if @timers.empty?
 
-    time = Time.now + Timer::QUANTUM
-    while not empty? and time > @timers.first.time
-      timer = @timers.shift
+    time = Time.now + 0.001
+    while not empty? and time >= @timers.first.time
+      timer = @timers.first
+      @timers.delete timer
       timer.call
     end
   end
 
-  # Insert a timer into the active timers
-  def insert(timer)
-    @timers.insert(index(timer), timer)
-  end
-
-  # Remove a given timer from the set we're monitoring
-  def cancel(timer)
-    @timers.delete timer
-  end
-
-  # Are there any timers pending?
-  def empty?
-    @timers.empty?
-  end
-
-  # Index where a timer would be located in the sorted timers array
-  def index(timer)
-    l, r = 0, @timers.size - 1
-
-    while l <= r
-      m = (r + l) / 2
-      if timer < @timers.at(m)
-        r = m - 1
-      else
-        l = m + 1
-      end
-    end
-    l
-  end
+  alias_method :insert, :add
+  alias_method :cancel, :delete
 
   # An individual timer set to fire a given proc at a given time
   class Timer
     include Comparable
-
-    # The timer system is guaranteed (at least by the specs) to be this precise
-    # during normal operation. Long blocking calls within actors will delay the
-    # firing of timers
-    QUANTUM = 0.02
-
     attr_reader :interval, :time, :recurring
 
-    def initialize(timers, interval, recurring, block)
+    def initialize(timers, interval, recurring = false, &block)
       @timers, @interval, @recurring = timers, interval, recurring
       @block = block
 

data/lib/timers/version.rb

@@ -1,3 +1,3 @@
 class Timers
-  VERSION = "0.0.0"
+  VERSION = "1.0.0.pre"
 end

data/spec/timers_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
 
 describe Timers do
-  Q = Timers::Timer::QUANTUM
+  # Level of accuracy enforced by the tests (50ms)
+  Q = 0.05
 
   it "sleeps until the next timer" do
-    interval = 0.1
+    interval   = Q * 2
     started_at = Time.now
 
     fired = false
@@ -15,7 +16,7 @@ describe Timers do
     (Time.now - started_at).should be_within(Q).of interval
   end
 
-  it "it calculates the interval until the next timer should fire" do
+  it "calculates the interval until the next timer should fire" do
     interval = 0.1
 
     subject.after(interval)
@@ -36,17 +37,16 @@ describe Timers do
   end
 
   describe "recurring timers" do
-    it "should continue to fire the timers at each interval" do
+    it "continues to fire the timers at each interval" do
       result = []
 
-      subject.every(Q * 3) { result << :foo }
+      subject.every(Q * 2) { result << :foo }
 
       sleep Q * 3
       subject.fire
       result.should == [:foo]
 
-      sleep Q * 3
-      subject.fire
+      sleep Q * 5
       subject.fire
       result.should == [:foo, :foo]
     end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: timers
 version: !ruby/object:Gem::Version
-  version: 0.0.0
-  prerelease: 
+  version: 1.0.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70212434293540 !ruby/object:Gem::Requirement
+  requirement: &70102019350080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212434293540
+  version_requirements: *70102019350080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70212434292840 !ruby/object:Gem::Requirement
+  requirement: &70102019349180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212434292840
+  version_requirements: *70102019349180
 description: Pure Ruby one-shot and periodic timers
 email:
 - tony.arcieri@gmail.com
@@ -67,9 +67,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10