rufus-scheduler 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c40e276338f283e1d434b24ff0914bb4f9e4772c
-  data.tar.gz: 6f675ccf7f32737bd45e96119db3f0217a9294c0
+  metadata.gz: d295240539281a67916e2d17affe1b83406f28ff
+  data.tar.gz: a597f93ce56ecd1988f65d8fe46a9cd5401974fb
 SHA512:
-  metadata.gz: 5a263aaebb6f8f434f7b1eeeb138e0e77d19dd11cb87dcb347be5543fd079e90ab4352aa3a3df297ea46fe8be76d2d25950dee02afbc427e49aab4d316fee385
-  data.tar.gz: 5037bcda9d0650d1404bc2c134cd3ad36e0b9fc90f95dfde27af416fb2a8794c844777ddfa42b24cbb5b07f0694c3a58b8006795321c2a3699404710c61d4860
+  metadata.gz: 39652b4c2cbf22b58b4a216fb866ab292eacb2042a7acc740d5d1c5bd936e3a68a0307cb4bcfc7b463b256751c1dd465bc8b32bc05130d9bce1b11fc16518b16
+  data.tar.gz: 37f9c3f06c4a49e75e3d38b20cd4a7bd8934263d671a78d78d5daa2c71f68d1a7273653512ca5b5fafc07412fa8a5b4c12c390bb57d9db0072887b8d84e8f7f4

data/CHANGELOG.txt

@@ -2,6 +2,13 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 3.2.2    released 2016-08-14
+
+- job opt hash preservation, as suggested in gh-212, by https://github.com/d-m-u
+- introduce Job#previous_time
+- countered ActiveRecord 3.2.22 on gh-210, by https://github.com/paulodelgado
+
+
 == rufus-scheduler - 3.2.1    released 2016-05-04
 
 - accept '* * * * 5L' (last friday) (equivalent to '* * * * 5#-1')

data/CREDITS.txt

@@ -4,7 +4,9 @@
 
 == Contributors
 
-- Kyle Simukka (https://githuc.om/simook) raise on "*/0 * * * *"
+- Paulo Delgado (https://github.com/paulodelgado) counter ActiveRecord, gh-210
+- Anjali Sharma (https://github.com/anjali-sharma) enhance job#last_time example
+- Kyle Simukka (https://github.com/simook) raise on "*/0 * * * *"
 - Ryan McGeary (https://github.com/rmm5t) svg badges for the readme
 - Balasankar C (https://github.com/balasankarc) fix CronJob spec vs December
 - Matthieu Rosinski (https://github.com/Korrigan) prevent "every" shifts
@@ -48,6 +50,7 @@
 
 == Feedback
 
+- d-m-u duhlmann - https://github.com/d-m-u - job opt hash preservation
 - Anjali Sharma - https://github.com/anjali-sharma - fix typographical error
 - Jonathan Campos - https://github.com/jonbcampos - negative cron day idea
 - Andrey Morskov - https://github.com/accessd - fix typographical error

data/README.md

@@ -123,7 +123,7 @@ Yes, issues can be reported in [rufus-scheduler issues](https://github.com/jmett
 * [Passenger and rufus-scheduler (2)](http://stackoverflow.com/questions/21861387/rufus-cron-job-not-working-in-apache-passenger#answer-21868555)
 * [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](https://github.com/jmettraux/rufus-scheduler#avoid-scheduling-when-running-the-ruby-on-rails-console)
+* [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)
 
 
@@ -181,7 +181,7 @@ Interval jobs, trigger, execute and then trigger again after the interval elapse
 
 Cron jobs are based on the venerable cron utility (```man 5 crontab```). They trigger following a pattern given in (almost) the same language cron uses.
 
-#### 
+####
 
 ### #schedule_x vs #x
 
@@ -641,12 +641,31 @@ job.scheduled_at
 ### last_time
 
 Returns the last time the job triggered (is usually nil for AtJob and InJob).
-k
 ```ruby
-job = scheduler.schedule_every('1d') do; end
-# ...
+job = scheduler.schedule_every('10s') do; end
+
 job.scheduled_at
   # => 2013-07-17 23:48:54 +0900
+job.last_time
+  # => nil (since we've just scheduled it)
+
+# after 10 seconds
+
+job.scheduled_at
+  # => 2013-07-17 23:48:54 +0900 (same as above)
+job.last_time
+  # => 2013-07-17 23:49:04 +0900
+```
+
+### previous_time
+
+Returns the previous `#next_time`
+```ruby
+scheduler.every('10s') do |job|
+  puts "job scheduled for #{job.previous_time} triggered at #{Time.now}"
+  puts "next time will be around #{job.next_time}"
+  puts "."
+end
 ```
 
 ### last_work_time, mean_work_time
@@ -1449,7 +1468,7 @@ The rufus-scheduler singleton is instantiated in the ```config/initializers/sche
 
 (Written in reply to https://github.com/jmettraux/rufus-scheduler/issues/186 )
 
-If you don't want rufus-scheduler to kick in when running the Ruby on Rails console, you can wrap your initializer in a conditional:
+If you don't want rufus-scheduler to kick in when running the Ruby on Rails console or invoking a rake task, you can wrap your initializer in a conditional:
 
 ```ruby
 #
@@ -1460,8 +1479,10 @@ require 'rufus-scheduler'
 s = Rufus::Scheduler.singleton
 
 
-unless defined?(Rails::Console)
+unless defined?(Rails::Console) || File.split($0).last == 'rake'
+
   # only schedule when not running from the Ruby on Rails console
+  # or from a rake task
 
   s.every '1m' do
 

data/lib/rufus/scheduler.rb

@@ -39,7 +39,7 @@ module Rufus
     require 'rufus/scheduler/job_array'
     require 'rufus/scheduler/locks'
 
-    VERSION = '3.2.1'
+    VERSION = '3.2.2'
 
     #
     # A common error class for rufus-scheduler
@@ -252,6 +252,9 @@ module Rufus
 
     def schedule(arg, callable=nil, opts={}, &block)
 
+      callable, opts = nil, callable if callable.is_a?(Hash)
+      opts = opts.dup
+
       opts[:_t] = Scheduler.parse(arg, opts)
 
       case opts[:_t]
@@ -263,6 +266,9 @@ module Rufus
 
     def repeat(arg, callable=nil, opts={}, &block)
 
+      callable, opts = nil, callable if callable.is_a?(Hash)
+      opts = opts.dup
+
       opts[:_t] = Scheduler.parse(arg, opts)
 
       case opts[:_t]
@@ -609,9 +615,11 @@ module Rufus
 
       fail NotRunningError.new(
         'cannot schedule, scheduler is down or shutting down'
-      ) if @started_at == nil
+      ) if @started_at.nil?
 
       callable, opts = nil, callable if callable.is_a?(Hash)
+      opts = opts.dup unless opts.has_key?(:_t)
+
       return_job_instance ||= opts[:job]
 
       job_class =

data/lib/rufus/scheduler/jobs.rb

@@ -53,6 +53,10 @@ module Rufus
       #
       attr_accessor :next_time
 
+      # previous "next trigger time"
+      #
+      attr_accessor :previous_time
+
       # anything with a #call(job[, timet]) method,
       # what gets actually triggered
       #
@@ -117,6 +121,7 @@ module Rufus
 
       def trigger(time)
 
+        @previous_time = @next_time
         set_next_time(time)
 
         return if (

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec