timers 4.0.1 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff04e8dedf4d39bd0ff36650200e6c3537669cd8
-  data.tar.gz: fd2f6c05f04a626f73401ea9c06e8be89956024e
+  metadata.gz: fc5b681c3922f53f0a1c332aad2955d61ee278a4
+  data.tar.gz: 4e90a800064db9f6cf1cdb4410cbb1ca8badd2ac
 SHA512:
-  metadata.gz: 5b829c8ffc7da2676e9b32e0f16fc54135dce451825db5c669f40566d6bd8a4334dd8d6b28d06dcd191cc92cd55a27dcd3fe9476b16fcb56a80c23b335fcb2f4
-  data.tar.gz: 08314ad60709460ff1d4f55cf4c61ccb0333bf7d67186702d5e3268cfe9ac2ba9e511c936b63be0ed4f9d6532a5f3ca0235bd65ceba319b812ffa4564115f014
+  metadata.gz: fd8330e2dfd5b23813c55d242ad44d6c8d7c00e251a047f4206c72511132eeeb8fdf640fc2802a9e83e87dabab2134532dea10f25a993e9fd98fb9b759c3faca
+  data.tar.gz: 5e8d5e38d58ee3c7167dae55a293c5bf2a5cc6f84ea65edbba5435eafc8b85b31d2865f81cec97cdc8b612af4f87654fadc8a4da565822e61dc09e6756a65b05

data/.travis.yml

@@ -8,6 +8,7 @@ rvm:
   - rbx-2
 
 matrix:
+  fast_finish: true
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head

data/CHANGES.md

@@ -1,3 +1,16 @@
+4.0.4 (2015-09-01)
+------------------
+* Re-release of the `4.1.1` version under the `4.0.4` designation to work-around issues caused by yanking `4.0.2` a couple weeks ago.
+
+4.1.1 (2015-08-21)
+------------------
+* Remove `RubyProf` from Gemfile and a test, due to it providing no substantial benefit while increasing problems building bundles under Rubinius.
+
+4.1.0 (2015-08-16)
+------------------
+* Addition of `now_and_every` method; fires block immediately, then sets recurring timer.
+* Includes `now_and_after` method; does the same as above for one-shot timers: essentially a "two-shot" timer.
+
 4.0.1 (2014-09-10)
 ------------------
 * Memory leak fixes

data/Gemfile

@@ -4,7 +4,3 @@ gem 'coveralls', :require => false
 
 # Specify your gem's dependencies in timers.gemspec
 gemspec
-
-unless RUBY_PLATFORM =~ /java/ 
-  gem "ruby-prof", :group => :development
-end

data/README.md

@@ -50,6 +50,13 @@ every_five_seconds = timers.every(5) { puts "Another 5 seconds" }
 loop { timers.wait }
 ```
 
+You can also schedule a block to run immediately and periodically with `Timers::Group#now_and_every`:
+```ruby
+now_and_every_five_seconds = timers.now_and_every(5) { puts "Now and in another 5 seconds" }
+
+loop { timers.wait }
+```
+
 If you'd like another method to do the waiting for you, e.g. `Kernel.select`,
 you can use `Timers::Group#wait_interval` to obtain the amount of time to wait. When
 a timeout is encountered, you can fire all pending timers with `Timers::Group#fire`:

data/lib/timers/events.rb

@@ -72,6 +72,7 @@ module Timers
           return handle
         end
       end
+      # @sequence.reverse.find { |handle| !handle.cancelled? }
     end
     
     # Returns the number of pending (possibly cancelled) events.
@@ -93,7 +94,7 @@ module Timers
     def pop(time)
       index = bisect_left(@sequence, time)
       
-      return @sequence.pop(@sequence.size - index)
+      @sequence.pop(@sequence.size - index)
     end
     
     # Return the left-most index where to insert item e, in a list a, assuming 

data/lib/timers/group.rb

@@ -38,12 +38,26 @@ module Timers
       Timer.new(self, interval, false, &block)
     end
 
+    # Call the given block immediately, and then after the given interval. The first
+    # argument will be the time at which the group was asked to fire timers for.
+    def now_and_after(interval, &block)
+      block.call
+      after(interval, &block)
+    end
+
     # Call the given block periodically at the given interval. The first 
     # argument will be the time at which the group was asked to fire timers for.
     def every(interval, recur = true, &block)
       Timer.new(self, interval, recur, &block)
     end
 
