delayed_job_heartbeat_plugin 0.1.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d23c84e35c7097a52dd7c4ff8431ec634adc72b4
-  data.tar.gz: 626b0561368160ea52dd2b7d4cf65240768cd3c7
+SHA256:
+  metadata.gz: 5ba564b35f94921f30c324a5597705a743fd443946492b131f382282d2650c91
+  data.tar.gz: 63947153fbcf5b303d47981cee2a21eb8f4d76298ad6bc4e8fefe18da9cabe26
 SHA512:
-  metadata.gz: fa8a6ff6c94fef094132d2625eb534a2f9b68730fae7696e57001ea513aa28ec7966bfff1b8c9f3e41ac10209ee817c3f495e5288aa4c445999def8c83fa2692
-  data.tar.gz: 5a13041ce00bf26a2dfccd022831f32c1273587e701c9e759423519ae3bbaf4ffe35677bb11ff4c81f2d9bfc6e66114d37bb979d22c33d322a393e03a7b46156
+  metadata.gz: 25f9c2a073c041070f6f25d0b5c20a03fe60a598880a95f25478e62fca3d1c2cd046e312e4d7da4355254b86f3fc2b5551a8d35d287baff015dcde5a767dc727
+  data.tar.gz: 6abadd87e0918dc4f0cb9f501455444b8ea81e30473913d229967d95909682d1673402267fe47c20c4d134136e09592f6607648b70320fa1f6b508dc78e70bda

data/.circleci/config.yml

