Skip to content

Commit

Permalink
Drop obsolete deps, upgrade to new deps
Browse files Browse the repository at this point in the history
* Drop dependency on older versions of RSpec. RSpec 3.x is the only
  version supported now.
* Drop dependency on Minitest 4.x. Minitest 5.x is the only version
  supported now.
* Drop dependency on older versions of Rails. Rails 4.2.x, 5.1.x, and
  5.2.x are the only versions supported now.
* Drop dependency on older versions of Ruby. Ruby 2.3.x, 2.4.x, and
  2.5.x are the only versions supported now.
  • Loading branch information
mcmire committed Feb 20, 2019
1 parent eb579ee commit ed95a68
Show file tree
Hide file tree
Showing 46 changed files with 1,221 additions and 1,215 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.bundle
Gemfile.lock
vendor/ruby
vendor/cache
doc
Expand Down
2 changes: 2 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
AllCops:
TargetRubyVersion: 2.4
Exclude:
- '*.gemspec'
Layout/AlignParameters:
EnforcedStyle: with_fixed_indentation
Layout/ConditionPosition:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0-p247
2.6.1
29 changes: 27 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
language: ruby
sudo: false
cache:
directories:
- vendor/bundle
script: "bundle exec rake"
# Source: <https://docs.travis-ci.com/user/languages/ruby/#bundler-20>
before_install:
- gem update --system '2.7.8' --no-document
- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
- gem install bundler -v '< 2' --no-document
install: "bundle install --jobs=3 --retry=3 --path vendor/bundle"

rvm:
- 1.9.3
- 2.0.0
- 2.6.1
- 2.5.1
- 2.4.4
- 2.3.7

env:
- TEST_FRAMEWORK=minitest
- TEST_FRAMEWORK=test_unit

gemfile:
- gemfiles/rails_4_2.gemfile
- gemfiles/rails_5_0.gemfile
- gemfiles/rails_5_1.gemfile
- gemfiles/rails_5_2.gemfile
55 changes: 23 additions & 32 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,44 +1,35 @@
appraise 'rails_3_0' do
gem 'rails', '~> 3.0.0'
gem 'sqlite3'
shared_dependencies = proc do
gem "sqlite3", "~> 1.3.6"
end

appraise 'rails_3_1' do
gem 'rails', '~> 3.1.0'
gem 'jquery-rails'
gem 'sass-rails'
gem 'sqlite3'
end
appraise "rails_4_2" do
instance_eval(&shared_dependencies)

appraise 'rails_3_2' do
gem 'rails', '~> 3.2.0'
gem 'jquery-rails'
gem 'sass-rails'
gem 'sqlite3'
gem "rails", "~> 4.2.0"
# gem 'jquery-rails'
# gem 'sass-rails'
end

appraise 'rails_4_0' do
gem 'rails', '~> 4.0.0'
gem 'jquery-rails'
gem 'sass-rails'
gem 'sqlite3'
end
appraise "rails_5_0" do
instance_eval(&shared_dependencies)

appraise 'rails_4_1' do
gem 'rails', github: 'rails/rails', branch: '4-1-stable'
gem 'jquery-rails'
gem 'sass-rails'
gem 'sqlite3'
gem "rails", "~> 5.0.0"
# gem 'jquery-rails'
# gem 'sass-rails'
end

appraise 'minitest_4_x' do
gem 'minitest', '~> 4.0'
end
appraise "rails_5_1" do
instance_eval(&shared_dependencies)

appraise 'minitest_5_x' do
gem 'minitest', '~> 5.0'
gem "rails", "~> 5.1.0"
# gem 'jquery-rails'
# gem 'sass-rails'
end

appraise 'test_unit' do
gem 'test-unit'
appraise "rails_5_2" do
instance_eval(&shared_dependencies)

gem "rails", "~> 5.2.0"
# gem 'jquery-rails'
# gem 'sass-rails'
end
11 changes: 10 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
source 'http://rubygems.org'
source "https://rubygems.org"

gemspec

gem "m"
gem "minitest"
gem "mocha"
gem "pry"
gem "pry-byebug"
gem "rails"
gem "rake"
gem "test-unit"
155 changes: 155 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
PATH
remote: .
specs:
shoulda-context (1.2.2)

GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.2)
actionpack (= 5.2.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.2)
actionpack (= 5.2.2)
actionview (= 5.2.2)
activejob (= 5.2.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.2)
actionview (= 5.2.2)
activesupport (= 5.2.2)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.2)
activesupport (= 5.2.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.2)
activesupport (= 5.2.2)
globalid (>= 0.3.6)
activemodel (5.2.2)
activesupport (= 5.2.2)
activerecord (5.2.2)
activemodel (= 5.2.2)
activesupport (= 5.2.2)
arel (>= 9.0)
activestorage (5.2.2)
actionpack (= 5.2.2)
activerecord (= 5.2.2)
marcel (~> 0.3.1)
activesupport (5.2.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
appraisal (2.2.0)
bundler
rake
thor (>= 0.14.0)
arel (9.0.0)
builder (3.2.3)
byebug (10.0.2)
coderay (1.1.2)
concurrent-ruby (1.1.4)
crass (1.0.4)
erubi (1.8.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (1.5.3)
concurrent-ruby (~> 1.0)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
m (1.5.1)
method_source (>= 0.6.7)
rake (>= 0.9.2.2)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
metaclass (0.0.4)
method_source (0.9.2)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
mocha (1.8.0)
metaclass (~> 0.0.1)
nio4r (2.3.1)
nokogiri (1.10.1)
mini_portile2 (~> 2.4.0)
power_assert (1.1.3)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.6.0)
byebug (~> 10.0)
pry (~> 0.10)
rack (2.0.6)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.2)
actioncable (= 5.2.2)
actionmailer (= 5.2.2)
actionpack (= 5.2.2)
actionview (= 5.2.2)
activejob (= 5.2.2)
activemodel (= 5.2.2)
activerecord (= 5.2.2)
activestorage (= 5.2.2)
activesupport (= 5.2.2)
bundler (>= 1.3.0)
railties (= 5.2.2)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.2)
actionpack (= 5.2.2)
activesupport (= 5.2.2)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.2)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
test-unit (3.3.0)
power_assert
thor (0.20.3)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)

PLATFORMS
ruby

DEPENDENCIES
appraisal
bundler (~> 1.0)
m
minitest
mocha
pry
pry-byebug
rails
rake
shoulda-context!
test-unit

BUNDLED WITH
1.17.3
26 changes: 13 additions & 13 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
require 'bundler/setup'
require 'bundler/gem_tasks'
require 'rake/testtask'
require 'appraisal'
require "bundler/setup"
require "bundler/gem_tasks"
require "rake/testtask"
require "appraisal"

$LOAD_PATH.unshift("lib")
load 'tasks/shoulda.rake'
load "tasks/shoulda.rake"

Rake::TestTask.new do |t|
t.libs << 'lib' << 'test'
t.pattern = 'test/**/*_test.rb'
t.libs << "lib" << "test"
t.pattern = "test/**/*_test.rb"
t.verbose = false
end

desc 'Test the plugin under all supported Rails versions.'
task :all => ['appraisal:cleanup', 'appraisal:install'] do
exec('rake appraisal test')
task :default do
if ENV["CI"]
exec "rake test --trace"
else
exec "appraisal install && appraisal rake test --trace"
end
end

desc 'Default: run tests'
task :default => [:all]
7 changes: 0 additions & 7 deletions gemfiles/minitest_4_x.gemfile

This file was deleted.

Loading

0 comments on commit ed95a68

Please sign in to comment.