rufus-scheduler 3.1.1 → 3.1.2

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 3.1.2    released 2015/05/23
+
+- avoid cron/:first_at infinite loop, thanks https://github.com/pouellet
+
+
 == rufus-scheduler - 3.1.1    released 2015/04/19
 
 - fix ZoTime.is_timezone? on OSX, thanks https://github.com/yaauie

data/CREDITS.txt

@@ -4,6 +4,7 @@
 
 == Contributors
 
+- Pascal Ouellet (https://github.com/pouellet) Scheduler#timeline loop fix
 - Ryan Biesemeyer (https://github.com/yaauie) ZoTime.is_timezone? on OSX
 - Ketan Padegaonkar (https://github.com/ketan) .brute_frequency improvement
 - Gabriel Gilder (https://github.com/ggilder) LA DST specs

data/lib/rufus/scheduler.rb

@@ -39,7 +39,7 @@ module Rufus
     require 'rufus/scheduler/job_array'
     require 'rufus/scheduler/locks'
 
-    VERSION = '3.1.1'
+    VERSION = '3.1.2'
 
     #
     # A common error class for rufus-scheduler

data/lib/rufus/scheduler/jobs.rb

@@ -621,7 +621,7 @@ module Rufus
 
       def next_time_from(time)
 
-        if @first_at == nil || @first_at < time
+        if @first_at == nil || @first_at <= time
           @cron_line.next_time(time)
         else
           @first_at

data/spec/scheduler_spec.rb

@@ -611,7 +611,7 @@ describe Rufus::Scheduler do
     end
   end
 
-  describe '#timeline(time0, time1)' do
+  describe '#timeline' do
 
     it 'returns a [ [ time, job ], ... ] of job occurrences' do
 
@@ -625,6 +625,21 @@ describe Rufus::Scheduler do
       expect(a[1][0]).to be_within_1s_of(Time.now + 10 * 60)
       expect(a[1][1]).to eq(j1)
     end
+
+    it 'should not lock when running timeline with a :first_at specified' do
+
+      now = Time.now
+
+      # scheduling a cron job with a first_at and running #timeline used
+      # to result in an infinite loop.
+
+      @scheduler.cron('* * * * * *', :first_at => now + 3) {}
+
+      jobs = @scheduler.timeline(now, now + 4)
+      expect(jobs.size).to be 2
+      expect(jobs[0][0]).to be_within_1s_of now + 3
+      expect(jobs[1][0]).to be_within_1s_of now + 4
+    end
   end
 
   #--

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake