rufus-scheduler 3.1.10 → 3.2.0

data/CHANGELOG.txt

@@ -2,6 +2,13 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 3.2.0    released 2015-12-28
+
+- cache CronLine#brute_frequency results, gh-188 and gh-89
+- "every" shift prevention by https://github.com/Korrigan
+- Ruby warnings silenced by https://github.com/vivitar
+
+
 == rufus-scheduler - 3.1.10    released 2015-11-18
 
 - allow for :first_in => 0, gh-179 by https://github.com/JonMcPherson

data/CREDITS.txt

@@ -4,6 +4,9 @@
 
 == Contributors
 
+- Balasankar C (https://github.com/balasankarc) fix CronJob spec vs December
+- Matthieu Rosinski (https://github.com/Korrigan) prevent "every" shifts
+- vivitar (https://github.com/vivitar) silenced a set of Ruby warnings
 - Jon McPherson (https://github.com/JonMcPherson) :first_in => 0 back
 - Calinoiu Alexandru Nicolae (https://github.com/alexandru-calinoiu) CronLine#prev_second fix
 - Alyssa Pohahau (https://github.com/alyssa) out of DST transition specs
@@ -43,6 +46,7 @@
 
 == Feedback
 
+- Eduardo Maia - https://github.com/emaiax - rufus and the Rails console
 - Suisea - https://github.com/suisea - readme rewording
 - Radek - http://stackoverflow.com/users/250422 - gh-166
 - Patrik Ragnarsson - https://github.com/dentarg - timeout vs nil, gh-156

data/README.md

@@ -123,6 +123,8 @@ Yes, issues can be reported in [rufus-scheduler issues](https://github.com/jmett
 * [I want a refund](http://blog.nodejitsu.com/getting-refunds-on-open-source-projects)
 * [Passenger and rufus-scheduler](http://stackoverflow.com/questions/18108719/debugging-rufus-scheduler/18156180#18156180)
 * [Passenger and rufus-scheduler (2)](http://stackoverflow.com/questions/21861387/rufus-cron-job-not-working-in-apache-passenger#answer-21868555)
+* [The scheduler comes up when running the Rails console](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)
 
 
 ## scheduling
@@ -1427,6 +1429,34 @@ The rufus-scheduler singleton is instantiated in the ```config/initializers/sche
 
 *Warning*: this works well with single-process Ruby servers like Webrick and Thin. Using rufus-scheduler with Passenger or Unicorn requires a bit more knowledge and tuning, gently provided by a bit of googling and reading, see [Faq](#faq) above.
 
+### avoid scheduling when running the Ruby on Rails console
+
+(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:
+
+```ruby
+#
+# config/initializers/scheduler.rb
+
+require 'rufus-scheduler'
+
+s = Rufus::Scheduler.singleton
+
+
+unless defined?(Rails::Console)
+  # only schedule when not running from the Rails on Rails console
+
+  s.every '1m' do
+
+    Rails.logger.info "hello, it's #{Time.now}"
+    Rails.logger.flush
+  end
+end
+```
+
+It should work for Ruby on Rails 3 and 4.
+
 ### rails server -d
 
 (Written in reply to https://github.com/jmettraux/rufus-scheduler/issues/165 )

data/lib/rufus/scheduler.rb

@@ -39,7 +39,7 @@ module Rufus
     require 'rufus/scheduler/job_array'
     require 'rufus/scheduler/locks'
 
-    VERSION = '3.1.10'
+    VERSION = '3.2.0'
 
     #
     # A common error class for rufus-scheduler
@@ -385,7 +385,7 @@ module Rufus
     #
     def scheduled?(job_or_job_id)
 
-      job, job_id = fetch(job_or_job_id)
+      job, _ = fetch(job_or_job_id)
 
       !! (job && job.unscheduled_at.nil? && job.next_time != nil)
     end
@@ -441,7 +441,7 @@ module Rufus
       if format == :timeline
         a = []
         h.each { |j, ts| ts.each { |t| a << [ t, j ] } }
-        a.sort_by { |(t, j)| t }
+        a.sort_by { |(t, _)| t }
       else
         h
       end

data/lib/rufus/scheduler/cronline.rb

@@ -42,8 +42,8 @@ class Rufus::Scheduler
     attr_reader :hours
     attr_reader :days
     attr_reader :months
+    #attr_reader :monthdays # reader defined below
     attr_reader :weekdays
-    attr_reader :monthdays
     attr_reader :timezone
 
     def initialize(line)
@@ -223,6 +223,10 @@ class Rufus::Scheduler
       }[1]
     end
 
+    # Caching facility. Currently only used for brute frequencies.
+    #
+    @cache = {}; class << self; attr_reader :cache; end
+
     # Returns the shortest delta between two potential occurences of the
     # schedule described by this cronline.
     #
@@ -239,16 +243,13 @@ class Rufus::Scheduler
     # Of course, this method can get VERY slow if you call on it a second-
     # based cronline...
     #
-    # Since it's a rarely used method, I haven't taken the time to make it
-    # smarter/faster.
-    #
-    # One obvious improvement would be to cache the result once computed...
-    #
-    # See https://github.com/jmettraux/rufus-scheduler/issues/89
-    # for a discussion about this method.
-    #
     def brute_frequency
 
+      key = "brute_frequency:#{@original}"
+
+      delta = self.class.cache[key]
+      return delta if delta
+
       delta = 366 * DAY_S
 
       t0 = previous_time(Time.local(2000, 1, 1))
@@ -268,7 +269,7 @@ class Rufus::Scheduler
         t0 = t1
       end
 
-      delta
+      self.class.cache[key] = delta
     end
 
     def next_second(time)
@@ -377,7 +378,7 @@ class Rufus::Scheduler
 
       return %w[ L ] if item == 'L'
 
-      item = '*' + item if item.match(/^\//)
+      item = '*' + item if item[0, 1] == '/'
 
       m = item.match(RANGE_REGEX)
 

data/lib/rufus/scheduler/jobs.rb

@@ -391,7 +391,7 @@ module Rufus
       attr_reader :paused_at
 
       attr_reader :first_at
-      attr_accessor :last_at
+      attr_reader :last_at
       attr_accessor :times
 
       def initialize(scheduler, duration, opts, block)
@@ -543,9 +543,12 @@ module Rufus
 
         return if is_post
 
+        n = Time.now
+
         @next_time =
-          if @first_at == nil || @first_at < Time.now
-            (trigger_time || Time.now) + @frequency
+          if @first_at == nil || @first_at < n
+            nt = (@next_time || trigger_time || n) + @frequency
+            nt > n ? nt : (trigger_time || n) + @frequency
           else
             @first_at
           end

metadata

@@ -1,69 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.1.10
+  version: 3.2.0
+  prerelease: 
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: job scheduler for Ruby (at, cron, in and every jobs).
@@ -87,31 +96,31 @@ files:
 - CHANGELOG.txt
 - CREDITS.txt
 - LICENSE.txt
-- t.txt
 - TODO.txt
 - README.md
 homepage: http://github.com/jmettraux/rufus-scheduler
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rufus
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: job scheduler for Ruby (at, cron, in and every jobs)
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 5b6294bd5d0ba45b0ae97cd681c4a915d3f4f15d
-  data.tar.gz: 1670414782d681e46791acd641524cde44aa8063
-SHA512:
-  metadata.gz: 769cdd5e8e86acb0f4a7dfac068710a0cc12210604604cd7423ea896b9ce2bd68b4f7bd16932c9122577d1121ebc05db7e15af76403e63ff404a60e35d6c96f6
-  data.tar.gz: cf3b2a402f6bad0411cdba7e9ce8a62021de7cd90bbfb4db321cd3b11b19af28dee9a87c3d1d481957f73a766cd84200a4eaccceb804365003f276876fb798b9

data/t.txt

@@ -1,31 +0,0 @@
-
-JRUBY
-
-1) Rufus::Scheduler::CronLine fall time correctly decrements every minute through a DST transition
-
-Failure/Error: expect(points).to eq([
-
-expected: ["0101-8(0901)", "0100-8(0900)", "0159-7(0859)", "0158-7(0858)"]
-     got: ["0101-7(0801)", "0100-7(0800)", "0059-7(0759)", "0058-7(0758)"]
-
-(compared using ==)
-# ./spec/cronline_spec.rb:1013:in `(root)'
-# ./spec/spec_helper.rb:69:in `in_zone'
-# ./spec/cronline_spec.rb:1001:in `(root)'
-
-
-RUBY1.8
-
-1) Rufus::Scheduler::CronLine fall time correctly decrements every minute through a DST transition
-
-Failure/Error: expect(points).to eq([
-
-expected: ["0101-8(0901)", "0100-8(0900)", "0159-7(0859)", "0158-7(0858)"]
-     got: ["0101-7(0801)", "0100-7(0800)", "0059-7(0759)", "0058-7(0758)"]
-
-(compared using ==)
-# ./spec/cronline_spec.rb:1013
-# ./spec/spec_helper.rb:69:in `call'
-# ./spec/spec_helper.rb:69:in `in_zone'
-# ./spec/cronline_spec.rb:1001
-