when-do 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8789ce93d5972a22cb28ade88726877ef864f80b
-  data.tar.gz: d705d5704d4b062791c19e423448f0d9ce890fdd
+  metadata.gz: 55089eb7417388181f4a1b23f3011afa7eedcce7
+  data.tar.gz: 12a44cd63aa78ee529e78a6915999f15ddee70bc
 SHA512:
-  metadata.gz: ee72d32fbda5ff916de43339db4bef73a0ce3a0f420d79af3555e2d6d19329868afbbb0ec5d8a82e4eee6dbb7faf00bd664854791d1e3d6435ff98868a7b2973
-  data.tar.gz: 9602f916ec76598b8312e33197bd064598c95817182cb7c2a744be428f39ff763c591ca6a4e0fedfae3bad178e7919cbba82e1c581476f9aca8d8770c8af88e7
+  metadata.gz: 23b8e2d495469b7b4fabbee4a46431b6518930dbc3f7c9aef5ea3bb2ab6fc19242ccc3b7698425a900730c2823691ea729878a6a0921c335e01ac06ec8d359fe
+  data.tar.gz: db0893e786167963253d6e4a69b10cf4b6811404eccaa37125241c8240440ff2dcca1dd14eb81b59e170cdb4536be0231707a623aaf8403e95aa93e8f94318f6

data/README.md

@@ -7,7 +7,7 @@ Supports
 * Dynamic cron schedules
 * Delayed queueing
 
-Schedules are not cached and can be changed at will. Redundant processes can run without duplication of jobs as long as they point to the same Redis. Jobs will not be double-queued when DST resets time backwards, but will be skipped when DST moves time forward. Leap seconds should be fine.
+Schedules are not cached and can be changed at will. Redundant processes can run without duplication of jobs as long as they point to the same Redis. Jobs will not be double-queued when DST resets time backwards, and will be queued as DST skips over them. Leap seconds are fine.
 
 ## Installation
 
@@ -66,7 +66,7 @@ Check schedules:
 
     When.schedules
 
-On my 2013 Macbook Air, 100k schedules can be analyzed in <3 seconds.
+On my 2013 1.3GHz Macbook Air, 100k schedules can be analyzed in <3 seconds.
 
 ## Contributing
 

data/lib/when-do/do.rb

@@ -58,21 +58,21 @@ module When
           end
         }.abort_on_exception = true
       else
-        analyze
+        ['HUP', 'INT', 'TERM', 'QUIT'].each { |sig| Signal.trap(sig) { }}
+        analyze(Time.now)
+        exit
       end
     end
 
-    def analyze
-      ['HUP', 'INT', 'TERM', 'QUIT'].each { |sig| Signal.trap(sig) { }}
-      started_at = Time.now
+    def analyze(started_at)
       if running?(started_at)
         logger.info('Another process is already analyzing.')
       else
-        logger.debug { 'Analyzing.' }
+        analyze_dst(started_at) if dst_forward?(started_at)
+        logger.debug { "Analyzing #{started_at}." }
         queue_scheduled(started_at)
         queue_delayed(started_at)
       end
-      exit
     end
 
     def running?(started_at)
@@ -89,6 +89,18 @@ module When
       check_and_set_analyzed[0]
     end
 
+    def dst_forward?(started_at)
+      started_at.hour - (started_at - 60).hour == 2
+    end
+
+    def analyze_dst(started_at)
+      logger.info { "DST forward shift detected. Triggering analysis for #{started_at.hour - 1}:00 through #{started_at.hour - 1}:59"}
+      skipped_time = Time.new(started_at.year, started_at.month, started_at.day, started_at.hour - 1, 0, 0, started_at.utc_offset - 3600)
+      (0..59).each do |min|
+        analyze(skipped_time + min * 60)
+      end
+    end
+
     def build_day_key(started_at)
       "#{schedule_key}:#{started_at.to_s.split(' ')[0]}"
     end
