rufus-scheduler 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3058360f44993095ae5952e9c85c85a961059be2
-  data.tar.gz: 7e99f90b386a9353b47bad6ab8f88228a5d46339
+  metadata.gz: 31bff13de665010182dbbb8aad7b32be532e0fe7
+  data.tar.gz: 71389925d05e4c699246d0ce5b8509270e967909
 SHA512:
-  metadata.gz: 0ccd580286d947bdcef2f4d544f3688fd8ed66d6a23ee09adc274cb5f770598bcf39de79aede9ff68c394834091ec0d9ffb2f9845cd9945b821cee5c94a5f857
-  data.tar.gz: 41864b63fdd2a44f2c14861cb25a8ab0523d58593edd16fa049338f413d009193f3d44bb9a14bc91820269fa0ad1bf92b84a210495e4b38bcb56447fe07ba37e
+  metadata.gz: 5246e1928d1a4149f47133d55f107389542bbabe5f7772d48fc64406f3ec0573ec54b213fc5b2a59f7d0675cc247bfc3ef4b801415ce3b0cc92640735b7db3af
+  data.tar.gz: 375afb960f519c4f57167dd6e339a5c390b6b54066ef1469b6cbbf40cbc2ffe109f6f71da6afbfc1e51ac6c8b61d5529b63cf4c969c043abc7c7aec2507bb65f

data/CHANGELOG.txt

@@ -2,6 +2,14 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== 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

data/CREDITS.txt

@@ -4,6 +4,7 @@
 
 == Contributors
 
+- 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
@@ -52,6 +53,8 @@
 
 == Feedback
 
+- 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

data/README.md

@@ -1458,6 +1458,20 @@ scheduler.every '2s' do
 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 set 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 "中国标准时间").

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.rb

@@ -39,7 +39,7 @@ module Rufus
     require 'rufus/scheduler/job_array'
     require 'rufus/scheduler/locks'
 
-    VERSION = '3.3.2'
+    VERSION = '3.3.3'
 
     #
     # A common error class for rufus-scheduler

data/lib/rufus/scheduler/cronline.rb

@@ -86,7 +86,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

data/lib/rufus/scheduler/jobs.rb

@@ -426,7 +426,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] ||
@@ -567,11 +567,10 @@ module Rufus
         n = Rufus::Scheduler::ZoTime.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
 

data/lib/rufus/scheduler/zotime.rb

@@ -193,6 +193,11 @@ class Rufus::Scheduler
       strftime('%H%M') + off + utc.strftime('(%H%M)')
     end
 
+    def to_time_s
+
+      strftime("%H:%M:%S.#{'%06d' % usec}")
+    end
+
     def self.now(zone=nil)
 
       ZoTime.new(Time.now.to_f, zone)
@@ -282,10 +287,19 @@ class Rufus::Scheduler
       return nil if str == nil
       return nil if str == '*'
 
+      ostr = str
+      str = :current if str == :local
+
+      # use Rails' zone by default if Rails is present
+
+      return Time.zone.tzinfo if (
+        ENV['TZ'].nil? && str == :current &&
+        Time.respond_to?(:zone) && Time.zone.respond_to?(:tzinfo)
+      )
+
       # ok, it's a timezone then
 
-      ostr = str
-      str = ENV['TZ'] || Time.now.zone if str == :current || str == :local
+      str = ENV['TZ'] || Time.now.zone if str == :current
 
       # utc_offset
 
@@ -363,9 +377,7 @@ class Rufus::Scheduler
 
       # last try with ENV['TZ']
 
-      z =
-        (ostr == :local || ostr == :current) &&
-        (::TZInfo::Timezone.get(ENV['TZ']) rescue nil)
+      z = ostr == :current && (::TZInfo::Timezone.get(ENV['TZ']) rescue nil)
       return z if z
 
       # so it's not a timezone.

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: job scheduler for Ruby (at, cron, in and every jobs).
@@ -59,25 +59,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.txt
+- CREDITS.txt
+- LICENSE.txt
 - Makefile
+- README.md
+- TODO.txt
+- fail.txt
+- fail18.txt
+- lib/rufus-scheduler.rb
+- lib/rufus/scheduler.rb
 - lib/rufus/scheduler/cronline.rb
 - lib/rufus/scheduler/job_array.rb
 - lib/rufus/scheduler/jobs.rb
 - lib/rufus/scheduler/locks.rb
 - lib/rufus/scheduler/util.rb
 - lib/rufus/scheduler/zotime.rb
-- lib/rufus/scheduler.rb
-- lib/rufus-scheduler.rb
-- rufus-scheduler.gemspec
-- CHANGELOG.txt
-- CREDITS.txt
-- fail18.txt
-- LICENSE.txt
 - n.txt
 - pics.txt
-- t.txt
-- TODO.txt
-- README.md
+- rufus-scheduler.gemspec
 homepage: http://github.com/jmettraux/rufus-scheduler
 licenses:
 - MIT
@@ -88,17 +88,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rufus
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: job scheduler for Ruby (at, cron, in and every jobs)

data/t.txt

@@ -1,25 +0,0 @@
-
-**phase 4 - 2016-12-22**
-
-> Added phase 3 logs to question. It looks like some how there is a new scheduler process that is subsequently created and then destroyed inside the model code. Thanks again for your diligence on this!
-
-Is that really happening in the model code? Your logs tell us that it happens in another process. Your initial Ruby process initializes rufus-scheduler then your HTTP requests are served in worker processes which are forks of your initial process (without the threads, in other words with inactive schedulers).
-
-You're using Puma in clustered mode. I should have immediately asked you about your configuration.
-
-Read carefully its documentation at https://github.com/puma/puma#configuration
-
-An easy fix would be not to use the clustered mode so that there is only one Ruby process involved, serving all the HTTP requests.
-
-If you need the clustered mode, you have to change your way of thinking. You probably don't want to have 1 rufus-scheduler instance per worker thread. You could focus on having the core (live) rufus-scheduler in the main process. It could have a "management" job that checks recently updated metrics and unschedules/schedules jobs.
-
-    SCHEDULER.every '10s', overlap: false do
-      Metric.recently_updated.each do |metric|
-        SCHEDULER.jobs(tags: metric.id).each(&:unschedule)
-        SCHEDULER.every(metric.frequency, tags: self.id) { metric.add_value }
-      end
-    end
-      # or something like that...
-
-Have fun!
-