Skip to content

Commit

Permalink
Allow Rails 5.1 usage (thoughtbot#856)
Browse files Browse the repository at this point in the history
  • Loading branch information
tiagoamaro authored and iarie committed Jun 17, 2017
1 parent 4983290 commit 7b9b54e
Show file tree
Hide file tree
Showing 5 changed files with 191 additions and 102 deletions.
8 changes: 8 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,11 @@ appraise "rails50" do

gem "rails-controller-testing"
end

appraise "rails51" do
gem "actionpack", "~> 5.1.0"
gem "actionview", "~> 5.1.0"
gem "activerecord", "~> 5.1.0"

gem "rails-controller-testing"
end
172 changes: 87 additions & 85 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ PATH
remote: .
specs:
administrate (0.7.0)
actionpack (>= 4.2, < 5.1)
actionview (>= 4.2, < 5.1)
activerecord (>= 4.2, < 5.1)
actionpack (>= 4.2, < 5.2)
actionview (>= 4.2, < 5.2)
activerecord (>= 4.2, < 5.2)
autoprefixer-rails (~> 6.0)
datetime_picker_rails (~> 0.0.7)
jquery-rails (>= 4.0)
Expand All @@ -17,107 +17,110 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionpack (4.2.8)
actionview (= 4.2.8)
activesupport (= 4.2.8)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (5.1.1)
actionview (= 5.1.1)
activesupport (= 5.1.1)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.8)
activesupport (= 4.2.8)
actionview (5.1.1)
activesupport (= 5.1.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activemodel (4.2.8)
activesupport (= 4.2.8)
builder (~> 3.1)
activerecord (4.2.8)
activemodel (= 4.2.8)
activesupport (= 4.2.8)
arel (~> 6.0)
activesupport (4.2.8)
activemodel (5.1.1)
activesupport (= 5.1.1)
activerecord (5.1.1)
activemodel (= 5.1.1)
activesupport (= 5.1.1)
arel (~> 8.0)
activesupport (5.1.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
administrate-field-image (1.1.0)
administrate (>= 0.2.0.rc1)
ammeter (1.1.3)
ammeter (1.1.4)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-rails (>= 2.2)
appraisal (2.1.0)
appraisal (2.2.0)
bundler
rake
thor (>= 0.14.0)
arel (6.0.4)
autoprefixer-rails (6.7.7.1)
arel (8.0.0)
ast (2.3.0)
autoprefixer-rails (6.7.7.2)
execjs
awesome_print (1.6.1)
awesome_print (1.7.0)
builder (3.2.3)
bundler-audit (0.4.0)
bundler-audit (0.5.0)
bundler (~> 1.2)
thor (~> 0.18)
byebug (6.0.2)
capybara (2.11.0)
byebug (9.0.6)
capybara (2.14.0)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
cliver (0.3.2)
coderay (1.1.0)
coderay (1.1.1)
concurrent-ruby (1.0.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
database_cleaner (1.5.1)
database_cleaner (1.6.1)
datetime_picker_rails (0.0.7)
momentjs-rails (>= 2.8.1)
diff-lcs (1.2.5)
dotenv (2.0.2)
dotenv-rails (2.0.2)
dotenv (= 2.0.2)
railties (~> 4.0)
diff-lcs (1.3)
dotenv (2.2.1)
dotenv-rails (2.2.1)
dotenv (= 2.2.1)
railties (>= 3.2, < 5.2)
easy_translate (0.5.0)
json
thread
thread_safe
erubi (1.6.0)
erubis (2.7.0)
execjs (2.7.0)
factory_girl (4.5.0)
factory_girl (4.8.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
factory_girl_rails (4.8.0)
factory_girl (~> 4.8.0)
railties (>= 3.0.0)
faker (1.5.0)
faker (1.7.3)
i18n (~> 0.5)
faraday (0.11.0)
faraday (0.12.1)
multipart-post (>= 1.2, < 3)
formulaic (0.3.0)
formulaic (0.4.0)
activesupport
capybara
i18n
hashdiff (0.3.2)
hashdiff (0.3.4)
highline (1.7.8)
i18n (0.8.1)
i18n-tasks (0.8.7)
activesupport (>= 2.3.18)
i18n-tasks (0.9.15)
activesupport (>= 4.0.2)
ast (>= 2.1.0)
easy_translate (>= 0.5.0)
erubis
highline (>= 1.7.3)
i18n
term-ansicolor (>= 1.3.2)
parser (>= 2.2.3.0)
rainbow (~> 2.2)
terminal-table (>= 1.5.1)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.0.3)
json (2.1.0)
kaminari (1.0.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.0.1)
Expand All @@ -130,7 +133,7 @@ GEM
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
kgio (2.10.0)
kgio (2.11.0)
launchy (2.4.3)
addressable (~> 2.3)
loofah (2.0.3)
Expand All @@ -140,55 +143,57 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.10.1)
minitest (5.10.2)
momentjs-rails (2.17.1)
railties (>= 3.1)
multipart-post (2.0.0)
nokogiri (1.7.1)
nokogiri (1.7.2)
mini_portile2 (~> 2.1.0)
normalize-rails (4.1.1)
pg (0.18.3)
poltergeist (1.12.0)
parser (2.4.0.0)
ast (~> 2.2)
pg (0.20.0)
poltergeist (1.15.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
pry (0.10.3)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-rails (0.3.4)
pry (>= 0.9.10)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (2.0.5)
rack (1.6.5)
rack (2.0.3)
rack-test (0.6.3)
rack (>= 1.0)
rack-timeout (0.3.2)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rack-timeout (0.4.2)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_stdout_logging (0.0.4)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
rails_stdout_logging (0.0.5)
railties (5.1.1)
actionpack (= 5.1.1)
activesupport (= 5.1.1)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.15.0)
rainbow (2.2.2)
rake
raindrops (0.18.0)
rake (12.0.0)
redcarpet (3.3.3)
rspec-core (3.5.1)
redcarpet (3.4.0)
rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-rails (3.5.0)
rspec-rails (3.5.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
Expand All @@ -198,7 +203,7 @@ GEM
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
safe_yaml (1.0.4)
sass (3.4.23)
sass (3.4.24)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
Expand All @@ -218,29 +223,26 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
term-ansicolor (1.3.2)
tins (~> 1.0)
terminal-table (1.5.2)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thor (0.19.4)
thread (0.2.2)
thread_safe (0.3.6)
tilt (2.0.7)
timecop (0.8.0)
tins (1.6.0)
timecop (0.8.1)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.9.0)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.2.1)
unicorn (5.3.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
webmock (2.3.2)
webmock (3.0.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
websocket-driver (0.6.4)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
xpath (2.0.0)
Expand Down
6 changes: 3 additions & 3 deletions administrate.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,db,lib,docs}/**/*", "LICENSE", "Rakefile"]
s.test_files = Dir["test/**/*"]

s.add_dependency "actionpack", ">= 4.2", "< 5.1"
s.add_dependency "actionview", ">= 4.2", "< 5.1"
s.add_dependency "activerecord", ">= 4.2", "< 5.1"
s.add_dependency "actionpack", ">= 4.2", "< 5.2"
s.add_dependency "actionview", ">= 4.2", "< 5.2"
s.add_dependency "activerecord", ">= 4.2", "< 5.2"

s.add_dependency "autoprefixer-rails", "~> 6.0"
s.add_dependency "datetime_picker_rails", "~> 0.0.7"
Expand Down
47 changes: 47 additions & 0 deletions gemfiles/rails51.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "administrate-field-image"
gem "autoprefixer-rails"
gem "bourbon", "~> 5.0.0.beta.7"
gem "faker"
gem "pg"
gem "redcarpet"
gem "sentry-raven"
gem "unicorn"
gem "actionpack", "~> 5.1.0"
gem "actionview", "~> 5.1.0"
gem "activerecord", "~> 5.1.0"
gem "rails-controller-testing"

group :development, :test do
gem "appraisal"
gem "awesome_print"
gem "bundler-audit", :require => false
gem "byebug"
gem "dotenv-rails"
gem "factory_girl_rails"
gem "i18n-tasks"
gem "pry-rails"
gem "rspec-rails", "~> 3.5.0"
end

group :test do
gem "ammeter"
gem "database_cleaner"
gem "formulaic"
gem "launchy"
gem "poltergeist"
gem "shoulda-matchers", "~> 2.8.0", :require => false
gem "timecop"
gem "webmock"
end

group :staging, :production do
gem "rack-timeout"
gem "rails_stdout_logging"
gem "uglifier"
end

gemspec :path => "../"
Loading

0 comments on commit 7b9b54e

Please sign in to comment.