rufus-scheduler 3.1.7 → 3.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e079dbf3241c1ac813823dfb641c9c0ffb65142
-  data.tar.gz: 6447c995f17e2ab55ddb7f1c781bbc9d529f9b1e
+  metadata.gz: fe6be00fcf61f4df224dfe810d39b370cd34dc70
+  data.tar.gz: 92527aec3d327a51f57f53bda26e369e247a33bf
 SHA512:
-  metadata.gz: 58b5446a8cffced91db92c159566f03283f04216e07af6ab7f0a88b5ee49783e79ec8ab86a2de2fc88533026874b2fc057e0a195a39d3e4c12a5a5c0538b4df9
-  data.tar.gz: ae3792df85ae9325692a9894564b7bd631a46bde3274c7f3302a711a034d838607e457a8cb8ea9680fe5cd62534b4c280b44eaa427995f6e8c06d7f0d64307cf
+  metadata.gz: 48531b28fdb9af27e37fd8f94188f0144d8542294e039df27c8c0476bfadb8a82f3623cf915e6ff1fe0e114675cd640697a4ad43e50cc9e423e70afe3626f6a9
+  data.tar.gz: 2bdaacf21eec775ce0a76208e8b1a1dc009c77717144d4897d79af8875915585dcf0d565363524dc27932388e12ac1de5c000f9e6775b511fe044d5d14f2b022

data/CHANGELOG.txt

@@ -2,6 +2,12 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 3.1.8    released 2015-11-10
+
+- stop jumping eagerly out of DST, fix for one hour jump when leaving DST
+  thanks Alyssa http://github.com/alyssa
+
+
 == rufus-scheduler - 3.1.7    released 2015-10-15
 
 - ack #unscheduled_at in #scheduled?, by Claude https://github.com/claudeatsafe

data/CREDITS.txt

@@ -4,6 +4,7 @@
 
 == Contributors
 
+- Alyssa Pohahau (https://github.com/alyssa) out of DST transition specs
 - Claude Vessaz (https://github.com/claudeatsafe) ack #unscheduled_at in #scheduled?
 - 김성식 (https://github.com/kssminus) job id uniqueness effort
 - Jesse Willet (https://github.com/jhw-at-prosperworks-com) cron vs "*/10"

data/lib/rufus/scheduler.rb

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

data/lib/rufus/scheduler/zotime.rb

@@ -47,13 +47,19 @@ class Rufus::Scheduler
 
         t = Time.at(@seconds)
 
-        if t.isdst
-          t1 = Time.at(@seconds + 3600)
-          t = t1 if t.zone != t1.zone && t.hour == t1.hour && t.min == t1.min
-            # ambiguous TZ (getting out of DST)
-        else
-          t.hour # force t to compute itself
-        end
+        #if t.isdst
+        #  t1 = Time.at(@seconds + 3600)
+        #  t = t1 if t.zone != t1.zone && t.hour == t1.hour && t.min == t1.min
+        #    # ambiguous TZ (getting out of DST)
+        #else
+        #  t.hour # force t to compute itself
+        #end
+          #
+          # jump out of DST as soon as possible, jumps 1h as seen from UTC
+
+        t.hour # force t to compute itself
+          #
+          # stay in DST as long as possible, no jump seen from UTC
 
         t
       end

data/spec/cronline_spec.rb

@@ -7,6 +7,17 @@
 
 require 'spec_helper'
 
+class Time
+
+  def to_compact_s
+
+    off = self.utc_offset / 3600
+    off = off >= 0 ? "+#{off}" : off.to_s
+
+    self.strftime('%H%M') + off + self.dup.utc.strftime('(%H%M)')
+  end
+end
+
 
 describe Rufus::Scheduler::CronLine do
 
@@ -392,7 +403,10 @@ describe Rufus::Scheduler::CronLine do
             '30 1 31 10 * America/New_York',
             ltz('America/New_York', 2004, 10, 1)
           )
-        ).to eq(ltz('America/New_York', 2004, 10, 31, 1, 30, 0))
+        ).to eq(
+          ltz('America/New_York', 0, 30, 1, 31, 10, 2004, nil, nil, true, nil)
+            # EDT summer time UTC-4
+        )
       end
     end
 
@@ -495,7 +509,10 @@ describe Rufus::Scheduler::CronLine do
             '30 1 31 10 * America/New_York',
             ltz('America/New_York', 2004, 10, 31, 14, 30, 0)
           )
-        ).to eq(ltz('America/New_York', 2004, 10, 31, 1, 30, 0))
+        ).to eq(
+          ltz('America/New_York', 0, 30, 1, 31, 10, 2004, nil, nil, false, nil)
+            # EST time UTC-5
+        )
       end
     end
 
