rufus-scheduler 3.0.9 → 3.1.0

data/lib/rufus/scheduler/locks.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2014, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2015, 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

data/lib/rufus/scheduler/util.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2014, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2015, 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
@@ -46,32 +46,9 @@ module Rufus
       o.is_a?(String) ? parse_duration(o, opts) : o
     end
 
-    TZ_REGEX = /\b((?:[a-zA-Z][a-zA-z0-9\-+]+)(?:\/[a-zA-Z0-9_\-+]+)?)\b/
-
     def self.parse_at(o, opts={})
 
-      return o if o.is_a?(Time)
-
-      # TODO: deal with tz if suffixed to Chronic string?
-      return Chronic.parse(o, opts) if defined?(Chronic)
-
-      tz = nil
-      s =
-        o.to_s.gsub(TZ_REGEX) { |m|
-          t = TZInfo::Timezone.get(m) rescue nil
-          tz ||= t
-          t ? '' : m
-        }
-
-      begin
-        DateTime.parse(o)
-      rescue
-        raise ArgumentError, "no time information in #{o.inspect}"
-      end if RUBY_VERSION < '1.9.0'
-
-      t = Time.parse(s)
-
-      tz ? tz.local_to_utc(t) : t
+      Rufus::Scheduler::ZoTime.parse(o, opts).time
 
     rescue StandardError => se
 

data/lib/rufus/scheduler/zones.rb

