@@ -201,6 +201,13 @@ module Scheduler @at = Rufus.at_to_f(@t) end + + # Returns the next time (or the unique time) this job is meant to trigger + # + def next_time + + Time.at(@at) + end end # @@ -327,6 +334,13 @@ module Scheduler trigger(time) if @cron_line.matches?(time) end + # Returns the next time this job is meant to trigger + # + def next_time (from=Time.now) + + @cron_line.next_time(from) + end + protected def determine_at lib/rufus/sc/jobs.rb @@ -33,7 +33,7 @@ module Rufus::Scheduler # This gem's version # - VERSION = '2.0.0' + VERSION = '2.0.1' # # It's OK to pass an object responding to :trigger when scheduling a job lib/rufus/sc/scheduler.rb @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = 'rufus-scheduler' - s.version = '2.0.0' + s.version = '2.0.1' s.authors = [ 'John Mettraux' ] s.email = 'jmettraux@gmail.com' s.homepage = 'http://rufus.rubyforge.org/' rufus-scheduler.gemspec @@ -105,5 +105,15 @@ describe Rufus::Scheduler::AtJob do @s.jobs.size.should.equal(0) end + + it 'should respond to #next_time' do + + t = Time.now + 3 * 3600 + + job = @s.at Time.now + 3 * 3600 do + end + + job.next_time.to_i.should.equal(t.to_i) + end end spec/at_spec.rb @@ -102,3 +102,21 @@ describe "#{SCHEDULER_CLASS}#cron" do end +describe Rufus::Scheduler::CronJob do + + before do + @s = start_scheduler + end + after do + stop_scheduler(@s) + end + + it 'should respond to #next_time' do + + job = @s.cron '* * * * *' do + end + + (job.next_time.to_i - Time.now.to_i).should.satisfy { |v| v < 60 } + end +end + spec/cron_spec.rb @@ -171,3 +171,23 @@ describe "#{SCHEDULER_CLASS}#every" do end +describe Rufus::Scheduler::EveryJob do + + before do + @s = start_scheduler + end + after do + stop_scheduler(@s) + end + + it 'should respond to #next_time' do + + t = Time.now + 3 * 3600 + + job = @s.every '3h' do + end + + job.next_time.to_i.should.equal(t.to_i) + end +end + spec/every_spec.rb @@ -151,5 +151,15 @@ describe Rufus::Scheduler::InJob do @s.jobs.size.should.equal(0) end + + it 'should respond to #next_time' do + + t = Time.now + 3 * 3600 + + job = @s.in '3h' do + end + + job.next_time.to_i.should.equal(t.to_i) + end end spec/in_spec.rb 33f1d13ef63553711b3e8a7ef2a2b82cf7003172 John Mettraux jmettraux@gmail.com http://github.com/jmettraux/rufus-scheduler/commit/2d250a8ca082ad798c4a4b839a0b724f6e8ba405 2d250a8ca082ad798c4a4b839a0b724f6e8ba405 2009-05-06T23:03:46-07:00 2009-05-06T23:03:46-07:00 implemented job #next_time 39ef63f867d6f9436f59a4fae0b5c23cc1ef9552 John Mettraux jmettraux@gmail.com