Add missing rails version to migration (#6)

.gitignore

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

.travis.yml

@@ -1,28 +1,14 @@
+services:
+  - postgresql
+
 sudo: false
 language: ruby
-before_install: gem install bundler -v 1.10.6
-env:
-  - RAILS_VERSION="~> 3.2.22"
-  - RAILS_VERSION="~> 4.0.13"
-  - RAILS_VERSION="~> 4.1.16"
-  - RAILS_VERSION="~> 4.2.7"
-  - RAILS_VERSION="~> 5.0.1"
+gemfile:
+  - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
 rvm:
-  - 2.4.0
-  - 2.3.3
-  - 2.2.6
-  - 2.1.10
-  - 2.0.0-p648
-matrix:
-  exclude:
-  - rvm: 2.4.0
-    env: RAILS_VERSION="~> 4.1.16"
-  - rvm: 2.4.0
-    env: RAILS_VERSION="~> 4.0.13"
-  - rvm: 2.4.0
-    env: RAILS_VERSION="~> 3.2.22"
-  - rvm: 2.1.10
-    env: RAILS_VERSION="~> 5.0.1"
-  - rvm: 2.0.0-p648
-    env: RAILS_VERSION="~> 5.0.1"
-
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
+script:
+  - bundle exec rspec

Appraisals

@@ -0,0 +1,9 @@
+appraise 'rails-5.2' do
+  gem 'activerecord', '5.2.4.4'
+  gem 'activesupport', '5.2.4.4'
+end
+
+appraise 'rails-6.0' do
+  gem 'activerecord', '6.0.3.3'
+  gem 'activesupport', '6.0.3.3'
+end

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
-### 0.2.1 (unreleased)
+### 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

delayed_job_heartbeat_plugin.gemspec

@@ -17,24 +17,18 @@ Gem::Specification.new do |spec|
   spec.test_files    = Dir.glob('spec/**/*')
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.0'
+  spec.required_ruby_version = '>= 2.5'
 
   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', '< 5.1'])
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'activerecord', ['>= 5.2', '< 6.1']
+  spec.add_development_dependency 'coveralls_reborn', '>= 0.18.0'
   spec.add_development_dependency 'database_cleaner', '>= 1.2'
-  # rspec < 3.5 requires rake < 11.0
-  spec.add_development_dependency 'rake', '< 11.0' 
-  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', '>= 12.3.3'
+  spec.add_development_dependency 'rspec', '~> 3'
+  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

gemfiles/rails_5.2.gemfile

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

gemfiles/rails_6.0.gemfile

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

lib/delayed/heartbeat/version.rb

@@ -2,6 +2,6 @@
 
 module Delayed
   module Heartbeat
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

lib/generators/delayed_job_heartbeat_plugin/install_generator.rb

@@ -9,7 +9,7 @@ class InstallGenerator < Rails::Generators::Base
     self.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)

lib/generators/delayed_job_heartbeat_plugin/templates/migration.rb → lib/generators/delayed_job_heartbeat_plugin/templates/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|

spec/spec_helper.rb

@@ -30,15 +30,26 @@
 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
+    `dropdb --host #{database_host} --port #{database_port} --if-exists #{database_name} 2> /dev/null`
+    `createdb --host #{database_host} --port #{database_port} #{database_name}`
+    `psql --host #{database_host} --port #{database_port} --dbname #{database_name} --echo-all --file spec/setup_db.sql`
+
+    pg_version = `psql --host #{database_host} --port #{database_port}  --dbname #{database_name} --tuples-only --command "select version()";`.strip
+    puts "Testing with Postgres version: #{pg_version}"
+    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