Skip to content

Commit

Permalink
Drop old rubies and rails support
Browse files Browse the repository at this point in the history
Add rails version to migration
  • Loading branch information
will89 committed Oct 5, 2020
1 parent d74b3ce commit 93ce19e
Show file tree
Hide file tree
Showing 11 changed files with 51 additions and 36 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@
/pkg/
/spec/reports/
/tmp/
log/
gemfiles/*.gemfile.lock
33 changes: 8 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,11 @@
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
9 changes: 9 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -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
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
14 changes: 7 additions & 7 deletions delayed_job_heartbeat_plugin.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +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 'rake', '>= 12.3.3'
spec.add_development_dependency 'rspec', '~> 3'
spec.add_development_dependency 'simplecov'
spec.add_development_dependency 'timecop'

if RUBY_PLATFORM == 'java'
Expand Down
2 changes: 2 additions & 0 deletions gemfiles/.bundle/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
BUNDLE_RETRY: "1"
8 changes: 8 additions & 0 deletions gemfiles/rails_5.2.gemfile
Original file line number Diff line number Diff line change
@@ -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: "../"
8 changes: 8 additions & 0 deletions gemfiles/rails_6.0.gemfile
Original file line number Diff line number Diff line change
@@ -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: "../"
2 changes: 1 addition & 1 deletion lib/delayed/heartbeat/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module Delayed
module Heartbeat
VERSION = '0.2.1'.freeze
VERSION = '0.3.0'.freeze
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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|
Expand Down

0 comments on commit 93ce19e

Please sign in to comment.