openwferu-scheduler 0.9.15.1128 → 0.9.15.1172

data/lib/openwfe/util/otime.rb

@@ -53,6 +53,9 @@ module OpenWFE
         to_iso8601_date(Time.new())
     end
 
+    #
+    # As the name implies.
+    #
     def OpenWFE.to_iso8601_date (date)
 
         if date.kind_of? Float 

data/lib/openwfe/util/scheduler.rb

@@ -143,6 +143,17 @@ module OpenWFE
     # prevents you from using anything else. The scheduler has no persistence
     # by itself, so no serialization issue.
     #
+    #
+    # Since OpenWFEru 0.9.16, a cron schedule can be set at the second level :
+    #
+    #     scheduler.schedule "7 * * * * *" do
+    #         puts "it's now the seventh second of the minute"
+    #     end
+    #
+    # The OpenWFEru scheduler recognizes an optional first column for second
+    # scheduling. This column can, like for the other columns, specify a 
+    # value ("7"), a list of values ("7,8,9,27") or a range ("7-12").
+    #
     class Scheduler
         include MonitorMixin
 
@@ -178,7 +189,7 @@ module OpenWFE
             @exit_when_no_more_jobs = false
             @dont_reschedule_every = false
 
-            @last_cron_minute = -1
+            @last_cron_second = -1
 
             @stopped = true
         end
@@ -657,15 +668,15 @@ module OpenWFE
                         @dont_reschedule_every = true if at_job_count < 1
                     end
 
+                    # TODO : eventually consider running cron / pending
+                    # job triggering in two different threads
+
                     #
                     # cron jobs
 
-                    if now.sec == 0 and now.min != @last_cron_minute
-                        #
-                        # only consider cron jobs at the second 0 of a 
-                        # minute
+                    if now.sec != @last_cron_second
 
-                        @last_cron_minute = now.min
+                        @last_cron_second = now.sec
 
                         #puts "step() @cron_jobs.size #{@cron_jobs.size}"
 
@@ -845,6 +856,7 @@ module OpenWFE
         class CronLine
 
             attr_reader \
+                :seconds,
                 :minutes,
                 :hours,
                 :days,
@@ -857,19 +869,26 @@ module OpenWFE
 
                 items = line.split
 
-                if items.length != 5
+                unless [ 5, 6 ].include?(items.length)
                     raise \
-                        "cron '#{line}' string should hold 5 items, " +
+                        "cron '#{line}' string should hold 5 or 6 items, " +
                         "not #{items.length}" \
                 end
 
-                @minutes = parse_item(items[0], 0, 59)
-                @hours = parse_item(items[1], 0, 24)
-                @days = parse_item(items[2], 1, 31)
-                @months = parse_item(items[3], 1, 12)
-                @weekdays = parse_weekdays(items[4])
+                offset = items.length - 5
+
+                @seconds = if offset == 1
+                    parse_item(items[0], 0, 59)
+                else
+                    [ 0 ]
+                end
+                @minutes = parse_item(items[0+offset], 0, 59)
+                @hours = parse_item(items[1+offset], 0, 24)
+                @days = parse_item(items[2+offset], 1, 31)
+                @months = parse_item(items[3+offset], 1, 12)
+                @weekdays = parse_weekdays(items[4+offset])
 
-                adjust_arrays()
+                #adjust_arrays()
             end
 
             def matches? (time)
@@ -878,6 +897,7 @@ module OpenWFE
                     time = Time.at(time)
                 end
 
+                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)
@@ -888,12 +908,12 @@ module OpenWFE
             end
 
             #
-            # Returns an array of 5 arrays (minutes, hours, days, months, 
-            # weekdays).
+            # Returns an array of 6 arrays (seconds, minutes, hours, days, 
+            # months, weekdays).
             # This method is used by the cronline unit tests.
             #
             def to_array
-                [ @minutes, @hours, @days, @months, @weekdays ]
+                [ @seconds, @minutes, @hours, @days, @months, @weekdays ]
             end
 
             private
@@ -901,18 +921,20 @@ module OpenWFE
                 #
                 # adjust values to Ruby
                 #
-                def adjust_arrays()
-                    if @hours
-                        @hours.each do |h|
-                            h = 0 if h == 23
-                        end
-                    end
-                    if @weekdays
-                        @weekdays.each do |wd|
-                            wd = wd - 1
-                        end
-                    end
-                end
+                #def adjust_arrays()
+                #    @hours = @hours.collect { |h|
+                #        if h == 24
+                #            0
+                #        else
+                #            h
+                #        end
+                #    } if @hours
+                #    @weekdays = @weekdays.collect { |wd|
+                #        wd - 1
+                #    } if @weekdays
+                #end
+                    #
+                    # dead code
 
                 WDS = [ "mon", "tue", "wed", "thu", "fri", "sat", "sun" ]
                     #
@@ -947,6 +969,7 @@ module OpenWFE
                 end
 
                 def parse_list (item, min, max)
+
                     items = item.split(",")
                     result = []
                     items.each do |i|
@@ -959,6 +982,7 @@ module OpenWFE
                 end
 
                 def parse_range (item, min, max)
+
                     i = item.index("-")
                     j = item.index("/")
 
@@ -980,6 +1004,7 @@ module OpenWFE
                         end
 
                     else # case */x
+
                         istart = min
                         iend = max
                     end
@@ -991,6 +1016,7 @@ module OpenWFE
 
                     value = istart
                     while true
+
                         result << value
                         value = value + inc
                         break if value > iend

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: openwferu-scheduler
 version: !ruby/object:Gem::Version 
-  version: 0.9.15.1128
-date: 2007-10-07 00:00:00 +09:00
+  version: 0.9.15.1172
+date: 2007-10-18 00:00:00 +09:00
 summary: OpenWFEru scheduler for Ruby (at, cron and every)
 require_paths: 
 - lib