rufus-scheduler 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5efdaec8fd127103673241abfcb7a14d9135aef
-  data.tar.gz: 95b4b8f72eaea194b946e9b6738fa42b9086fc2a
+  metadata.gz: ad34820fe55c8eccd3edf74096abc62679e1469b
+  data.tar.gz: d571059ae2153fc7b6c8db515b4b37ffe965d091
 SHA512:
-  metadata.gz: d511d09f4a9c0deffd90a97005d0824b891a55a92236cf885fde676830960ebbaad407d1a4fd4817b81d20d0f7ef9a504ad35b96a58b7a195e30bae89eda0046
-  data.tar.gz: d4da5209b9d01d6a4c861ed022b36971377762ae31ec785d068c0070af3e098e0ff0f6939cd128a96f5752deb74c49daf798a074d6a7557fa80d125f4286dcd5
+  metadata.gz: 9524bfda419a72978d51f135243394d2af6b3805003681e6732f3270c49d14237b03943378f69171c62f40d2f0c379e2f3e971243015970d6d21341ef00f9379
+  data.tar.gz: d9320d55f5a4e9c43ffdb1e4b270bcf62c547386bec3ccd781a5f4e171ad8f92dc4cccba3a89f5ecb4412fc3f61fb23a34931ba40353c884069cbdfffd429d34

data/CHANGELOG.txt

@@ -2,6 +2,41 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 3.4.0    released 2017-03-23
+
+- Stop supporting Ruby < 1.9
+- Drop ZoTime for et-orbi's Etorbi::EoTime, gh-240
+- Fix for ZooKeeper example, thanks to @djrodgerspryor, gh-238
+
+
+== rufus-scheduler - 3.3.4    released 2017-02-16
+
+- More detailed "cannot determine timezone from nil" message, gh-237
+
+
+== rufus-scheduler - 3.3.3    released 2017-01-29
+
+- use Rails' timezone by default if Rails is present, gh-230, gh-233,
+  thanks Alexander Deeb
+- is_a?(Fixnum) replaced by is_a?(Integer), gh-232, thanks Cody Cutrer
+- Fix for every double trigger, gh-231, thanks Sofia Bravo
+
+
+== rufus-scheduler - 3.3.2    released 2017-01-05
+
+- Fix ZoTime issue with Time.zone.now #=> 'CST', thanks zzjin
+- Fix cron weekdays + monthdays, by Dominik Sander, https://github.com/dsander
+- Speedup CronLine#brute_frequency, by Dominik Sander
+- Use object_id instead of hash to make Job id
+
+
+== rufus-scheduler - 3.3.1    released 2016-12-03
+
+- gh-222 fall back on ENV['TZ'] when Time.now.zone is something
+  like "中国标准时间" (ask for "Asia/Shanghai"), thanks to
+  https://github.com/lovingyu
+
+
 == rufus-scheduler - 3.3.0    released 2016-11-28
 
 - Bring in Piavka's Job#trigger_off_schedule, gh-214

data/CREDITS.txt

@@ -4,6 +4,11 @@
 
 == Contributors
 