+    # Call the given block immediately, and then periodically at the given interval. The first
+    # argument will be the time at which the group was asked to fire timers for.
+    def now_and_every(interval, recur = true, &block)
+      block.call
+      every(interval, recur, &block)
+    end
+
     # Wait for the next timer and fire it. Can take a block, which should behave
     # like sleep(n), except that n may be nil (sleep forever) or a negative
     # number (fire immediately after return).
@@ -61,7 +75,7 @@ module Timers
         end
       end
 
-      fire
+      return fire
     end
 
     # Interval to wait until when the next timer will fire.

data/lib/timers/version.rb

@@ -1,3 +1,3 @@
 module Timers
-  VERSION = "4.0.1"
+  VERSION = "4.0.4"
 end

data/spec/every_spec.rb

@@ -16,4 +16,19 @@ RSpec.describe Timers::Group do
 
     expect(result).to be == [:a, :c, :a, :a, :b, :d]
   end
+
+  it "should fire immediately and then several times later" do
+    result = []
+
+    subject.every(0.7) { result << :a }
+    subject.every(2.3) { result << :b }
+    subject.now_and_every(1.3) { result << :c }
+    subject.now_and_every(2.4) { result << :d }
+
+    Timers::Wait.for(2.5) do |remaining|
+      subject.wait if subject.wait_interval < remaining
+    end
+
+    expect(result).to be == [:c, :d, :a, :c, :a, :a, :b, :d]
+  end
 end

data/spec/performance_spec.rb

@@ -1,6 +1,4 @@
-
 require 'spec_helper'
-require 'ruby-prof' unless RUBY_PLATFORM =~ /java/
 
 # Event based timers:
 
@@ -41,26 +39,8 @@ require 'ruby-prof' unless RUBY_PLATFORM =~ /java/
 # Serviced 1142649 events in 11.194903921 seconds, 102068.70405115146 e/s.
 
 RSpec.describe Timers::Group do
-  if defined? RubyProf
-    before(:each) do
-      # Running RubyProf makes the code slightly slower.
-      RubyProf.start
-      puts "*** Running with RubyProf reduces performance ***"
-    end
 
-    after(:each) do |arg|
-      if RubyProf.running?
-        # file = arg.metadata[:description].gsub(/\s+/, '-')
-      
-        result = RubyProf.stop
-      
-        printer = RubyProf::FlatPrinter.new(result)
-        printer.print($stderr, min_percent: 1.0)
-      end
-    end
-  end
-  
-  it "run efficiently" do
+  it "runs efficiently" do
     result = []
     range = (1..500)
     duration = 2.0
@@ -80,4 +60,41 @@ RSpec.describe Timers::Group do
     
     expect(subject.current_offset).to be_within(TIMER_QUANTUM).of(duration)
   end
+
+=begin
+  it "runs efficiently at high volume" do
+    results = []
+    range = (1..300)
+    groups = (1..20)
+    duration = 101
+
+    timers = []
+    @mutex = Mutex.new
+    start = Time.now
+    groups.each do |gi|
+      timers << Thread.new {
+        result = []
+        timer = Timers::Group.new
+        total = 0
+        range.each do |ri|
+          offset = ri.to_f / range.max
+          total += (duration / offset).floor
+          timer.every(ri.to_f / range.max, :strict) { result << ri }
+        end
+        timer.wait while result.size < total
+        @mutex.synchronize { results += result }
+        
+      }
+    end
+    timers.each { |t| t.join }
+    finish = Time.now
+    
+    rate = results.size.to_f / ( runtime = finish - start )
+    
+    puts "Serviced #{results.size} events in #{runtime} seconds, #{rate} e/s; across #{groups.max} timers."
+    
+    expect(runtime).to be_within(TIMER_QUANTUM).of(duration)
+  end
+=end
+
 end

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: timers
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.4
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hitimes
+  type: :runtime
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -26,13 +26,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
+  type: :development
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,13 +40,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
+  type: :development
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Schedule procs to run after a certain time, or at periodic intervals, using