rufus-scheduler 1.0.7 → 1.0.8

data/CHANGELOG.txt

@@ -2,6 +2,17 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 1.0.8    released 2008/07/18
+
+- todo  #21251 : added 'at', 'cron', 'in' and 'every' shortcut methods
+- todo  #21203 : keeping track of At and EveryJob until last trigger is over
+- todo  #20823 : now raising exception in case of bad 'at' parameter
+- todo  #21194 : added trigger_thread to Job class
+- todo  #21193 : spinned CronLine out to rufus/cronline.rb
+- bug   #20893 : sometimes unschedule(every_job) not working when job was
+                 active (performing). Fixed.
+
+
 == rufus-scheduler - 1.0.7    released 2008/06/16
 
 - todo  #20669 : implemented CronJob.next_time()

data/CREDITS.txt

@@ -3,6 +3,7 @@
 
 == Feedback
 
+- Sean Liu, unschedule_every issue
 - Manfred Usselman (no cronjobs on sundays bug)
 - Michael Goth, tests with precision > 1s
 

data/README.txt

@@ -17,7 +17,35 @@ http://rubyforge.org/frs/?group_id=4812
 
 == usage
 
-For all the scheduling related information, see the Rufus::Scheduler class rdoc itself or the original OpenWFEru scheduler documentation at http://openwferu.rubyforge.org/scheduler.html
+some examples :
+
+    require 'rubygems'
+    require 'rufus/scheduler'
+
+    scheduler = Rufus::Scheduler.start_new
+
+    scheduler.in("3d") do
+      regenerate_monthly_report()
+    end
+      #
+      # will call the regenerate_monthly_report method
+      # in 3 days from now
+
+     scheduler.every "10m10s" do
+       check_score(favourite_team) # every 10 minutes and 10 seconds
+     end
+
+     scheduler.cron "0 22 * * 1-5" do
+       log.info "activating security system..."
+       activate_security_system()
+     end
+
+     job_id = scheduler.at "Sun Oct 07 14:24:01 +0900 2009" do
+       init_self_destruction_sequence()
+     end
+
+
+For all the scheduling related information, see the Rufus::Scheduler class rdoc itself (http://rufus.rubyforge.org/rufus-scheduler/classes/Rufus/Scheduler.html) or the original OpenWFEru scheduler documentation at http://openwferu.rubyforge.org/scheduler.html
 
 Apart from scheduling, There are also two interesting methods in this gem, they are named parse_time_string and to_time_string :
 
@@ -66,7 +94,7 @@ http://github.com/jmettraux/rufus-scheduler
 
 == author
 
-John Mettraux, jmettraux@gmail.com 
+John Mettraux, jmettraux@gmail.com
 http://jmettraux.wordpress.com
 
 

data/lib/rufus/cronline.rb

@@ -0,0 +1,304 @@
+#
+#--
+# Copyright (c) 2006-2008, John Mettraux, jmettraux@gmail.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+#
+
+#
+# "made in Japan"
+#
+# John Mettraux at openwfe.org
+#
+
+module Rufus
+
+  #
+  # A 'cron line' is a line in the sense of a crontab
+  # (man 5 crontab) file line.
+  #
+  class CronLine
+
+    #
+    # The string used for creating this cronline instance.
+    #
+    attr_reader :original
+
+    attr_reader \
+      :seconds,
+      :minutes,
+      :hours,
+      :days,
+      :months,
+      :weekdays
+
+    def initialize (line)
+
+      super()
+
+      @original = line
+
+      items = line.split
+
+      unless [ 5, 6 ].include?(items.length)
+        raise \
+          "cron '#{line}' string should hold 5 or 6 items, " +
+          "not #{items.length}" \
+      end
+
+      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()
+    end
+
+    #
+    # 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) unless time.kind_of?(Time)
+
+      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
+
+    #
+    # Returns an array of 6 arrays (seconds, minutes, hours, days,
+    # months, weekdays).
+    # This method is used by the cronline unit tests.
+    #
+    def to_array
+
+      [ @seconds, @minutes, @hours, @days, @months, @weekdays ]
+    end
+
+    #
+    # Returns the next time that this cron line is supposed to 'fire'
+    #
+    # This is raw, 3 secs to iterate over 1 year on my macbook :( brutal.
+    #
+    def next_time (now = Time.now)
+
+      #
+      # position now to the next cron second
+
+      if @seconds
+        next_sec = @seconds.find { |s| s > now.sec } || 60 + @seconds.first
+        now += next_sec - now.sec
+      else
+        now += 1
+      end
+
+      #
+      # prepare sec jump array
+
+      sjarray = nil
+
+      if @seconds
+
+        sjarray = []
+
+        i = @seconds.index(now.sec)
+        ii = i
+
+        loop do
+          cur = @seconds[ii]
+          ii += 1
+          ii = 0 if ii == @seconds.size
+          nxt = @seconds[ii]
+          nxt += 60 if ii == 0
+          sjarray << (nxt - cur)
+          break if ii == i
+        end
+
+      else
+
+        sjarray = [ 1 ]
+      end
+
+      #
+      # ok, seek...
+
+      i = 0
+
+      loop do
+        return now if matches?(now)
+        now += sjarray[i]
+        i += 1
+        i = 0 if i == sjarray.size
+        # danger... potentially no exit...
+      end
+
+      nil
+    end
+
+    private
+
+      #--
+      # adjust values to Ruby
+      #
+      #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, keeping it as a reminder
+      #++
+
+      WDS = [ "sun", "mon", "tue", "wed", "thu", "fri", "sat" ]
+        #
+        # used by parse_weekday()
+
+      def parse_weekdays (item)
+
+        item = item.downcase
+
+        WDS.each_with_index do |day, index|
+          item = item.gsub day, "#{index}"
+        end
+
+        r = parse_item item, 0, 7
+
+        return r unless r.is_a?(Array)
+
+        r.collect { |e| e == 7 ? 0 : e }.uniq
+      end
+
+      def parse_item (item, min, max)
+
+        return nil \
+          if item == "*"
+        return parse_list(item, min, max) \
+          if item.index(",")
+        return parse_range(item, min, max) \
+          if item.index("*") or item.index("-")
+
+        i = Integer(item)
+
+        i = min if i < min
+        i = max if i > max
+
+        [ i ]
+      end
+
+      def parse_list (item, min, max)
+
+        items = item.split(",")
+
+        items.inject([]) { |r, i| r.push(parse_range(i, min, max)) }.flatten
+      end
+
+      def parse_range (item, min, max)
+
+        i = item.index("-")
+        j = item.index("/")
+
+        return item.to_i if (not i and not j)
+
+        inc = 1
+
+        inc = Integer(item[j+1..-1]) if j
+
+        istart = -1
+        iend = -1
+
+        if i
+
+          istart = Integer(item[0..i-1])
+
+          if j
+            iend = Integer(item[i+1..j])
+          else
+            iend = Integer(item[i+1..-1])
+          end
+
+        else # case */x
+
+          istart = min
+          iend = max
+        end
+
+        istart = min if istart < min
+        iend = max if iend > max
+
+        result = []
+
+        value = istart
+        loop do
+
+          result << value
+          value = value + inc
+          break if value > iend
+        end
+
+        result
+      end
+
+      def no_match? (value, cron_values)
+
+        return false if not cron_values
+
+        cron_values.each do |v|
+          return false if value == v # ok, it matches
+        end
+
+        true # no match found
+      end
+  end
+
+end
+

data/lib/rufus/otime.rb

@@ -336,6 +336,20 @@ module Rufus
     h
   end
 
+  #
+  # Ensures that a duration is a expressed as a Float instance.
+  #
+  #   duration_to_f("10s")
+  #
+  # will yield 10.0
+  #
+  def Rufus.duration_to_f (s)
+
+    return s if s.kind_of?(Float)
+    return parse_time_string(s) if s.kind_of?(String)
+    Float(s.to_s)
+  end
+
   protected
 
     DURATIONS2M = [

data/lib/rufus/scheduler.rb

@@ -31,7 +31,7 @@
 require 'thread'
 require 'monitor'
 require 'rufus/otime'
-
+require 'rufus/cronline'
 
 module Rufus
 
@@ -45,7 +45,7 @@ module Rufus
   # params (usually an array or nil), either a block, which is more in the
   # Ruby way.
   #
-  # == The gem "openwferu-scheduler"
+  # == The gem "rufus-scheduler"
   #
   # This scheduler was previously known as the "openwferu-scheduler" gem.
   #
@@ -114,6 +114,9 @@ module Rufus
   #     regenerate_latest_report()
   #   end
   #
+  # (note : a schedule every isn't triggered immediately, thus this example
+  # will first trigger 1 hour and 20 minutes after being scheduled)
+  #
   # The scheduler has a "exit_when_no_more_jobs" attribute. When set to
   # 'true', the scheduler will exit as soon as there are no more jobs to
   # run.
@@ -287,6 +290,20 @@ module Rufus
   #
   #   scheduler.new :thread_name => "the crazy scheduler"
   #
+  #
+  # == job.trigger_thread
+  #
+  # Since rufus-scheduler 1.0.8, you can have access to the thread of
+  # a job currently being triggered.
+  #
+  #   job = scheduler.get_job(job_id)
+  #   thread = job.trigger_thread
+  #
+  # This new method will return nil if the job is not currently being
+  # triggered. Not that in case of an every or cron job, this method
+  # will return the thread of the last triggered instance, thus, in case
+  # of overlapping executions, you only get the most recent thread.
+  #
   class Scheduler
 
     #
@@ -324,6 +341,7 @@ module Rufus
 
       @pending_jobs = []
       @cron_jobs = {}
+      @non_cron_jobs = {}
 
       @schedule_queue = Queue.new
       @unschedule_queue = Queue.new
@@ -346,7 +364,7 @@ module Rufus
       #@correction = 0.00045
 
       @exit_when_no_more_jobs = false
-      @dont_reschedule_every = false
+      #@dont_reschedule_every = false
 
       @last_cron_second = -1
 
@@ -467,6 +485,11 @@ module Rufus
         &block)
     end
 
+    #
+    # a shortcut for schedule_at
+    #
+    alias :at :schedule_at
+
 
     #
     # Schedules a job by stating in how much time it should trigger.
@@ -478,11 +501,16 @@ module Rufus
     def schedule_in (duration, params={}, &block)
 
       do_schedule_at(
-        Time.new.to_f + duration_to_f(duration),
+        Time.new.to_f + Rufus::duration_to_f(duration),
         prepare_params(params),
         &block)
     end
 
+    #
+    # a shortcut for schedule_in
+    #
+    alias :in :schedule_in
+
     #
     # Schedules a job in a loop. After an execution, it will not execute
     # before the time specified in 'freq'.
@@ -505,76 +533,33 @@ module Rufus
     #     # schedule something every two days, start in 5 hours...
     #   end
     #
+    # (without setting a :first_in (or :first_at), our example schedule would
+    # have had been triggered after two days).
+    #
     def schedule_every (freq, params={}, &block)
 
-      f = duration_to_f freq
-
       params = prepare_params params
-      schedulable = params[:schedulable]
       params[:every] = freq
 
-      first_at = params.delete :first_at
-      first_in = params.delete :first_in
-
-      previous_at = params[:previous_at]
+      first_at = params[:first_at]
+      first_in = params[:first_in]
 
-      next_at = if first_at
-        first_at
+      first_at = if first_at
+        at_to_f(first_at)
       elsif first_in
-        Time.now.to_f + duration_to_f(first_in)
-      elsif previous_at
-        previous_at + f
+        Time.now.to_f + Rufus.duration_to_f(first_in)
       else
-        Time.now.to_f + f
+        Time.now.to_f + Rufus.duration_to_f(freq) # not triggering immediately
       end
 
-      do_schedule_at(next_at, params) do |job_id, at|
-
-        #
-        # trigger ...
-
-        hit_exception = false
-
-        begin
-
-          if schedulable
-            schedulable.trigger params
-          else
-            block.call job_id, at, params
-          end
-
-        rescue Exception => e
-
-          log_exception e
-
-          hit_exception = true
-        end
-
-        # cannot use a return here !!! (block)
-
-        unless \
-          @dont_reschedule_every or
-          (params[:dont_reschedule] == true) or
-          (hit_exception and params[:try_again] == false)
-
-          #
-          # ok, reschedule ...
-
-          params[:job_id] = job_id
-          params[:previous_at] = at
-
-          schedule_every params[:every], params, &block
-            #
-            # yes, this is a kind of recursion
-
-            # note that params[:every] might have been changed
-            # by the block/schedulable code
-        end
-
-        job_id
-      end
+      do_schedule_at(first_at, params, &block)
     end
 
+    #
+    # a shortcut for schedule_every
+    #
+    alias :every :schedule_every
+
     #
     # Schedules a cron job, the 'cron_line' is a string
     # following the Unix cron standard (see "man 5 crontab" in your command
@@ -607,11 +592,9 @@ module Rufus
       #
       # is a job with the same id already scheduled ?
 
-      cron_id = params[:cron_id]
-      cron_id = params[:job_id] unless cron_id
+      cron_id = params[:cron_id] || params[:job_id]
 
-      #unschedule(cron_id) if cron_id
-      @unschedule_queue << [ :cron, cron_id ]
+      #@unschedule_queue << cron_id
 
       #
       # schedule
@@ -619,12 +602,16 @@ module Rufus
       b = to_block(params, &block)
       job = CronJob.new(self, cron_id, cron_line, params, &b)
 
-      #@cron_jobs[job.job_id] = job
       @schedule_queue << job
 
       job.job_id
     end
 
+    #
+    # an alias for schedule()
+    #
+    alias :cron :schedule
+
     #--
     #
     # The UNscheduling methods
@@ -637,15 +624,17 @@ module Rufus
     #
     def unschedule (job_id)
 
-      @unschedule_queue << [ :at, job_id ]
+      @unschedule_queue << job_id
     end
 
     #
     # Unschedules a cron job
     #
+    # (deprecated : use unschedule(job_id) for all the jobs !)
+    #
     def unschedule_cron_job (job_id)
 
-      @unschedule_queue << [ :cron, job_id ]
+      unschedule(job_id)
     end
 
     #--
@@ -660,7 +649,7 @@ module Rufus
     #
     def get_job (job_id)
 
-      @cron_jobs[job_id] || @pending_jobs.find { |job| job.job_id == job_id }
+      @cron_jobs[job_id] || @non_cron_jobs[job_id]
     end
 
     #
@@ -669,13 +658,8 @@ module Rufus
     #
     def get_schedulable (job_id)
 
-      #return nil unless job_id
-
       j = get_job(job_id)
-
-      return j.schedulable if j.respond_to?(:schedulable)
-
-      nil
+      j.respond_to?(:schedulable) ? j.schedulable : nil
     end
 
     #
@@ -684,7 +668,7 @@ module Rufus
     def find_jobs (tag)
 
       @cron_jobs.values.find_all { |job| job.has_tag?(tag) } +
-      @pending_jobs.find_all { |job| job.has_tag?(tag) }
+      @non_cron_jobs.values.find_all { |job| job.has_tag?(tag) }
     end
 
     #
@@ -720,7 +704,7 @@ module Rufus
     #
     def every_job_count
 
-      @pending_jobs.select { |j| j.is_a?(EveryJob) }.size
+      @non_cron_jobs.values.select { |j| j.class == EveryJob }.size
     end
 
     #
@@ -728,36 +712,43 @@ module Rufus
     #
     def at_job_count
 
-      @pending_jobs.select { |j| j.instance_of?(AtJob) }.size
+      @non_cron_jobs.values.select { |j| j.class == AtJob }.size
     end
 
     #
     # Returns true if the given string seems to be a cron string.
     #
-    def Scheduler.is_cron_string (s)
+    def self.is_cron_string (s)
 
       s.match ".+ .+ .+ .+ .+" # well...
     end
 
     private
 
+      #
+      # the unschedule work itself.
+      #
       def do_unschedule (job_id)
 
+        job = get_job job_id
+
+        return (@cron_jobs.delete(job_id) != nil) if job.is_a?(CronJob)
+
+        return false unless job # not found
+
+        if job.is_a?(AtJob) # catches AtJob and EveryJob instances
+          @non_cron_jobs.delete(job_id)
+          job.params[:dont_reschedule] = true # for AtJob as well, no worries
+        end
+
         for i in 0...@pending_jobs.length
           if @pending_jobs[i].job_id == job_id
             @pending_jobs.delete_at i
-            return true
+            return true # asap
           end
         end
-          #
-          # not using delete_if because it scans the whole list
-
-        do_unschedule_cron_job job_id
-      end
 
-      def do_unschedule_cron_job (job_id)
-
-        (@cron_jobs.delete(job_id) != nil)
+        true
       end
 
       #
@@ -765,9 +756,7 @@ module Rufus
       #
       def prepare_params (params)
 
-        params = { :schedulable => params } \
-          if params.is_a?(Schedulable)
-        params
+        params.is_a?(Schedulable) ? { :schedulable => params } : params
       end
 
       #
@@ -776,47 +765,33 @@ module Rufus
       #
       def do_schedule_at (at, params={}, &block)
 
-        #puts "0 at is '#{at.to_s}' (#{at.class})"
+        job = params.delete :job
 
-        at = at_to_f at
+        unless job
 
-        #puts "1 at is '#{at.to_s}' (#{at.class})"}"
+          jobClass = params[:every] ? EveryJob : AtJob
 
-        jobClass = params[:every] ? EveryJob : AtJob
+          b = to_block params, &block
 
-        job_id = params[:job_id]
-
-        b = to_block params, &block
+          job = jobClass.new self, at_to_f(at), params[:job_id], params, &b
+        end
 
-        job = jobClass.new self, at, job_id, params, &b
+        if jobClass == AtJob && job.at < (Time.new.to_f + @precision)
 
-        #do_unschedule(job_id) if job_id
+          job.trigger() unless params[:discard_past]
 
-        if at < (Time.new.to_f + @precision)
+          @non_cron_jobs.delete job.job_id # just to be sure
 
-          job.trigger() unless params[:discard_past]
           return nil
         end
 
+        @non_cron_jobs[job.job_id] = job
+
         @schedule_queue << job
 
         job.job_id
       end
 
-      #
-      # Ensures that a duration is a expressed as a Float instance.
-      #
-      #   duration_to_f("10s")
-      #
-      # will yields 10.0
-      #
-      def duration_to_f (s)
-
-        return s if s.kind_of?(Float)
-        return Rufus::parse_time_string(s) if s.kind_of?(String)
-        Float(s.to_s)
-      end
-
       #
       # Ensures an 'at' instance is translated to a float
       # (to be compared with the float coming from time.to_f)
@@ -826,6 +801,9 @@ module Rufus
         at = Rufus::to_ruby_time(at) if at.kind_of?(String)
         at = Rufus::to_gm_time(at) if at.kind_of?(DateTime)
         at = at.to_f if at.kind_of?(Time)
+
+        raise "cannot schedule at : #{at.inspect}" unless at.is_a?(Float)
+
         at
       end
 
@@ -838,12 +816,10 @@ module Rufus
 
         return block if block
 
-        schedulable = params[:schedulable]
+        schedulable = params.delete(:schedulable)
 
         return nil unless schedulable
 
-        params.delete :schedulable
-
         l = lambda do
           schedulable.trigger(params)
         end
@@ -886,9 +862,6 @@ module Rufus
       #
       def step
 
-        #puts Time.now.to_f
-        #puts @pending_jobs.collect { |j| [ j.job_id, j.at ] }.inspect
-
         step_unschedule
           # unschedules any job in the unschedule queue before
           # they have a chance to get triggered.
@@ -911,15 +884,7 @@ module Rufus
 
           break if @unschedule_queue.empty?
 
-          type, job_id = @unschedule_queue.pop
-
-          if type == :cron
-
-            do_unschedule_cron_job job_id
-          else
-
-            do_unschedule job_id
-          end
+          do_unschedule(@unschedule_queue.pop)
         end
       end
 
@@ -947,22 +912,17 @@ module Rufus
       end
 
       #
-      # triggers every eligible pending jobs, then every eligible
+      # triggers every eligible pending (at or every) jobs, then every eligible
       # cron jobs.
       #
       def step_trigger
 
-        now = Time.new
-
-        if @exit_when_no_more_jobs
-
-          if @pending_jobs.size < 1
+        now = Time.now
 
-            @stopped = true
-            return
-          end
+        if @exit_when_no_more_jobs && @pending_jobs.size < 1
 
-          @dont_reschedule_every = true if at_job_count < 1
+          @stopped = true
+          return
         end
 
         # TODO : eventually consider running cron / pending
@@ -977,12 +937,9 @@ module Rufus
 
           @last_cron_second = now.sec
 
-          #puts "step() @cron_jobs.size #{@cron_jobs.size}"
-
           @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)