@@ -0,0 +1,174 @@
+#--
+# Copyright (c) 2006-2015, 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.
+#++
+
+
+class Rufus::Scheduler
+
+TIMEZONES = %w[
+GB NZ UCT EET CET PRC ROC WET GMT EST ROK UTC MST HST MET Zulu Cuba Iran W-SU
+Eire GMT0 Libya Japan Egypt GMT+0 GMT-0 Israel Poland Navajo Turkey GB-Eire
+Iceland PST8PDT Etc/UCT CST6CDT NZ-CHAT MST7MDT Jamaica EST5EDT Etc/GMT Etc/UTC
+US/Samoa Etc/GMT0 Portugal Hongkong Etc/Zulu Singapore Asia/Baku Etc/GMT-9
+Etc/GMT+1 Etc/GMT+0 Asia/Aden Etc/GMT+2 Etc/GMT+3 Etc/GMT+4 Etc/GMT+5 Etc/GMT+6
+Etc/GMT+7 Etc/GMT+8 Etc/GMT+9 Etc/GMT-0 Etc/GMT-1 Universal Asia/Dili Greenwich
+Asia/Gaza Etc/GMT-8 Etc/GMT-7 US/Alaska Asia/Oral Etc/GMT-6 Etc/GMT-5 Etc/GMT-4
+Asia/Hovd Etc/GMT-3 US/Hawaii Etc/GMT-2 Kwajalein Asia/Omsk Asia/Macao
+Etc/GMT-14 Asia/Kabul US/Central Etc/GMT-13 US/Arizona Asia/Macau Asia/Qatar
+Asia/Seoul Asia/Tokyo Asia/Dubai US/Pacific Etc/GMT-12 Etc/GMT-11 Etc/GMT-10
+Asia/Dhaka Asia/Dacca Asia/Chita Etc/GMT+12 Etc/GMT+10 Asia/Amman Asia/Aqtau
+Etc/GMT+11 US/Eastern Asia/Thimbu Asia/Brunei Asia/Tehran Asia/Beirut
+Europe/Rome Europe/Riga Brazil/Acre Brazil/East Europe/Oslo Brazil/West
+Africa/Lome Asia/Taipei Asia/Saigon Asia/Riyadh Asia/Aqtobe Asia/Anadyr
+Europe/Kiev Asia/Almaty Africa/Juba Pacific/Yap US/Aleutian Asia/Muscat
+US/Mountain Asia/Harbin Asia/Hebron Asia/Manila Asia/Kuwait Asia/Urumqi
+US/Michigan Indian/Mahe SystemV/EST5 Asia/Kashgar Indian/Cocos Asia/Jakarta
+Asia/Kolkata Asia/Kuching America/Atka Asia/Irkutsk Pacific/Apia Asia/Magadan
+Africa/Dakar America/Lima Pacific/Fiji Pacific/Guam Europe/Vaduz Pacific/Niue
+Asia/Nicosia Africa/Ceuta Pacific/Truk America/Adak Pacific/Wake Africa/Tunis
+Africa/Cairo Asia/Colombo SystemV/AST4 SystemV/CST6 Asia/Karachi Asia/Rangoon
+SystemV/MST7 Asia/Baghdad Europe/Malta Africa/Lagos Europe/Minsk SystemV/PST8
+Canada/Yukon Asia/Tbilisi America/Nome Asia/Bahrain Africa/Accra Europe/Paris
+Asia/Bangkok Asia/Bishkek Asia/Thimphu SystemV/YST9 Asia/Yerevan Asia/Yakutsk
+Europe/Sofia Asia/Ust-Nera Australia/ACT Australia/LHI Europe/Tirane
+Asia/Tel_Aviv Australia/NSW Africa/Luanda Asia/Tashkent Africa/Lusaka
+Asia/Shanghai Africa/Malabo Asia/Sakhalin Africa/Maputo Africa/Maseru
+SystemV/HST10 Africa/Kigali Africa/Niamey Pacific/Samoa America/Sitka
+Pacific/Palau Pacific/Nauru Pacific/Efate Asia/Makassar Pacific/Chuuk
+Africa/Harare Africa/Douala America/Aruba America/Thule America/Bahia
+America/Jujuy America/Belem Asia/Katmandu America/Boise Indian/Comoro
+Indian/Chagos Asia/Jayapura Europe/Zurich Asia/Istanbul Europe/Zagreb
+Etc/Greenwich Europe/Warsaw Europe/Vienna Etc/Universal Asia/Dushanbe
+Europe/Athens Europe/Berlin Africa/Bissau Asia/Damascus Africa/Banjul
+Europe/Dublin Africa/Bangui Africa/Bamako Europe/Jersey Africa/Asmera
+Europe/Lisbon Africa/Asmara Europe/London Asia/Ashgabat Asia/Calcutta
+Europe/Madrid Europe/Monaco Europe/Moscow Europe/Prague Europe/Samara
+Europe/Skopje Asia/Khandyga Canada/Pacific Africa/Abidjan America/Manaus
+Asia/Chongqing Asia/Chungking Africa/Algiers America/Maceio US/Pacific-New
+Africa/Conakry America/La_Paz America/Juneau America/Nassau America/Inuvik
+Europe/Andorra Africa/Kampala Asia/Ashkhabad Asia/Hong_Kong America/Havana
+Canada/Eastern Europe/Belfast Canada/Central Australia/West Asia/Jerusalem
+Africa/Mbabane Asia/Kamchatka America/Virgin America/Guyana Asia/Kathmandu
+Mexico/General America/Panama Europe/Nicosia America/Denver Europe/Tallinn
+Africa/Nairobi America/Dawson Europe/Vatican Europe/Vilnius America/Cuiaba
+Africa/Tripoli Pacific/Wallis Atlantic/Faroe Pacific/Tarawa Pacific/Tahiti
+Pacific/Saipan Pacific/Ponape America/Cayman America/Cancun Asia/Pontianak
+Asia/Pyongyang Asia/Vientiane Asia/Qyzylorda Pacific/Noumea America/Bogota
+Pacific/Midway Pacific/Majuro Asia/Samarkand Indian/Mayotte Pacific/Kosrae
+Asia/Singapore Indian/Reunion America/Belize America/Regina America/Recife
+Pacific/Easter Mexico/BajaSur America/Merida Pacific/Chatham Pacific/Fakaofo
+Pacific/Gambier America/Rosario Asia/Ulan_Bator Indian/Maldives Pacific/Norfolk
+America/Antigua Asia/Phnom_Penh America/Phoenix America/Caracas America/Cayenne
+Atlantic/Azores Pacific/Pohnpei Atlantic/Canary America/Chicago Atlantic/Faeroe
+Africa/Windhoek America/Cordoba America/Creston Africa/Timbuktu America/Curacao
+Africa/Sao_Tome Africa/Ndjamena SystemV/AST4ADT Europe/Uzhgorod Europe/Tiraspol
+SystemV/CST6CDT Africa/Monrovia America/Detroit Europe/Sarajevo Australia/Eucla
+America/Tijuana America/Toronto America/Godthab America/Grenada Europe/Istanbul
+America/Ojinaga America/Tortola Australia/Perth Europe/Helsinki Australia/South
+Europe/Guernsey SystemV/EST5EDT Europe/Chisinau SystemV/MST7MDT Europe/Busingen
+Europe/Budapest Europe/Brussels America/Halifax America/Mendoza America/Noronha
+America/Nipigon Canada/Atlantic America/Yakutat SystemV/PST8PDT SystemV/YST9YDT
+Canada/Mountain Africa/Kinshasa Africa/Khartoum Africa/Gaborone Africa/Freetown
+America/Iqaluit America/Jamaica US/East-Indiana Africa/El_Aaiun America/Knox_IN
+Africa/Djibouti Africa/Blantyre America/Moncton America/Managua Asia/Choibalsan
+America/Marigot Australia/North Europe/Belgrade America/Resolute
+America/Mazatlan Pacific/Funafuti Pacific/Auckland Pacific/Honolulu
+Pacific/Johnston America/Miquelon America/Santarem Mexico/BajaNorte
+America/Santiago Antarctica/Troll America/Asuncion America/Atikokan
+America/Montreal America/Barbados Africa/Bujumbura Pacific/Pitcairn
+Asia/Ulaanbaatar Indian/Mauritius America/New_York Antarctica/Syowa
+America/Shiprock Indian/Kerguelen Asia/Novosibirsk America/Anguilla
+Indian/Christmas Asia/Vladivostok Asia/Ho_Chi_Minh Antarctica/Davis
+Atlantic/Bermuda Europe/Amsterdam Antarctica/Casey America/St_Johns
+Atlantic/Madeira America/Winnipeg America/St_Kitts Europe/Volgograd
+Brazil/DeNoronha Europe/Bucharest Africa/Mogadishu America/St_Lucia
+Atlantic/Stanley Europe/Stockholm Australia/Currie Europe/Gibraltar
+Australia/Sydney Asia/Krasnoyarsk Australia/Darwin America/Dominica
+America/Edmonton America/Eirunepe Europe/Podgorica America/Ensenada
+Europe/Ljubljana Australia/Hobart Europe/Mariehamn Africa/Lubumbashi
+America/Goose_Bay Europe/Luxembourg America/Menominee America/Glace_Bay
+America/Fortaleza Africa/Nouakchott America/Matamoros Pacific/Galapagos
+America/Guatemala Pacific/Kwajalein Pacific/Marquesas America/Guayaquil
+Asia/Kuala_Lumpur Europe/San_Marino America/Monterrey Europe/Simferopol
+America/Araguaina Antarctica/Vostok Europe/Copenhagen America/Catamarca
+Pacific/Pago_Pago America/Sao_Paulo America/Boa_Vista America/St_Thomas
+Chile/Continental America/Vancouver Africa/Casablanca Europe/Bratislava
+Pacific/Enderbury Pacific/Rarotonga Europe/Zaporozhye US/Indiana-Starke
+Antarctica/Palmer Asia/Novokuznetsk Africa/Libreville America/Chihuahua
+America/Anchorage Pacific/Tongatapu Antarctica/Mawson Africa/Porto-Novo
+Asia/Yekaterinburg America/Paramaribo America/Hermosillo Atlantic/Jan_Mayen
+Antarctica/McMurdo America/Costa_Rica Antarctica/Rothera America/Grand_Turk
+Atlantic/Reykjavik Atlantic/St_Helena Australia/Victoria Chile/EasterIsland
+Asia/Ujung_Pandang Australia/Adelaide America/Montserrat America/Porto_Acre
+Africa/Brazzaville Australia/Brisbane America/Kralendijk America/Montevideo
+America/St_Vincent America/Louisville Australia/Canberra Australia/Tasmania
+Europe/Isle_of_Man Europe/Kaliningrad Africa/Ouagadougou America/Rio_Branco
+Pacific/Kiritimati Africa/Addis_Ababa America/Metlakatla America/Martinique
+Asia/Srednekolymsk America/Guadeloupe America/Fort_Wayne Australia/Lindeman
+America/Whitehorse Arctic/Longyearbyen America/Pangnirtung America/Mexico_City
+America/Los_Angeles America/Rainy_River Atlantic/Cape_Verde Pacific/Guadalcanal
+Indian/Antananarivo America/El_Salvador Australia/Lord_Howe Africa/Johannesburg
+America/Tegucigalpa Canada/Saskatchewan America/Thunder_Bay Canada/Newfoundland
+America/Puerto_Rico America/Yellowknife Australia/Melbourne America/Porto_Velho
+Australia/Queensland Australia/Yancowinna America/Santa_Isabel
+America/Blanc-Sablon America/Scoresbysund America/Danmarkshavn
+Pacific/Port_Moresby Antarctica/Macquarie America/Buenos_Aires
+Africa/Dar_es_Salaam America/Campo_Grande America/Dawson_Creek
+America/Indianapolis Pacific/Bougainville America/Rankin_Inlet
+America/Indiana/Knox America/Lower_Princes America/Coral_Harbour
+America/St_Barthelemy Australia/Broken_Hill America/Cambridge_Bay
+America/Indiana/Vevay America/Swift_Current America/Port_of_Spain
+Antarctica/South_Pole America/Santo_Domingo Atlantic/South_Georgia
+America/Port-au-Prince America/Bahia_Banderas America/Indiana/Winamac
+America/Indiana/Marengo America/Argentina/Jujuy America/Argentina/Salta
+Canada/East-Saskatchewan America/Indiana/Vincennes America/Argentina/Tucuman
+America/Argentina/Ushuaia Antarctica/DumontDUrville America/Indiana/Tell_City
+America/Argentina/Mendoza America/Argentina/Cordoba America/Indiana/Petersburg
+America/Argentina/San_Luis America/Argentina/San_Juan America/Argentina/La_Rioja
+America/North_Dakota/Center America/Kentucky/Monticello
+America/North_Dakota/Beulah America/Kentucky/Louisville
+America/Argentina/Catamarca America/Indiana/Indianapolis
+America/North_Dakota/New_Salem America/Argentina/Rio_Gallegos
+America/Argentina/Buenos_Aires America/Argentina/ComodRivadavia
+]
+
+##
+## http://en.wikipedia.org/wiki/List_of_time_zone_abbreviations
+#
+#ABBREVIATIONS = %w[
+#ACDT ACST ACT ADT AEDT AEST AFT AKDT AKST AMST AMST AMT AMT ART AST AST AWDT
+#AWST AZOST AZT BDT BIOT BIT BOT BRT BST BST BTT CAT CCT CDT CDT CEDT CEST CET
+#CHADT CHAST CHOT ChST CHUT CIST CIT CKT CLST CLT COST COT CST CST CST CST CST
+#CT CVT CWST CXT DAVT DDUT DFT EASST EAST EAT ECT ECT EDT EEDT EEST EET EGST EGT
+#EIT EST EST FET FJT FKST FKST FKT FNT GALT GAMT GET GFT GILT GIT GMT GST GST
+#GYT HADT HAEC HAST HKT HMT HOVT HST ICT IDT IOT IRDT IRKT IRST IST IST IST JST
+#KGT KOST KRAT KST LHST LHST LINT MAGT MART MAWT MDT MET MEST MHT MIST MIT MMT
+#MSK MST MST MST MUT MVT MYT NCT NDT NFT NPT NST NT NUT NZDT NZST OMST ORAT PDT
+#PET PETT PGT PHOT PKT PMDT PMST PONT PST PST PYST PYT RET ROTT SAKT SAMT SAST
+#SBT SCT SGT SLST SRET SRT SST SST SYOT TAHT THA TFT TJT TKT TLT TMT TOT TVT UCT
+#ULAT USZ1 UTC UYST UYT UZT VET VLAT VOLT VOST VUT WAKT WAST WAT WEDT WEST WET
+#WIT WST YAKT YEKT Z
+#].uniq
+
+end
+

