From 6775fba1a802ef48c72cab83ef063ca3d9731365 Mon Sep 17 00:00:00 2001 From: Richard Lee Date: Thu, 6 Apr 2017 15:08:18 +0800 Subject: [PATCH 1/2] Test latest Ruby versions --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cb307c59..5cf9f1e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: ruby rvm: - - 2.2.3 - - 2.3.1 - # - 2.4.0 + - 2.2.6 + - 2.3.3 + - 2.4.1 env: global: - CODECLIMATE_REPO_TOKEN=396d4263adb6febf1e6e9b0c0e176fbde35e1a116a3c1ecf8dd4f9384e41979b From 11157708dd97431b6692c1fe9861d247c214b7f4 Mon Sep 17 00:00:00 2001 From: Richard Lee Date: Fri, 7 Apr 2017 03:48:53 +0800 Subject: [PATCH 2/2] Move to Appraisals --- .gitignore | 1 + .travis.yml | 23 +++++++++++++++++------ Appraisals | 20 ++++++++++++++++++++ Gemfile | 17 ++--------------- gemfiles/3.2.gemfile | 16 ++++++++++++++++ gemfiles/4.0.gemfile | 15 +++++++++++++++ gemfiles/4.1.gemfile | 15 +++++++++++++++ gemfiles/4.2.gemfile | 15 +++++++++++++++ gemfiles/5.0.gemfile | 15 +++++++++++++++ 9 files changed, 116 insertions(+), 21 deletions(-) create mode 100644 Appraisals create mode 100644 gemfiles/3.2.gemfile create mode 100644 gemfiles/4.0.gemfile create mode 100644 gemfiles/4.1.gemfile create mode 100644 gemfiles/4.2.gemfile create mode 100644 gemfiles/5.0.gemfile diff --git a/.gitignore b/.gitignore index f1b148d5..7374a56d 100644 --- a/.gitignore +++ b/.gitignore @@ -21,5 +21,6 @@ *.DS_Store Gemfile.lock +*.gemfile.lock /coverage diff --git a/.travis.yml b/.travis.yml index 5cf9f1e1..daa06977 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,23 @@ rvm: env: global: - CODECLIMATE_REPO_TOKEN=396d4263adb6febf1e6e9b0c0e176fbde35e1a116a3c1ecf8dd4f9384e41979b - matrix: - - "AS_VERSION=3.2.0" - - "AS_VERSION=4.0.0" - - "AS_VERSION=4.1.0" - - "AS_VERSION=4.2.0" - - "AS_VERSION=5.0.0" +gemfile: + - gemfiles/3.2.gemfile + - gemfiles/4.0.gemfile + - gemfiles/4.1.gemfile + - gemfiles/4.2.gemfile + - gemfiles/5.0.gemfile +matrix: + fast_finish: true + exclude: + - rvm: 2.4.1 + gemfile: gemfiles/3.2.gemfile + - rvm: 2.4.1 + gemfile: gemfiles/4.0.gemfile + - rvm: 2.4.1 + gemfile: gemfiles/4.1.gemfile + - rvm: 2.4.1 + gemfile: gemfiles/4.2.gemfile # We need to install latest version of bundler, because one in travis # image is too old to recognize platform => :mri_22 in Gemfile. before_install: diff --git a/Appraisals b/Appraisals new file mode 100644 index 00000000..6a74ec34 --- /dev/null +++ b/Appraisals @@ -0,0 +1,20 @@ +appraise '3.2' do + gem 'activesupport', '~> 3.2.22' + gem 'minitest', '~> 5' +end + +appraise '4.0' do + gem 'activesupport', '~> 4.0.13' +end + +appraise '4.1' do + gem 'activesupport', '~> 4.1.14' +end + +appraise '4.2' do + gem 'activesupport', '~> 4.2.5.1' +end + +appraise '5.0' do + gem 'activesupport', '~> 5.0.0' +end diff --git a/Gemfile b/Gemfile index 49b34169..163acf72 100644 --- a/Gemfile +++ b/Gemfile @@ -3,24 +3,11 @@ source "https://rubygems.org" gemspec gem 'rake' +gem 'appraisal' -as_version = ENV["AS_VERSION"] || "default" - -as_version = case as_version -when "default" - ">= 3.2.0" -else - "~> #{as_version}" -end - -gem "activesupport", as_version +gem "activesupport" gem 'addressable', '~> 2.2' -# 3.2 now requires the minitest gem -if as_version =~ /3\.2\./ - gem "minitest", '~> 5' -end - gem "codeclimate-test-reporter", group: :test, require: nil group :development, :test do diff --git a/gemfiles/3.2.gemfile b/gemfiles/3.2.gemfile new file mode 100644 index 00000000..822daa14 --- /dev/null +++ b/gemfiles/3.2.gemfile @@ -0,0 +1,16 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rake" +gem "appraisal" +gem "activesupport", "~> 3.2.22" +gem "addressable", "~> 2.2" +gem "codeclimate-test-reporter", :group => :test, :require => nil +gem "minitest", "~> 5" + +group :development, :test do + gem "byebug", :platforms => [:mri_20, :mri_21, :mri_22] +end + +gemspec :path => "../" diff --git a/gemfiles/4.0.gemfile b/gemfiles/4.0.gemfile new file mode 100644 index 00000000..1f6e12a8 --- /dev/null +++ b/gemfiles/4.0.gemfile @@ -0,0 +1,15 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rake" +gem "appraisal" +gem "activesupport", "~> 4.0.13" +gem "addressable", "~> 2.2" +gem "codeclimate-test-reporter", :group => :test, :require => nil + +group :development, :test do + gem "byebug", :platforms => [:mri_20, :mri_21, :mri_22] +end + +gemspec :path => "../" diff --git a/gemfiles/4.1.gemfile b/gemfiles/4.1.gemfile new file mode 100644 index 00000000..cf256c7f --- /dev/null +++ b/gemfiles/4.1.gemfile @@ -0,0 +1,15 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rake" +gem "appraisal" +gem "activesupport", "~> 4.1.14" +gem "addressable", "~> 2.2" +gem "codeclimate-test-reporter", :group => :test, :require => nil + +group :development, :test do + gem "byebug", :platforms => [:mri_20, :mri_21, :mri_22] +end + +gemspec :path => "../" diff --git a/gemfiles/4.2.gemfile b/gemfiles/4.2.gemfile new file mode 100644 index 00000000..ec3599cd --- /dev/null +++ b/gemfiles/4.2.gemfile @@ -0,0 +1,15 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rake" +gem "appraisal" +gem "activesupport", "~> 4.2.5.1" +gem "addressable", "~> 2.2" +gem "codeclimate-test-reporter", :group => :test, :require => nil + +group :development, :test do + gem "byebug", :platforms => [:mri_20, :mri_21, :mri_22] +end + +gemspec :path => "../" diff --git a/gemfiles/5.0.gemfile b/gemfiles/5.0.gemfile new file mode 100644 index 00000000..be66dee2 --- /dev/null +++ b/gemfiles/5.0.gemfile @@ -0,0 +1,15 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rake" +gem "appraisal" +gem "activesupport", "~> 5.0.0" +gem "addressable", "~> 2.2" +gem "codeclimate-test-reporter", :group => :test, :require => nil + +group :development, :test do + gem "byebug", :platforms => [:mri_20, :mri_21, :mri_22] +end + +gemspec :path => "../"