Skip to content

Commit

Permalink
Drop AR < 4.2, Add test support for edge, Bump JRuby, Drop rbx
Browse files Browse the repository at this point in the history
  • Loading branch information
Zachary Scott committed Mar 19, 2017
1 parent 4b9bdc4 commit 604758e
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 104 deletions.
24 changes: 6 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,19 @@ before_install:

script: "bundle exec rake test"
rvm:
- 1.9.3
- 2.0.0
- 2.1.9
- 2.2.5
- 2.3.1
- 2.2.6
- 2.3.3
- 2.4.0
- ruby-head
- jruby
- jruby-9.1.0.0
- rbx
- jruby-9.1.8.0
gemfile:
- gemfiles/active_record_40.gemfile
- gemfiles/active_record_41.gemfile
- gemfiles/active_record_42.gemfile
- gemfiles/active_record_50.gemfile
- gemfiles/active_record_edge.gemfile
matrix:
allow_failures:
- rvm: ruby-head
- rvm: rbx
- rvm: jruby
- rvm: jruby-9.1.0.0
- rvm: jruby-9.1.8.0
fast_finish: true
exclude:
- rvm: 1.9.3
gemfile: gemfiles/active_record_50.gemfile
- rvm: 2.0.0
gemfile: gemfiles/active_record_50.gemfile
- rvm: 2.1.9
gemfile: gemfiles/active_record_50.gemfile
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ desc 'Default: run unit tests.'
task :default => "test:all"

namespace :test do
%w(active_record_40 active_record_41 active_record_42 active_record_50).each do |version|
%w(active_record_42 active_record_50 active_record_edge).each do |version|
desc "Test acts_as_paranoid against #{version}"
task version do
sh "BUNDLE_GEMFILE='gemfiles/#{version}.gemfile' bundle install --quiet"
Expand All @@ -19,7 +19,7 @@ namespace :test do

desc "Run all tests for acts_as_paranoid"
task :all do
%w(active_record_40 active_record_41 active_record_42 active_record_50).each do |version|
%w(active_record_42 active_record_50 active_record_edge).each do |version|
sh "BUNDLE_GEMFILE='gemfiles/#{version}.gemfile' bundle install --quiet"
sh "BUNDLE_GEMFILE='gemfiles/#{version}.gemfile' bundle exec rake -t test"
end
Expand Down
6 changes: 2 additions & 4 deletions acts_as_paranoid.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ Gem::Specification.new do |spec|
spec.test_files = Dir["test/*.rb"]
spec.require_paths = ["lib"]

spec.required_rubygems_version = ">= 1.3.6"

spec.add_dependency "activerecord", ">= 4.0", "< 5.1"
spec.add_dependency "activesupport", ">= 4.0", "< 5.1"
spec.add_dependency "activerecord", ">= 4.2", "< 6.0"
spec.add_dependency "activesupport", ">= 4.2", "< 6.0"

spec.add_development_dependency "bundler", "~> 1.5"
spec.add_development_dependency "rake"
Expand Down
25 changes: 0 additions & 25 deletions gemfiles/active_record_40.gemfile

This file was deleted.

25 changes: 0 additions & 25 deletions gemfiles/active_record_41.gemfile

This file was deleted.

15 changes: 1 addition & 14 deletions gemfiles/active_record_42.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,10 @@ source 'https://rubygems.org'
gem 'activerecord', '~> 4.2.4', :require => 'active_record'
gem 'activesupport', '~> 4.2.4', :require => 'active_support'

platforms :ruby do
if RUBY_VERSION > "2.1.0"
gem 'sqlite3'
else
gem 'sqlite3', '1.3.8'
end
end
gem 'sqlite3'

platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
end

platforms :rbx do
gem 'rubysl', '~> 2.0'
gem 'racc'
gem 'minitest'
gem 'rubinius-developer_tools'
end

gemspec :path => '../'
19 changes: 3 additions & 16 deletions gemfiles/active_record_50.gemfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,12 @@
source 'https://rubygems.org'

gem 'activerecord', '>= 5.0.0.beta1', '< 5.1', require: 'active_record'
gem 'activesupport', '>= 5.0.0.beta1', '< 5.1', require: 'active_support'
gem 'activerecord', '~> 5.0.0', require: 'active_record'
gem 'activesupport', '~> 5.0.0', require: 'active_support'

platforms :ruby do
if RUBY_VERSION > "2.1.0"
gem 'sqlite3'
else
gem 'sqlite3', '1.3.8'
end
end
gem 'sqlite3'

platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
end

platforms :rbx do
gem 'rubysl', '~> 2.0'
gem 'racc'
gem 'minitest'
gem 'rubinius-developer_tools'
end

gemspec :path => '../'
14 changes: 14 additions & 0 deletions gemfiles/active_record_edge.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
source 'https://rubygems.org'

github 'rails/rails' do
gem 'activerecord', require: 'active_record'
gem 'activesupport', require: 'active_support'
end

gem 'sqlite3'

platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
end

gemspec :path => '../'

0 comments on commit 604758e

Please sign in to comment.