data/lib/rufus/scheduler/zotime.rb

@@ -0,0 +1,154 @@
+#--
+# Copyright (c) 2006-2015, 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 'rufus/scheduler/zones'
+
+
+class Rufus::Scheduler
+
+  #
+  # Zon{ing|ed}Time, whatever.
+  #
+  class ZoTime
+
+    attr_accessor :seconds
+    attr_accessor :zone
+
+    def initialize(s, zone)
+
+      @seconds = s.to_f
+      @zone = zone
+    end
+
+    def time
+
+      in_zone do
+
+        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
+
+        t
+      end
+    end
+
+    def utc
+
+      time.utc
+    end
+
+    def add(s)
+
+      @seconds += s.to_f
+    end
+
+    def substract(s)
+
+      @seconds -= s.to_f
+    end
+
+    def to_f
+
+      @seconds
+    end
+
+    #DELTA_TZ_REX = /^[+-][0-1][0-9]:?[0-5][0-9]$/
+
+    def self.envtzable?(s)
+
+      TIMEZONES.include?(s)
+    end
+
+    def self.parse(str, opts={})
+
+      if defined?(::Chronic) && t = ::Chronic.parse(str, opts)
+        return ZoTime.new(t, ENV['TZ'])
+      end
+
+      begin
+        DateTime.parse(str)
+      rescue
+        raise ArgumentError, "no time information in #{o.inspect}"
+      end if RUBY_VERSION < '1.9.0'
+
+      zone = nil
+
+      s =
+        str.gsub(/\S+/) { |m|
+          if envtzable?(m)
+            zone ||= m
+            ''
+          else
+            m
+          end
+        }
+
+      return nil unless zone.nil? || is_timezone?(zone)
+
+      zt = ZoTime.new(0, zone || ENV['TZ'])
+      zt.in_zone { zt.seconds = Time.parse(s).to_f }
+
+      zt.seconds == nil ? nil : zt
+    end
+
+    def self.is_timezone?(str)
+
+      return false if str == nil
+
+      return true if Time.zone_offset(str)
+      return true if str == 'Zulu'
+
+      return !! (::TZInfo::Timezone.get(str) rescue nil) if defined?(::TZInfo)
+
+      zt = ZoTime.new(0, str)
+      t = zt.time
+
+      return false if t.zone == ''
+      return false if str.match(/[a-z]/) && str.start_with?(t.zone)
+
+      return false if RUBY_PLATFORM.include?('java') && ! envtzable?(str)
+
+      true
+    end
+
+    def in_zone(&block)
+
+      current_timezone = ENV['TZ']
+      ENV['TZ'] = @zone
+
+      block.call
+
+    ensure
+
+      ENV['TZ'] = current_timezone
+    end
+  end
+end
+

