Skip to content

Commit

Permalink
adjust plugin loading to delayed_job 4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
codez committed Jan 11, 2016
1 parent 34ffd61 commit 0710f25
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 72 deletions.
4 changes: 0 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@ source 'https://rubygems.org'

# Specify your gem's dependencies in delayed_cron_job.gemspec
gemspec

group :test do
gem 'pry-debugger'
end
2 changes: 1 addition & 1 deletion delayed_cron_job.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]

spec.add_dependency "delayed_job"
spec.add_dependency "delayed_job", ">= 4.1"

spec.add_development_dependency "bundler"
spec.add_development_dependency "rake"
Expand Down
2 changes: 1 addition & 1 deletion lib/delayed_cron_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ module DelayedCronJob
Delayed::Backend::ActiveRecord::Job.attr_accessible(:cron)
end

DelayedCronJob::Plugin.callback_block.call(Delayed::Worker.lifecycle)
Delayed::Worker.plugins << DelayedCronJob::Plugin
4 changes: 2 additions & 2 deletions lib/delayed_cron_job/plugin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def cron?(job)
# after perform.
lifecycle.around(:error) do |worker, job, &block|
if cron?(job)
job.last_error = "#{$ERROR_INFO.message}\n#{$ERROR_INFO.backtrace.join("\n")}"
job.error = $ERROR_INFO
worker.job_say(job,
"FAILED with #{$ERROR_INFO.class.name}: #{$ERROR_INFO.message}",
Logger::ERROR)
Expand Down Expand Up @@ -55,4 +55,4 @@ def cron?(job)
end

end
end
end
2 changes: 1 addition & 1 deletion lib/delayed_cron_job/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module DelayedCronJob
VERSION = '0.5.2'
VERSION = '0.6.0'
end
2 changes: 1 addition & 1 deletion spec/delayed_cron_job_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,4 @@ def perform; end
expect(Delayed::Job.count).to eq(0)
end
end
end
end
64 changes: 2 additions & 62 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

require 'delayed_job_active_record'
require 'delayed_cron_job'
require 'pry'

Delayed::Worker.logger = Logger.new('/tmp/dj.log')
ENV['RAILS_ENV'] = 'test'
Expand All @@ -37,7 +36,7 @@
t.string :locked_by
t.string :queue
t.string :cron
t.timestamps
t.timestamps null: false
end

add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
Expand All @@ -46,64 +45,5 @@

# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
RSpec.configure do |config|
# The settings below are suggested to provide a good initial experience
# with RSpec, but feel free to customize to your heart's content.
=begin
# These two settings work together to allow you to limit a spec run
# to individual examples or groups you care about by tagging them with
# `:focus` metadata. When nothing is tagged with `:focus`, all examples
# get run.
config.filter_run :focus
config.run_all_when_everything_filtered = true
# Many RSpec users commonly either run the entire suite or an individual
# file, and it's useful to allow more verbose output when running an
# individual spec file.
if config.files_to_run.one?
# Use the documentation formatter for detailed output,
# unless a formatter has already been configured
# (e.g. via a command-line flag).
config.default_formatter = 'doc'
end
# Print the 10 slowest examples and example groups at the
# end of the spec run, to help surface which specs are running
# particularly slow.
config.profile_examples = 10
# Run specs in random order to surface order dependencies. If you find an
# order dependency and want to debug it, you can fix the order by providing
# the seed, which is printed after each run.
# --seed 1234
config.order = :random
# Seed global randomization in this process using the `--seed` CLI option.
# Setting this allows you to use `--seed` to deterministically reproduce
# test failures related to randomization by passing the same `--seed` value
# as the one that triggered the failure.
Kernel.srand config.seed
# rspec-expectations config goes here. You can use an alternate
# assertion/expectation library such as wrong or the stdlib/minitest
# assertions if you prefer.
config.expect_with :rspec do |expectations|
# Enable only the newer, non-monkey-patching expect syntax.
# For more details, see:
# - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
expectations.syntax = :expect
end
# rspec-mocks config goes here. You can use an alternate test double
# library (such as bogus or mocha) by changing the `mock_with` option here.
config.mock_with :rspec do |mocks|
# Enable only the newer, non-monkey-patching expect syntax.
# For more details, see:
# - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
mocks.syntax = :expect
# Prevents you from mocking or stubbing a method that does not exist on
# a real object. This is generally recommended.
mocks.verify_partial_doubles = true
end
=end

end

0 comments on commit 0710f25

Please sign in to comment.