Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create initial environment for Rails 5 #1013

Merged
merged 12 commits into from
Apr 23, 2017
Merged

Create initial environment for Rails 5 #1013

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7c0a323
Add Rails 5 appraisal
mcmire Sep 4, 2016
0f4093a
Exclude Ruby 2.0 and 2.1 from Rails 5.0 jobs in Travis CI
Apr 19, 2017
f7022ec
Add specific ruby versions so Travis CI downloads the right rvm binaries
Apr 19, 2017
e5178ab
Exclude Ruby 2.3 from Rails 4.0.x jobs in Travis CI
Apr 19, 2017
ed2ca66
capture, silence_stream, and silence_stderr were removed in Rails 5
mcmire Sep 4, 2016
51d97a5
Don't require ActiveResource tests under Rails 5
mcmire Sep 4, 2016
54c7f19
Don't protect attributes under Rails 5
mcmire Sep 4, 2016
b33f6c4
Fetch pry gem using HTTPS
Apr 19, 2017
4d2b6e3
Add rails-controller-testing gem to rails 5.0 tests
Apr 19, 2017
738b0b3
Update appraisal to rails 5.0.2
Apr 19, 2017
558dbd9
Add jbuilder to rails 4.2 and 5.0 tests
Apr 19, 2017
43437c4
Fix multi-line block code style
Apr 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,25 @@ env:
- DATABASE_ADAPTER=postgresql

rvm:
- 2.0
- 2.3.3
- 2.2.6
- 2.1
- 2.2
- 2.0

gemfile:
- gemfiles/4.0.0.gemfile
- gemfiles/4.0.1.gemfile
- gemfiles/4.1.gemfile
- gemfiles/4.2.gemfile
- gemfiles/5.0.gemfile

matrix:
exclude:
- rvm: 2.0
gemfile: gemfiles/5.0.gemfile
- rvm: 2.1
gemfile: gemfiles/5.0.gemfile
- rvm: 2.3.3
gemfile: gemfiles/4.0.0.gemfile
- rvm: 2.3.3
gemfile: gemfiles/4.0.1.gemfile
23 changes: 21 additions & 2 deletions Appraisals
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ rails_4 = proc do
gem 'minitest-reporters'
end

rails_5 = proc do
instance_eval(&shared_dependencies)
instance_eval(&spring)
end

#---

appraise '4.0.0' do
Expand Down Expand Up @@ -66,8 +71,22 @@ appraise '4.2' do
gem 'sass-rails', '~> 5.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'jbuilder', '~> 2.0'
gem 'sdoc', '~> 0.4.0'
# gem 'sdoc', '~> 0.4.0'
gem 'bcrypt', '~> 3.1.7'
gem 'spring'
# gem 'spring'
gem 'protected_attributes', "~> 1.0.6"
end

appraise '5.0' do
instance_eval(&rails_5)
gem 'rails', '~> 5.0.2'
gem 'rails-controller-testing', '>= 1.0.1'
# gem 'sass-rails', '~> 5.0'
# gem 'coffee-rails', '~> 4.2'
gem 'jbuilder', '~> 2.5'
# gem 'sdoc', '~> 0.4.0'
gem 'bcrypt', '~> 3.1.7'
gem 'listen', '~> 3.0.5'
# gem 'spring'
# gem 'spring-watcher-listen', '~> 2.0.0'
end
2 changes: 1 addition & 1 deletion gemfiles/4.0.0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

gem "appraisal", "~> 2.0"
gem "bundler", "~> 1.1"
gem "pry", :github => "pry/pry"
gem "pry", :git => "https://github.com/pry/pry.git"
gem "pry-byebug"
gem "rake", ">= 10.5.0", "< 11"
gem "rspec", "~> 3.2"
Expand Down
12 changes: 5 additions & 7 deletions gemfiles/4.0.0.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
GIT
remote: git://github.com/pry/pry.git
revision: 3c138cbf94a44f7a6696afdab1ab5149d7541974
remote: https://github.com/pry/pry.git
revision: 1f64463184e0a160d0b41d1a1f92b8e2f230278c
specs:
pry (0.10.1)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -48,7 +47,7 @@ GEM
builder (3.1.4)
byebug (5.0.0)
columnize (= 0.9.0)
coderay (1.1.0)
coderay (1.1.1)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
Expand Down Expand Up @@ -149,7 +148,6 @@ GEM
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
shoulda-context (1.2.1)
slop (3.6.0)
spring (1.4.0)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
Expand Down Expand Up @@ -220,4 +218,4 @@ DEPENDENCIES
zeus

BUNDLED WITH
1.11.2
1.14.6
2 changes: 1 addition & 1 deletion gemfiles/4.0.1.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

gem "appraisal", "~> 2.0"
gem "bundler", "~> 1.1"
gem "pry", :github => "pry/pry"
gem "pry", :git => "https://github.com/pry/pry.git"
gem "pry-byebug"
gem "rake", ">= 10.5.0", "< 11"
gem "rspec", "~> 3.2"
Expand Down
12 changes: 5 additions & 7 deletions gemfiles/4.0.1.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
GIT
remote: git://github.com/pry/pry.git
revision: 3c138cbf94a44f7a6696afdab1ab5149d7541974
remote: https://github.com/pry/pry.git
revision: 1f64463184e0a160d0b41d1a1f92b8e2f230278c
specs:
pry (0.10.1)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -50,7 +49,7 @@ GEM
builder (3.1.4)
byebug (5.0.0)
columnize (= 0.9.0)
coderay (1.1.0)
coderay (1.1.1)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
Expand Down Expand Up @@ -151,7 +150,6 @@ GEM
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
shoulda-context (1.2.1)
slop (3.6.0)
spring (1.4.0)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
Expand Down Expand Up @@ -222,4 +220,4 @@ DEPENDENCIES
zeus

