Merge c3f0479 into b4e2657

lib/perfectsched.rb

@@ -52,7 +52,7 @@ module PerfectSched
     require File.expand_path(v, File.dirname(__FILE__))
   }
 
-  require 'cron-spec'
+  require 'chrono'
   require 'tzinfo'
 
   def self.open(config, &block)
@@ -71,28 +71,13 @@ def self.open(config, &block)
   end
 
   def self.cron_time(cron, timestamp, timezone)
-    begin
-      tab = CronSpec::CronSpecification.new(cron)
-    rescue
-      raise ArgumentError, "invalid cron format: #{$!}: #{cron.inspect}"
-    end
-
-    begin
-      tz = TZInfo::Timezone.get(timezone) if timezone
-    rescue
-      raise ArgumentError, "unknown timezone: #{$!}: #{timezone.inspect}"
+    unless /\A\s*(?:[0-9,*,\-\/]+\s+){4}[0-9,*,\-\/]+\z/ =~ cron
+      raise ArgumentError, "invalid cron format: #{cron.inspect}"
     end
 
-    ts = (timestamp + 59) / 60 * 60
-    while true
-      t = Time.at(ts).utc
-      t = tz.utc_to_local(t) if tz
-      if tab.is_specification_in_effect?(t)
-        return ts
-      end
-      ts += 60
-      # FIXME break
-    end
+    ts = timestamp - 1 # compatibility
+    t = Time.find_zone!(timezone || 'UTC'.freeze).at(ts)
+    Chrono::NextTime.new(now: t, source: cron).to_time.to_i
   end
 
   def self.next_time(cron, before_timestamp, timezone)

perfectsched.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_dependency "cron-spec", [">= 0.1.2", "<= 0.1.2"]
+  gem.add_dependency "chrono", "~> 0.1.0"
   gem.add_dependency "sequel", "~> 3.48.0"
   gem.add_dependency "tzinfo", "~> 1.1"
   gem.add_dependency "perfectqueue", "~> 0.8.41"

spec/perfect_sched_spec.rb

@@ -39,7 +39,7 @@
       ts = PerfectSched.next_time('0 * * * *', 0, nil)
       expect(ts).not_to be_nil
     end
-    xit 'calculates 4 years quickly' do
+    it 'calculates 4 years quickly' do
       t = Time.utc(2012,2,29)
       ts = PerfectSched.next_time('0 0 29 2 *', t.to_i, nil)
       expect(ts).to eq(Time.utc(2016,2,29).to_i)
@@ -49,15 +49,17 @@
     end
 
     context 'DST 2015' do
-      it 'can go through America/Los_Angeles transition' do
-        t0 = Time.new(2015,  3,  8,  1, 59, 59, -8*3600)
-        t1 = Time.new(2015,  3,  9,  2,  0,  0, -7*3600) # 2015-03-08T02:00:00 doesn't exist
+      it 'skips task on 8 Mar because 1:59:59 PDT -> 3:00:00 PST' do
+        t0 = Time.new(2015,  3,  7,  2,  0,  0, -8*3600)
+        # 2015-03-08T02:00:00 doesn't exist
+        t1 = Time.new(2015,  3,  9,  2,  0,  0, -7*3600)
         ts = PerfectSched.next_time('* 2 * * *', t0.to_i, 'America/Los_Angeles')
         expect(ts).to eq(t1.to_i)
       end
-      it 'can go through America/Los_Angeles transition' do
+      it 'runs twice on Nov 11 because 1:59:59 PST -> 1:00:00 PDT' do
+        # 2015-11-01T01:00:00 exists twice
         t0 = Time.new(2015, 11,  1,  1,  0,  0, -7*3600)
-        t1 = Time.new(2015, 11,  1,  1,  0,  0, -8*3600) # 2015-11-01T01:00:00 exists twice
+        t1 = Time.new(2015, 11,  1,  1,  0,  0, -8*3600)
         ts = PerfectSched.next_time('0 1 * * *', t0.to_i, 'America/Los_Angeles')
         expect(ts).to eq(t1.to_i)
       end