data/rufus-scheduler.gemspec

@@ -26,38 +26,13 @@ job scheduler for Ruby (at, cron, in and every jobs).
     '*.gemspec', '*.txt', '*.rdoc', '*.md'
   ]
 
-  s.add_runtime_dependency 'tzinfo'
+  #s.add_runtime_dependency 'tzinfo'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '>= 2.13.0'
   s.add_development_dependency 'chronic'
+  s.add_development_dependency 'tzinfo'
 
   s.require_path = 'lib'
-
-  s.post_install_message =
-    %{
-***
-
-Thanks for installing rufus-scheduler #{s.version}
-
-It might not be 100% compatible with rufus-scheduler 2.x.
-
-If you encounter issues with this new rufus-scheduler, especially
-if your app worked fine with previous versions of it, you can
-
-A) Forget it and peg your Gemfile to rufus-scheduler 2.0.24
-
-and / or
-
-B) Take some time to carefully report the issue at
-   https://github.com/jmettraux/rufus-scheduler/issues
-
-For general help about rufus-scheduler, ask via:
-http://stackoverflow.com/questions/ask?tags=rufus-scheduler+ruby
-
-Cheers.
-
-***
-    }
 end
 

data/spec/cronline_spec.rb

@@ -5,7 +5,6 @@
 # Sat Mar 21 12:55:27 JST 2009
 #
 