+            cron_job.trigger if cron_job.matches?(now)
           end
         end
 
@@ -1005,29 +962,12 @@ module Rufus
             #
             # obviously
 
-          trigger job
+          job.trigger
 
           @pending_jobs.delete_at 0
         end
       end
 
-      #
-      # Triggers the job (in a dedicated thread).
-      #
-      def trigger (job)
-
-        Thread.new do
-          begin
-
-            job.trigger
-
-          rescue Exception => e
-
-            log_exception e
-          end
-        end
-      end
-
       #
       # If an error occurs in the job, it well get caught and an error
       # message will be displayed to STDOUT.
@@ -1108,6 +1048,12 @@ module Rufus
       #
       attr_reader :params
 
+      #
+      # if the job is currently executing, this field points to
+      # the 'trigger thread'
+      #
+      attr_reader :trigger_thread
+
 
       def initialize (scheduler, job_id, params, &block)
 
@@ -1147,6 +1093,31 @@ module Rufus
 
         @scheduler.unschedule(@job_id)
       end
+
+      #
+      # Triggers the job (in a dedicated thread).
+      #
+      def trigger
+
+        Thread.new do
+
+          @trigger_thread = Thread.current
+            # keeping track of the thread
+
+          begin
+
+            do_trigger
+
+          rescue Exception => e
+
+            @scheduler.send(:log_exception, e)
+          end
+
+          #@trigger_thread = nil if @trigger_thread = Thread.current
+          @trigger_thread = nil
+            # overlapping executions, what to do ?
+        end
+      end
     end
 
     #
