sidekiq-cron 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b73b92bf2df7e62197f67b5458ec5f33a7ee531
-  data.tar.gz: 3fed6fbd16c45bdba384bf959314ef685dc4bfd5
+  metadata.gz: a6e4efebfa16f1bedd09081f160e3db3d778e0b9
+  data.tar.gz: b23fe76d331791eabd457cd85f797181bf086712
 SHA512:
-  metadata.gz: d7649e1bb970285e696751daf76096832e33de9436c85afea14389335b7653d038896baef7a6f05a81a5222aa680bcb312d1473c4a630677b9e4e1ffde8676e5
-  data.tar.gz: 66ac5d6377199a03e2e8cd97eb896d9c880088aab7188213515bbb8768bc11ed5856d94e0cd2a808b747624b9840166c621a372fcb04dabcaf37502ba207b50b
+  metadata.gz: 3286595909fbc0c05504fb38b12f79544b020a627454701adc8e7b10fd7afc7a27cf27a3edf062b3840eca9e4ebc4964149bc9742e6d1bd85d0177cdea6fe18b
+  data.tar.gz: 337457599316fcdec08c10d29fab8b7d130584c345c97f3e4ad2bc93a2c7f2a240689776be8da24d380057ec23481995f0eff456e3789e68a3cc979012f817bf

data/Changes.md

@@ -1,3 +1,17 @@
+v 1.0.4
+-------
+
+- fix problem with upgrading to 1.0.x - parsing last enqued time didn't count with old time format stored in redis
+
+v 1.0.0
+-------
+
+- use [fugit](https://github.com/floraison/fugit) instead of [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) - API of cron didn't change (rufus scheduler is using fugit)
+- better working with Timezones
+- translations for JA, zh-CN
+- cron without timezone are considered as UTC, to add Timezone to cron use format `* * * * * Europe/Berlin`
+- be aware that this release can change when your jobs are enqueued (for me it didn't change but it is in one project, in other it can shift by different timezone setup)
+
 v 0.6.0
 -------
 

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/lib/sidekiq/cron/job.rb

@@ -13,6 +13,7 @@ module Sidekiq
       #how long we would like to store informations about previous enqueues
       REMEMBER_THRESHOLD = 24 * 60 * 60
       LAST_ENQUEUE_TIME_FORMAT = '%Y-%m-%d %H:%M:%S %z'
+      LAST_ENQUEUE_TIME_FORMAT_OLD = '%Y-%m-%d %H:%M:%S'
 
       #crucial part of whole enquing job
       def should_enque? time
@@ -552,6 +553,8 @@ module Sidekiq
 
       def parse_enqueue_time(timestamp)
         DateTime.strptime(timestamp, LAST_ENQUEUE_TIME_FORMAT).to_time.utc
+      rescue ArgumentError
+        DateTime.strptime(timestamp, LAST_ENQUEUE_TIME_FORMAT_OLD).to_time.utc
       end
 
       def not_past_scheduled_time?(current_time)

data/sidekiq-cron.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sidekiq-cron 1.0.3 ruby lib
+# stub: sidekiq-cron 1.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron".freeze
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/test/unit/job_test.rb

@@ -131,6 +131,28 @@ describe "Cron Job" do
     end
   end
 
+  describe 'parse_enqueue_time' do
+    before do
+      @args = {
+        name: "Test",
+        cron: "* * * * *"
+      }
+      @job = Sidekiq::Cron::Job.new(@args)
+    end
+
+    it 'should correctly parse new format' do
+      assert_equal @job.send(:parse_enqueue_time, '2017-01-02 15:23:43 UTC'), Time.new(2017, 1, 2, 15, 23, 43, '+00:00')
+    end
+
+    it 'should correctly parse new format with different timezone' do
+      assert_equal @job.send(:parse_enqueue_time, '2017-01-02 15:23:43 +01:00'), Time.new(2017, 1, 2, 15, 23, 43, '+01:00')
+    end
+
+    it 'should correctly parse old format' do
+      assert_equal @job.send(:parse_enqueue_time, '2017-01-02 15:23:43'), Time.new(2017, 1, 2, 15, 23, 43, '+00:00')
+    end
+  end
+
   describe 'formatted time' do
     before do
       @args = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ondrej Bartas