rufus-scheduler 1.0.4 → 1.0.5

data/CHANGELOG.txt

@@ -2,6 +2,13 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 1.0.5    released 2008/03/17
+
+- bug   #18363 : constrained precision to 0.0 < p <= 1.0 - s188
+- todo  #18821 : best effort drift correction integrated - s187
+- bug   #18513 : 0 seconds and :drop_seconds => "0m". Fixed - s186
+
+
 == rufus-scheduler - 1.0.4    released 2008/02/29
 
 - todo  #18474 : implemented to_duration_array() - s183

data/CREDITS.txt

@@ -3,6 +3,8 @@
 
 == Feedback
 
+- Michael Goth, tests with precision > 1s
+
 * many people gave feedback previously, see
   http://openwferu.rubyforge.org/svn/trunk/openwfe-ruby/CREDITS.txt
 

data/lib/rufus/otime.rb

@@ -268,7 +268,7 @@ module Rufus
     #
     def Rufus.to_duration_string (seconds, options={})
 
-        return '0s' if seconds <= 0
+        return (options[:drop_seconds] ? '0m' : '0s') if seconds <= 0
 
         h = to_duration_hash seconds, options
 

data/lib/rufus/scheduler.rb

@@ -236,7 +236,24 @@ module Rufus
         # By default, the precision is 0.250, with means the scheduler
         # will check for jobs to execute 4 times per second.
         #
-        attr_accessor :precision
+        attr_reader :precision
+
+        #
+        # Setting the precision ( 0.0 < p <= 1.0 )
+        #
+        def precision= (f)
+
+            raise "precision must be 0.0 < p <= 1.0" \
+                if f <= 0.0 or f > 1.0
+
+            @precision = f
+        end
+
+        #--
+        # Set by default at 0.00045, it's meant to minimize drift
+        #
+        #attr_accessor :correction
+        #++
 
         #
         # As its name implies.
@@ -262,11 +279,13 @@ module Rufus
             @precision = 0.250
                 # every 250ms, the scheduler wakes up (default value)
             begin
-                @precision = Float(params[:scheduler_precision])
+                self.precision = Float(params[:scheduler_precision])
             rescue Exception => e
                 # let precision at its default value
             end
 
+            #@correction = 0.00045
+
             @exit_when_no_more_jobs = false
             @dont_reschedule_every = false
 
@@ -296,10 +315,15 @@ module Rufus
 
                     break if @stopped
 
+                    t0 = Time.now.to_f
+
                     step
 
-                    sleep @precision
-                        # TODO : adjust precision
+                    d = Time.now.to_f - t0 # + @correction
+
+                    next if d > @precision
+
+                    sleep (@precision - d)
                 end
             end
         end
@@ -665,7 +689,7 @@ module Rufus
         #
         def Scheduler.is_cron_string (s)
 
-            s.match(".+ .+ .+ .+ .+")
+            s.match ".+ .+ .+ .+ .+"
         end
 
         #protected
@@ -886,7 +910,7 @@ module Rufus
 
                 if @exit_when_no_more_jobs
 
-                   if @pending_jobs.size < 1
+                    if @pending_jobs.size < 1
 
                         @stopped = true
                         return
@@ -911,6 +935,7 @@ module Rufus
 
                     @cron_jobs.each do |cron_id, cron_job|
                         #puts "step() cron_id : #{cron_id}"
+                        #trigger(cron_job) if cron_job.matches?(now, @precision)
                         trigger(cron_job) if cron_job.matches?(now)
                     end
                 end
@@ -1166,8 +1191,10 @@ module Rufus
             # has to fire this CronJob instance.
             #
             def matches? (time)
+            #def matches? (time, precision)
 
-                @cron_line.matches? time
+                #@cron_line.matches?(time, precision)
+                @cron_line.matches?(time)
             end
 
             #
@@ -1240,17 +1267,29 @@ module Rufus
             #
             # Returns true if the given time matches this cron line.
             #
+            # (the precision is passed as well to determine if it's
+            # worth checking seconds and minutes)
+            #
             def matches? (time)
+            #def matches? (time, precision)
 
                 time = Time.at(time) \
                     if time.kind_of?(Float) or time.kind_of?(Integer)
 
-                return false if no_match?(time.sec, @seconds)
-                return false if no_match?(time.min, @minutes)
-                return false if no_match?(time.hour, @hours)
-                return false if no_match?(time.day, @days)
-                return false if no_match?(time.month, @months)
-                return false if no_match?(time.wday, @weekdays)
+                return false \
+                    if no_match?(time.sec, @seconds)
+                    #if precision <= 1 and no_match?(time.sec, @seconds)
+                return false \
+                    if no_match?(time.min, @minutes)
+                    #if precision <= 60 and no_match?(time.min, @minutes)
+                return false \
+                    if no_match?(time.hour, @hours)
+                return false \
+                    if no_match?(time.day, @days)
+                return false \
+                    if no_match?(time.month, @months)
+                return false \
+                    if no_match?(time.wday, @weekdays)
 
                 true
             end
@@ -1381,10 +1420,10 @@ module Rufus
                     return false if not cron_values
 
                     cron_values.each do |v|
-                        return false if value == v
+                        return false if value == v # ok, it matches
                     end
 
-                    true
+                    true # no match found
                 end
         end
 

data/test/scheduler_0_test.rb

@@ -235,9 +235,9 @@ class SchedulerTest < Test::Unit::TestCase
     #
     def test_scheduler_7
 
-        scheduler = OpenWFE::Scheduler.new(:scheduler_precision => 0.100)
+        scheduler = Rufus::Scheduler.new(:scheduler_precision => 0.100)
 
-        assert_equal scheduler.precision, 0.100
+        assert_equal 0.100, scheduler.precision
     end
 
     #
@@ -249,7 +249,7 @@ class SchedulerTest < Test::Unit::TestCase
     #
     def test_8
 
-        scheduler = OpenWFE::Scheduler.new
+        scheduler = Rufus::Scheduler.new
         scheduler.start
 
         var = false
@@ -313,6 +313,17 @@ class SchedulerTest < Test::Unit::TestCase
         scheduler.stop
     end
 
+    def test_10
+
+        e = nil
+        begin
+            OpenWFE::Scheduler.new.precision = 10
+        rescue Exception => e
+        end
+
+        assert_not_nil e, "exception not caught"
+    end
+
     protected
 
         class TestSchedulable

data/test/time_1_test.rb

@@ -26,6 +26,7 @@ class Time1Test < Test::Unit::TestCase
     def test_0
 
         tts 0, "0s"
+        tts 0, "0m", { :drop_seconds => true }
         tts 60, "1m"
         tts 61, "1m1s"
         tts 3661, "1h1m1s"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-scheduler
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-29 00:00:00 +09:00
+date: 2008-03-17 00:00:00 +09:00
 default_executable: 
 dependencies: []