@@ -1160,23 +1131,13 @@ module Rufus
       #
       attr_accessor :at
 
-      #
-      # The constructor.
-      #
+
       def initialize (scheduler, at, at_id, params, &block)
 
         super(scheduler, at_id, params, &block)
         @at = at
       end
 
-      #
-      # Triggers the job (calls the block)
-      #
-      def trigger
-
-        @block.call @job_id, @at
-      end
-
       #
       # Returns the Time instance at which this job is scheduled.
       #
@@ -1193,6 +1154,18 @@ module Rufus
 
         schedule_info
       end
+
+      protected
+
+        #
+        # Triggers the job (calls the block)
+        #
+        def do_trigger
+
+          @block.call @job_id, @at
+
+          @scheduler.instance_variable_get(:@non_cron_jobs).delete @job_id
+        end
     end
 
     #
@@ -1208,6 +1181,48 @@ module Rufus
 
         @params[:every]
       end
+
+      protected
+
+        #
+        # triggers the job, then reschedules it if necessary
+        #
+        def do_trigger
+
+          hit_exception = false
+
+          begin
+
+            @block.call @job_id, @at, @params
+
+          rescue Exception => e
+
+            @scheduler.send(:log_exception, e)
+
+            hit_exception = true
+          end
+
+          if \
+            @scheduler.instance_variable_get(:@exit_when_no_more_jobs) or
+            (@params[:dont_reschedule] == true) or
+            (hit_exception and @params[:try_again] == false)
+
+            @scheduler.instance_variable_get(:@non_cron_jobs).delete(job_id)
+              # maybe it'd be better to wipe that reference from here anyway...
+
+            return
+          end
+
+          #
+          # ok, reschedule ...
+
+
+          params[:job] = self
+
+          @at = @at + Rufus.duration_to_f(params[:every])
+
+          @scheduler.send(:do_schedule_at, @at, params)
+        end
     end
 
     #