-require 'tzinfo'
 require 'spec_helper'
 
 
@@ -15,6 +14,24 @@ describe Rufus::Scheduler::CronLine do
     Rufus::Scheduler::CronLine.new(cronline_string)
   end
 
+  def nt(cronline, now)
+    Rufus::Scheduler::CronLine.new(cronline).next_time(now)
+  end
+  def ntz(cronline, now)
+    tz = cronline.split.last
+    tu = nt(cronline, now).utc
+    in_zone(tz) { tu.getlocal }
+  end
+
+  def pt(cronline, now)
+    Rufus::Scheduler::CronLine.new(cronline).previous_time(now)
+  end
+  def ptz(cronline, now)
+    tz = cronline.split.last
+    tu = pt(cronline, now).utc
+    in_zone(tz) { tu.getlocal }
+  end
+
   def match(line, time)
     expect(cl(line).matches?(time)).to eq(true)
   end
@@ -49,12 +66,20 @@ describe Rufus::Scheduler::CronLine do
 
       to_a '0 0 1 1 *', [ [0], [0], [0], [1], [1], nil, nil, nil ]
 
-      to_a '0 23-24 * * *', [ [0], [0], [23, 0], nil, nil, nil, nil, nil ]
+      if ruby18?
+        to_a '0 23-24 * * *', [ [0], [0], [0, 23], nil, nil, nil, nil, nil ]
+      else
+        to_a '0 23-24 * * *', [ [0], [0], [23, 0], nil, nil, nil, nil, nil ]
+      end
         #
         # as reported by Aimee Rose in
         # https://github.com/jmettraux/rufus-scheduler/issues/56
 
-      to_a '0 23-2 * * *', [ [0], [0], [23, 0, 1, 2], nil, nil, nil, nil, nil ]
+      if ruby18?
+        to_a '0 23-2 * * *', [ [0], [0], [0, 1, 2, 23], nil, nil, nil, nil, nil ]
+      else
+        to_a '0 23-2 * * *', [ [0], [0], [23, 0, 1, 2], nil, nil, nil, nil, nil ]
+      end
     end
 
     it 'rejects invalid weekday expressions' do
@@ -92,7 +117,10 @@ describe Rufus::Scheduler::CronLine do
 
       to_a(
         '0 */2 * * *',
-        [ [0], [0], (0..11).collect { |e| e * 2 }, nil, nil, nil, nil, nil ])
+        [ [0], [0], (0..23).select { |e| e.even? }, nil, nil, nil, nil, nil ])
+      to_a(
+        '0 0-23/2 * * *',
+        [ [0], [0], (0..23).select { |e| e.even? }, nil, nil, nil, nil, nil ])
       to_a(
         '0 7-23/2 * * *',
         [ [0], [0], (7..23).select { |e| e.odd? }, nil, nil, nil, nil, nil ])