@@ -863,19 +880,17 @@ describe Rufus::Scheduler::CronLine do
         t = Time.local(2015, 3, 8, 1, 57)
 
         points =
-          [ 0, 1, 2, 3 ].collect do
+          4.times.collect do
             t = line.next_time(t)
-            t.strftime('%H:%M:%Sl') + ' ' + t.dup.utc.strftime('%H:%M:%Su')
+            t.to_compact_s
           end
 
-        expect(points).to eq(
-          [
-            '01:58:00l 09:58:00u',
-            '01:59:00l 09:59:00u',
-            '03:00:00l 10:00:00u',
-            '03:01:00l 10:01:00u'
-          ]
-        )
+        expect(points).to eq([
+          '0158-8(0958)',
+          '0159-8(0959)',
+          '0300-7(1000)',
+          '0301-7(1001)'
+        ])
       end
     end
 
@@ -895,19 +910,158 @@ describe Rufus::Scheduler::CronLine do
         t = Time.local(2015, 3, 8, 3, 2)
 
         points =
-          [ 0, 1, 2, 3 ].collect do
+          4.times.collect do
             t = line.previous_time(t)
-            t.strftime('%H:%M:%Sl') + ' ' + t.dup.utc.strftime('%H:%M:%Su')
+            t.to_compact_s
           end
 
-        expect(points).to eq(
-          [
-            '03:01:00l 10:01:00u',
-            '03:00:00l 10:00:00u',
-            '01:59:00l 09:59:00u',
-            '01:58:00l 09:58:00u'
-          ]
-        )
+        expect(points).to eq([
+          '0301-7(1001)',
+          '0300-7(1000)',
+          '0159-8(0959)',
+          '0158-8(0958)'
+        ])
+      end
+    end
+
+    it 'correctly increments when entering DST' do
+
+      in_zone 'America/Los_Angeles' do
+
+        line = cl('*/10 * * * * America/Los_Angeles')
+
+        t = Time.local(2015, 3, 8, 1, 40)
+        t1 = t.dup
+
+        points = []
+        while t1 - t < 1 * 3600
+          t1 = line.next_time(t1)
+          points << t1.to_compact_s
+        end
+
+        expect(points).to eq(%w[
+          0150-8(0950)
+          0300-7(1000)
+          0310-7(1010)
+          0320-7(1020)
+          0330-7(1030)
+          0340-7(1040)
+        ])
+      end
+    end
+  end
+
+  context 'fall time' do
+
+    it 'correctly increments through a DST transition' do
+
+      expect(
+        nt('* * * * * America/Los_Angeles', Time.utc(2015, 11, 1, 9, 59))
+      ).to eq(Time.utc(2015, 11, 1, 10, 00))
+    end
+
+    it 'correctly increments every minute through a DST transition' do
+
+      in_zone 'America/Los_Angeles' do
+
+        line = cl('* * * * * America/Los_Angeles')
+
+        #t = Time.local(2015, 11, 1, 1, 57)
+          #
+          # --> 2015-11-01 01:57:00 -0800 (already PST)
+
+        t = Time.local(0, 57, 1, 1, 11, 2015, nil, nil, true, nil)
+          #
+          # --> 2015-11-01 01:57:00 -0700 (still PDT)
+
+        points =
+          4.times.collect do
+            t = line.next_time(t)
+            t.to_compact_s
+          end
+
+        expect(points).to eq([
+          '0158-7(0858)',
+          '0159-7(0859)',
+          '0100-8(0900)',
+          '0101-8(0901)'
+        ])
+      end
+    end
+
+    it 'correctly decrements through a DST transition' do
+
+      expect(
+        pt('* * * * * America/Los_Angeles', Time.utc(2015, 11, 1, 10, 00))
+      ).to eq(Time.utc(2015, 11, 1, 9, 59))
+    end
+
+    it 'correctly decrements every minute through a DST transition' do
+
+      in_zone 'America/Los_Angeles' do
+
+        line = cl('* * * * * America/Los_Angeles')
+
+        t = Time.local(0, 2, 1, 1, 11, 2015, nil, nil, true, nil)
+          #
+          # try to force PST
+
+        # TODO: at some point, try to find out if the latest jRuby still
+        #       exhibits that behaviour, report to them if necessary
+
+        points =
+          (0..3).collect do
+            t = line.previous_time(t)
+            t.to_compact_s
+          end
+
+        if t.zone == 'PST'
+          expect(points).to eq([
+            '0101-8(0901)',
+            '0100-8(0900)',
+            '0159-7(0859)',
+            '0158-7(0858)'
+          ])
+        else
+          expect(points).to eq([
+            '0101-7(0801)',
+            '0100-7(0800)',
+            '0059-7(0759)',
+            '0058-7(0758)'
+          ])
+        end
+      end
+    end
+
+    it 'correctly increments when leaving DST' do
+
+      in_zone 'America/Los_Angeles' do
+
+        line = cl('*/10 * * * * America/Los_Angeles')
+
+        t = Time.local(2015, 11, 1, 0, 40)
+        t1 = t.dup
+
+        points = []
+        while t1 - t < 2 * 3600
+          t1 = line.next_time(t1)
+          points << t1.to_compact_s
+        end
+
+        expect(points).to eq([
+          '0050-7(0750)', # | PDT
+          '0100-7(0800)', # |
+          '0110-7(0810)', # V
+          '0120-7(0820)',
+          '0130-7(0830)',
+          '0140-7(0840)',
+          '0150-7(0850)',
+          '0100-8(0900)', # + PST
+          '0110-8(0910)', # |
+          '0120-8(0920)', # V
+          '0130-8(0930)',
+          '0140-8(0940)'
+        ])
       end
     end
   end

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@
 # Wed Apr 17 06:00:59 JST 2013
 #
 