@@ -0,0 +1,93 @@
+version: 2.1
+jobs:
+  lint:
+      docker:
+        - image: salsify/ruby_ci:2.7.6
+      working_directory: ~/delayed_job_heartbeat_plugin
+      steps:
+        - checkout
+        - restore_cache:
+            keys:
+              - v1-gems-ruby-2.7.6-{{ checksum "delayed_job_heartbeat_plugin.gemspec" }}-{{ checksum "Gemfile" }}
+              - v1-gems-ruby-2.7.6-
+        - run:
+            name: Install Gems
+            command: |
+              if ! bundle check --path=vendor/bundle; then
+                bundle install --path=vendor/bundle --jobs=4 --retry=3
+                bundle clean
+              fi
+        - save_cache:
+            key: v1-gems-ruby-2.7.6-{{ checksum "delayed_job_heartbeat_plugin.gemspec" }}-{{ checksum "Gemfile" }}
+            paths:
+              - "vendor/bundle"
+              - "gemfiles/vendor/bundle"
+        - run:
+            name: Run Rubocop
+            command: bundle exec rubocop --config .rubocop.yml
+  test:
+      parameters:
+        gemfile:
+          type: string
+        ruby_version:
+          type: string
+      docker:
+        - image: salsify/ruby_ci:<< parameters.ruby_version >>
+          environment:
+            DB_USER: "circleci"
+        - image: cimg/postgres:12.7
+          environment:
+            POSTGRES_USER: "circleci"
+            POSTGRES_DB: "circle_test"
+            POSTGRES_HOST_AUTH_METHOD: "trust"
+      environment:
+        RACK_ENV: "test"
+        RAILS_ENV: "test"
+        CIRCLE_TEST_REPORTS: "test-results"
+        BUNDLE_GEMFILE: << parameters.gemfile >>
+      working_directory: ~/delayed_job_heartbeat_plugin
+      steps:
+        - checkout
+        - restore_cache:
+            keys:
+              - v1-gems-ruby-<< parameters.ruby_version >>-{{ checksum "delayed_job_heartbeat_plugin.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
+              - v1-gems-ruby-<< parameters.ruby_version >>-
+        - run:
+            name: Install Gems
+            command: |
+              if ! bundle check --path=vendor/bundle; then
+                bundle install --path=vendor/bundle --jobs=4 --retry=3
+                bundle clean
+              fi
+        - save_cache:
+            key: v1-gems-ruby-<< parameters.ruby_version >>-{{ checksum "delayed_job_heartbeat_plugin.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
+            paths:
+              - "vendor/bundle"
+              - "gemfiles/vendor/bundle"
+        - run:
+            name: Wait for Database
+            command: dockerize -wait tcp://localhost:5432 -timeout 60s
+        - run:
+            name: Wait for Database User
+            command: t=30; for i in `seq $t`; do psql -h localhost -p 5432 -U circleci -d circle_test -c '\q' && break; [ $i -eq $t ] && return 2; sleep 1; done;
+        - run:
+            name: Run Tests
+            command: |
+              bundle exec rspec --format RspecJunitFormatter --out $CIRCLE_TEST_REPORTS/rspec/junit.xml --format progress spec
+        - store_test_results:
+            path: "test-results"
+workflows:
+  build:
+    jobs:
+      - lint
+      - test:
+          matrix:
+            parameters:
+              gemfile:
+                - "gemfiles/rails_6.0.gemfile"
+                - "gemfiles/rails_6.1.gemfile"
+                - "gemfiles/rails_7.0.gemfile"
+              ruby_version:
+                - "2.7.6"
+                - "3.0.4"
+                - "3.1.2"

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @jturkel @will89

data/.gitignore

@@ -7,3 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+log/
+gemfiles/*.gemfile.lock
+gemfiles/.bundle

data/.rubocop.yml

@@ -0,0 +1,8 @@
+inherit_gem:
+  salsify_rubocop: conf/rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.7
+  Exclude:
+    - 'vendor/**/*'
+    - 'gemfiles/**/*'

data/Appraisals

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+appraise 'rails-6.0' do
+  gem 'activerecord', '~> 6.0.4'
+  gem 'activesupport', '~> 6.0.4'
+end
+
+appraise 'rails-6.1' do
+  gem 'activerecord', '~> 6.1.5'
+  gem 'activesupport', '~> 6.1.5'
+end
+
+appraise 'rails-7.0' do
+  gem 'activerecord', '~> 7.0.2'
+  gem 'activesupport', '~> 7.0.2'
+end

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+# Changelog
+
+### 0.5.0
+- Drop support for ruby < 2.7
+- Add support for ruby 3.1
+- Drop Rails 5.2
+- Add Rails 7.0
+
+### 0.4.0
+- Use frozen string literals.
+
+### 0.3.0
+* Drop support for Ruby < 2.5.
+* Drop support for Rails < 5.2.
+* Bugfix for rails version in generated migration files
+
+### 0.2.0
+* Enable correlation between workers and unlocked jobs in results returned from deleting workers

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in delayed_job_heartbeat_plugin.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/delayed_job_heartbeat_plugin.gemspec

@@ -1,5 +1,6 @@
-# encoding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'delayed/heartbeat/version'
 
@@ -13,27 +14,32 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/salsify/delayed_job_heartbeat_plugin'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  if spec.respond_to?(:metadata)
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+    spec.metadata['rubygems_mfa_required'] = 'true'
+  else
+    raise 'RubyGems 2.0 or newer is required to set allowed_push_host.'
+  end
+
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.test_files    = Dir.glob('spec/**/*')
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.0'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.add_dependency 'delayed_job', '>= 4.1.0'
   spec.add_dependency 'delayed_job_active_record', '>= 4.1.0'
 
-  spec.add_development_dependency 'activerecord', ENV.fetch('RAILS_VERSION', ['>= 3.2', '< 4.3'])
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'activerecord', ['>= 5.2', '< 7.1']
+  spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'coveralls_reborn', '>= 0.18.0'
   spec.add_development_dependency 'database_cleaner', '>= 1.2'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '3.3.0'
-  spec.add_development_dependency 'simplecov', '~> 0.7.1'
+  spec.add_development_dependency 'pg'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3'
+  spec.add_development_dependency 'rspec_junit_formatter'
+  spec.add_development_dependency 'salsify_rubocop', '~> 1.0.2'
+  spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'timecop'
-
-  if RUBY_PLATFORM == 'java'
-    spec.add_development_dependency 'jdbc-sqlite3'
-    spec.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
-  else
-    spec.add_development_dependency 'sqlite3'
-  end
 end

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.4"
+gem "activesupport", "~> 6.0.4"
+
+gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.1.5"
+gem "activesupport", "~> 6.1.5"
+
+gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.0.2"
+gem "activesupport", "~> 7.0.2"
+
+gemspec path: "../"

data/lib/delayed/heartbeat/compatibility.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/version'
 require 'active_record/version'
 

data/lib/delayed/heartbeat/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
   module Heartbeat
     class Configuration
@@ -22,7 +24,7 @@ module Delayed
 
         self.heartbeat_timeout_seconds ||= 180
         self.heartbeat_interval_seconds ||= 60
-        self.on_worker_termination ||= Proc.new { }
+        self.on_worker_termination ||= Proc.new {}
       end
     end
   end

data/lib/delayed/heartbeat/delete_worker_results.rb

@@ -1,42 +1,34 @@
+# frozen_string_literal: true
+
 module Delayed
   module Heartbeat
     class DeleteWorkerResults
-      attr_reader :workers, :unlocked_jobs
+      def initialize(worker_job_map)
+        @worker_job_map = worker_job_map
+      end
+
+      def workers
+        @worker_job_map.keys
+      end
 
-      def initialize(workers, unlocked_jobs)
-        @workers = workers
-        @unlocked_jobs = unlocked_jobs
+      def unlocked_jobs(worker = nil)
+        worker ? @worker_job_map.fetch(worker, []) : @worker_job_map.values.flatten
       end
 
       def empty?
-        workers.empty? && unlocked_jobs.empty?
+        @worker_job_map.empty?
       end
 
       def to_s
         io = StringIO.new
         workers.each do |worker|
-          io.puts("Deleted worker #{worker_description(worker)}")
+          worker_description = "#{worker.label}(#{worker.name})"
+          io.puts("Deleted worker #{worker_description}")
+          unlocked_jobs(worker).each do |unlocked_job|
+            io.puts("Unlocked orphaned job #{unlocked_job.id} from worker #{worker_description}")
+          end
         end
-
-        unlocked_jobs.each do |unlocked_job|
-          worker = worker_map[unlocked_job.locked_by]
-          worker_string = worker ? worker_description(worker) : unlocked_job.locked_by
-          io.puts("Unlocked orphaned job #{unlocked_job.id} from worker #{worker_string}")
-        end
-
-        io.string
-      end
-
-      private
-
-      def worker_map
-        @worker_map ||= workers.each_with_object(Hash.new) do |worker, worker_map|
-          worker_map[worker.name] = worker
-        end
-      end
-
-      def worker_description(worker)
-        "#{worker.label}(#{worker.name})"
+        io.string.rstrip
       end
     end
   end

data/lib/delayed/heartbeat/plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 
 module Delayed
@@ -6,12 +8,10 @@ module Delayed
 
       callbacks do |lifecycle|
         lifecycle.before(:execute) do |worker|
-          if Delayed::Heartbeat.configuration.enabled?
-            @heartbeat = Delayed::Heartbeat::WorkerHeartbeat.new(worker.name)
-          end
+          @heartbeat = Delayed::Heartbeat::WorkerHeartbeat.new(worker.name) if Delayed::Heartbeat.configuration.enabled?
         end
 
-        lifecycle.after(:execute) do |worker|
+        lifecycle.after(:execute) do |_worker|
           @heartbeat.stop if @heartbeat
         end
       end
@@ -19,4 +19,3 @@ module Delayed
     end
   end
 end
-

data/lib/delayed/heartbeat/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'delayed_job'
 require 'rails'
 

data/lib/delayed/heartbeat/tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :delayed do
   namespace :heartbeat do
     desc 'Cleans up workers that have not heartbeated recently.'
@@ -18,7 +20,7 @@ namespace :delayed do
     end
 
     def verbose?
-      ENV['VERBOSE'].to_s.downcase == 'true'
+      ENV['VERBOSE'].to_s.casecmp('true').zero?
     end
   end
 end

data/lib/delayed/heartbeat/version.rb

@@ -1,7 +1,7 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Delayed
   module Heartbeat
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.5.0'
   end
 end

data/lib/delayed/heartbeat/worker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'delayed/heartbeat/compatibility'
 
 module Delayed
@@ -43,7 +45,7 @@ module Delayed
       end
 
       def self.workers_with_different_version(current_version)
-        where('version != ?',  current_version)
+        where('version != ?', current_version)
       end
 
       def self.delete_workers(workers)

data/lib/delayed/heartbeat/worker_heartbeat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
   module Heartbeat
     class WorkerHeartbeat
@@ -40,12 +42,13 @@ module Delayed
       def run_heartbeat_loop
         loop do
           break if sleep_interruptibly(heartbeat_interval)
+
           update_heartbeat
           # Return the connection back to the pool since we won't be needing
           # it again for a while.
           Delayed::Backend::ActiveRecord::Job.clear_active_connections!
         end
-      rescue => e
+      rescue StandardError => e
         # We don't want the worker to continue running if the heartbeat can't be written.
         # Don't use Thread.abort_on_exception because that will give Delayed::Job a chance
         # to mark the job as failed which will unlock it even though the clock
@@ -65,8 +68,8 @@ module Delayed
         if heartbeat_delta_seconds < heartbeat_timeout_seconds || self_termination_disabled?
           @worker_model.update_column(:last_heartbeat_at, now)
         else
-          raise Timeout::Error, "Worker heartbeat not updated for #{heartbeat_delta_seconds} seconds which " \
-              "exceeds timeout\n. Current job: #{ @worker_model.job.inspect}"
+          raise Timeout::Error.new("Worker heartbeat not updated for #{heartbeat_delta_seconds} seconds which " \
+              "exceeds timeout\n. Current job: #{@worker_model.job.inspect}")
         end
       end
 

data/lib/delayed/heartbeat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'delayed/heartbeat/compatibility'
 require 'delayed/heartbeat/configuration'
 require 'delayed/heartbeat/delete_worker_results'
@@ -16,9 +18,7 @@ module Delayed
         yield(configuration) if block_given?
       end
 
-      def configuration
-        @configuration
-      end
+      attr_reader :configuration
 
       def delete_workers_with_different_version(current_version = configuration.worker_version)
         old_workers = Delayed::Heartbeat::Worker.workers_with_different_version(current_version)
@@ -34,11 +34,11 @@ module Delayed
 
       def cleanup_workers(workers, mark_attempt_failed: true)
         Delayed::Heartbeat::Worker.transaction do
-          orphaned_jobs = workers.flat_map do |worker|
-            worker.unlock_jobs(mark_attempt_failed: mark_attempt_failed)
+          worker_job_map = workers.each_with_object(Hash.new) do |worker, result|
+            result[worker] = worker.unlock_jobs(mark_attempt_failed: mark_attempt_failed)
           end
           Delayed::Heartbeat::Worker.delete_workers(workers)
-          Delayed::Heartbeat::DeleteWorkerResults.new(workers, orphaned_jobs)
+          Delayed::Heartbeat::DeleteWorkerResults.new(worker_job_map)
         end
       end
     end

data/lib/delayed_job_heartbeat_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support'
 require 'active_record'
 require 'delayed_job'

data/lib/generators/delayed_job_heartbeat_plugin/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 require 'rails/generators/migration'
 require 'rails/generators/active_record'
@@ -6,10 +8,10 @@ module DelayedJobHeartbeatPlugin
   class InstallGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    self.source_paths << File.join(File.dirname(__FILE__), 'templates')
+    source_paths << File.join(File.dirname(__FILE__), 'templates')
 
     def create_migration_file
-      migration_template('migration.rb', 'db/migrate/create_delayed_workers.rb')
+      migration_template('migration.erb', 'db/migrate/create_delayed_workers.rb')
     end
 
     def self.next_migration_number(dirname)

data/lib/generators/delayed_job_heartbeat_plugin/templates/{migration.rb → migration.erb}

@@ -1,4 +1,4 @@
-class CreateDelayedWorkers < ActiveRecord::Migration
+class CreateDelayedWorkers < ActiveRecord::Migration[<%= ActiveRecord::VERSION::MAJOR %>.<%= ActiveRecord::VERSION::MINOR %>]
 
   def change
     create_table(:delayed_workers) do |t|

data/spec/db/schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define(version: 0) do
 
   create_table(:delayed_jobs, force: true) do |t|

data/spec/delayed/heartbeat/delete_worker_results_spec.rb

@@ -1,34 +1,33 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Delayed::Heartbeat::DeleteWorkerResults do
   let(:worker) { create_worker(name: 'my-worker') }
   let(:job) { create_job(locked_by: worker.name) }
-  let(:results) { create_results([worker], [job]) }
+  let(:results) { create_results(worker => [job]) }
 
   describe "#workers" do
     specify { expect(results.workers).to eq [worker] }
   end
 
   describe "#unlocked_jobs" do
-    specify { expect(results.unlocked_jobs).to eq [job] }
+    let(:other_worker) { create_worker(name: 'my-other-worker') }
+    let(:other_job) { create_job(locked_by: worker.name) }
+    let(:results) { create_results(worker => [job], other_worker => [other_job]) }
+
+    specify { expect(results.unlocked_jobs(worker)).to eq [job] }
+    specify { expect(results.unlocked_jobs).to match_array [job, other_job] }
   end
 
   describe "#to_s" do
     it "includes workers" do
-      results = create_results([worker], [])
+      results = create_results(worker => [])
       expect(results.to_s).to include(worker.name)
     end
 
-    it "includes jobs for known workers" do
-      results = create_results([worker], [job])
-      expect(results.to_s).to include(job.id.to_s)
-    end
-
-    it "includes jobs locked by an unknown worker" do
-      job = create_job(locked_by: 'unknown-worker')
-      results = create_results([], [job])
+    it "includes jobs for workers" do
       expect(results.to_s).to include(job.id.to_s)
-      expect(results.to_s).to include(job.locked_by)
     end
   end
 
@@ -41,7 +40,7 @@ describe Delayed::Heartbeat::DeleteWorkerResults do
     Delayed::Job.create!(attributes)
   end
 
-  def create_results(workers, unlocked_jobs)
-    Delayed::Heartbeat::DeleteWorkerResults.new(workers, unlocked_jobs)
+  def create_results(worker_job_map)
+    Delayed::Heartbeat::DeleteWorkerResults.new(worker_job_map)
   end
 end

data/spec/delayed/heartbeat/worker_heartbeat_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Delayed::Heartbeat::WorkerHeartbeat, cleaner_strategy: :truncation do

data/spec/delayed/heartbeat_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Delayed::Heartbeat do
@@ -78,5 +80,3 @@ describe Delayed::Heartbeat do
   end
 
 end
-
-

data/spec/spec_helper.rb

@@ -1,12 +1,13 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 
 require 'simplecov'
 require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    SimpleCov::Formatter::HTMLFormatter,
-    Coveralls::SimpleCov::Formatter
-]
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+  [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
+)
 SimpleCov.start do
   add_filter 'spec'
 end
@@ -30,27 +31,38 @@ Delayed::Worker.logger.level = Logger::DEBUG
 ActiveRecord::Base.logger = Delayed::Worker.logger
 ActiveRecord::Migration.verbose = false
 
-db_adapter = ENV.fetch('ADAPTER', 'sqlite3')
-config = YAML.load(File.read('spec/db/database.yml'))
-ActiveRecord::Base.establish_connection(config[db_adapter])
-require 'db/schema'
+database_name = 'delayed_job_heartbeat_plugin_test'
+database_host = ENV.fetch('PGHOST', 'localhost')
+database_port = ENV.fetch('PGPORT', 5432)
 
 RSpec.configure do |config|
   config.order = 'random'
 
   config.before(:suite) do
+    db_connection_args = "--host #{database_host} --port #{database_port}"
+    `dropdb #{db_connection_args} --if-exists #{database_name} 2> /dev/null`
+    `createdb #{db_connection_args} #{database_name}`
+
+    pg_version = `psql #{db_connection_args} --dbname #{database_name} --tuples-only --command "select version()";`
+    puts "Testing with Postgres version: #{pg_version.strip}"
+    puts "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING}"
+
+    database_url = "postgres://#{database_host}:#{database_port}/#{database_name}"
+    puts "Using database #{database_url}"
+    ActiveRecord::Base.establish_connection(database_url)
+    require 'db/schema'
     DatabaseCleaner.clean_with(:truncation)
   end
 
-  config.before(:each) do |example|
+  config.before do |example|
     DatabaseCleaner.strategy = example.metadata.fetch(:cleaner_strategy, :transaction)
   end
 
-  config.before(:each) do
+  config.before do
     DatabaseCleaner.start
   end
 
-  config.after(:each) do
+  config.after do
     DatabaseCleaner.clean
   end
 end

data/spec/support/destroyed_model.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 RSpec::Matchers.define :have_been_destroyed do
   match do |actual|
@@ -6,7 +6,7 @@ RSpec::Matchers.define :have_been_destroyed do
   end
 
   description do
-    "model should have been destroyed"
+    'model should have been destroyed'
   end
 
   failure_message do |actual|

data/spec/support/test_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TestJob
   def perform
 

data/spec/support/test_job_with_callbacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TestJobWithCallbacks
   cattr_accessor :called_callbacks
   self.called_callbacks = []

data/spec/support/wait.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wait
   def self.for(condition_name, max_wait_time: 5, polling_interval: 0.001)
     wait_until = Time.now + max_wait_time.seconds

metadata

@@ -1,159 +1,215 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_heartbeat_plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Joel Turkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls_reborn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: salsify_rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -163,15 +219,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".circleci/config.yml"
+- ".github/CODEOWNERS"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/setup
 - delayed_job_heartbeat_plugin.gemspec
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - lib/delayed/heartbeat.rb
 - lib/delayed/heartbeat/compatibility.rb
 - lib/delayed/heartbeat/configuration.rb
@@ -184,8 +247,7 @@ files:
 - lib/delayed/heartbeat/worker_heartbeat.rb
 - lib/delayed_job_heartbeat_plugin.rb
 - lib/generators/delayed_job_heartbeat_plugin/install_generator.rb
-- lib/generators/delayed_job_heartbeat_plugin/templates/migration.rb
-- spec/db/database.yml
+- lib/generators/delayed_job_heartbeat_plugin/templates/migration.erb
 - spec/db/schema.rb
 - spec/delayed/heartbeat/delete_worker_results_spec.rb
 - spec/delayed/heartbeat/worker_heartbeat_spec.rb
@@ -198,29 +260,29 @@ files:
 homepage: https://github.com/salsify/delayed_job_heartbeat_plugin
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Delayed::Job plugin to unlock jobs from dead workers
 test_files:
-- spec/db/database.yml
 - spec/db/schema.rb
 - spec/delayed/heartbeat/delete_worker_results_spec.rb
 - spec/delayed/heartbeat/worker_heartbeat_spec.rb

data/.travis.yml

@@ -1,14 +0,0 @@
-sudo: false
-language: ruby
-before_install: gem install bundler -v 1.10.6
-env:
-  matrix:
-    - RAILS_VERSION="~> 3.2.22"
-    - RAILS_VERSION="~> 4.0.13"
-    - RAILS_VERSION="~> 4.1.13"
-    - RAILS_VERSION="~> 4.2.4"
-rvm:
-  - 2.0.0
-  - 2.1.7
-  - 2.2.3
-

data/spec/db/database.yml

@@ -1,5 +0,0 @@
-sqlite3:
-  adapter: sqlite3
-  pool: 5
-  timeout: 15000
-  database: tmp/sqlite3.db