@@ -1252,14 +1267,6 @@ module Rufus
         @cron_line.matches?(time)
       end
 
-      #
-      # As the name implies.
-      #
-      def trigger
-
-        @block.call @job_id, @cron_line, @params
-      end
-
       #
       # Returns the original cron tab string used to schedule this
       # Job. Like for example "60/3 * * * Sun".
@@ -1280,275 +1287,15 @@ module Rufus
 
         @cron_line.next_time(from)
       end
-    end
-
-    #
-    # A 'cron line' is a line in the sense of a crontab
-    # (man 5 crontab) file line.
-    #
-    class CronLine
-
-      #
-      # The string used for creating this cronline instance.
-      #
-      attr_reader :original
-
-      attr_reader \
-        :seconds,
-        :minutes,
-        :hours,
-        :days,
-        :months,
-        :weekdays
-
-      def initialize (line)
-
-        super()
-
-        @original = line
-
-        items = line.split
-
-        unless [ 5, 6 ].include?(items.length)
-          raise \
-            "cron '#{line}' string should hold 5 or 6 items, " +
-            "not #{items.length}" \
-        end
-
-        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()
-      end
-
-      #
-      # 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) unless time.kind_of?(Time)
-
-        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
-
-      #
-      # Returns an array of 6 arrays (seconds, minutes, hours, days,
-      # months, weekdays).
-      # This method is used by the cronline unit tests.
-      #
-      def to_array
-
-        [ @seconds, @minutes, @hours, @days, @months, @weekdays ]
-      end
-
-      #
-      # Returns the next time that this cron line is supposed to 'fire'
-      #
-      # This is raw, 3 secs to iterate over 1 year on my macbook :( brutal.
-      #
-      def next_time (now = Time.now)
-
-        #
-        # position now to the next cron second
 