+require 'pp'
+
 puts "RUBY_VERSION: #{RUBY_VERSION}"
 puts "RUBY_PLATFORM: #{RUBY_PLATFORM}"
 

data/spec/zotime_spec.rb

@@ -73,22 +73,17 @@ describe Rufus::Scheduler::ZoTime do
     # New York      EST: UTC-5
     # summer (dst)  EDT: UTC-4
 
-    it 'chooses the non DST time when there is ambiguity' do
+    it 'chooses the DST time when there is ambiguity' do
 
       t = ltz('America/New_York', 2004, 10, 31, 0, 30, 0)
       zt = Rufus::Scheduler::ZoTime.new(t, 'America/New_York')
       zt.add(3600)
       ztt = zt.time
 
-      expect(ztt.to_i).to eq(1099204200)
+      expect(ztt.to_i).to eq(1099204200 - 3600)
 
-      if ruby18?
-        expect(ztt.strftime('%Y/%m/%d %H:%M:%S %Z %z')
-          ).to eq('2004/10/31 01:30:00 EST -0500')
-      else
-        expect(ztt.strftime('%Y/%m/%d %H:%M:%S %Z %z')
-          ).to eq('2004/10/31 01:30:00 EST -0500')
-      end
+      expect(ztt.strftime('%Y/%m/%d %H:%M:%S %Z %z')
+        ).to eq('2004/10/31 01:30:00 EDT -0400')
     end
   end
 
@@ -162,17 +157,17 @@ describe Rufus::Scheduler::ZoTime do
       st3 = t3.strftime('%Y/%m/%d %H:%M:%S %Z') + " #{t3.isdst}"
 
       expect(t0.to_i).to eq(1414281599)
-      expect(t1.to_i).to eq(1414285200)
+      expect(t1.to_i).to eq(1414285200 - 3600)
       expect(t2.to_i).to eq(1414285200)
       expect(t3.to_i).to eq(1414285201)
 
       expect(st0).to eq('2014/10/26 01:59:59 CEST true')
-      expect(st1).to eq('2014/10/26 02:00:00 CET false')
+      expect(st1).to eq('2014/10/26 02:00:00 CEST true')
       expect(st2).to eq('2014/10/26 02:00:00 CET false')
       expect(st3).to eq('2014/10/26 02:00:01 CET false')
 
-      expect(t1 - t0).to eq(3601)
-      expect(t2 - t1).to eq(0)
+      expect(t1 - t0).to eq(1)
+      expect(t2 - t1).to eq(3600)
       expect(t3 - t2).to eq(1)
     end
   end

data/t.txt

@@ -0,0 +1,31 @@
+
+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
+

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.1.8
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !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'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   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).
@@ -73,14 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.txt
-- CREDITS.txt
-- LICENSE.txt
-- README.md
 - Rakefile
-- TODO.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
@@ -88,7 +81,8 @@ files:
 - lib/rufus/scheduler/util.rb
 - lib/rufus/scheduler/zones.rb
 - lib/rufus/scheduler/zotime.rb
-- rufus-scheduler.gemspec
+- lib/rufus/scheduler.rb
+- lib/rufus-scheduler.rb
 - spec/basics_spec.rb
 - spec/cronline_spec.rb
 - spec/error_spec.rb
@@ -114,6 +108,13 @@ files:
 - spec/spec_helper.rb
 - spec/threads_spec.rb
 - spec/zotime_spec.rb
+- rufus-scheduler.gemspec
+- CHANGELOG.txt
+- CREDITS.txt
+- LICENSE.txt
+- t.txt
+- TODO.txt
+- README.md
 homepage: http://github.com/jmettraux/rufus-scheduler
 licenses:
 - MIT
@@ -124,17 +125,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.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: job scheduler for Ruby (at, cron, in and every jobs)