rufus-scheduler 3.3.4 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aadc34a3585ec0563a43eeecee75009ac311490f
-  data.tar.gz: ea9e07f929da453a7fe63711bd80c75457444f6d
+  metadata.gz: b8c6844d5f77112580ff29651a33fe2bc3b9545f
+  data.tar.gz: 329289b1d8a476270440672b4efd71d4d41e976d
 SHA512:
-  metadata.gz: f43b61128d67c893d88a1a796dbf029c3d18577a80d4f8874c25d8272318252c96da6f499c561e5bafa25349c228d0c950a937db12b492ef2f348667b2ba700d
-  data.tar.gz: c01cbfd377824b64f148f515e65db781f5433eaab1d574fd46c45210139bf1fbbb3ec5b8208f371044bdde909bb7917d38955d5e3dd8fcd3bdff79ef4f52d450
+  metadata.gz: 8a7a056a68f73e62a54b44cbb40c3862e70b75cd92bfbe887ac39c8f72c7398798bb5062272d7d78b8aeeaf3083971276febfa36fb2e7e534b4cd9efb5b7e41a
+  data.tar.gz: a0e682b539d953cf706ee0d431dfd175994c67f8ddeeb61dc5e1d966bf5fd56e79b0c92d5f32e1abaf80fa1674a774d743cb4acc1b248125b55b000a98344d1a

data/CHANGELOG.txt

@@ -2,6 +2,30 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 3.5.0    released 2018-05-15
+
+- Use fugit to parse durations
+- Drop .parse_time_string and .parse_duration_string
+- Use fugit to parse cronlines
+
+
+== rufus-scheduler - 3.4.2    released 2017-05-24
+
+(had yanked 3.4.1, going 3.4.2)
+
+
+== rufus-scheduler - 3.4.1    released 2017-05-24
+
+- Let #schedule accept a CronLine instance, gh-247
+
+
+== 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

data/CREDITS.txt

@@ -4,6 +4,11 @@
 
 == Contributors
 
+- Wes McNamee (https://github.com/ghostsquad) - let #schedule accept a CronLine
+- Joe Rafaniello (https://github.com/jrafanie) - Travis Ruby 2.4.1
+- 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
@@ -53,6 +58,8 @@
 
 == Feedback
 
+- Gian - https://github.com/snmgian - cron vs :first clarification - gh-266
+- 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

data/Makefile

@@ -4,6 +4,10 @@ NAME = \
 VERSION = \
   $(shell ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.version")
 
+count_lines:
+	find lib -name "*.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"
+	find spec -name "*_spec.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"
+cl: count_lines
 
 gemspec_validate:
 	@echo "---"

data/README.md

@@ -103,7 +103,7 @@ I'll drive you right to the [tracks](#so-rails).
 
 So you need help. People can help you, but first help them help you, and don't waste their time. Provide a complete description of the issue. If it works on A but not on B and others have to ask you: "so what is different between A and B" you are wasting everyone's time.
 
-"hello" and "thanks" are not swear words.
+"hello", "please" and "thanks" are not swear words.
 
 Go read [how to report bugs effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html), twice.
 
@@ -128,6 +128,7 @@ Yes, issues can be reported in [rufus-scheduler issues](https://github.com/jmett
 * [Passenger in-depth spawn methods](https://www.phusionpassenger.com/library/indepth/ruby/spawn_methods/)
 * [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)
+* [The job triggers twice](https://github.com/jmettraux/rufus-scheduler#lockfile--mylockfiletxt)
 * [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)
 
@@ -376,7 +377,7 @@ Since, by default, jobs are triggered in their own new thread, job instances mig
 
 To prevent overlap, one can set :overlap => false. Such a job will not trigger if one of its instance is already running.
 
-The `:overlap` option is considered before the `:mutex` option when the scheduler is reviewing jobs for triggering.
+The `:overlap` option is considered after the `:mutex` option when the scheduler is reviewing jobs for triggering.
 
 ### :mutex => mutex_instance / mutex_name / array of mutexes
 
@@ -415,7 +416,7 @@ This option is for repeat jobs (cron / every) only.
 It's used to specify the first time after which the repeat job should trigger for the first time.
 
 In the case of an "every" job, this will be the first time (modulo the scheduler frequency) the job triggers.
-For a "cron" job, it's the time *after* which the first schedule will trigger.
+For a "cron" job as well, the :first will point to the first time the job has to trigger, the following trigger time are then determined by the cron string.
 
 ```ruby
 scheduler.every '2d', :first_at => Time.now + 10 * 3600 do
@@ -439,7 +440,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'
@@ -847,7 +848,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
@@ -1282,7 +1283,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.
@@ -1449,7 +1450,7 @@ rufus-scheduler/lib/rufus/scheduler/zotime.rb:41:
 	...
 ```
 
-It may happen on Windows or on systems that poorly hints to Ruby on which timezone to use. It should be solved by setting explicitely the `ENV['TZ']` before the scheduler instantiation:
+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

data/lib/rufus/scheduler/job_array.rb

@@ -1,27 +1,3 @@
-#--
-# Copyright (c) 2006-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
-# 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-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
-# 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
 
@@ -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
@@ -564,7 +546,7 @@ module Rufus
 
         return if is_post
 
-        n = Rufus::Scheduler::ZoTime.now
+        n = EoTime.now
 
         @next_time =
           if @first_at && (trigger_time == nil || @first_at > n)
@@ -604,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
@@ -624,11 +606,14 @@ module Rufus
 
     class CronJob < RepeatJob
 
+      attr_reader :cron_line
+
       def initialize(scheduler, cronline, opts, block)
 
         super(scheduler, cronline, opts, block)
 
-        @cron_line = opts[:_t] || CronLine.new(cronline)
+        @cron_line = opts[:_t] || ::Fugit::Cron.parse(cronline)
+
         set_next_time(nil)
       end
 

data/lib/rufus/scheduler/locks.rb

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