From 7e823b435499f67d32ffd4218fe8f9d454b1d43d Mon Sep 17 00:00:00 2001 From: Max Melentiev Date: Mon, 19 Aug 2019 10:53:59 +0300 Subject: [PATCH] Require tests against rails 6.0, run tests against rails 6.1.alpha Rails 6.0 requires ruby >= 2.5, so ruby 2.4 is not tested by default and replaced with 2.6 --- .travis.yml | 14 +++++++++----- Appraisals | 27 ++++++++++++++++----------- CHANGELOG.md | 2 ++ gemfiles/rails_42.gemfile | 4 ++-- gemfiles/rails_50.gemfile | 4 ++-- gemfiles/rails_51.gemfile | 4 ++-- gemfiles/rails_52.gemfile | 4 ++-- gemfiles/rails_60.gemfile | 6 ++---- gemfiles/rails_61.gemfile | 23 +++++++++++++++++++++++ telegram-bot.gemspec | 4 ++-- 10 files changed, 62 insertions(+), 30 deletions(-) create mode 100644 gemfiles/rails_61.gemfile diff --git a/.travis.yml b/.travis.yml index cf12a26..b333114 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,27 +1,31 @@ language: ruby cache: bundler rvm: +- 2.6 - 2.5 -- 2.4 gemfile: +- gemfiles/rails_60.gemfile - gemfiles/rails_52.gemfile -- gemfiles/rails_51.gemfile matrix: include: # old rails + - rvm: 2.5 + gemfile: gemfiles/rails_51.gemfile - rvm: 2.5 gemfile: gemfiles/rails_50.gemfile - rvm: 2.5 gemfile: gemfiles/rails_42.gemfile # old rubies + - rvm: 2.4 + gemfile: gemfiles/rails_52.gemfile - rvm: 2.3 gemfile: gemfiles/rails_52.gemfile # future rails - rvm: 2.5 - gemfile: gemfiles/rails_60.gemfile - # Allow rails 6 to fail while master branch is used + gemfile: gemfiles/rails_61.gemfile + # Allow rails 6.1 to fail while master branch is used allow_failures: - rvm: 2.5 - gemfile: gemfiles/rails_60.gemfile + gemfile: gemfiles/rails_61.gemfile notifications: email: false diff --git a/Appraisals b/Appraisals index 2505839..17da2c1 100644 --- a/Appraisals +++ b/Appraisals @@ -1,26 +1,31 @@ -appraise 'rails-60' do +appraise 'rails-61' do git 'https://github.com/rails/rails.git' do - gem 'actionpack', '~> 6.0.0.alpha' - gem 'railties', '~> 6.0.0.alpha' + gem 'actionpack', '~> 6.1.0.alpha' + gem 'railties', '~> 6.1.0.alpha' end end +appraise 'rails-60' do + gem 'actionpack', '~> 6.0.0' + gem 'railties', '~> 6.0.0' +end + appraise 'rails-52' do - gem 'actionpack', '~> 5.2.0.beta2' - gem 'railties', '~> 5.2.0.beta2' + gem 'actionpack', '~> 5.2.0' + gem 'railties', '~> 5.2.0' end appraise 'rails-51' do - gem 'actionpack', '~> 5.1' - gem 'railties', '~> 5.1' + gem 'actionpack', '~> 5.1.0' + gem 'railties', '~> 5.1.0' end appraise 'rails-50' do - gem 'actionpack', '~> 5.0' - gem 'railties', '~> 5.0' + gem 'actionpack', '~> 5.0.0' + gem 'railties', '~> 5.0.0' end appraise 'rails-42' do - gem 'actionpack', '~> 4.2' - gem 'railties', '~> 4.2' + gem 'actionpack', '~> 4.2.0' + gem 'railties', '~> 4.2.0' end diff --git a/CHANGELOG.md b/CHANGELOG.md index 49ce398..5e32f03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Unreleased +- Rails 6.0 support. + # 0.14.2 - Add reply helpers: `answer_pre_checkout_query`, `answer_shipping_query`. diff --git a/gemfiles/rails_42.gemfile b/gemfiles/rails_42.gemfile index 9b6254d..b600d8a 100644 --- a/gemfiles/rails_42.gemfile +++ b/gemfiles/rails_42.gemfile @@ -2,8 +2,8 @@ source "https://rubygems.org" -gem "actionpack", "~> 4.2" -gem "railties", "~> 4.2" +gem "actionpack", "~> 4.2.0" +gem "railties", "~> 4.2.0" group :development do gem "appraisal", "~> 2.2" diff --git a/gemfiles/rails_50.gemfile b/gemfiles/rails_50.gemfile index e55fb2e..489919e 100644 --- a/gemfiles/rails_50.gemfile +++ b/gemfiles/rails_50.gemfile @@ -2,8 +2,8 @@ source "https://rubygems.org" -gem "actionpack", "~> 5.0" -gem "railties", "~> 5.0" +gem "actionpack", "~> 5.0.0" +gem "railties", "~> 5.0.0" group :development do gem "appraisal", "~> 2.2" diff --git a/gemfiles/rails_51.gemfile b/gemfiles/rails_51.gemfile index 80757e9..91df7e4 100644 --- a/gemfiles/rails_51.gemfile +++ b/gemfiles/rails_51.gemfile @@ -2,8 +2,8 @@ source "https://rubygems.org" -gem "actionpack", "~> 5.1" -gem "railties", "~> 5.1" +gem "actionpack", "~> 5.1.0" +gem "railties", "~> 5.1.0" group :development do gem "appraisal", "~> 2.2" diff --git a/gemfiles/rails_52.gemfile b/gemfiles/rails_52.gemfile index 6461352..b2a0ec6 100644 --- a/gemfiles/rails_52.gemfile +++ b/gemfiles/rails_52.gemfile @@ -2,8 +2,8 @@ source "https://rubygems.org" -gem "actionpack", "~> 5.2.0.beta2" -gem "railties", "~> 5.2.0.beta2" +gem "actionpack", "~> 5.2.0" +gem "railties", "~> 5.2.0" group :development do gem "appraisal", "~> 2.2" diff --git a/gemfiles/rails_60.gemfile b/gemfiles/rails_60.gemfile index efb041c..d903325 100644 --- a/gemfiles/rails_60.gemfile +++ b/gemfiles/rails_60.gemfile @@ -2,10 +2,8 @@ source "https://rubygems.org" -git "https://github.com/rails/rails.git" do - gem "actionpack", "~> 6.0.0.alpha" - gem "railties", "~> 6.0.0.alpha" -end +gem "actionpack", "~> 6.0.0" +gem "railties", "~> 6.0.0" group :development do gem "appraisal", "~> 2.2" diff --git a/gemfiles/rails_61.gemfile b/gemfiles/rails_61.gemfile new file mode 100644 index 0000000..f7142b6 --- /dev/null +++ b/gemfiles/rails_61.gemfile @@ -0,0 +1,23 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +git "https://github.com/rails/rails.git" do + gem "actionpack", "~> 6.1.0.alpha" + gem "railties", "~> 6.1.0.alpha" +end + +group :development do + gem "appraisal", "~> 2.2" + gem "pry", "~> 0.10.1" + gem "pry-byebug", "~> 3.2.0" + gem "sdoc", "~> 0.4.1" + gem "telegram-bot-types", "~> 0.6.0" + gem "rspec", "~> 3.5.0" + gem "rspec-its", "~> 1.1.0" + gem "rspec-rails", "~> 3.5.0" + gem "rubocop", "~> 0.52.1" + gem "coveralls", "~> 0.8.2", require: false +end + +gemspec path: "../" diff --git a/telegram-bot.gemspec b/telegram-bot.gemspec index 9aae4cf..9b36f9d 100644 --- a/telegram-bot.gemspec +++ b/telegram-bot.gemspec @@ -22,8 +22,8 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '~> 2.0' - spec.add_dependency 'actionpack', '>= 4.0', '< 6.0' - spec.add_dependency 'activesupport', '>= 4.0', '< 6.0' + spec.add_dependency 'actionpack', '>= 4.0', '< 6.1' + spec.add_dependency 'activesupport', '>= 4.0', '< 6.1' spec.add_dependency 'httpclient', '~> 2.7' spec.add_development_dependency 'bundler', '> 1.16'