@@ -189,56 +217,34 @@ describe Rufus::Scheduler::CronLine do
 
   describe '#next_time' do
 
-    def nt(cronline, now)
-      Rufus::Scheduler::CronLine.new(cronline).next_time(now)
-    end
-    def ntz(cronline, now)
-      tz = cronline.split.last
-      tu = nt(cronline, now).utc
-      in_zone(tz) { tu.getlocal }
-    end
-
     it 'computes the next occurence correctly' do
 
-      now = Time.at(0).getutc # Thu Jan 01 00:00:00 UTC 1970
-
-      expect(nt('* * * * *', now)).to eq(now + 60)
-      expect(nt('* * * * sun', now)).to eq(now + 259200)
-      expect(nt('* * * * * *', now)).to eq(now + 1)
-      expect(nt('* * 13 * fri', now)).to eq(now + 3715200)
-
-      expect(nt('10 12 13 12 *', now)).to eq(now + 29938200)
-        # this one is slow (1 year == 3 seconds)
-        #
-        # historical note:
-        # (comment made in 2006 or 2007, the underlying libs got better and
-        # that slowness is gone)
-
-      expect(nt('0 0 * * thu', now)).to eq(now + 604800)
-      expect(nt('00 0 * * thu', now)).to eq(now + 604800)
+      in_zone 'Europe/Berlin' do
 
-      expect(nt('0 0 * * *', now)).to eq(now + 24 * 3600)
-      expect(nt('0 24 * * *', now)).to eq(now + 24 * 3600)
+        now = Time.at(0) - 3600
 
-      now = local(2008, 12, 31, 23, 59, 59, 0)
+        expect(nt('* * * * *', now)).to eq(now + 60)
+        expect(nt('* * * * sun', now)).to eq(now + 259200)
+        expect(nt('* * * * * *', now)).to eq(now + 1)
+        expect(nt('* * 13 * fri', now)).to eq(now + 3715200)
 
-      expect(nt('* * * * *', now)).to eq(now + 1)
-    end
+        expect(nt('10 12 13 12 *', now)).to eq(now + 29938200)
+          # this one is slow (1 year == 3 seconds)
+          #
+          # historical note:
+          # (comment made in 2006 or 2007, the underlying libs got better and
+          # that slowness is gone)
 
-    it 'computes the next occurence correctly in UTC (TZ not specified)' do
+        expect(nt('0 0 * * thu', now)).to eq(now + 604800)
+        expect(nt('00 0 * * thu', now)).to eq(now + 604800)
 
-      now = utc(1970, 1, 1)
+        expect(nt('0 0 * * *', now)).to eq(now + 24 * 3600)
+        expect(nt('0 24 * * *', now)).to eq(now + 24 * 3600)
 
-      expect(nt('* * * * *', now)).to eq(utc(1970, 1, 1, 0, 1))
-      expect(nt('* * * * sun', now)).to eq(utc(1970, 1, 4))
-      expect(nt('* * * * * *', now)).to eq(utc(1970, 1, 1, 0, 0, 1))
-      expect(nt('* * 13 * fri', now)).to eq(utc(1970, 2, 13))
-
-      expect(nt('10 12 13 12 *', now)).to eq(utc(1970, 12, 13, 12, 10))
-        # this one is slow (1 year == 3 seconds)
-      expect(nt('* * 1 6 *', now)).to eq(utc(1970, 6, 1))
+        now = local(2008, 12, 31, 23, 59, 59, 0)
 
-      expect(nt('0 0 * * thu', now)).to eq(utc(1970, 1, 8))
+        expect(nt('* * * * *', now)).to eq(now + 1)
+      end
     end
 
     it 'computes the next occurence correctly in local TZ (TZ not specified)' do
@@ -260,9 +266,7 @@ describe Rufus::Scheduler::CronLine do
     it 'computes the next occurence correctly in UTC (TZ specified)' do
 
       zone = 'Europe/Stockholm'
-      tz = TZInfo::Timezone.get(zone)
-      now = tz.local_to_utc(local(1970, 1, 1))
-        # Midnight in zone, UTC
+      now = in_zone(zone) { Time.local(1970, 1, 1) }
 
       expect(nt("* * * * * #{zone}", now)).to eq(utc(1969, 12, 31, 23, 1))
       expect(nt("* * * * sun #{zone}", now)).to eq(utc(1970, 1, 3, 23))
