diff --git a/.travis.yml b/.travis.yml index f93bca740..37ff85b03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,8 @@ matrix: - rvm: rbx-2 gemfile: - - Gemfile - - gemfiles/rails_3.gemfile - - gemfiles/rails_4.gemfile + - gemfiles/rails_3_2.gemfile + - gemfiles/rails_4_1.gemfile + - gemfiles/rails_4_2.gemfile + - gemfiles/rails_5.gemfile - gemfiles/rack_1.5.2.gemfile diff --git a/Appraisals b/Appraisals index 0d6d928ef..58cc20428 100644 --- a/Appraisals +++ b/Appraisals @@ -1,10 +1,18 @@ -appraise 'rails-3' do +appraise 'rails-3-2' do gem 'rails', '3.2.19' gem 'rack-cache', '<= 1.2' # Pin as next rack-cache version (1.3) removes Ruby1.9 support end -appraise 'rails-4' do - gem 'rails', '4.1.6' +appraise 'rails-4-1' do + gem 'rails', '~> 4.1' +end + +appraise 'rails-4-2' do + gem 'rails', '~> 4.2' +end + +appraise 'rails-5' do + gem 'rails', '~> 5.x' end appraise 'rack-1.5.2' do diff --git a/CHANGELOG.md b/CHANGELOG.md index f7567868c..c4734a854 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ * [#1197](https://github.com/ruby-grape/grape/pull/1290): Fix using JSON and Array[JSON] as groups when parameter is optional - [@lukeivers](https://github.com/lukeivers). 0.14.0 (12/07/2015) +================= #### Features diff --git a/gemfiles/rack_1.5.2.gemfile b/gemfiles/rack_1.5.2.gemfile index 3ba7ea3a7..7f2185d38 100644 --- a/gemfiles/rack_1.5.2.gemfile +++ b/gemfiles/rack_1.5.2.gemfile @@ -1,13 +1,13 @@ # This file was generated by Appraisal -source 'https://rubygems.org' +source "https://rubygems.org" -gem 'rack', '1.5.2' +gem "rack", "1.5.2" group :development, :test do - gem 'guard' - gem 'guard-rspec' - gem 'guard-rubocop' + gem "guard" + gem "guard-rspec" + gem "guard-rubocop" end -gemspec path: '../' +gemspec :path => "../" diff --git a/gemfiles/rails_3_2.gemfile b/gemfiles/rails_3_2.gemfile new file mode 100644 index 000000000..5933f37cd --- /dev/null +++ b/gemfiles/rails_3_2.gemfile @@ -0,0 +1,14 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "3.2.19" +gem "rack-cache", "<= 1.2" + +group :development, :test do + gem "guard" + gem "guard-rspec" + gem "guard-rubocop" +end + +gemspec :path => "../" diff --git a/gemfiles/rails_4_1.gemfile b/gemfiles/rails_4_1.gemfile new file mode 100644 index 000000000..1f17c23ee --- /dev/null +++ b/gemfiles/rails_4_1.gemfile @@ -0,0 +1,13 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", " ~> 4.1" + +group :development, :test do + gem "guard" + gem "guard-rspec" + gem "guard-rubocop" +end + +gemspec :path => "../" diff --git a/gemfiles/rails_4_2.gemfile b/gemfiles/rails_4_2.gemfile new file mode 100644 index 000000000..3a071fc69 --- /dev/null +++ b/gemfiles/rails_4_2.gemfile @@ -0,0 +1,13 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 4.2" + +group :development, :test do + gem "guard" + gem "guard-rspec" + gem "guard-rubocop" +end + +gemspec :path => "../" diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile new file mode 100644 index 000000000..9da5e667b --- /dev/null +++ b/gemfiles/rails_5.gemfile @@ -0,0 +1,13 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 5.x" + +group :development, :test do + gem "guard" + gem "guard-rspec" + gem "guard-rubocop" +end + +gemspec :path => "../" diff --git a/grape.gemspec b/grape.gemspec index ee9fa9215..f83bffd8a 100644 --- a/grape.gemspec +++ b/grape.gemspec @@ -39,4 +39,5 @@ Gem::Specification.new do |s| s.files = Dir['**/*'].keep_if { |file| File.file?(file) } s.test_files = Dir['spec/**/*'] s.require_paths = ['lib'] + s.required_ruby_version = '~> 2' end