sidekiq-cron 1.0.0 → 1.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/sidekiq/cron/job.rb +6 -2
- data/sidekiq-cron.gemspec +70 -70
- data/test/unit/job_test.rb +3 -2
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ded0af6d28d26842c24c57d59d6c91b413ee4a72
|
4
|
+
data.tar.gz: 8602e4d3bb9a992382549dbfbfa3f12b0f9c5170
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9430905a4b17f3186e8b7f6275f14c308e3f9bb308964861b92d78376493c7d445d2218ec1818a514df16f284fed206cf9c4e4ab1330a13eb48b5095b33c6ec7
|
7
|
+
data.tar.gz: 8d095e03c1568ba9a5231a1a0c6c49e96d1427bf64e54aa2f19c8dc242e76e0aea50eae8bf676be8a01bb281ef0ce560fdfe0f2f2153d5fb675f498e41fc2f61
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.0.
|
1
|
+
1.0.1
|
data/lib/sidekiq/cron/job.rb
CHANGED
@@ -275,7 +275,7 @@ module Sidekiq
|
|
275
275
|
|
276
276
|
#set last enqueue time - from args or from existing job
|
277
277
|
if args['last_enqueue_time'] && !args['last_enqueue_time'].empty?
|
278
|
-
@last_enqueue_time =
|
278
|
+
@last_enqueue_time = parse_enqueue_time(args['last_enqueue_time'])
|
279
279
|
else
|
280
280
|
@last_enqueue_time = last_enqueue_time_from_redis
|
281
281
|
end
|
@@ -364,7 +364,7 @@ module Sidekiq
|
|
364
364
|
out = nil
|
365
365
|
if fetch_missing_args
|
366
366
|
Sidekiq.redis do |conn|
|
367
|
-
out =
|
367
|
+
out = parse_enqueue_time(conn.hget(redis_key, "last_enqueue_time")) rescue nil
|
368
368
|
end
|
369
369
|
end
|
370
370
|
out
|
@@ -550,6 +550,10 @@ module Sidekiq
|
|
550
550
|
end
|
551
551
|
end
|
552
552
|
|
553
|
+
def parse_enqueue_time(timestamp)
|
554
|
+
DateTime.strptime(timestamp, LAST_ENQUEUE_TIME_FORMAT).to_time.utc
|
555
|
+
end
|
556
|
+
|
553
557
|
def not_past_scheduled_time?(current_time)
|
554
558
|
last_cron_time = parsed_cron.previous_time(current_time).utc
|
555
559
|
# or could it be?
|
data/sidekiq-cron.gemspec
CHANGED
@@ -2,18 +2,18 @@
|
|
2
2
|
# DO NOT EDIT THIS FILE DIRECTLY
|
3
3
|
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
|
4
4
|
# -*- encoding: utf-8 -*-
|
5
|
-
# stub: sidekiq-cron 1.0.
|
5
|
+
# stub: sidekiq-cron 1.0.1 ruby lib
|
6
6
|
|
7
7
|
Gem::Specification.new do |s|
|
8
|
-
s.name = "sidekiq-cron"
|
9
|
-
s.version = "1.0.
|
8
|
+
s.name = "sidekiq-cron".freeze
|
9
|
+
s.version = "1.0.1"
|
10
10
|
|
11
|
-
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
12
|
-
s.require_paths = ["lib"]
|
13
|
-
s.authors = ["Ondrej Bartas"]
|
14
|
-
s.date = "2018-
|
15
|
-
s.description = "Enables to set jobs to be run in specified time (using CRON notation)"
|
16
|
-
s.email = "ondrej@bartas.cz"
|
11
|
+
s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
|
12
|
+
s.require_paths = ["lib".freeze]
|
13
|
+
s.authors = ["Ondrej Bartas".freeze]
|
14
|
+
s.date = "2018-08-15"
|
15
|
+
s.description = "Enables to set jobs to be run in specified time (using CRON notation)".freeze
|
16
|
+
s.email = "ondrej@bartas.cz".freeze
|
17
17
|
s.extra_rdoc_files = [
|
18
18
|
"LICENSE.txt",
|
19
19
|
"README.md"
|
@@ -53,75 +53,75 @@ Gem::Specification.new do |s|
|
|
53
53
|
"test/unit/poller_test.rb",
|
54
54
|
"test/unit/web_extension_test.rb"
|
55
55
|
]
|
56
|
-
s.homepage = "http://github.com/ondrejbartas/sidekiq-cron"
|
57
|
-
s.licenses = ["MIT"]
|
58
|
-
s.rubygems_version = "2.5.1"
|
59
|
-
s.summary = "Sidekiq Cron helps to add repeated scheduled jobs"
|
56
|
+
s.homepage = "http://github.com/ondrejbartas/sidekiq-cron".freeze
|
57
|
+
s.licenses = ["MIT".freeze]
|
58
|
+
s.rubygems_version = "2.5.2.1".freeze
|
59
|
+
s.summary = "Sidekiq Cron helps to add repeated scheduled jobs".freeze
|
60
60
|
|
61
61
|
if s.respond_to? :specification_version then
|
62
62
|
s.specification_version = 4
|
63
63
|
|
64
64
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
65
|
-
s.add_runtime_dependency(%q<sidekiq
|
66
|
-
s.add_runtime_dependency(%q<fugit
|
67
|
-
s.add_development_dependency(%q<bundler
|
68
|
-
s.add_development_dependency(%q<simplecov
|
69
|
-
s.add_development_dependency(%q<redis-namespace
|
70
|
-
s.add_development_dependency(%q<shoulda-context
|
71
|
-
s.add_development_dependency(%q<rack
|
72
|
-
s.add_development_dependency(%q<rack-test
|
73
|
-
s.add_development_dependency(%q<jeweler
|
74
|
-
s.add_development_dependency(%q<minitest
|
75
|
-
s.add_development_dependency(%q<test-unit
|
76
|
-
s.add_development_dependency(%q<sdoc
|
77
|
-
s.add_development_dependency(%q<slim
|
78
|
-
s.add_development_dependency(%q<sinatra
|
79
|
-
s.add_development_dependency(%q<mocha
|
80
|
-
s.add_development_dependency(%q<coveralls
|
81
|
-
s.add_development_dependency(%q<shotgun
|
82
|
-
s.add_development_dependency(%q<guard
|
83
|
-
s.add_development_dependency(%q<guard-minitest
|
65
|
+
s.add_runtime_dependency(%q<sidekiq>.freeze, [">= 4.2.1"])
|
66
|
+
s.add_runtime_dependency(%q<fugit>.freeze, ["~> 1.1"])
|
67
|
+
s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
|
68
|
+
s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
|
69
|
+
s.add_development_dependency(%q<redis-namespace>.freeze, [">= 1.5.2"])
|
70
|
+
s.add_development_dependency(%q<shoulda-context>.freeze, [">= 0"])
|
71
|
+
s.add_development_dependency(%q<rack>.freeze, [">= 0"])
|
72
|
+
s.add_development_dependency(%q<rack-test>.freeze, [">= 0"])
|
73
|
+
s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
|
74
|
+
s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
|
75
|
+
s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
|
76
|
+
s.add_development_dependency(%q<sdoc>.freeze, [">= 0"])
|
77
|
+
s.add_development_dependency(%q<slim>.freeze, [">= 0"])
|
78
|
+
s.add_development_dependency(%q<sinatra>.freeze, [">= 0"])
|
79
|
+
s.add_development_dependency(%q<mocha>.freeze, [">= 0"])
|
80
|
+
s.add_development_dependency(%q<coveralls>.freeze, [">= 0"])
|
81
|
+
s.add_development_dependency(%q<shotgun>.freeze, [">= 0"])
|
82
|
+
s.add_development_dependency(%q<guard>.freeze, [">= 0"])
|
83
|
+
s.add_development_dependency(%q<guard-minitest>.freeze, [">= 0"])
|
84
84
|
else
|
85
|
-
s.add_dependency(%q<sidekiq
|
86
|
-
s.add_dependency(%q<fugit
|
87
|
-
s.add_dependency(%q<bundler
|
88
|
-
s.add_dependency(%q<simplecov
|
89
|
-
s.add_dependency(%q<redis-namespace
|
90
|
-
s.add_dependency(%q<shoulda-context
|
91
|
-
s.add_dependency(%q<rack
|
92
|
-
s.add_dependency(%q<rack-test
|
93
|
-
s.add_dependency(%q<jeweler
|
94
|
-
s.add_dependency(%q<minitest
|
95
|
-
s.add_dependency(%q<test-unit
|
96
|
-
s.add_dependency(%q<sdoc
|
97
|
-
s.add_dependency(%q<slim
|
98
|
-
s.add_dependency(%q<sinatra
|
99
|
-
s.add_dependency(%q<mocha
|
100
|
-
s.add_dependency(%q<coveralls
|
101
|
-
s.add_dependency(%q<shotgun
|
102
|
-
s.add_dependency(%q<guard
|
103
|
-
s.add_dependency(%q<guard-minitest
|
85
|
+
s.add_dependency(%q<sidekiq>.freeze, [">= 4.2.1"])
|
86
|
+
s.add_dependency(%q<fugit>.freeze, ["~> 1.1"])
|
87
|
+
s.add_dependency(%q<bundler>.freeze, [">= 0"])
|
88
|
+
s.add_dependency(%q<simplecov>.freeze, [">= 0"])
|
89
|
+
s.add_dependency(%q<redis-namespace>.freeze, [">= 1.5.2"])
|
90
|
+
s.add_dependency(%q<shoulda-context>.freeze, [">= 0"])
|
91
|
+
s.add_dependency(%q<rack>.freeze, [">= 0"])
|
92
|
+
s.add_dependency(%q<rack-test>.freeze, [">= 0"])
|
93
|
+
s.add_dependency(%q<jeweler>.freeze, [">= 0"])
|
94
|
+
s.add_dependency(%q<minitest>.freeze, [">= 0"])
|
95
|
+
s.add_dependency(%q<test-unit>.freeze, [">= 0"])
|
96
|
+
s.add_dependency(%q<sdoc>.freeze, [">= 0"])
|
97
|
+
s.add_dependency(%q<slim>.freeze, [">= 0"])
|
98
|
+
s.add_dependency(%q<sinatra>.freeze, [">= 0"])
|
99
|
+
s.add_dependency(%q<mocha>.freeze, [">= 0"])
|
100
|
+
s.add_dependency(%q<coveralls>.freeze, [">= 0"])
|
101
|
+
s.add_dependency(%q<shotgun>.freeze, [">= 0"])
|
102
|
+
s.add_dependency(%q<guard>.freeze, [">= 0"])
|
103
|
+
s.add_dependency(%q<guard-minitest>.freeze, [">= 0"])
|
104
104
|
end
|
105
105
|
else
|
106
|
-
s.add_dependency(%q<sidekiq
|
107
|
-
s.add_dependency(%q<fugit
|
108
|
-
s.add_dependency(%q<bundler
|
109
|
-
s.add_dependency(%q<simplecov
|
110
|
-
s.add_dependency(%q<redis-namespace
|
111
|
-
s.add_dependency(%q<shoulda-context
|
112
|
-
s.add_dependency(%q<rack
|
113
|
-
s.add_dependency(%q<rack-test
|
114
|
-
s.add_dependency(%q<jeweler
|
115
|
-
s.add_dependency(%q<minitest
|
116
|
-
s.add_dependency(%q<test-unit
|
117
|
-
s.add_dependency(%q<sdoc
|
118
|
-
s.add_dependency(%q<slim
|
119
|
-
s.add_dependency(%q<sinatra
|
120
|
-
s.add_dependency(%q<mocha
|
121
|
-
s.add_dependency(%q<coveralls
|
122
|
-
s.add_dependency(%q<shotgun
|
123
|
-
s.add_dependency(%q<guard
|
124
|
-
s.add_dependency(%q<guard-minitest
|
106
|
+
s.add_dependency(%q<sidekiq>.freeze, [">= 4.2.1"])
|
107
|
+
s.add_dependency(%q<fugit>.freeze, ["~> 1.1"])
|
108
|
+
s.add_dependency(%q<bundler>.freeze, [">= 0"])
|
109
|
+
s.add_dependency(%q<simplecov>.freeze, [">= 0"])
|
110
|
+
s.add_dependency(%q<redis-namespace>.freeze, [">= 1.5.2"])
|
111
|
+
s.add_dependency(%q<shoulda-context>.freeze, [">= 0"])
|
112
|
+
s.add_dependency(%q<rack>.freeze, [">= 0"])
|
113
|
+
s.add_dependency(%q<rack-test>.freeze, [">= 0"])
|
114
|
+
s.add_dependency(%q<jeweler>.freeze, [">= 0"])
|
115
|
+
s.add_dependency(%q<minitest>.freeze, [">= 0"])
|
116
|
+
s.add_dependency(%q<test-unit>.freeze, [">= 0"])
|
117
|
+
s.add_dependency(%q<sdoc>.freeze, [">= 0"])
|
118
|
+
s.add_dependency(%q<slim>.freeze, [">= 0"])
|
119
|
+
s.add_dependency(%q<sinatra>.freeze, [">= 0"])
|
120
|
+
s.add_dependency(%q<mocha>.freeze, [">= 0"])
|
121
|
+
s.add_dependency(%q<coveralls>.freeze, [">= 0"])
|
122
|
+
s.add_dependency(%q<shotgun>.freeze, [">= 0"])
|
123
|
+
s.add_dependency(%q<guard>.freeze, [">= 0"])
|
124
|
+
s.add_dependency(%q<guard-minitest>.freeze, [">= 0"])
|
125
125
|
end
|
126
126
|
end
|
127
127
|
|
data/test/unit/job_test.rb
CHANGED
@@ -601,13 +601,14 @@ describe "Cron Job" do
|
|
601
601
|
it "last_enqueue_time shouldn't be rewritten after save" do
|
602
602
|
#adding last_enqueue_time to initialize is only for test purpose
|
603
603
|
last_enqueue_time = '2013-01-01 23:59:59'
|
604
|
+
expected_enqueue_time = DateTime.parse(last_enqueue_time).to_time.utc
|
604
605
|
Sidekiq::Cron::Job.create(@args.merge('last_enqueue_time' => last_enqueue_time))
|
605
606
|
job = Sidekiq::Cron::Job.find(@args)
|
606
|
-
assert_equal job.last_enqueue_time,
|
607
|
+
assert_equal job.last_enqueue_time, expected_enqueue_time
|
607
608
|
|
608
609
|
Sidekiq::Cron::Job.create(@args)
|
609
610
|
job = Sidekiq::Cron::Job.find(@args)
|
610
|
-
assert_equal job.last_enqueue_time,
|
611
|
+
assert_equal job.last_enqueue_time, expected_enqueue_time, "after second create should have same time"
|
611
612
|
end
|
612
613
|
end
|
613
614
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sidekiq-cron
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ondrej Bartas
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-08-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: sidekiq
|
@@ -337,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
337
337
|
version: '0'
|
338
338
|
requirements: []
|
339
339
|
rubyforge_project:
|
340
|
-
rubygems_version: 2.5.1
|
340
|
+
rubygems_version: 2.5.2.1
|
341
341
|
signing_key:
|
342
342
|
specification_version: 4
|
343
343
|
summary: Sidekiq Cron helps to add repeated scheduled jobs
|