BUNDLED WITH
1.11.2
1.14.6
2 changes: 1 addition & 1 deletion gemfiles/4.1.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

gem "appraisal", "~> 2.0"
gem "bundler", "~> 1.1"
gem "pry", :github => "pry/pry"
gem "pry", :git => "https://github.com/pry/pry.git"
gem "pry-byebug"
gem "rake", ">= 10.5.0", "< 11"
gem "rspec", "~> 3.2"
Expand Down
12 changes: 5 additions & 7 deletions gemfiles/4.1.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
GIT
remote: git://github.com/pry/pry.git
revision: 3c138cbf94a44f7a6696afdab1ab5149d7541974
remote: https://github.com/pry/pry.git
revision: 1f64463184e0a160d0b41d1a1f92b8e2f230278c
specs:
pry (0.10.1)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -50,7 +49,7 @@ GEM
builder (3.2.2)
byebug (5.0.0)
columnize (= 0.9.0)
coderay (1.1.0)
coderay (1.1.1)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
Expand Down Expand Up @@ -148,7 +147,6 @@ GEM
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
shoulda-context (1.2.1)
slop (3.6.0)
spring (1.4.0)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
Expand Down Expand Up @@ -217,4 +215,4 @@ DEPENDENCIES
zeus

BUNDLED WITH
1.11.2
1.14.6
4 changes: 2 additions & 2 deletions gemfiles/4.2.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

gem "appraisal", "~> 2.0"
gem "bundler", "~> 1.1"
gem "pry", :github => "pry/pry"
gem "pry", :git => "https://github.com/pry/pry.git"
gem "pry-byebug"
gem "rake", ">= 10.5.0", "< 11"
gem "rspec", "~> 3.2"
Expand All @@ -28,7 +28,7 @@ gem "uglifier", ">= 1.3.0"
gem "coffee-rails", "~> 4.1.0"
gem "jquery-rails"
gem "turbolinks"
gem "sdoc", "~> 0.4.0"
gem "sdoc"
gem "activeresource", "4.0.0"
gem "protected_attributes", "~> 1.0.6"
gem "minitest-reporters"
Expand Down
20 changes: 9 additions & 11 deletions gemfiles/4.2.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
GIT
remote: git://github.com/pry/pry.git
revision: 3c138cbf94a44f7a6696afdab1ab5149d7541974
remote: https://github.com/pry/pry.git
revision: 1f64463184e0a160d0b41d1a1f92b8e2f230278c
specs:
pry (0.10.1)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -59,7 +58,7 @@ GEM
builder (3.2.2)
byebug (5.0.0)
columnize (= 0.9.0)
coderay (1.1.0)
coderay (1.1.1)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
Expand All @@ -75,8 +74,8 @@ GEM
globalid (0.3.6)
activesupport (>= 4.1.0)
i18n (0.7.0)
jbuilder (2.3.1)
activesupport (>= 3.0.0, < 5)
jbuilder (2.6.3)
activesupport (>= 3.0.0, < 5.2)
multi_json (~> 1.2)
jquery-rails (4.0.5)
rails-dom-testing (~> 1.0)
Expand All @@ -96,7 +95,7 @@ GEM
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.11.2)
multi_json (1.12.1)
nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2)
pg (0.18.3)
Expand Down Expand Up @@ -174,7 +173,6 @@ GEM
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
shoulda-context (1.2.1)
slop (3.6.0)
spring (1.4.0)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
Expand Down Expand Up @@ -228,7 +226,7 @@ DEPENDENCIES
rspec (~> 3.2)
rspec-rails (>= 3.2.0, < 4)
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
sdoc
shoulda-context (~> 1.2.0)
spring
spring-commands-rspec
Expand All @@ -240,4 +238,4 @@ DEPENDENCIES
zeus

BUNDLED WITH
1.11.2
1.14.6
31 changes: 31 additions & 0 deletions gemfiles/5.0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "appraisal", "~> 2.0"
gem "bundler", "~> 1.1"
gem "pry", :git => "https://github.com/pry/pry.git"
gem "pry-byebug"
gem "rake", ">= 10.5.0", "< 11"
gem "rspec", "~> 3.2"
gem "zeus"
gem "yard"
gem "redcarpet"
gem "pygments.rb"
gem "fssm"
gem "rspec-rails", ">= 3.2.0", "< 4"
gem "shoulda-context", "~> 1.2.0"
gem "sqlite3", :platform => :ruby
gem "pg", :platform => :ruby
gem "activerecord-jdbc-adapter", :platform => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
gem "jdbc-sqlite3", :platform => :jruby
gem "jruby-openssl", :platform => :jruby
gem "therubyrhino", :platform => :jruby
gem "spring"
gem "spring-commands-rspec"
gem "rails", "~> 5.0.2"
gem "rails-controller-testing", ">= 1.0.1"
gem "jbuilder", "~> 2.5"
gem "bcrypt", "~> 3.1.7"
gem "listen", "~> 3.0.5"
Loading