Remove Appraisal for handcrafted Gemfiles, determine Nokogiri dependency at runtime for Rails versions that can run older Rubies

Bart de Water · Bart de Water · commit a583e9cc2af1 · 2017-05-11T10:13:59.000-04:00
f067b34 is an incorrect solution, Ruby 2.4.1 and Rails 4.2 is a valid combo and to have no deprecation warnings that combination requires Nokogiri >= 1.7.
diff --git a/.travis.yml b/.travis.yml
@@ -21,8 +21,12 @@ matrix:
   exclude:
     - rvm: 2.4.1
       gemfile: gemfiles/rails_4.0.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_4.0.gemfile
     - rvm: 2.4.1
       gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_4.1.gemfile
     - rvm: 1.9.3
       gemfile: gemfiles/rails_5.0.gemfile
     - rvm: 2.0.0
diff --git a/Appraisals b/Appraisals
diff --git a/gemfiles/rails_4.0.gemfile b/gemfiles/rails_4.0.gemfile
@@ -1,10 +1,9 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
+nokogiri_ver = RUBY_VERSION < '2.1' ? '1.6' : '1.7'
 
 gem "actionpack", "~> 4.0.0"
 gem "activerecord", "~> 4.0.0"
 gem "railties", "~> 4.0.0"
-gem "nokogiri", "~> 1.6.0"
+gem 'nokogiri', "~> #{nokogiri_ver}.0"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile
@@ -1,10 +1,9 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
+nokogiri_ver = RUBY_VERSION < '2.1' ? '1.6' : '1.7'
 
 gem "actionpack", "~> 4.1.0"
 gem "activerecord", "~> 4.1.0"
 gem "railties", "~> 4.1.0"
-gem "nokogiri", "~> 1.6.0"
+gem 'nokogiri', "~> #{nokogiri_ver}.0"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile
@@ -1,10 +1,9 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
+nokogiri_ver = RUBY_VERSION < '2.1' ? '1.6' : '1.7'
 
 gem "actionpack", "~> 4.2.0"
 gem "activerecord", "~> 4.2.0"
 gem "railties", "~> 4.2.0"
-gem "nokogiri", "~> 1.6.0"
+gem 'nokogiri', "~> #{nokogiri_ver}.0"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile
@@ -1,10 +1,7 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
 gem "actionpack", "~> 5.0.0"
 gem "activerecord", "~> 5.0.0"
 gem "railties", "~> 5.0.0"
-gem "nokogiri", "~> 1.7.0"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile
@@ -1,10 +1,7 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
 gem "actionpack", "~> 5.1.0"
 gem "activerecord", "~> 5.1.0"
 gem "railties", "~> 5.1.0"
-gem "nokogiri", "~> 1.7.0"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile
@@ -1,5 +1,3 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
 git "https://github.com/rails/rails.git", :branch => "master" do

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# This file was generated by Appraisal`
`2`		`-`
`3`	`1`	`source "https://rubygems.org"`
`4`	`2`
`5`	`3`	`git "https://github.com/rails/rails.git", :branch => "master" do`