-        if @seconds
-          next_sec = @seconds.find { |s| s > now.sec } || 60 + @seconds.first
-          now += next_sec - now.sec
-        else
-          now += 1
-        end
+      protected
 
         #
-        # prepare sec jump array
-
-        sjarray = nil
-
-        if @seconds
-
-          sjarray = []
-
-          i = @seconds.index(now.sec)
-          ii = i
-
-          loop do
-            cur = @seconds[ii]
-            ii += 1
-            ii = 0 if ii == @seconds.size
-            nxt = @seconds[ii]
-            nxt += 60 if ii == 0
-            sjarray << (nxt - cur)
-            break if ii == i
-          end
-
-        else
-
-          sjarray = [ 1 ]
-        end
-
+        # As the name implies.
         #
-        # ok, seek...
-
-        i = 0
-
-        loop do
-          return now if matches?(now)
-          now += sjarray[i]
-          i += 1
-          i = 0 if i == sjarray.size
-          # danger... potentially no exit...
-        end
-
-        nil
-      end
-
-      private
-
-        #--
-        # adjust values to Ruby
-        #
-        #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, keeping it as a reminder
-        #++
-
-        WDS = [ "sun", "mon", "tue", "wed", "thu", "fri", "sat" ]
-          #
-          # used by parse_weekday()
-
-        def parse_weekdays (item)
-
-          item = item.downcase
-
-          WDS.each_with_index do |day, index|
-            item = item.gsub day, "#{index}"
-          end
-
-          r = parse_item item, 0, 7
-
-          return r unless r.is_a?(Array)
-
-          r.collect { |e| e == 7 ? 0 : e }.uniq
-        end
-
-        def parse_item (item, min, max)
-
-          return nil \
-            if item == "*"
-          return parse_list(item, min, max) \
-            if item.index(",")
-          return parse_range(item, min, max) \
-            if item.index("*") or item.index("-")
-
-          i = Integer(item)
-
-          i = min if i < min
-          i = max if i > max
-
-          [ i ]
-        end
-
-        def parse_list (item, min, max)
-
-          items = item.split(",")
-
-          items.inject([]) { |r, i| r.push(parse_range(i, min, max)) }.flatten
-        end
-
-        def parse_range (item, min, max)
-
-          i = item.index("-")
-          j = item.index("/")
-
-          return item.to_i if (not i and not j)
-
-          inc = 1
-
-          inc = Integer(item[j+1..-1]) if j
-
-          istart = -1
-          iend = -1
-
-          if i
-
-            istart = Integer(item[0..i-1])
-
-            if j
-              iend = Integer(item[i+1..j])
-            else
-              iend = Integer(item[i+1..-1])
-            end
-
-          else # case */x
-
-            istart = min
-            iend = max
-          end
-
-          istart = min if istart < min
-          iend = max if iend > max
-
-          result = []
-
-          value = istart
-          loop do
-
-            result << value
-            value = value + inc
-            break if value > iend
-          end
-
-          result
-        end
-
-        def no_match? (value, cron_values)
-
-          return false if not cron_values
-
-          cron_values.each do |v|
-            return false if value == v # ok, it matches
-          end
+        def do_trigger
 
-          true # no match found
+          @block.call @job_id, @cron_line, @params
         end
     end