+- Benjamin Fleischer (https://github.com/bf4) - ZoTime#subtract
+- Sam Rowe (https://github.com/riddley) - gh-240 timezone for Debian
+- Daniel Rodgers-Pryor (https://github.com/djrodgerspryor) - gh-238 fix ZooKeeper example
+- Cody Cutrer (https://github.com/ccutrer) - gh-232 is_a?(Fixnum) replacement
+- Dominik Sander (https://github.com/dsander) - gh-225, gh-226
 - Piavka (https://github.com/piavka) - Job#trigger_off_schedule, gh-214
 - Paulo Delgado (https://github.com/paulodelgado) counter ActiveRecord, gh-210
 - Anjali Sharma (https://github.com/anjali-sharma) enhance job#last_time example
@@ -51,6 +56,12 @@
 
 == Feedback
 
+- Vito Laurenza - https://github.com/veetow - help debugging tz issues - gh-240
+- Yoshimi Keiji - https://githuc.com/walf443 - v.3.3.3 mislabelling
+- Alexander Deeb - https://github.com/adeeb1 - gh-230
+- Sofia Bravo - http://stackoverflow.com/users/1123850/sofia-bravo - gh-231
+- zzjin - https://githu.com/zzjin - 3.3.x vs CST abbreviated timezone - gh-228
+- lovingyu - https://github.com/lovingyu - fallback to ENV['TZ'] - gh-222
 - Ramon Tayag - https://github.com/ramontayag - prevent day 0 in cronlines
 - Akinori Musha - https://github.com/knu - ENV['TZ'] setting is harmful
 - Nicolás Satragno - https://twitter.com/nsatragno - parse_to_time vs Date

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2005-2016, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2005-2017, 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

data/README.md

@@ -8,7 +8,7 @@ Job scheduler for Ruby (at, cron, in and every jobs).
 
 It uses threads.
 
-**Note**: maybe are you looking for the [README of rufus-scheduler 2.x](https://github.com/jmettraux/rufus-scheduler/blob/two/README.rdoc)?
+**Note**: maybe are you looking for the [README of rufus-scheduler 2.x](https://github.com/jmettraux/rufus-scheduler/blob/two/README.rdoc)? (especially if you're using [Dashing](https://github.com/Shopify/dashing) which is [stuck](https://github.com/Shopify/dashing/blob/master/dashing.gemspec) on rufus-scheduler 2.0.24)
 
 Quickstart:
 ```ruby
@@ -67,7 +67,7 @@ A rufus-scheduler instance will go on scheduling while it is present among the o
 ## related and similar gems
 
 * [Whenever](https://github.com/javan/whenever) - let cron call back your Ruby code, trusted and reliable cron drives your schedule
-* [Clockwork](https://github.com/tomykaira/clockwork) - rufus-scheduler inspired gem
+* [Clockwork](https://github.com/Rykian/clockwork) - rufus-scheduler inspired gem
 * [Crono](https://github.com/plashchynski/crono) - an in-Rails cron scheduler
 * [PerfectSched](https://github.com/treasure-data/perfectsched) - highly available distributed cron built on [Sequel](http://sequel.jeremyevans.net) and more
 
@@ -91,7 +91,7 @@ I'll drive you right to the [tracks](#so-rails).
 * As said, no more EventMachine-based scheduler
 * ```scheduler.every('100') {``` will schedule every 100 seconds (previously, it would have been 0.1s). This aligns rufus-scheduler on Ruby's ```sleep(100)```
 * The scheduler isn't catching the whole of Exception anymore, only StandardError
-* The error_handler is #on_error (instead of #on_exception), by default it now prints the details of the error to $stderr (used to be $stdout)
+* The error_handler is [#on_error](#rufusscheduleron_errorjob-error) (instead of #on_exception), by default it now prints the details of the error to $stderr (used to be $stdout)
 * Rufus::Scheduler::TimeOutError renamed to Rufus::Scheduler::TimeoutError
 * Introduction of "interval" jobs. Whereas "every" jobs are like "every 10 minutes, do this", interval jobs are like "do that, then wait for 10 minutes, then do that again, and so on"
 * Introduction of a :lockfile => true/filename mechanism to prevent multiple schedulers from executing
@@ -129,6 +129,7 @@ Yes, issues can be reported in [rufus-scheduler issues](https://github.com/jmett
 * [Passenger in-depth spawn methods (smart spawning)](https://www.phusionpassenger.com/library/indepth/ruby/spawn_methods/#smart-spawning-hooks)
 * [The scheduler comes up when running the Rails console or a Rake task](https://github.com/jmettraux/rufus-scheduler#avoid-scheduling-when-running-the-ruby-on-rails-console)
 * [I don't get any of this, I just want it to work in my Rails application](#so-rails)
+* [I get "zotime.rb:41:in `initialize': cannot determine timezone from nil"](#i-get-zotimerb41in-initialize-cannot-determine-timezone-from-nil)
 
 
 ## scheduling
@@ -438,7 +439,7 @@ job.first_at = Time.now + 10
 job.first_at = Rufus::Scheduler.parse('2029-12-12')
 ```
 
-The first argument (in all its flavours) accepts a :now or :immediately value. That schedules the first occurence for immediate triggering. Consider:
+The first argument (in all its flavours) accepts a :now or :immediately value. That schedules the first occurrence for immediate triggering. Consider:
 
 ```ruby
 require 'rufus-scheduler'
@@ -781,7 +782,7 @@ job =
 job.call
 ```
 
-Warning: the Scheduler#on_error handler is not involved. Error handling is the responsibility of the caller.
+Warning: the Scheduler[#on_error](#rufusscheduleron_errorjob-error) handler is not involved. Error handling is the responsibility of the caller.
 
 If the call has to be rescued by the error handler of the scheduler, ```call(true)``` might help:
 
@@ -846,7 +847,7 @@ Every jobs use a time duration between each start of their execution, while inte
 
 ### frequency
 
-It returns the shortest interval of time between two potential occurences of the job.
+It returns the shortest interval of time between two potential occurrences of the job.
 
 For instance:
 ```ruby
@@ -1063,6 +1064,20 @@ def scheduler.on_error(job, error)
 end
 ```
 
+On Rails, the `on_error` method redefinition might look like:
+```ruby
+def scheduler.on_error(job, error)
+
+  Rails.logger.error(
+    "err#{error.object_id} rufus-scheduler intercepted #{error.inspect}" +
+    " in job #{job.inspect}")
+  error.backtrace.each_with_index do |line, i|
+    Rails.logger.error(
+      "err#{error.object_id} #{i}: #{line}")
+  end
+end
+```
+
 ## Rufus::Scheduler #on_pre_trigger and #on_post_trigger callbacks
 
 One can bind callbacks before and after jobs trigger:
@@ -1267,7 +1282,7 @@ end
 
 This uses a [zookeeper](http://zookeeper.apache.org/) to make sure only one scheduler in a group of distributed schedulers runs.
 
-The methods #lock and #unlock are overriden and #confirm_lock is provided,
+The methods #lock and #unlock are overridden and #confirm_lock is provided,
 to make sure that the lock is still valid.
 
 The #confirm_lock method is called right before a job triggers (if it is provided). The more generic callback #on_pre_trigger is called right after #confirm_lock.
@@ -1417,7 +1432,58 @@ end
 # or even
 
 Rufus::Scheduler.parse("2013-12-12 14:00 Pacific/Saipan")
-  # => 2013-12-12 04:00:00 UTC
+  # => #<Rufus::Scheduler::ZoTime:0x007fb424abf4e8 @seconds=1386820800.0, @zone=#<TZInfo::DataTimezone: Pacific/Saipan>, @time=nil>
+```
+
+### I get "zotime.rb:41:in `initialize': cannot determine timezone from nil"
+
+For when you see an error like:
+```
+rufus-scheduler/lib/rufus/scheduler/zotime.rb:41:
+  in `initialize':
+    cannot determine timezone from nil (etz:nil,tnz:"中国标准时间",tzid:nil)
+      (ArgumentError)
+	from rufus-scheduler/lib/rufus/scheduler/zotime.rb:198:in `new'
+	from rufus-scheduler/lib/rufus/scheduler/zotime.rb:198:in `now'
+	from rufus-scheduler/lib/rufus/scheduler.rb:561:in `start'
+	...
+```
+
+It may happen on Windows or on systems that poorly hints to Ruby on which timezone to use. It should be solved by setting explicitly the `ENV['TZ']` before the scheduler instantiation:
+```ruby
+ENV['TZ'] = 'Asia/Shanghai'
+scheduler = Rufus::Scheduler.new
+scheduler.every '2s' do
+  puts "#{Time.now} Hello #{ENV['TZ']}!"
+end
+```
+
+On Rails you might want to try with:
+```ruby
+ENV['TZ'] = Time.zone.name # Rails only
+scheduler = Rufus::Scheduler.new
+scheduler.every '2s' do
+  puts "#{Time.now} Hello #{ENV['TZ']}!"
+end
+```
+(Hat tip to Alexander in [gh-230](https://github.com/jmettraux/rufus-scheduler/issues/230))
+
+Rails sets its timezone under `config/application.rb`.
+
+Rufus-Scheduler 3.3.3 detects the presence of Rails and uses its timezone setting (tested with Rails 4), so setting `ENV['TZ']` should not be necessary.
+
+The value can be determined thanks to [https://en.wikipedia.org/wiki/List_of_tz_database_time_zones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
+
+Use a "continent/city" identifier (for example "Asia/Shanghai"). Do not use an abbreviation (not "CST") and do not use a local time zone name (not "中国标准时间" nor "Eastern Standard Time" which, for instance, points to a time zone in America and to another one in Australia...).
+
+If the error persists (and especially on Windows), try to add the `tzinfo-data` to your Gemfile, as in:
+```ruby
+gem 'tzinfo-data'
+```
+or by manually requiring it before requiring rufus-scheduler (if you don't use Bundler):
+```ruby
+require 'tzinfo/data'
+require 'rufus-scheduler'
 ```
 
 

data/fail.txt

@@ -0,0 +1,2 @@
+rspec ./spec/job_spec.rb:465 # Rufus::Scheduler::Job :mutex :mutex => [ array_of_mutex_names_or_instances ] prevents concurrent executions
+rspec ./spec/scheduler_spec.rb:534 # Rufus::Scheduler#running_jobs(:tag/:tags => x) returns a list of running jobs filtered by tag

data/lib/rufus/scheduler/cronline.rb

@@ -1,28 +1,3 @@
-#--
-# Copyright (c) 2006-2016, 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.
-#++
-
-require 'set'
 
 
 class Rufus::Scheduler
@@ -33,6 +8,11 @@ class Rufus::Scheduler
   #
   class CronLine
 
+    # The max number of years in the future or the past before giving up
+    # searching for #next_time or #previous_time respectively
+    #
+    NEXT_TIME_MAX_YEARS = 14
+
     # The string used for creating this cronline instance.
     #
     attr_reader :original
@@ -58,10 +38,10 @@ class Rufus::Scheduler
 
       items = line.split
 
-      if @timezone = ZoTime.get_tzone(items.last)
+      if @timezone = EoTime.get_tzone(items.last)
         @original_timezone = items.pop
       else
-        @timezone = ZoTime.get_tzone(:current)
+        @timezone = EoTime.local_tzone
       end
 
       fail ArgumentError.new(
@@ -81,7 +61,7 @@ class Rufus::Scheduler
 
         fail ArgumentError.new(
           "invalid cronline: '#{line}'"
-        ) if es && es.find { |e| ! e.is_a?(Fixnum) }
+        ) if es && es.find { |e| ! e.is_a?(Integer) }
       end
 
       if @days && @days.include?(0) # gh-221
@@ -94,10 +74,10 @@ class Rufus::Scheduler
     #
     def matches?(time)
 
-        # FIXME Don't create a new ZoTime if time is already a ZoTime in same
+        # FIXME Don't create a new EoTime if time is already a EoTime in same
         #       zone ...
         #       Wait, this seems only used in specs...
-      t = ZoTime.new(time.to_f, @timezone)
+      t = EoTime.new(time.to_f, @timezone)
 
       return false unless sub_match?(t, :sec, @seconds)
       return false unless sub_match?(t, :min, @minutes)
@@ -133,15 +113,21 @@ class Rufus::Scheduler
     #
     # (Thanks to K Liu for the note and the examples)
     #
-    def next_time(from=ZoTime.now)
+    def next_time(from=EoTime.now)
 
       nt = nil
-      zt = ZoTime.new(from.to_i + 1, @timezone)
+      zt = EoTime.new(from.to_i + 1, @timezone)
+      maxy = from.year + NEXT_TIME_MAX_YEARS
 
       loop do
 
         nt = zt.dup
 
+        fail RangeError.new(
+          "failed to reach occurrence within " +
+          "#{NEXT_TIME_MAX_YEARS} years for '#{original}'"
+        ) if nt.year > maxy
+
         unless date_match?(nt)
           zt.add((24 - nt.hour) * 3600 - nt.min * 60 - nt.sec)
           next
@@ -168,29 +154,35 @@ class Rufus::Scheduler
     # Returns the previous time the cronline matched. It's like next_time, but
     # for the past.
     #
-    def previous_time(from=Time.now)
+    def previous_time(from=EoTime.now)
 
       pt = nil
-      zt = ZoTime.new(from.to_i - 1, @timezone)
+      zt = EoTime.new(from.to_i - 1, @timezone)
+      miny = from.year - NEXT_TIME_MAX_YEARS
 
       loop do
 
         pt = zt.dup
 
+        fail RangeError.new(
+          "failed to reach occurrence within " +
+          "#{NEXT_TIME_MAX_YEARS} years for '#{original}'"
+        ) if pt.year < miny
+
         unless date_match?(pt)
-          zt.substract(pt.hour * 3600 + pt.min * 60 + pt.sec + 1)
+          zt.subtract(pt.hour * 3600 + pt.min * 60 + pt.sec + 1)
           next
         end
         unless sub_match?(pt, :hour, @hours)
-          zt.substract(pt.min * 60 + pt.sec + 1)
+          zt.subtract(pt.min * 60 + pt.sec + 1)
           next
         end
         unless sub_match?(pt, :min, @minutes)
-          zt.substract(pt.sec + 1)
+          zt.subtract(pt.sec + 1)
           next
         end
         unless sub_match?(pt, :sec, @seconds)
-          zt.substract(prev_second(pt))
+          zt.subtract(prev_second(pt))
           next
         end
 
@@ -242,7 +234,7 @@ class Rufus::Scheduler
     #
     @cache = {}; class << self; attr_reader :cache; end
 
-    # Returns the shortest delta between two potential occurences of the
+    # Returns the shortest delta between two potential occurrences of the
     # schedule described by this cronline.
     #
     # .
@@ -279,8 +271,10 @@ class Rufus::Scheduler
 #p Time.now - st
         d = t1 - t0
         delta = d if d < delta
-
-        break if @months == nil && t1.month == 2
+        break if @months.nil? && t1.month == 2
+        break if @months.nil? && @days.nil? && t1.day == 2
+        break if @months.nil? && @days.nil? && @hours.nil? && t1.hour == 1
+        break if @months.nil? && @days.nil? && @hours.nil? && @minutes.nil? && t1.min == 1
         break if t1.year >= 2001
 
         t0 = t1
@@ -488,9 +482,15 @@ class Rufus::Scheduler
 
       return false unless sub_match?(zt, :day, @days)
       return false unless sub_match?(zt, :month, @months)
+
+      return true if (
+        (@weekdays && @monthdays) &&
+        (sub_match?(zt, :wday, @weekdays) ||
+         sub_match?(zt, :monthdays, @monthdays)))
+
       return false unless sub_match?(zt, :wday, @weekdays)
-      #return false unless monthday_match?(zt, @monthdays)
       return false unless sub_match?(zt, :monthdays, @monthdays)
+
       true
     end
   end

data/lib/rufus/scheduler/job_array.rb

@@ -1,27 +1,3 @@
-#--
-# Copyright (c) 2006-2016, 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.
-#++
-
 
 module Rufus
 

data/lib/rufus/scheduler/jobs.rb

@@ -1,27 +1,3 @@
-#--
-# Copyright (c) 2006-2016, 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.
-#++
-
 
 module Rufus
 
@@ -86,7 +62,7 @@ module Rufus
             nil
           end
 
-        @scheduled_at = Rufus::Scheduler::ZoTime.now
+        @scheduled_at = EoTime.now
         @unscheduled_at = nil
         @last_time = nil
 
@@ -132,14 +108,14 @@ module Rufus
       # Done in collaboration with Piavka in
       # https://github.com/jmettraux/rufus-scheduler/issues/214
       #
-      def trigger_off_schedule(time=Rufus::Scheduler::ZoTime.now)
+      def trigger_off_schedule(time=EoTime.now)
 
         do_trigger(time)
       end
 
       def unschedule
 
-        @unscheduled_at = Rufus::Scheduler::ZoTime.now
+        @unscheduled_at = EoTime.now
       end
 
       def threads
@@ -199,7 +175,7 @@ module Rufus
       #
       def call(do_rescue=false)
 
-        do_call(Rufus::Scheduler::ZoTime.now, do_rescue)
+        do_call(EoTime.now, do_rescue)
       end
 
       protected
@@ -266,7 +242,7 @@ module Rufus
 
       def trigger_now(time)
 
-        t = Rufus::Scheduler::ZoTime.now
+        t = EoTime.now
           # if there are mutexes, t might be really bigger than time
 
         Thread.current[:rufus_scheduler_job] = self
@@ -280,7 +256,7 @@ module Rufus
       ensure
 
         @last_work_time =
-          Rufus::Scheduler::ZoTime.now - Thread.current[:rufus_scheduler_time]
+          EoTime.now - Thread.current[:rufus_scheduler_time]
         @mean_work_time =
           ((@count - 1) * @mean_work_time + @last_work_time) / @count
 
@@ -373,7 +349,7 @@ module Rufus
           self.class.name.split(':').last.downcase[0..-4],
           @scheduled_at.to_f,
           @next_time.to_f,
-          self.hash.abs
+          (self.object_id < 0 ? 'm' : '') + self.object_id.to_s
         ].map(&:to_s).join('_')
       end
 
@@ -426,7 +402,7 @@ module Rufus
 
         fail ArgumentError.new(
           "cannot accept :times => #{@times.inspect}, not nil or an int"
-        ) unless @times == nil || @times.is_a?(Fixnum)
+        ) unless @times == nil || @times.is_a?(Integer)
 
         self.first_at =
           opts[:first] || opts[:first_time] ||
@@ -440,12 +416,13 @@ module Rufus
 
         return (@first_at = nil) if first == nil
 
-        n0 = Rufus::Scheduler::ZoTime.now
+        n0 = EoTime.now
         n1 = n0 + 0.003
 
         first = n0 if first == :now || first == :immediately || first == 0
+        fdur = Rufus::Scheduler.parse_duration(first, no_error: true)
 
-        @first_at = ZoTime.make(first)
+        @first_at = (fdur && (EoTime.now + fdur)) || EoTime.make(first)
         @first_at = n1 if @first_at >= n0 && @first_at < n1
 
         fail ArgumentError.new(
@@ -458,13 +435,18 @@ module Rufus
 
       def last_at=(last)
 
-        #@last_at = last ? Rufus::Scheduler.parse_to_time(last) : nil
-        @last_at = last ? ZoTime.make(last) : nil
+        @last_at =
+          if last
+            ldur = Rufus::Scheduler.parse_duration(last, no_error: true)
+            (ldur && (EoTime.now + ldur)) || EoTime.make(last)
+          else
+            nil
+          end
 
         fail ArgumentError.new(
           "cannot set last[_at|_in] in the past: " +
           "#{last.inspect} -> #{@last_at.inspect}"
-        ) if last && @last_at < Rufus::Scheduler::ZoTime.now
+        ) if last && @last_at < EoTime.now
 
         @last_at
       end
@@ -485,7 +467,7 @@ module Rufus
 
       def pause
 
-        @paused_at = Rufus::Scheduler::ZoTime.now
+        @paused_at = EoTime.now
       end
 
       def resume
@@ -503,7 +485,7 @@ module Rufus
         [
           self.class.name.split(':').last.downcase[0..-4],
           @scheduled_at.to_f,
-          self.hash.abs
+          (self.object_id < 0 ? 'm' : '') + self.object_id.to_s
         ].map(&:to_s).join('_')
       end
 
@@ -564,14 +546,13 @@ module Rufus
 
         return if is_post
 
-        n = Rufus::Scheduler::ZoTime.now
+        n = EoTime.now
 
         @next_time =
-          if @first_at == nil || @first_at < (n - @scheduler.frequency)
-            nt = (@next_time || trigger_time || n) + @frequency
-            nt > n ? nt : (trigger_time || n) + @frequency
-          else
+          if @first_at && (trigger_time == nil || @first_at > n)
             @first_at
+          else
+            (@next_time || n) + @frequency
           end
       end
 
@@ -605,10 +586,10 @@ module Rufus
 
         @next_time =
           if is_post
-            Rufus::Scheduler::ZoTime.now + @interval
+            EoTime.now + @interval
           elsif trigger_time.nil?
             if @first_at == nil || @first_at < Time.now
-              Rufus::Scheduler::ZoTime.now + @interval
+              EoTime.now + @interval
             else
               @first_at
             end

data/lib/rufus/scheduler/locks.rb

@@ -1,26 +1,3 @@
-#--
-# Copyright (c) 2006-2016, 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.
-#++
 
 require 'fileutils'