@@ -135,7 +147,7 @@ module When
     private
 
     def sleep_until_next_minute
-      to_sleep = 62 - Time.now.sec #handle up to 2 leap seconds
+      to_sleep = 62 - Time.now.sec # handle up to 2 leap seconds
       logger.debug { "Sleeping #{to_sleep} seconds."}
       sleep(to_sleep)
     end

data/spec/lib/when-do/cli_spec.rb

@@ -3,6 +3,7 @@ require 'when-do/cli'
 
 describe When::CLI do
   let(:cli) { When::CLI.new }
+
   describe '#options' do
     context 'argv has an option with no following value' do
       before do

data/spec/lib/when-do/do_spec.rb

@@ -134,4 +134,93 @@ describe When::Do do
         .to(2)
     end
   end
+
+  describe '#dst_forward?' do
+    context 'started_at is the minute after dst skips forward' do
+      let(:started_at) { Time.new(2014, 3, 9, 3) }
+
+      it 'returns true' do
+        expect(when_do.dst_forward?(started_at)).to eq true
+      end
+    end
+
+    context 'started_at is the minute before dst skips forward' do
+      let(:started_at) { Time.new(2014, 3, 9, 1, 59) }
+
+      it 'returns false' do
+        expect(when_do.dst_forward?(started_at)).to eq false
+      end
+    end
+
+    context 'started_at is the minute after dst skips backward' do
+      let(:started_at) { Time.new(2014, 11, 2, 1) }
+
+      it 'returns false' do
+        expect(when_do.dst_forward?(started_at)).to eq false
+      end
+    end
+
+    context 'started_at is the minute before dst skips backward' do
+      let(:started_at) { Time.new(2014, 11, 2, 0, 59) + 3600 }
+
+      it 'returns false' do
+        expect(when_do.dst_forward?(started_at)).to eq false
+      end
+    end
+  end
+
+  describe '#analyze_dst' do
+    it 'calls analyze for each minute of the hour before started_at' do
+      hour_before = Time.new(started_at.year, started_at.month, started_at.day, started_at.hour - 1, 0, 0, started_at.utc_offset - 3600)
+      (0..59).each do |min|
+        expect(when_do).to receive(:analyze).with(hour_before + min * 60).ordered
+      end
+      when_do.analyze_dst(started_at)
+    end
+  end
+
+  describe '#analyze' do
+    before do
+      when_do.stub(:queue_scheduled)
+      when_do.stub(:queue_delayed)
+    end
+
+    context '#running? is false' do
+      before do
+        when_do.stub(:running?).with(started_at).and_return false
+      end
+
+      it 'calls queue_scheduled' do
+        expect(when_do).to receive(:queue_scheduled).with(started_at)
+        when_do.analyze(started_at)
+      end
+
+      it 'calls queue_delayed' do
+        expect(when_do).to receive(:queue_delayed).with(started_at)
+        when_do.analyze(started_at)
+      end
+
+      context '#dst_forward? is true' do
+        before do
+          when_do.stub(:dst_forward?).with(started_at).and_return true
+        end
+
+        it 'calls analyze_dst' do
+          expect(when_do).to receive(:analyze_dst).with(started_at)
+          when_do.analyze(started_at)
+        end
+      end
+
+      context '#dst_forward? is false' do
+        before do
+          when_do.stub(:dst_forward?).with(started_at).and_return false
+        end
+
+        it 'does not call analyze_dst' do
+          expect(when_do).not_to receive(:analyze_dst).with(started_at)
+          when_do.analyze(started_at)
+        end
+      end
+    end
+  end
 end

data/when-do.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "when-do"
-  spec.version       = '1.0.4'
+  spec.version       = '1.1.0'
   spec.authors       = ["TH"]
   spec.email         = ["tylerhartland7@gmail.com"]
   spec.description   = %q{Queues jobs when you want.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: when-do
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - TH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: when-cron