say_when 0.2.5 → 0.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/.gitignore +2 -1
- data/.travis.yml +4 -0
- data/Gemfile +8 -0
- data/Rakefile +9 -1
- data/lib/generators/say_when/migration/templates/migration.rb +5 -3
- data/lib/say_when/scheduler.rb +63 -36
- data/lib/say_when/storage/active_record/job.rb +42 -22
- data/lib/say_when/storage/memory/job.rb +37 -4
- data/lib/say_when/tasks.rb +1 -14
- data/lib/say_when/version.rb +1 -1
- data/lib/say_when.rb +5 -2
- data/say_when.gemspec +2 -4
- data/spec/active_record_spec_helper.rb +0 -2
- data/spec/db/schema.rb +4 -2
- data/spec/say_when/cron_expression_spec.rb +1 -1
- data/spec/say_when/processor/active_messaging_spec.rb +3 -4
- data/spec/say_when/scheduler_spec.rb +6 -6
- data/spec/say_when/storage/active_record/job_spec.rb +20 -6
- data/spec/say_when/storage/memory/job_spec.rb +16 -2
- data/spec/say_when/storage/memory/trigger_spec.rb +1 -1
- data/spec/say_when/triggers/once_strategy_spec.rb +2 -2
- data/spec/spec_helper.rb +7 -0
- metadata +86 -136
- data/lib/say_when/storage/mongoid/job.rb +0 -15
- data/spec/db/test.db +0 -0
- data/spec/mongoid_spec_helper.rb +0 -7
- data/spec/say_when/storage/mongoid/trigger_spec.rb +0 -57
checksums.yaml
ADDED
@@ -0,0 +1,7 @@
|
|
1
|
+
---
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: ff56cfaa645736fcace3c95f0d9f20a35b7785aa2be6cd544caee8ecb3d0b537
|
4
|
+
data.tar.gz: e04c3cbf9dfff48405d88a574aab8ebd1bf85bb747f6223efa3df184f9e485bb
|
5
|
+
SHA512:
|
6
|
+
metadata.gz: 16b737f008959d234f85f9d8100bb5503500c6b0d8acdb5c78f9306e7c7ac7166571d9021a69daba2406e29e112cba8e0b0b27bd222edb7dfae6b2ceb62f8264
|
7
|
+
data.tar.gz: 020d6842616be2b4984f6f7202279d09660646b112a7d0b24cffad38a6be711a1ee257f12eb4fc64aaa861816e2ba75673f773b4bca54c1af131b91029198ebe
|
data/.gitignore
CHANGED
data/.travis.yml
ADDED
data/Gemfile
CHANGED
@@ -2,3 +2,11 @@ source "http://rubygems.org"
|
|
2
2
|
|
3
3
|
# Specify your gem's dependencies in say_when.gemspec
|
4
4
|
gemspec
|
5
|
+
|
6
|
+
gem "rspec", "=1.3.2", git: 'https://github.com/makandra/rspec.git', branch: '1-3-lts'
|
7
|
+
|
8
|
+
git 'https://github.com/makandra/rails.git', :branch => '2-3-lts' do
|
9
|
+
gem 'rails', '~>2.3.18'
|
10
|
+
gem 'activesupport', :require => false
|
11
|
+
gem 'railslts-version', :require => false
|
12
|
+
end
|
data/Rakefile
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
class CreateSayWhenTables < ActiveRecord::Migration
|
2
|
-
|
2
|
+
|
3
3
|
def self.up
|
4
4
|
|
5
5
|
create_table :say_when_jobs, :force => true do |t|
|
@@ -35,11 +35,13 @@ class CreateSayWhenTables < ActiveRecord::Migration
|
|
35
35
|
t.datetime :start_at
|
36
36
|
t.datetime :end_at
|
37
37
|
end
|
38
|
-
|
38
|
+
|
39
39
|
add_index :say_when_jobs, :status
|
40
40
|
add_index :say_when_jobs, :next_fire_at
|
41
|
+
add_index :say_when_jobs, [:next_fire_at, :status]
|
42
|
+
add_index :say_when_jobs, [:last_fire_at, :status]
|
41
43
|
end
|
42
|
-
|
44
|
+
|
43
45
|
def self.down
|
44
46
|
drop_table :say_when_job_executions
|
45
47
|
drop_table :say_when_jobs
|
data/lib/say_when/scheduler.rb
CHANGED
@@ -7,8 +7,8 @@ module SayWhen
|
|
7
7
|
|
8
8
|
@@scheduler = nil
|
9
9
|
@@lock = nil
|
10
|
-
|
11
|
-
attr_accessor :storage_strategy, :processor_class, :tick_length
|
10
|
+
|
11
|
+
attr_accessor :storage_strategy, :processor_class, :tick_length, :reset_acquired_length, :reset_next_at
|
12
12
|
|
13
13
|
attr_accessor :running
|
14
14
|
|
@@ -40,11 +40,11 @@ module SayWhen
|
|
40
40
|
def start
|
41
41
|
self.scheduler.start
|
42
42
|
end
|
43
|
-
|
44
43
|
end
|
45
44
|
|
46
45
|
def initialize
|
47
46
|
self.tick_length = 1
|
47
|
+
self.reset_acquired_length = 3600
|
48
48
|
end
|
49
49
|
|
50
50
|
def processor
|
@@ -54,7 +54,7 @@ module SayWhen
|
|
54
54
|
end
|
55
55
|
@processor
|
56
56
|
end
|
57
|
-
|
57
|
+
|
58
58
|
def start
|
59
59
|
logger.info "SayWhen::Scheduler starting"
|
60
60
|
|
@@ -63,47 +63,75 @@ module SayWhen
|
|
63
63
|
trap("TERM", "EXIT")
|
64
64
|
|
65
65
|
begin
|
66
|
-
|
67
66
|
self.running = true
|
68
67
|
|
69
68
|
logger.info "SayWhen::Scheduler running"
|
70
|
-
job = nil
|
71
69
|
while running
|
72
|
-
|
73
|
-
time_now = Time.now
|
74
|
-
logger.debug "SayWhen:: Looking for job that should be ready to fire before #{time_now}"
|
75
|
-
job = job_class.acquire_next(time_now)
|
76
|
-
if job.nil?
|
77
|
-
logger.debug "SayWhen:: no jobs to acquire, sleep"
|
78
|
-
sleep(tick_length)
|
79
|
-
else
|
80
|
-
logger.debug "SayWhen:: got a job: #{job.inspect}"
|
81
|
-
# delegate processing the trigger to the processor
|
82
|
-
self.processor.process(job)
|
83
|
-
logger.debug "SayWhen:: job processed"
|
84
|
-
|
85
|
-
# this should update next fire at, and put back in list of scheduled jobs
|
86
|
-
job.fired(time_now)
|
87
|
-
logger.debug "SayWhen:: job fired complete"
|
88
|
-
end
|
89
|
-
rescue Interrupt
|
90
|
-
job_msg = job && " job:'#{job.inspect}'"
|
91
|
-
logger.error "\nSayWhen:: Interrupt! #{job_msg}"
|
92
|
-
exit
|
93
|
-
rescue StandardError=>ex
|
94
|
-
job_msg = job && " job:'#{job.inspect}'"
|
95
|
-
logger.error "SayWhen:: Failure to process#{job_msg}: #{ex.message}\n\t#{ex.backtrace.join("\t\n")}"
|
96
|
-
job.release if job
|
97
|
-
rescue Exception=>ex
|
98
|
-
logger.error "SayWhen:: Exception in process#{job_msg}: #{ex.message}\n\t#{ex.backtrace.join("\t\n")}"
|
99
|
-
exit
|
100
|
-
end
|
70
|
+
process_jobs
|
101
71
|
end
|
72
|
+
rescue Exception => ex
|
73
|
+
logger.error "SayWhen::Scheduler stopping, error: #{ex.class.name}: #{ex.message}"
|
74
|
+
exit
|
102
75
|
end
|
103
76
|
|
104
77
|
logger.info "SayWhen::Scheduler stopped"
|
105
78
|
end
|
106
79
|
|
80
|
+
def process_jobs
|
81
|
+
job = nil
|
82
|
+
time_now = Time.now
|
83
|
+
self.reset_next_at ||= Time.now
|
84
|
+
|
85
|
+
if reset_acquired_length > 0 && reset_next_at <= time_now
|
86
|
+
self.reset_next_at = time_now + reset_acquired_length
|
87
|
+
logger.debug "SayWhen:: reset acquired at #{time_now}, try again at #{reset_next_at}"
|
88
|
+
job_class.reset_acquired(reset_acquired_length)
|
89
|
+
end
|
90
|
+
|
91
|
+
begin
|
92
|
+
logger.debug "SayWhen:: Looking for job that should be ready to fire before #{time_now}"
|
93
|
+
job = job_class.acquire_next(time_now)
|
94
|
+
rescue StandardError => ex
|
95
|
+
job_error("Failure to acquire job", job, ex)
|
96
|
+
job = nil
|
97
|
+
end
|
98
|
+
|
99
|
+
if job.nil?
|
100
|
+
logger.debug "SayWhen:: no jobs to acquire, sleep"
|
101
|
+
sleep(tick_length)
|
102
|
+
return
|
103
|
+
end
|
104
|
+
|
105
|
+
begin
|
106
|
+
logger.debug "SayWhen:: got a job: #{job.inspect}"
|
107
|
+
# delegate processing the trigger to the processor
|
108
|
+
self.processor.process(job)
|
109
|
+
logger.debug "SayWhen:: job processed"
|
110
|
+
|
111
|
+
# if successful, update next fire at, put back to waiting / ended
|
112
|
+
job.fired(time_now)
|
113
|
+
logger.debug "SayWhen:: job fired complete"
|
114
|
+
rescue StandardError => ex
|
115
|
+
job_error("Failure to process", job, ex)
|
116
|
+
end
|
117
|
+
|
118
|
+
rescue Interrupt => ex
|
119
|
+
job_error("Interrupt!", job, ex)
|
120
|
+
raise ex
|
121
|
+
rescue StandardError => ex
|
122
|
+
job_error("Error!", job, ex)
|
123
|
+
sleep(tick_length)
|
124
|
+
rescue Exception => ex
|
125
|
+
job_error("Exception!", job, ex)
|
126
|
+
raise ex
|
127
|
+
end
|
128
|
+
|
129
|
+
def job_error(msg, job, ex)
|
130
|
+
job_msg = job && " job:'#{job.inspect}'"
|
131
|
+
logger.error "SayWhen::Scheduler #{msg}#{job_msg}: #{ex.message}\n\t#{ex.backtrace.join("\t\n")}"
|
132
|
+
job.release if job
|
133
|
+
end
|
134
|
+
|
107
135
|
def stop
|
108
136
|
logger.info "SayWhen::Scheduler stopping..."
|
109
137
|
self.running = false
|
@@ -127,6 +155,5 @@ module SayWhen
|
|
127
155
|
def logger
|
128
156
|
SayWhen::logger
|
129
157
|
end
|
130
|
-
|
131
158
|
end
|
132
159
|
end
|
@@ -8,36 +8,41 @@ module SayWhen
|
|
8
8
|
module ActiveRecord
|
9
9
|
|
10
10
|
class Job < ::ActiveRecord::Base
|
11
|
-
|
12
11
|
include SayWhen::BaseJob
|
13
|
-
|
14
12
|
self.table_name = "say_when_jobs"
|
15
|
-
|
16
|
-
|
17
13
|
serialize :trigger_options
|
18
14
|
serialize :data
|
19
15
|
belongs_to :scheduled, :polymorphic => true
|
20
16
|
has_many :job_executions, :class_name=>'SayWhen::Storage::ActiveRecord::JobExecution'
|
21
17
|
before_create :set_defaults
|
22
18
|
|
19
|
+
def self.reset_acquired(older_than_seconds)
|
20
|
+
return unless older_than_seconds.to_i > 0
|
21
|
+
older_than = (Time.now - older_than_seconds.to_i)
|
22
|
+
update_all(
|
23
|
+
"status = '#{STATE_WAITING}'",
|
24
|
+
["status = ? and updated_at < ?", STATE_ACQUIRED, older_than]
|
25
|
+
)
|
26
|
+
end
|
27
|
+
|
23
28
|
def self.acquire_next(no_later_than)
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
return next_job
|
29
|
+
@next_job = nil
|
30
|
+
hide_logging do
|
31
|
+
SayWhen::Storage::ActiveRecord::Job.transaction do
|
32
|
+
# select and lock the next job that needs executin' (status waiting, and after no_later_than)
|
33
|
+
@next_job = find(:first,
|
34
|
+
:lock => true,
|
35
|
+
:order => 'next_fire_at ASC',
|
36
|
+
:conditions => ['status = ? and ? >= next_fire_at',
|
37
|
+
STATE_WAITING,
|
38
|
+
no_later_than.in_time_zone('UTC')])
|
39
|
+
|
40
|
+
# set status to acquired to take it out of rotation
|
41
|
+
@next_job.update_attribute(:status, STATE_ACQUIRED) unless @next_job.nil?
|
42
|
+
|
43
|
+
end
|
40
44
|
end
|
45
|
+
@next_job
|
41
46
|
end
|
42
47
|
|
43
48
|
def set_defaults
|
@@ -79,9 +84,24 @@ module SayWhen
|
|
79
84
|
execution.save!
|
80
85
|
result
|
81
86
|
end
|
82
|
-
|
87
|
+
|
88
|
+
protected
|
89
|
+
|
90
|
+
def self.hide_logging
|
91
|
+
old_logger = nil
|
92
|
+
begin
|
93
|
+
old_logger = ::ActiveRecord::Base.logger
|
94
|
+
::ActiveRecord::Base.logger = nil
|
95
|
+
|
96
|
+
yield
|
97
|
+
|
98
|
+
ensure
|
99
|
+
::ActiveRecord::Base.logger = old_logger
|
100
|
+
end
|
101
|
+
end
|
102
|
+
|
83
103
|
end
|
84
|
-
|
104
|
+
|
85
105
|
end
|
86
106
|
end
|
87
107
|
end
|
@@ -17,21 +17,45 @@ module SayWhen
|
|
17
17
|
has_properties :trigger_strategy, :trigger_options, :last_fire_at, :next_fire_at
|
18
18
|
has_properties :job_class, :job_method, :data
|
19
19
|
has_properties :scheduled
|
20
|
+
has_properties :updated_at
|
21
|
+
|
22
|
+
def self.class_lock
|
23
|
+
@@_lock ||= Mutex.new
|
24
|
+
end
|
25
|
+
|
26
|
+
def self._reset
|
27
|
+
@@jobs = SortedSet.new
|
28
|
+
end
|
29
|
+
|
30
|
+
def self.reset_acquired(older_than_seconds)
|
31
|
+
return unless older_than_seconds.to_i > 0
|
32
|
+
older_than = (Time.now - older_than_seconds.to_i)
|
33
|
+
self.class_lock.synchronize {
|
34
|
+
jobs.select do |j|
|
35
|
+
j.status == STATE_ACQUIRED && j.updated_at < older_than
|
36
|
+
end.each{ |j| j.status = STATE_WAITING }
|
37
|
+
}
|
38
|
+
end
|
20
39
|
|
21
40
|
def self.acquire_next(no_later_than)
|
22
|
-
self.
|
23
|
-
|
41
|
+
self.class_lock.synchronize {
|
42
|
+
|
24
43
|
next_job = jobs.detect(nil) do |j|
|
25
44
|
(j.status == STATE_WAITING) && (j.next_fire_at.to_i <= no_later_than.to_i)
|
26
45
|
end
|
27
46
|
|
28
|
-
|
47
|
+
if next_job
|
48
|
+
next_job.status = STATE_ACQUIRED
|
49
|
+
next_job.updated_at = Time.now
|
50
|
+
end
|
51
|
+
|
29
52
|
next_job
|
30
|
-
}
|
53
|
+
}
|
31
54
|
end
|
32
55
|
|
33
56
|
def initialize(options={})
|
34
57
|
super
|
58
|
+
self.updated_at = Time.now
|
35
59
|
self.status = STATE_WAITING unless self.status
|
36
60
|
self.next_fire_at = trigger.next_fire_at
|
37
61
|
self.class.jobs << self
|
@@ -41,6 +65,15 @@ module SayWhen
|
|
41
65
|
self.next_fire_at.to_i <=> job.next_fire_at.to_i
|
42
66
|
end
|
43
67
|
|
68
|
+
def fired(fired_at=Time.now)
|
69
|
+
super
|
70
|
+
self.updated_at = Time.now
|
71
|
+
end
|
72
|
+
|
73
|
+
def release
|
74
|
+
super
|
75
|
+
self.updated_at = Time.now
|
76
|
+
end
|
44
77
|
end
|
45
78
|
|
46
79
|
end
|
data/lib/say_when/tasks.rb
CHANGED
@@ -6,17 +6,4 @@ namespace :say_when do
|
|
6
6
|
SayWhen::Scheduler.start
|
7
7
|
end
|
8
8
|
|
9
|
-
|
10
|
-
# # thanks resque
|
11
|
-
# task :preload => :setup do
|
12
|
-
# if defined?(Rails) && Rails.respond_to?(:application)
|
13
|
-
# # Rails 3
|
14
|
-
# Rails.application.eager_load!
|
15
|
-
# elsif defined?(Rails::Initializer)
|
16
|
-
# # Rails 2.3
|
17
|
-
# $rails_rake_task = false
|
18
|
-
# Rails::Initializer.run :load_application_classes
|
19
|
-
# end
|
20
|
-
# end
|
21
|
-
|
22
|
-
end
|
9
|
+
end
|
data/lib/say_when/version.rb
CHANGED
data/lib/say_when.rb
CHANGED
@@ -18,8 +18,11 @@ module SayWhen
|
|
18
18
|
end
|
19
19
|
|
20
20
|
def SayWhen.logger
|
21
|
-
|
22
|
-
|
21
|
+
if !defined?(@@logger) || !@@logger
|
22
|
+
if defined?(Rails.logger) && Rails.logger
|
23
|
+
@@logger = Rails.logger
|
24
|
+
end
|
25
|
+
|
23
26
|
@@logger = Logger.new(STDOUT) unless defined?(@@logger)
|
24
27
|
end
|
25
28
|
@@logger
|
data/say_when.gemspec
CHANGED
@@ -18,9 +18,7 @@ Gem::Specification.new do |s|
|
|
18
18
|
s.add_development_dependency "activemessaging", '~> 0.9.0'
|
19
19
|
s.add_development_dependency "activesupport", '~> 2.3.14'
|
20
20
|
s.add_development_dependency "activerecord", '~> 2.3.14'
|
21
|
-
s.add_development_dependency
|
22
|
-
s.add_development_dependency '
|
21
|
+
s.add_development_dependency 'rspec', '~> 1.3'
|
22
|
+
s.add_development_dependency 'rake', '~> 10.5.0'
|
23
23
|
s.add_development_dependency 'sqlite3'
|
24
|
-
s.add_development_dependency 'rake'
|
25
|
-
|
26
24
|
end
|
data/spec/db/schema.rb
CHANGED
@@ -28,9 +28,11 @@ ActiveRecord::Schema.define(:version => 0) do
|
|
28
28
|
t.datetime :start_at
|
29
29
|
t.datetime :end_at
|
30
30
|
end
|
31
|
-
|
31
|
+
|
32
32
|
add_index :say_when_jobs, :status
|
33
33
|
add_index :say_when_jobs, :next_fire_at
|
34
|
+
add_index :say_when_jobs, [:next_fire_at, :status]
|
35
|
+
add_index :say_when_jobs, [:last_fire_at, :status]
|
34
36
|
|
35
37
|
|
36
|
-
end
|
38
|
+
end
|
@@ -1,7 +1,6 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
require File.dirname(__FILE__) + '/../../../lib/say_when/storage/active_record/job'
|
1
|
+
require_relative '../../spec_helper'
|
2
|
+
require_relative '../../../lib/say_when/processor/active_messaging'
|
3
|
+
require_relative '../../../lib/say_when/storage/active_record/job'
|
5
4
|
|
6
5
|
def destination(destination_name)
|
7
6
|
d = ActiveMessaging::Gateway.find_destination(destination_name).value
|
@@ -1,5 +1,5 @@
|
|
1
|
-
|
2
|
-
|
1
|
+
require_relative '../spec_helper'
|
2
|
+
require_relative '../active_record_spec_helper'
|
3
3
|
|
4
4
|
describe SayWhen::Scheduler do
|
5
5
|
|
@@ -58,15 +58,15 @@ describe SayWhen::Scheduler do
|
|
58
58
|
it "should start the scheduler running and stop it" do
|
59
59
|
@scheduler.running.should be_false
|
60
60
|
|
61
|
-
puts 'starting'
|
61
|
+
# puts 'starting'
|
62
62
|
scheduler_thread = Thread.start{@scheduler.start}
|
63
|
-
puts 'started'
|
63
|
+
# puts 'started'
|
64
64
|
sleep(0.1)
|
65
65
|
@scheduler.running.should == true
|
66
66
|
|
67
|
-
puts 'stop'
|
67
|
+
# puts 'stop'
|
68
68
|
@scheduler.stop
|
69
|
-
puts 'wait for it'
|
69
|
+
# puts 'wait for it'
|
70
70
|
@scheduler.running.should == false
|
71
71
|
end
|
72
72
|
|
@@ -1,10 +1,12 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
1
|
+
require_relative '../../../spec_helper'
|
2
|
+
require_relative '../../../active_record_spec_helper'
|
3
|
+
require_relative '../../../../lib/say_when/storage/active_record/job'
|
4
4
|
|
5
5
|
describe SayWhen::Storage::ActiveRecord::Job do
|
6
6
|
|
7
7
|
before(:each) do
|
8
|
+
SayWhen::Storage::ActiveRecord::Job.delete_all
|
9
|
+
|
8
10
|
@valid_attributes = {
|
9
11
|
:trigger_strategy => :cron,
|
10
12
|
:trigger_options => {:expression => '0 0 12 ? * * *', :time_zone => 'Pacific Time (US & Canada)'},
|
@@ -48,18 +50,31 @@ describe SayWhen::Storage::ActiveRecord::Job do
|
|
48
50
|
j.next_fire_at.should == ce.next_fire_at
|
49
51
|
end
|
50
52
|
|
53
|
+
it "resets acquired jobs" do
|
54
|
+
old = 2.hours.ago
|
55
|
+
j = SayWhen::Storage::ActiveRecord::Job.create!(@valid_attributes.merge({
|
56
|
+
:status => 'acquired', :updated_at => old, :created_at => old
|
57
|
+
}))
|
58
|
+
|
59
|
+
SayWhen::Storage::ActiveRecord::Job.reset_acquired(3600)
|
60
|
+
|
61
|
+
j.reload
|
62
|
+
j.status.should == 'waiting'
|
63
|
+
end
|
64
|
+
|
51
65
|
it "can find the next job" do
|
52
66
|
j2_opts = {
|
53
67
|
:trigger_strategy => :cron,
|
54
68
|
:trigger_options => {:expression => '0 0 10 ? * * *', :time_zone => 'Pacific Time (US & Canada)'},
|
55
|
-
:data => {:foo=>'
|
69
|
+
:data => {:foo=>'can find the next job - j2', :result=>2},
|
56
70
|
:job_class => 'SayWhen::Test::TestTask',
|
57
71
|
:job_method => 'execute'
|
58
72
|
}
|
59
73
|
|
60
74
|
j1 = SayWhen::Storage::ActiveRecord::Job.create(@valid_attributes)
|
61
75
|
j2 = SayWhen::Storage::ActiveRecord::Job.create(j2_opts)
|
62
|
-
|
76
|
+
acquire = 1.day.since
|
77
|
+
next_job = SayWhen::Storage::ActiveRecord::Job.acquire_next(acquire)
|
63
78
|
next_job.should == j2
|
64
79
|
end
|
65
80
|
|
@@ -80,5 +95,4 @@ describe SayWhen::Storage::ActiveRecord::Job do
|
|
80
95
|
j.last_fire_at.should == now
|
81
96
|
j.status.should == SayWhen::BaseJob::STATE_WAITING
|
82
97
|
end
|
83
|
-
|
84
98
|
end
|
@@ -1,9 +1,10 @@
|
|
1
|
-
|
2
|
-
|
1
|
+
require_relative '../../../spec_helper'
|
2
|
+
require_relative '../../../../lib/say_when/storage/memory/job'
|
3
3
|
|
4
4
|
describe SayWhen::Store::Memory::Job do
|
5
5
|
|
6
6
|
before(:each) do
|
7
|
+
SayWhen::Store::Memory::Job._reset
|
7
8
|
@valid_attributes = {
|
8
9
|
:name => 'Memory::Job::Test',
|
9
10
|
:group => 'Test',
|
@@ -28,4 +29,17 @@ describe SayWhen::Store::Memory::Job do
|
|
28
29
|
j.execute.should == 1
|
29
30
|
end
|
30
31
|
|
32
|
+
it "can reset acquired jobs" do
|
33
|
+
j = SayWhen::Store::Memory::Job.new(@valid_attributes)
|
34
|
+
j.status = 'acquired'
|
35
|
+
j.updated_at = 2.hours.ago
|
36
|
+
SayWhen::Store::Memory::Job.reset_acquired(3600)
|
37
|
+
j.status.should == 'waiting'
|
38
|
+
end
|
39
|
+
|
40
|
+
it "can find the next job" do
|
41
|
+
j = SayWhen::Store::Memory::Job.new(@valid_attributes)
|
42
|
+
next_job = SayWhen::Store::Memory::Job.acquire_next(1.day.since)
|
43
|
+
next_job.should == j
|
44
|
+
end
|
31
45
|
end
|
@@ -1,5 +1,5 @@
|
|
1
|
-
|
2
|
-
|
1
|
+
require_relative '../../spec_helper'
|
2
|
+
require_relative '../../../lib/say_when/triggers/once_strategy'
|
3
3
|
|
4
4
|
describe SayWhen::Triggers::OnceStrategy do
|
5
5
|
|
data/spec/spec_helper.rb
CHANGED
@@ -3,6 +3,7 @@ ENV['RAILS_ENV']='test'
|
|
3
3
|
require "rubygems"
|
4
4
|
require 'bundler/setup'
|
5
5
|
require 'active_support'
|
6
|
+
require 'active_record'
|
6
7
|
|
7
8
|
require 'spec'
|
8
9
|
require 'spec/autorun'
|
@@ -10,8 +11,14 @@ require 'spec/autorun'
|
|
10
11
|
$: << (File.dirname(__FILE__) + "/../lib")
|
11
12
|
require "say_when"
|
12
13
|
|
14
|
+
logger = Logger.new(STDOUT)
|
15
|
+
logger.level = Logger::ERROR
|
16
|
+
SayWhen.logger = logger
|
17
|
+
::ActiveRecord::Base.logger = logger
|
18
|
+
|
13
19
|
Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
|
14
20
|
|
21
|
+
|
15
22
|
Spec::Runner.configure do |config|
|
16
23
|
config.mock_with :rspec
|
17
24
|
end
|
metadata
CHANGED
@@ -1,140 +1,108 @@
|
|
1
|
-
--- !ruby/object:Gem::Specification
|
1
|
+
--- !ruby/object:Gem::Specification
|
2
2
|
name: say_when
|
3
|
-
version: !ruby/object:Gem::Version
|
4
|
-
|
5
|
-
prerelease:
|
6
|
-
segments:
|
7
|
-
- 0
|
8
|
-
- 2
|
9
|
-
- 5
|
10
|
-
version: 0.2.5
|
3
|
+
version: !ruby/object:Gem::Version
|
4
|
+
version: 0.4.0
|
11
5
|
platform: ruby
|
12
|
-
authors:
|
6
|
+
authors:
|
13
7
|
- Andrew Kuklewicz
|
14
8
|
autorequire:
|
15
9
|
bindir: bin
|
16
10
|
cert_chain: []
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
- !ruby/object:Gem::Dependency
|
11
|
+
date: 2022-04-12 00:00:00.000000000 Z
|
12
|
+
dependencies:
|
13
|
+
- !ruby/object:Gem::Dependency
|
21
14
|
name: activemessaging
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
- !ruby/object:Gem::Version
|
27
|
-
hash: 59
|
28
|
-
segments:
|
29
|
-
- 0
|
30
|
-
- 9
|
31
|
-
- 0
|
15
|
+
requirement: !ruby/object:Gem::Requirement
|
16
|
+
requirements:
|
17
|
+
- - "~>"
|
18
|
+
- !ruby/object:Gem::Version
|
32
19
|
version: 0.9.0
|
33
20
|
type: :development
|
34
21
|
prerelease: false
|
35
|
-
|
36
|
-
|
22
|
+
version_requirements: !ruby/object:Gem::Requirement
|
23
|
+
requirements:
|
24
|
+
- - "~>"
|
25
|
+
- !ruby/object:Gem::Version
|
26
|
+
version: 0.9.0
|
27
|
+
- !ruby/object:Gem::Dependency
|
37
28
|
name: activesupport
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
- !ruby/object:Gem::Version
|
43
|
-
hash: 31
|
44
|
-
segments:
|
45
|
-
- 2
|
46
|
-
- 3
|
47
|
-
- 14
|
29
|
+
requirement: !ruby/object:Gem::Requirement
|
30
|
+
requirements:
|
31
|
+
- - "~>"
|
32
|
+
- !ruby/object:Gem::Version
|
48
33
|
version: 2.3.14
|
49
34
|
type: :development
|
50
35
|
prerelease: false
|
51
|
-
|
52
|
-
|
36
|
+
version_requirements: !ruby/object:Gem::Requirement
|
37
|
+
requirements:
|
38
|
+
- - "~>"
|
39
|
+
- !ruby/object:Gem::Version
|
40
|
+
version: 2.3.14
|
41
|
+
- !ruby/object:Gem::Dependency
|
53
42
|
name: activerecord
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
- !ruby/object:Gem::Version
|
59
|
-
hash: 31
|
60
|
-
segments:
|
61
|
-
- 2
|
62
|
-
- 3
|
63
|
-
- 14
|
43
|
+
requirement: !ruby/object:Gem::Requirement
|
44
|
+
requirements:
|
45
|
+
- - "~>"
|
46
|
+
- !ruby/object:Gem::Version
|
64
47
|
version: 2.3.14
|
65
48
|
type: :development
|
66
49
|
prerelease: false
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
- 5
|
80
|
-
version: 1.9.5
|
50
|
+
version_requirements: !ruby/object:Gem::Requirement
|
51
|
+
requirements:
|
52
|
+
- - "~>"
|
53
|
+
- !ruby/object:Gem::Version
|
54
|
+
version: 2.3.14
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
|
+
name: rspec
|
57
|
+
requirement: !ruby/object:Gem::Requirement
|
58
|
+
requirements:
|
59
|
+
- - "~>"
|
60
|
+
- !ruby/object:Gem::Version
|
61
|
+
version: '1.3'
|
81
62
|
type: :development
|
82
63
|
prerelease: false
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
version: "1.3"
|
64
|
+
version_requirements: !ruby/object:Gem::Requirement
|
65
|
+
requirements:
|
66
|
+
- - "~>"
|
67
|
+
- !ruby/object:Gem::Version
|
68
|
+
version: '1.3'
|
69
|
+
- !ruby/object:Gem::Dependency
|
70
|
+
name: rake
|
71
|
+
requirement: !ruby/object:Gem::Requirement
|
72
|
+
requirements:
|
73
|
+
- - "~>"
|
74
|
+
- !ruby/object:Gem::Version
|
75
|
+
version: 10.5.0
|
96
76
|
type: :development
|
97
77
|
prerelease: false
|
98
|
-
|
99
|
-
|
78
|
+
version_requirements: !ruby/object:Gem::Requirement
|
79
|
+
requirements:
|
80
|
+
- - "~>"
|
81
|
+
- !ruby/object:Gem::Version
|
82
|
+
version: 10.5.0
|
83
|
+
- !ruby/object:Gem::Dependency
|
100
84
|
name: sqlite3
|
101
|
-
|
102
|
-
|
103
|
-
requirements:
|
85
|
+
requirement: !ruby/object:Gem::Requirement
|
86
|
+
requirements:
|
104
87
|
- - ">="
|
105
|
-
- !ruby/object:Gem::Version
|
106
|
-
|
107
|
-
segments:
|
108
|
-
- 0
|
109
|
-
version: "0"
|
88
|
+
- !ruby/object:Gem::Version
|
89
|
+
version: '0'
|
110
90
|
type: :development
|
111
91
|
prerelease: false
|
112
|
-
|
113
|
-
|
114
|
-
name: rake
|
115
|
-
version_requirements: &id007 !ruby/object:Gem::Requirement
|
116
|
-
none: false
|
117
|
-
requirements:
|
92
|
+
version_requirements: !ruby/object:Gem::Requirement
|
93
|
+
requirements:
|
118
94
|
- - ">="
|
119
|
-
- !ruby/object:Gem::Version
|
120
|
-
|
121
|
-
segments:
|
122
|
-
- 0
|
123
|
-
version: "0"
|
124
|
-
type: :development
|
125
|
-
prerelease: false
|
126
|
-
requirement: *id007
|
95
|
+
- !ruby/object:Gem::Version
|
96
|
+
version: '0'
|
127
97
|
description:
|
128
|
-
email:
|
98
|
+
email:
|
129
99
|
- andrew@prx.org
|
130
100
|
executables: []
|
131
|
-
|
132
101
|
extensions: []
|
133
|
-
|
134
102
|
extra_rdoc_files: []
|
135
|
-
|
136
|
-
|
137
|
-
- .
|
103
|
+
files:
|
104
|
+
- ".gitignore"
|
105
|
+
- ".travis.yml"
|
138
106
|
- Gemfile
|
139
107
|
- Rakefile
|
140
108
|
- generators/say_when_migration/say_when_migration_generator.rb
|
@@ -154,7 +122,6 @@ files:
|
|
154
122
|
- lib/say_when/storage/active_record/job_execution.rb
|
155
123
|
- lib/say_when/storage/memory/base.rb
|
156
124
|
- lib/say_when/storage/memory/job.rb
|
157
|
-
- lib/say_when/storage/mongoid/job.rb
|
158
125
|
- lib/say_when/tasks.rb
|
159
126
|
- lib/say_when/triggers/base.rb
|
160
127
|
- lib/say_when/triggers/cron_strategy.rb
|
@@ -165,64 +132,47 @@ files:
|
|
165
132
|
- say_when.gemspec
|
166
133
|
- spec/active_record_spec_helper.rb
|
167
134
|
- spec/db/schema.rb
|
168
|
-
- spec/db/test.db
|
169
|
-
- spec/mongoid_spec_helper.rb
|
170
135
|
- spec/say_when/cron_expression_spec.rb
|
171
136
|
- spec/say_when/processor/active_messaging_spec.rb
|
172
137
|
- spec/say_when/scheduler_spec.rb
|
173
138
|
- spec/say_when/storage/active_record/job_spec.rb
|
174
139
|
- spec/say_when/storage/memory/job_spec.rb
|
175
140
|
- spec/say_when/storage/memory/trigger_spec.rb
|
176
|
-
- spec/say_when/storage/mongoid/trigger_spec.rb
|
177
141
|
- spec/say_when/triggers/once_strategy_spec.rb
|
178
142
|
- spec/spec.opts
|
179
143
|
- spec/spec_helper.rb
|
180
144
|
- spec/support/models.rb
|
181
145
|
homepage: http://labs.prx.org
|
182
146
|
licenses: []
|
183
|
-
|
147
|
+
metadata: {}
|
184
148
|
post_install_message:
|
185
149
|
rdoc_options: []
|
186
|
-
|
187
|
-
require_paths:
|
150
|
+
require_paths:
|
188
151
|
- lib
|
189
|
-
required_ruby_version: !ruby/object:Gem::Requirement
|
190
|
-
|
191
|
-
requirements:
|
152
|
+
required_ruby_version: !ruby/object:Gem::Requirement
|
153
|
+
requirements:
|
192
154
|
- - ">="
|
193
|
-
- !ruby/object:Gem::Version
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
version: "0"
|
198
|
-
required_rubygems_version: !ruby/object:Gem::Requirement
|
199
|
-
none: false
|
200
|
-
requirements:
|
155
|
+
- !ruby/object:Gem::Version
|
156
|
+
version: '0'
|
157
|
+
required_rubygems_version: !ruby/object:Gem::Requirement
|
158
|
+
requirements:
|
201
159
|
- - ">="
|
202
|
-
- !ruby/object:Gem::Version
|
203
|
-
|
204
|
-
segments:
|
205
|
-
- 0
|
206
|
-
version: "0"
|
160
|
+
- !ruby/object:Gem::Version
|
161
|
+
version: '0'
|
207
162
|
requirements: []
|
208
|
-
|
209
|
-
rubyforge_project:
|
210
|
-
rubygems_version: 1.8.22
|
163
|
+
rubygems_version: 3.1.4
|
211
164
|
signing_key:
|
212
|
-
specification_version:
|
165
|
+
specification_version: 4
|
213
166
|
summary: Scheduling system for programmatically defined and stored jobs.
|
214
|
-
test_files:
|
167
|
+
test_files:
|
215
168
|
- spec/active_record_spec_helper.rb
|
216
169
|
- spec/db/schema.rb
|
217
|
-
- spec/db/test.db
|
218
|
-
- spec/mongoid_spec_helper.rb
|
219
170
|
- spec/say_when/cron_expression_spec.rb
|
220
171
|
- spec/say_when/processor/active_messaging_spec.rb
|
221
172
|
- spec/say_when/scheduler_spec.rb
|
222
173
|
- spec/say_when/storage/active_record/job_spec.rb
|
223
174
|
- spec/say_when/storage/memory/job_spec.rb
|
224
175
|
- spec/say_when/storage/memory/trigger_spec.rb
|
225
|
-
- spec/say_when/storage/mongoid/trigger_spec.rb
|
226
176
|
- spec/say_when/triggers/once_strategy_spec.rb
|
227
177
|
- spec/spec.opts
|
228
178
|
- spec/spec_helper.rb
|
data/spec/db/test.db
DELETED
Binary file
|
data/spec/mongoid_spec_helper.rb
DELETED
@@ -1,57 +0,0 @@
|
|
1
|
-
require File.dirname(__FILE__) + '/../../../spec_helper'
|
2
|
-
require File.dirname(__FILE__) + '/../../../mongoid_spec_helper'
|
3
|
-
# require File.dirname(__FILE__) + '/../../../../lib/say_when/store/mongoid/trigger'
|
4
|
-
|
5
|
-
# describe SayWhen::Store::Mongoid::Trigger do
|
6
|
-
|
7
|
-
# before(:each) do
|
8
|
-
# SayWhen::Store::Mongoid::Trigger.delete_all
|
9
|
-
# @valid_attributes = {
|
10
|
-
# :expression => '0 0 12 ? * * *',
|
11
|
-
# :time_zone => 'Pacific Time (US & Canada)'
|
12
|
-
# }
|
13
|
-
# end
|
14
|
-
|
15
|
-
# it "can be created using new and save" do
|
16
|
-
# t = SayWhen::Store::Mongoid::Trigger.new(@valid_attributes)
|
17
|
-
# t.should be_valid
|
18
|
-
# t.save
|
19
|
-
# end
|
20
|
-
|
21
|
-
# it "sets a cron_expression" do
|
22
|
-
# t = SayWhen::Store::Mongoid::Trigger.create(@valid_attributes)
|
23
|
-
# t.cron_expression.should_not be_nil
|
24
|
-
# t.cron_expression.expression.should == '0 0 12 ? * * *'
|
25
|
-
# t.cron_expression.time_zone.should == 'Pacific Time (US & Canada)'
|
26
|
-
# end
|
27
|
-
|
28
|
-
# it "has a waiting state on create" do
|
29
|
-
# t = SayWhen::Store::Mongoid::Trigger.create(@valid_attributes)
|
30
|
-
# t.status.should == SayWhen::BaseTrigger::STATE_WAITING
|
31
|
-
# end
|
32
|
-
|
33
|
-
# it "has a next fire at set on create" do
|
34
|
-
# ce = SayWhen::CronExpression.new(@valid_attributes[:expression], @valid_attributes[:time_zone])
|
35
|
-
# t = SayWhen::Store::Mongoid::Trigger.create(@valid_attributes)
|
36
|
-
# t.status.should == SayWhen::BaseTrigger::STATE_WAITING
|
37
|
-
# t.next_fire_at.should == ce.next_fire_at(t.created_at)
|
38
|
-
# end
|
39
|
-
|
40
|
-
# it "can be fired" do
|
41
|
-
# ce = SayWhen::CronExpression.new(@valid_attributes[:expression], @valid_attributes[:time_zone])
|
42
|
-
# t = SayWhen::Store::Mongoid::Trigger.create(@valid_attributes)
|
43
|
-
# nfa = ce.last_fire_at(t.created_at - 1.second)
|
44
|
-
# lfa = ce.last_fire_at(nfa - 1.second)
|
45
|
-
# t.next_fire_at = nfa
|
46
|
-
# t.last_fire_at = lfa
|
47
|
-
|
48
|
-
# now = Time.now
|
49
|
-
# Time.stub!(:now).and_return(now)
|
50
|
-
|
51
|
-
# t.fired
|
52
|
-
# t.next_fire_at.should == ce.next_fire_at(now)
|
53
|
-
# t.last_fire_at.should == now
|
54
|
-
# t.status.should == SayWhen::BaseTrigger::STATE_WAITING
|
55
|
-
# end
|
56
|
-
|
57
|
-
# end
|