@@ -275,20 +279,6 @@ describe Rufus::Scheduler::CronLine do
       expect(nt("0 0 * * thu #{zone}", now)).to eq(utc(1970, 1, 7, 23))
     end
 
-    #it 'computes the next occurence correctly in local TZ (TZ specified)' do
-    #  zone = 'Europe/Stockholm'
-    #  tz = TZInfo::Timezone.get(zone)
-    #  now = tz.local_to_utc(utc(1970, 1, 1)).localtime
-    #    # Midnight in zone, local time
-    #  nt("* * * * * #{zone}", now).should == local(1969, 12, 31, 18, 1)
-    #  nt("* * * * sun #{zone}", now).should == local(1970, 1, 3, 18)
-    #  nt("* * * * * * #{zone}", now).should == local(1969, 12, 31, 18, 0, 1)
-    #  nt("* * 13 * fri #{zone}", now).should == local(1970, 2, 12, 18)
-    #  nt("10 12 13 12 * #{zone}", now).should == local(1970, 12, 13, 6, 10)
-    #  nt("* * 1 6 * #{zone}", now).should == local(1970, 5, 31, 19)
-    #  nt("0 0 * * thu #{zone}", now).should == local(1970, 1, 7, 18)
-    #end
-
     it 'computes the next time correctly when there is a sun#2 involved' do
 
       expect(nt('* * * * sun#1', local(1970, 1, 1))).to eq(local(1970, 1, 4))
@@ -375,15 +365,6 @@ describe Rufus::Scheduler::CronLine do
 
   describe '#previous_time' do
 
-    def pt(cronline, now)
-      Rufus::Scheduler::CronLine.new(cronline).previous_time(now)
-    end
-    def ptz(cronline, now)
-      tz = cronline.split.last
-      tu = pt(cronline, now).utc
-      in_zone(tz) { tu.getlocal }
-    end
-
     it 'returns the previous time the cron should have triggered' do
 
       expect(
@@ -438,21 +419,21 @@ describe Rufus::Scheduler::CronLine do
 
   describe '#matches?' do
 
-    it 'matches correctly in UTC (TZ not specified)' do
-
-      match '* * * * *', utc(1970, 1, 1, 0, 1)
-      match '* * * * sun', utc(1970, 1, 4)
-      match '* * * * * *', utc(1970, 1, 1, 0, 0, 1)
-      match '* * 13 * fri', utc(1970, 2, 13)
-
-      match '10 12 13 12 *', utc(1970, 12, 13, 12, 10)
-      match '* * 1 6 *', utc(1970, 6, 1)
-
-      match '0 0 * * thu', utc(1970, 1, 8)
-
-      match '0 0 1 1 *', utc(2012, 1, 1)
-      no_match '0 0 1 1 *', utc(2012, 1, 1, 1, 0)
-    end
+#    it 'matches correctly in UTC (TZ not specified)' do
+#
+#      match '* * * * *', utc(1970, 1, 1, 0, 1)
+#      match '* * * * sun', utc(1970, 1, 4)
+#      match '* * * * * *', utc(1970, 1, 1, 0, 0, 1)
+#      match '* * 13 * fri', utc(1970, 2, 13)
+#
+#      match '10 12 13 12 *', utc(1970, 12, 13, 12, 10)
+#      match '* * 1 6 *', utc(1970, 6, 1)
+#
+#      match '0 0 * * thu', utc(1970, 1, 8)
+#
+#      match '0 0 1 1 *', utc(2012, 1, 1)
+#      no_match '0 0 1 1 *', utc(2012, 1, 1, 1, 0)
+#    end
 
     it 'matches correctly in local TZ (TZ not specified)' do
 
@@ -546,19 +527,19 @@ describe Rufus::Scheduler::CronLine do
     it 'returns the shortest delta between two occurrences' do
 
       expect(Rufus::Scheduler::CronLine.new(
-          '* * * * *').frequency).to eq(60)
+        '* * * * *').frequency).to eq(60)
       expect(Rufus::Scheduler::CronLine.new(
-          '* * * * * *').frequency).to eq(1)
+        '* * * * * *').frequency).to eq(1)
 
       expect(Rufus::Scheduler::CronLine.new(
-          '5 23 * * *').frequency).to eq(24 * 3600)
+        '5 23 * * *').frequency).to eq(24 * 3600)
       expect(Rufus::Scheduler::CronLine.new(
-          '5 * * * *').frequency).to eq(3600)
+        '5 * * * *').frequency).to eq(3600)
       expect(Rufus::Scheduler::CronLine.new(
-          '10,20,30 * * * *').frequency).to eq(600)
+        '10,20,30 * * * *').frequency).to eq(600)
 
       expect(Rufus::Scheduler::CronLine.new(
-          '10,20,30 * * * * *').frequency).to eq(10)
+        '10,20,30 * * * * *').frequency).to eq(10)
     end
   end
 
