rufus-scheduler 2.0.19 → 2.0.20

data/CHANGELOG.txt

@@ -2,6 +2,15 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 2.0.20    released 2013/07/15
+
+- add Rufus::Scheduler.new (so that rs 3.0 quickstarts are OK with 2.0.20)
+- implement CronLine#previous_time(now=Time.now) (Idea Matteo Cerutti)
+- throw ArgumentError for invalid cron lines (Thanks Aimee Rose)
+- cron 0 vs 24 hour case straightening (Thanks Aimee Rose)
+- support for sun#L or sun#-2 in cron lines
+
+
 == rufus-scheduler - 2.0.19    released 2013/05/07
 
 - raise ArgumentError on <= 0.0 "every" frequency (Thanks Lucy Fu)

data/CREDITS.txt

@@ -4,6 +4,9 @@
 
 == Contributors
 
+- Thomas Sevestre (https://github.com/thomassevestre) :exception option
+- Matteo Cerutti - last_time / previous_time idea (and initial implementation)
+- Aimee Rose (https://github.com/AimeeRose) cronline and > 24
 - Lucy Fu (https://github.com/lfu) arg error on <= 0 "every" freq
 - Rainux Luo (https://github.com/rainux) multiple mutexes
 - Andrew Davey (https://github.com/asdavey) "L" in cron lines
@@ -22,6 +25,7 @@
 
 == Feedback
 
+- Hongli Lai - Scheduler#stop(:terminate => true) request
 - Tero Tilus - raises on unsupported/unknown options
 - Louis Coilliot - Scheduler#running_jobs
 - Henrique G. Testa - pause/resume concept

data/README.rdoc

@@ -98,12 +98,18 @@ The timezones are the ones supported by the 'tzinfo' rubygem (http://tzinfo.ruby
 
 The timezone support was contributed by Tanzeeb Khalili.
 
-Since 2.0.9, "monthdays" are supported
+"monthdays" are supported
 
   scheduler.cron '0 22 * * sun#1,sun#2' do
     # every first and second sunday of the month, at 22:00
   end
 
+It's also OK (since 2.0.19) to use L (for last monthday) or negative numbers.
+
+  scheduler.cron '0 22 * * sun#-1' do
+    # every last sunday of the month, at 22:00
+  end
+
 
 == scheduler.join
 
@@ -132,6 +138,18 @@ You shouldn't be exposed to this issue when using EventMachine, since while runn
 DO NOT CALL this #join method if you're running rufus-scheduler from Rails or Sinatra or any application that's already some kind of 'daemon'. It's not necessary! #join is meant for small standalone scripts.
 
 
+== schedule.stop
+
+  scheduler.stop
+
+This call stops the scheduler. It doesn't unschedule jobs. If there are running jobs, they're left running.
+
+If you need to stop the scheduler and wait for all the jobs currently running to finish (without killing them), rufus-scheduler 2.0.20 brings a new :terminate => true option.
+
+  scheduler.stop(:terminate => true)
+    # returns once all the jobs have been unscheduled and no jobs is running
+
+
 == block parameters
 
 Scheduled blocks accept 0 or 1 parameter (this unique parameter is the job
@@ -319,7 +337,7 @@ The chronic gem may help (http://chronic.rubyforge.org/) :
   require 'chronic' # sudo gem install chronic
 
   scheduler.every '3h', :first_at => Chronic.parse('this tuesday 5:00') do
-    # do something starting this tueday
+    # do something starting this tuesday
   end
 
 Note : setting a :first_at/:first_in in the past will get rufus-scheduler to trigger for all the past schedules until now. Adding :discard_past => true will prevent this.
@@ -520,6 +538,15 @@ For backward compatibility, overriding #log_exception is still OK :
 
 Note that an every job or a cron job will stay scheduled even if it experiences an exception.
 
+By default, all exceptions are rescued. It's easy to customize that behaviour :
+
+  scheduler = Rufus::Scheduler::PlainScheduler.start_new(:exception => StandardError)
+    # or
+  #scheduler = Rufus::Scheduler::EmScheduler.start_new(:exception => StandardError)
+
+  scheduler.in "3s" do
+    exit
+  end
 
 == frequency
 
@@ -555,7 +582,7 @@ More and more ruby applications are using EventMachine. This flavour of the sche
 
 == with Passenger
 
-"it terminates for no apparent reason !"
+"it terminates for no apparent reason!"
 
 https://github.com/jmettraux/rufus-scheduler/issues/issue/10
 
@@ -576,22 +603,35 @@ The 'tzinfo' rubygem.
 The ruby gem 'eventmachine' if you use Rufus::Scheduler::EmScheduler, else no other dependencies.
 
 
-== mailing list
+== support
+
+If you identify and pinpoint a bug, please use the issue tracker. If you are unsure whether the fault lies in rufus-scheduler or in your software, use the mailing list. The mailing list is Google-powered, so, yes, you can search it.
+
+Please read carefully: http://www.chiark.greenend.org.uk/~sgtatham/bugs.html (then re-read it).
+
+
+=== mailing list
 
 On the rufus-ruby list :
 
 http://groups.google.com/group/rufus-ruby
 
+Newcomers' first message is held for moderation in order to prevent spam. Further messages are not held.
+
+
+=== issue tracker
 
-== issue tracker
+https://github.com/jmettraux/rufus-scheduler/issues
 
-http://rubyforge.org/tracker/?atid=18584&group_id=4812&func=browse
 
+=== irc
 
-== irc
+If you come over to #ruote to ask for rufus-scheduler help, please make sure to 1) say hello 2) be polite 3) state that you're looking for rufus-scheduler help 4) remember that we cannot read your mind and guess whatever lies in your deployment.
 
   irc.freenode.net #ruote
 
+If there is no answer on IRC, use the mailing list.
+
 
 == source
 
@@ -618,3 +658,4 @@ http://rufus.rubyforge.org
 == license
 
 MIT
+

data/lib/rufus/sc/cronline.rb

@@ -33,6 +33,9 @@ module Rufus
   #
   class CronLine
 
+    DAY_S = 24 * 3600
+    WEEK_S = 7 * DAY_S
+
     # The string used for creating this cronline instance.
     #
     attr_reader :original
@@ -74,7 +77,7 @@ module Rufus
 
         raise ArgumentError.new(
           "invalid cronline: '#{line}'"
-        ) if es && es.find { |e| ! e.is_a?(Integer) }
+        ) if es && es.find { |e| ! e.is_a?(Fixnum) }
       end
     end
 
@@ -125,25 +128,21 @@ module Rufus
       time = @timezone ? @timezone.utc_to_local(now.getutc) : now
 
       time = time - time.usec * 1e-6 + 1
-        # little adjustment before starting
+        # small adjustment before starting
 
       loop do
 
         unless date_match?(time)
-          time += (24 - time.hour) * 3600 - time.min * 60 - time.sec
-          next
+          time += (24 - time.hour) * 3600 - time.min * 60 - time.sec; next
         end
         unless sub_match?(time, :hour, @hours)
-          time += (60 - time.min) * 60 - time.sec
-          next
+          time += (60 - time.min) * 60 - time.sec; next
         end
         unless sub_match?(time, :min, @minutes)
-          time += 60 - time.sec
-          next
+          time += 60 - time.sec; next
         end
         unless sub_match?(time, :sec, @seconds)
-          time += 1
-          next
+          time += 1; next
         end
 
         break
@@ -157,6 +156,28 @@ module Rufus
       time
     end
 
+    # Returns the previous the cronline matched. It's like next_time, but
+    # for the past.
+    #
+    def previous_time(now=Time.now)
+
+      # looks back by slices of two hours,
+      #
+      # finds for '* * * * sun', '* * 13 * *' and '0 12 13 * *'
+      # starting 1970, 1, 1 in 1.8 to 2 seconds (says Rspec)
+
+      start = current = now - 2 * 3600
+      result = nil
+
+      loop do
+        nex = next_time(current)
+        return (result ? result : previous_time(start)) if nex > now
+        result = current = nex
+      end
+
+      # never reached
+    end
+
     # Returns an array of 6 arrays (seconds, minutes, hours, days,
     # months, weekdays).
     # This method is used by the cronline unit tests.
@@ -190,15 +211,18 @@ module Rufus
 
       items.each do |it|
 
-        if it.match(/#[12345]$/)
+        if m = it.match(/^(.+)#(l|-?[12345])$/)
 
           raise ArgumentError.new(
             "ranges are not supported for monthdays (#{it})"
-          ) if it.index('-')
+          ) if m[1].index('-')
+
+          expr = it.gsub(/#l/, '#-1')
 
-          (monthdays ||= []) << it
+          (monthdays ||= []) << expr
 
         else
+
           expr = it.dup
           WEEKDAYS.each_with_index { |a, i| expr.gsub!(/#{a}/, i.to_s) }
 
@@ -221,110 +245,109 @@ module Rufus
     def parse_item(item, min, max)
 
       return nil if item == '*'
-      return [ 'L' ] if item == 'L'
-      return parse_list(item, min, max) if item.index(',')
-      return parse_range(item, min, max) if item.match(/[*-\/]/)
 
-      i = item.to_i
-
-      i = min if i < min
-      i = max if i > max
-
-      [ i ]
-    end
-
-    def parse_list(item, min, max)
-
-      l = item.split(',').collect { |i| parse_range(i, min, max) }.flatten
+      r = item.split(',').map { |i| parse_range(i.strip, min, max) }.flatten
 
       raise ArgumentError.new(
         "found duplicates in #{item.inspect}"
-      ) if l.uniq.size < l.size
+      ) if r.uniq.size < r.size
 
-      l
+      r
     end
 
+    RANGE_REGEX = /^(\*|\d{1,2})(?:-(\d{1,2}))?(?:\/(\d{1,2}))?$/
+
     def parse_range(item, min, max)
 
-      dash = item.index('-')
-      slash = item.index('/')
+      return %w[ L ] if item == 'L'
 
-      return parse_item(item, min, max) if (not slash) and (not dash)
+      m = item.match(RANGE_REGEX)
 
       raise ArgumentError.new(
-        "'L' (end of month) is not accepted in ranges, " +
-        "#{item.inspect} is not valid"
-      ) if item.index('L')
+        "cannot parse #{item.inspect}"
+      ) unless m
 
-      inc = slash ? item[slash + 1..-1].to_i : 1
+      sta = m[1]
+      sta = sta == '*' ? min : sta.to_i
 
-      istart = -1
-      iend = -1
+      edn = m[2]
+      edn = edn ? edn.to_i : sta
+      edn = max if m[1] == '*'
 
-      if dash
+      inc = m[3]
+      inc = inc ? inc.to_i : 1
 
-        istart = item[0..dash - 1].to_i
-        iend = (slash ? item[dash + 1..slash - 1] : item[dash + 1..-1]).to_i
-
-      else # case */x
-
-        istart = min
-        iend = max
-      end
-
-      istart = min if istart < min
-      iend = max if iend > max
+      raise ArgumentError.new(
+        "#{item.inspect} is not in range #{min}..#{max}"
+      ) if sta < min or edn > max
 
-      result = []
+      r = []
+      val = sta
 
-      value = istart
       loop do
-        result << value
-        value = value + inc
-        break if value > iend
+        v = val
+        v = 0 if max == 24 && v == 24
+        r << v
+        break if inc == 1 && val == edn
+        val += inc
+        break if inc > 1 && val > edn
+        val = min if val > max
       end
 
-      result
+      r.uniq
     end
 
-    def sub_match?(time, accessor, values=:none)
+    def sub_match?(time, accessor, values)
 
-      value, values =
-        if values == :none
-          [ time, accessor ]
-        else
-          [ time.send(accessor), values ]
-        end
+      value = time.send(accessor)
 
       return true if values.nil?
-      return true if values.include?('L') && (time + 24 * 3600).day == 1
+      return true if values.include?('L') && (time + DAY_S).day == 1
+
+      return true if value == 0 && accessor == :hour && values.include?(24)
 
       values.include?(value)
     end
 
+    def monthday_match?(date, values)
+
+      return true if values.nil?
+
+      today_values = monthdays(date)
+
+      (today_values & values).any?
+    end
+
     def date_match?(date)
 
       return false unless sub_match?(date, :day, @days)
       return false unless sub_match?(date, :month, @months)
       return false unless sub_match?(date, :wday, @weekdays)
-      return false unless sub_match?(CronLine.monthday(date), @monthdays)
+      return false unless monthday_match?(date, @monthdays)
       true
     end
 
-    DAY_IN_SECONDS = 7 * 24 * 3600
+    def monthdays(date)
+
+      pos = 1
+      d = date.dup
 
-    def self.monthday(date)
+      loop do
+        d = d - WEEK_S
+        break if d.month != date.month
+        pos = pos + 1
+      end
 
-      count = 1
-      date2 = date.dup
+      neg = -1
+      d = date.dup
 
       loop do
-        date2 = date2 - DAY_IN_SECONDS
-        break if date2.month != date.month
-        count = count + 1
+        d = d + WEEK_S
+        break if d.month != date.month
+        neg = neg - 1
       end
 
-      "#{WEEKDAYS[date.wday]}##{count}"
+      [ "#{WEEKDAYS[date.wday]}##{pos}", "#{WEEKDAYS[date.wday]}##{neg}" ]
     end
   end
 end

data/lib/rufus/sc/jobs.rb

@@ -198,7 +198,7 @@ module Scheduler
 
           to_job.unschedule if to_job
 
-        rescue Exception => e
+        rescue (@scheduler.options[:exception] || Exception) => e
 
           @scheduler.do_handle_exception(self, e)
         end

data/lib/rufus/sc/rtime.rb

@@ -343,8 +343,6 @@ module Rufus
     at
   end
 
-  protected # well, somehow
-
   DURATIONS2M = [
     [ 'y', 365 * 24 * 3600 ],
     [ 'M', 30 * 24 * 3600 ],

data/lib/rufus/sc/scheduler.rb

@@ -327,6 +327,21 @@ module Rufus::Scheduler
       }.compact
     end
 
+    # This is a blocking call, it will return when all the jobs have been
+    # unscheduled, waiting for any running one to finish before unscheduling
+    # it.
+    #
+    def terminate_all_jobs
+
+      all_jobs.each do |job_id, job|
+        job.unschedule
+      end
+
+      while running_jobs.size > 0
+        sleep 0.01
+      end
+    end
+
     protected
 
     # Returns a job queue instance.
@@ -455,9 +470,23 @@ module Rufus::Scheduler
         "#{self.class} - #{Rufus::Scheduler::VERSION}"
     end
 
+    # Stops this scheduler.
+    #
+    # == :terminate => true
+    #
+    # If the option :terminate is set to true,
+    # the method will return once all the jobs have been unscheduled and
+    # are done with their current run if any.
+    #
+    # (note that if a job is
+    # currently running, this method will wait for it to terminate, it
+    # will not interrupt the job run).
+    #
     def stop(opts={})
 
       @thread.exit
+
+      terminate_all_jobs if opts[:terminate]
     end
 
     def join
@@ -487,9 +516,24 @@ module Rufus::Scheduler
       end
     end
 
-    def stop
+
+    # Stops this scheduler.
+    #
+    # == :terminate => true
+    #
+    # If the option :terminate is set to true,
+    # the method will return once all the jobs have been unscheduled and
+    # are done with their current run if any.
+    #
+    # (note that if a job is
+    # currently running, this method will wait for it to terminate, it
+    # will not interrupt the job run).
+    #
+    def stop(opts={})
 
       trap(@options[:signal] || 10)
+
+      terminate_all_jobs if opts[:terminate]
     end
   end
 
@@ -530,13 +574,27 @@ module Rufus::Scheduler
 
     # Stops the scheduler.
     #
+    # == :stop_em => true
+    #
     # If the :stop_em option is passed and set to true, it will stop the
     # EventMachine (but only if it started the EM by itself !).
     #
+    # == :terminate => true
+    #
+    # If the option :terminate is set to true,
+    # the method will return once all the jobs have been unscheduled and
+    # are done with their current run if any.
+    #
+    # (note that if a job is
+    # currently running, this method will wait for it to terminate, it
+    # will not interrupt the job run).
+    #
     def stop(opts={})
 
       @timer.cancel
 
+      terminate_all_jobs if opts[:terminate]
+
       EM.stop if opts[:stop_em] and @em_thread
     end
 

data/lib/rufus/sc/version.rb

@@ -26,7 +26,7 @@
 module Rufus
 module Scheduler
 
-  VERSION = '2.0.19'
+  VERSION = '2.0.20'
 end
 end
 

data/lib/rufus/scheduler.rb

@@ -28,6 +28,13 @@ require 'rufus/sc/scheduler'
 
 module Rufus::Scheduler
 
+  # Starts and return a new instance of a PlainScheduler.
+  #
+  def self.new(opts={})
+
+    PlainScheduler.start_new(opts)
+  end
+
   # A quick way to get a scheduler up an running
   #
   #   require 'rubygems'

data/spec/cronline_spec.rb

@@ -24,13 +24,6 @@ describe Rufus::CronLine do
     cl(line).to_array.should == array
   end
 
-  def local(*args)
-    Time.local(*args)
-  end
-  def utc(*args)
-    Time.utc(*args)
-  end
-
   describe '.new' do
 
     it 'interprets cron strings correctly' do
@@ -54,6 +47,13 @@ describe Rufus::CronLine do
       to_a '1-5 * * * * *', [ [1,2,3,4,5], nil, nil, nil, nil, nil, nil, nil ]
 
       to_a '0 0 1 1 *', [ [0], [0], [0], [1], [1], nil, nil, nil ]
+
+      to_a '0 23-24 * * *', [ [0], [0], [23, 0], nil, nil, nil, nil, nil ]
+        #
+        # as reported by Aimee Rose in
+        # https://github.com/jmettraux/rufus-scheduler/issues/56
+
+      to_a '0 23-2 * * *', [ [0], [0], [23, 0, 1, 2], nil, nil, nil, nil, nil ]
     end
 
     it 'rejects invalid weekday expressions' do
@@ -84,7 +84,7 @@ describe Rufus::CronLine do
 
       to_a(
         '0 */2 * * *',
-        [ [0], [0], (0..12).collect { |e| e * 2 }, nil, nil, nil, nil, nil ])
+        [ [0], [0], (0..11).collect { |e| e * 2 }, nil, nil, nil, nil, nil ])
       to_a(
         '0 7-23/2 * * *',
         [ [0], [0], (7..23).select { |e| e.odd? }, nil, nil, nil, nil, nil ])
@@ -105,7 +105,8 @@ describe Rufus::CronLine do
       to_a '09 * * * *', [ [0], [9], nil, nil, nil, nil, nil, nil ]
       to_a '09-12 * * * *', [ [0], [9, 10, 11, 12], nil, nil, nil, nil, nil, nil ]
       to_a '07-08 * * * *', [ [0], [7, 8], nil, nil, nil, nil, nil, nil ]
-      to_a '* */08 * * *', [ [0], nil, [0, 8, 16, 24], nil, nil, nil, nil, nil ]
+      to_a '* */08 * * *', [ [0], nil, [0, 8, 16], nil, nil, nil, nil, nil ]
+      to_a '* */07 * * *', [ [0], nil, [0, 7, 14, 21], nil, nil, nil, nil, nil ]
       to_a '* 01-09/04 * * *', [ [0], nil, [1, 5, 9], nil, nil, nil, nil, nil ]
       to_a '* * * * 06', [ [0], nil, nil, nil, nil, [6], nil, nil ]
     end
@@ -132,6 +133,18 @@ describe Rufus::CronLine do
 
       lambda { cl '* L * * *'}.should raise_error(ArgumentError)
     end
+
+    it 'raises for out of range input' do
+
+      lambda { cl '60-62 * * * *'}.should raise_error(ArgumentError)
+      lambda { cl '62 * * * *'}.should raise_error(ArgumentError)
+      lambda { cl '60 * * * *'}.should raise_error(ArgumentError)
+      lambda { cl '* 25-26 * * *'}.should raise_error(ArgumentError)
+      lambda { cl '* 25 * * *'}.should raise_error(ArgumentError)
+        #
+        # as reported by Aimee Rose in
+        # https://github.com/jmettraux/rufus-scheduler/pull/58
+    end
   end
 
   describe '#next_time' do
@@ -151,9 +164,16 @@ describe Rufus::CronLine do
 
       nt('10 12 13 12 *', now).should == now + 29938200
         # this one is slow (1 year == 3 seconds)
+        #
+        # historical note:
+        # (comment made in 2006 or 2007, the underlying libs got better and
+        # that slowness is gone)
 
       nt('0 0 * * thu', now).should == now + 604800
 
+      nt('0 0 * * *', now).should == now + 24 * 3600
+      nt('0 24 * * *', now).should == now + 24 * 3600
+
       now = local(2008, 12, 31, 23, 59, 59, 0)
 
       nt('* * * * *', now).should == now + 1
@@ -225,34 +245,56 @@ describe Rufus::CronLine do
 
     it 'computes the next time correctly when there is a sun#2 involved' do
 
-      now = local(1970, 1, 1)
+      nt('* * * * sun#1', local(1970, 1, 1)).should == local(1970, 1, 4)
+      nt('* * * * sun#2', local(1970, 1, 1)).should == local(1970, 1, 11)
 
-      nt('* * * * sun#1', now).should == local(1970, 1, 4)
-      nt('* * * * sun#2', now).should == local(1970, 1, 11)
+      nt('* * * * sun#2', local(1970, 1, 12)).should == local(1970, 2, 8)
+    end
 
-      now = local(1970, 1, 12)
+    it 'computes the next time correctly when there is a sun#2,sun#3 involved' do
 
-      nt('* * * * sun#2', now).should == local(1970, 2, 8)
+      nt('* * * * sun#2,sun#3', local(1970, 1, 1)).should == local(1970, 1, 11)
+      nt('* * * * sun#2,sun#3', local(1970, 1, 12)).should == local(1970, 1, 18)
     end
 
-    it 'computes the next time correctly when there is a sun#2,sun#3 involved' do
+    it 'understands sun#L' do
 
-      now = local(1970, 1, 1)
+      nt('* * * * sun#L', local(1970, 1, 1)).should == local(1970, 1, 25)
+    end
+
+    it 'understands sun#-1' do
+
+      nt('* * * * sun#-1', local(1970, 1, 1)).should == local(1970, 1, 25)
+    end
+
+    it 'understands sun#-2' do
+
+      nt('* * * * sun#-2', local(1970, 1, 1)).should == local(1970, 1, 18)
+    end
 
-      nt('* * * * sun#2,sun#3', now).should == local(1970, 1, 11)
+    it 'computes the next time correctly when "L" (last day of month)' do
 
-      now = local(1970, 1, 12)
+      nt('* * L * *', lo(1970, 1, 1)).should == lo(1970, 1, 31)
+      nt('* * L * *', lo(1970, 2, 1)).should == lo(1970, 2, 28)
+      nt('* * L * *', lo(1972, 2, 1)).should == lo(1972, 2, 29)
+      nt('* * L * *', lo(1970, 4, 1)).should == lo(1970, 4, 30)
+    end
+  end
 
-      nt('* * * * sun#2,sun#3', now).should == local(1970, 1, 18)
+  describe '#previous_time' do
+
+    def pt(cronline, now)
+      Rufus::CronLine.new(cronline).previous_time(now)
     end
 
-   it 'computes the next time correctly when there is a L (last day of month)' do
+    it 'returns the previous time the cron should have triggered' do
+
+      pt('* * * * sun', lo(1970, 1, 1)).should == lo(1969, 12, 28, 23, 59, 00)
+      pt('* * 13 * *', lo(1970, 1, 1)).should == lo(1969, 12, 13, 23, 59, 00)
+      pt('0 12 13 * *', lo(1970, 1, 1)).should == lo(1969, 12, 13, 12, 00)
 
-     nt('* * L * *', local(1970,1,1)).should == local(1970, 1, 31)
-     nt('* * L * *', local(1970,2,1)).should == local(1970, 2, 28)
-     nt('* * L * *', local(1972,2,1)).should == local(1972, 2, 29)
-     nt('* * L * *', local(1970,4,1)).should == local(1970, 4, 30)
-   end
+      pt('* * * * * sun', lo(1970, 1, 1)).should == lo(1969, 12, 28, 23, 59, 59)
+    end
   end
 
   describe '#matches?' do
@@ -325,16 +367,21 @@ describe Rufus::CronLine do
     end
   end
 
-  describe '.monthday' do
+  describe '#monthdays' do
 
     it 'returns the appropriate "sun#2"-like string' do
 
-      d = local(1970, 1, 1)
-      Rufus::CronLine.monthday(d).should == 'thu#1'
-      Rufus::CronLine.monthday(d + 6 * 24 * 3600).should == 'wed#1'
-      Rufus::CronLine.monthday(d + 13 * 24 * 3600).should == 'wed#2'
+      class Rufus::CronLine
+        public :monthdays
+      end
+
+      cl = Rufus::CronLine.new('* * * * *')
+
+      cl.monthdays(local(1970, 1, 1)).should == %w[ thu#1 thu#-5 ]
+      cl.monthdays(local(1970, 1, 7)).should == %w[ wed#1 wed#-4 ]
+      cl.monthdays(local(1970, 1, 14)).should == %w[ wed#2 wed#-3 ]
 
-      Rufus::CronLine.monthday(local(2011, 3, 11)).should == 'fri#2'
+      cl.monthdays(local(2011, 3, 11)).should == %w[ fri#2 fri#-3 ]
     end
   end
 end

data/spec/exception_spec.rb

@@ -1,4 +1,3 @@
-
 #
 # Specifying rufus-scheduler
 #
@@ -93,5 +92,22 @@ describe SCHEDULER_CLASS do
     $j.class.should == Rufus::Scheduler::InJob
     $e.to_s.should == 'Houston we have a problem'
   end
+
+  it 'allow custom exception rescue' do
+    @s.options[:exception]= StandardError
+
+    job = @s.in 0 do
+      exit
+    end
+
+    @e= nil
+    begin
+      wait_next_tick
+    rescue SystemExit => e
+      @e= e
+    end
+
+    @e.should_not == nil
+  end
 end
 

data/spec/rtime_spec.rb

@@ -105,7 +105,7 @@ describe 'rufus/rtime' do
   end
 end
 
-describe 'rufus/rtime#at_to_f' do
+describe 'Rufus.at_to_f' do
 
   def atf(o)
     Rufus.at_to_f(o)

data/spec/scheduler_spec.rb

@@ -200,6 +200,38 @@ describe SCHEDULER_CLASS do
       end
     end
   end
+
+  context 'termination' do
+
+    describe '#stop(true)' do
+
+      it 'terminates the scheduler, blocking until all the jobs are unscheduled' do
+
+        $every = nil
+        $cron = nil
+
+        s = start_scheduler
+        s.every '1s' do
+          $every = :in
+          sleep 0.5
+          $every = :out
+        end
+        s.cron '* * * * * *' do
+          $cron = :in
+          sleep 0.5
+          $cron = :out
+        end
+
+        sleep 2
+
+        s.stop(:terminate => true)
+
+        s.jobs.size.should == 0
+        $every.should == :out
+        $cron.should == :out
+      end
+    end
+  end
 end
 
 describe 'Rufus::Scheduler#start_new' do

data/spec/spec_base.rb

@@ -76,3 +76,12 @@ def wait_next_tick
   #end
 end
 
+def local(*args)
+  Time.local(*args)
+end
+alias lo local
+
+def utc(*args)
+  Time.utc(*args)
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.0.19
+  version: 2.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -67,39 +67,38 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
-- lib/rufus/otime.rb
-- lib/rufus/sc/cronline.rb
-- lib/rufus/sc/jobqueues.rb
-- lib/rufus/sc/jobs.rb
-- lib/rufus/sc/rtime.rb
+- lib/rufus-scheduler.rb
+- lib/rufus/scheduler.rb
 - lib/rufus/sc/scheduler.rb
+- lib/rufus/sc/rtime.rb
 - lib/rufus/sc/version.rb
-- lib/rufus/scheduler.rb
-- lib/rufus-scheduler.rb
-- spec/at_in_spec.rb
-- spec/at_spec.rb
-- spec/blocking_spec.rb
-- spec/cron_spec.rb
-- spec/cronline_spec.rb
-- spec/every_spec.rb
+- lib/rufus/sc/cronline.rb
+- lib/rufus/sc/jobs.rb
+- lib/rufus/sc/jobqueues.rb
+- lib/rufus/otime.rb
+- spec/job_spec.rb
+- spec/stress_schedule_unschedule_spec.rb
+- spec/schedulable_spec.rb
 - spec/exception_spec.rb
 - spec/in_spec.rb
-- spec/job_spec.rb
-- spec/mutex_spec.rb
+- spec/timeout_spec.rb
+- spec/at_spec.rb
+- spec/at_in_spec.rb
+- spec/spec_base.rb
+- spec/cronline_spec.rb
 - spec/rtime_spec.rb
-- spec/schedulable_spec.rb
+- spec/mutex_spec.rb
 - spec/scheduler_spec.rb
-- spec/spec_base.rb
-- spec/stress_schedule_unschedule_spec.rb
-- spec/timeout_spec.rb
-- test/kjw.rb
+- spec/blocking_spec.rb
+- spec/every_spec.rb
+- spec/cron_spec.rb
 - test/t.rb
+- test/kjw.rb
 - rufus-scheduler.gemspec
 - CHANGELOG.txt
-- CREDITS.txt
-- LICENSE.txt
-- out.txt
 - TODO.txt
+- LICENSE.txt
+- CREDITS.txt
 - README.rdoc
 homepage: http://github.com/jmettraux/rufus-scheduler
 licenses: []
@@ -113,21 +112,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1513262691769122142
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1513262691769122142
 requirements: []
 rubyforge_project: rufus
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: job scheduler for Ruby (at, cron, in and every jobs)

data/out.txt

@@ -1,4 +0,0 @@
-ruby-1.8.7-p249 :001 > nada
-NameError: undefined local variable or method `nada' for #<Object:0x1001d1298>
-	from (irb):1
-ruby-1.8.7-p249 :002 > ^D