@@ -567,22 +548,30 @@ describe Rufus::Scheduler::CronLine do
     it 'returns the shortest delta between two occurrences' do
 
       expect(Rufus::Scheduler::CronLine.new(
-          '* * * * *').brute_frequency).to eq(60)
+        '* * * * *').brute_frequency).to eq(60)
       expect(Rufus::Scheduler::CronLine.new(
-          '* * * * * *').brute_frequency).to eq(1)
+        '* * * * * *').brute_frequency).to eq(1)
 
       expect(Rufus::Scheduler::CronLine.new(
-          '5 23 * * *').brute_frequency).to eq(24 * 3600)
+        '5 23 * * *').brute_frequency).to eq(24 * 3600)
       expect(Rufus::Scheduler::CronLine.new(
-          '5 * * * *').brute_frequency).to eq(3600)
+        '5 * * * *').brute_frequency).to eq(3600)
       expect(Rufus::Scheduler::CronLine.new(
-          '10,20,30 * * * *').brute_frequency).to eq(600)
+        '10,20,30 * * * *').brute_frequency).to eq(600)
 
       #Rufus::Scheduler::CronLine.new(
       #    '10,20,30 * * * * *').brute_frequency.should == 10
         #
         # takes > 20s ...
     end
+
+    # some combos only appear every other year...
+    #
+    it 'does not go into an infinite loop' do
+
+      expect(Rufus::Scheduler::CronLine.new(
+        '1 2 3 4 5').brute_frequency).to eq(31622400)
+    end
   end
 
   context 'summer time' do
@@ -593,10 +582,6 @@ describe Rufus::Scheduler::CronLine do
     #
     it 'schedules correctly through a switch into summer time' do
 
-      #j = `zdump -v Europe/Berlin | grep "Sun Mar" | grep 2014`.split("\n")[0]
-      #j = j.match(/^.+ (Sun Mar .+ UTC) /)[1]
-        # only works on system that have a zdump...
-
       in_zone 'Europe/Berlin' do
 
         # find the summer jump
@@ -623,14 +608,14 @@ describe Rufus::Scheduler::CronLine do
         n0 = cl0.next_time(friday)
         n1 = cl1.next_time(friday)
 
-        expect(n0.strftime('%H:%M:%S %^a')).to eq('00:02:00 MON')
+        expect(n0.strftime('%H:%M:%S %^a')).to eq('00:02:00 TUE')
         expect(n1.strftime('%H:%M:%S %^a')).to eq('08:45:00 MON')
 
         expect(n0.isdst).to eq(true)
         expect(n1.isdst).to eq(true)
 
         expect(
-          (n0 - 24 * 3600 * 3).strftime('%H:%M:%S %^a')).to eq('23:02:00 THU')
+          (n0 - 24 * 3600 * 3).strftime('%H:%M:%S %^a')).to eq('23:02:00 FRI')
         expect(
           (n1 - 24 * 3600 * 3).strftime('%H:%M:%S %^a')).to eq('07:45:00 FRI')
       end
@@ -676,6 +661,70 @@ describe Rufus::Scheduler::CronLine do
           (n1 - 24 * 3600 * 3).strftime('%H:%M:%S %^a')).to eq('09:45:00 FRI')
       end
     end
+
+    it 'correctly increments through a DST transition' do
+
+      expect(
+        nt('* * * * * America/Los_Angeles', Time.utc(2015, 3, 8, 9, 59))
+      ).to eq(Time.utc(2015, 3, 8, 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, 3, 8, 1, 57)
+
+        points =
+          [ 0, 1, 2, 3 ].collect do
+            t = line.next_time(t)
+            t.strftime('%H:%M:%Sl') + ' ' + t.dup.utc.strftime('%H:%M:%Su')
+          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'
+          ]
+        )
+      end
+    end
+
+    it 'correctly decrements through a DST transition' do
+
+      expect(
+        pt('* * * * * America/Los_Angeles', Time.utc(2015, 3, 8, 10, 00))
+      ).to eq(Time.utc(2015, 3, 8, 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(2015, 3, 8, 3, 2)
+
+        points =
+          [ 0, 1, 2, 3 ].collect do
+            t = line.previous_time(t)
+            t.strftime('%H:%M:%Sl') + ' ' + t.dup.utc.strftime('%H:%M:%Su')
+          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'
+          ]
+        )
+      end
+    end
   end
 end