From a19f92738d4167bb8a05b4181680778542352c7a Mon Sep 17 00:00:00 2001
From: Gonzalo <grzuy0@gmail.com>
Date: Wed, 17 Jan 2018 13:49:23 -0300
Subject: [PATCH] Test against actively supported rubies and gems

https://www.ruby-lang.org/en/downloads/branches://www.ruby-lang.org/en/downloads/branches/
http://guides.rubyonrails.org/maintenance_policy.html
https://www.ruby-lang.org/en/downloads/releases/
---
 .travis.yml                                   | 12 ++++++----
 Appraisals                                    | 23 ++++++-------------
 gemfiles/dalli2.gemfile                       |  5 +---
 ...vesupport4.2.gemfile => rails_4_2.gemfile} |  3 +--
 ...vesupport5.0.gemfile => rails_5_0.gemfile} |  3 +--
 ...vesupport4.1.gemfile => rails_5_1.gemfile} |  7 +++---
 6 files changed, 20 insertions(+), 33 deletions(-)
 rename gemfiles/{activesupport4.2.gemfile => rails_4_2.gemfile} (72%)
 rename gemfiles/{activesupport5.0.gemfile => rails_5_0.gemfile} (72%)
 rename gemfiles/{activesupport4.1.gemfile => rails_5_1.gemfile} (51%)

diff --git a/.travis.yml b/.travis.yml
index 6f714e5..771e716 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,15 @@
 language: ruby
 rvm:
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
+  - 2.5.0
+  - 2.4.3
+  - 2.3.6
+  - 2.2.9
   - jruby-9.1.14.0
 
 gemfile:
-  - gemfiles/activesupport4.1.gemfile
-  - gemfiles/activesupport4.2.gemfile
+  - gemfiles/rails_5_1.gemfile
+  - gemfiles/rails_5_0.gemfile
+  - gemfiles/rails_4_2.gemfile
   - gemfiles/dalli2.gemfile
 
 services:
diff --git a/Appraisals b/Appraisals
index bd04b28..56fadfc 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,27 +1,18 @@
-appraise 'activesupport3.2' do
-  gem 'activesupport', '~> 3.2.0'
-  gem 'actionpack', '~> 3.2.0'
+appraise 'rails_5-1' do
+  gem 'activesupport', '~> 5.1.0'
+  gem 'actionpack', '~> 5.1.0'
 end
 
-appraise 'activesupport4.0' do
-  gem 'activesupport', '~> 4.0.0'
-  gem 'actionpack', '~> 4.0.0'
+appraise 'rails_5-0' do
+  gem 'activesupport', '~> 5.0.0'
+  gem 'actionpack', '~> 5.0.0'
 end
 
-appraise 'activesupport4.1' do
-  gem 'activesupport', '~> 4.1.0'
-  gem 'actionpack', '~> 4.1.0'
-end
-
-appraise 'activesupport4.2' do
+appraise 'rails_4-2' do
   gem 'activesupport', '~> 4.2.0'
   gem 'actionpack', '~> 4.2.0'
 end
 
-appraise 'dalli1.1' do
-  gem 'dalli', '1.1.5'
-end
-
 appraise 'dalli2' do
   gem 'dalli', '~> 2.0'
 end
diff --git a/gemfiles/dalli2.gemfile b/gemfiles/dalli2.gemfile
index 0367e1d..f955198 100644
--- a/gemfiles/dalli2.gemfile
+++ b/gemfiles/dalli2.gemfile
@@ -3,9 +3,6 @@
 source "https://rubygems.org"
 
 gem "dalli", "~> 2.0"
-gem "rack", "<= 1.4.7", platforms: [:ruby_21, :jruby]
-gem "activesupport", "<= 3.2.22.2", platforms: [:ruby_21, :jruby]
-gem "listen", "<= 3.0.6", platforms: [:ruby_21, :jruby]
 
 group :development do
   gem "pry"
@@ -13,4 +10,4 @@ group :development do
   gem "guard-minitest"
 end
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/activesupport4.2.gemfile b/gemfiles/rails_4_2.gemfile
similarity index 72%
rename from gemfiles/activesupport4.2.gemfile
rename to gemfiles/rails_4_2.gemfile
index e642baf..d4532c5 100644
--- a/gemfiles/activesupport4.2.gemfile
+++ b/gemfiles/rails_4_2.gemfile
@@ -4,7 +4,6 @@ source "https://rubygems.org"
 
 gem "activesupport", "~> 4.2.0"
 gem "actionpack", "~> 4.2.0"
-gem "listen", "<= 3.0.6", platforms: [:ruby_21, :jruby]
 
 group :development do
   gem "pry"
@@ -12,4 +11,4 @@ group :development do
   gem "guard-minitest"
 end
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/activesupport5.0.gemfile b/gemfiles/rails_5_0.gemfile
similarity index 72%
rename from gemfiles/activesupport5.0.gemfile
rename to gemfiles/rails_5_0.gemfile
index 6a03d13..0fea132 100644
--- a/gemfiles/activesupport5.0.gemfile
+++ b/gemfiles/rails_5_0.gemfile
@@ -4,7 +4,6 @@ source "https://rubygems.org"
 
 gem "activesupport", "~> 5.0.0"
 gem "actionpack", "~> 5.0.0"
-gem "listen", "<= 3.0.6", platforms: [:ruby_21, :jruby]
 
 group :development do
   gem "pry"
@@ -12,4 +11,4 @@ group :development do
   gem "guard-minitest"
 end
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/activesupport4.1.gemfile b/gemfiles/rails_5_1.gemfile
similarity index 51%
rename from gemfiles/activesupport4.1.gemfile
rename to gemfiles/rails_5_1.gemfile
index 8eae1c9..bb501ef 100644
--- a/gemfiles/activesupport4.1.gemfile
+++ b/gemfiles/rails_5_1.gemfile
@@ -2,9 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 4.1.0"
-gem "actionpack", "~> 4.1.0"
-gem "listen", "<= 3.0.6", platforms: [:ruby_21, :jruby]
+gem "activesupport", "~> 5.1.0"
+gem "actionpack", "~> 5.1.0"
 
 group :development do
   gem "pry"
@@ -12,4 +11,4 @@ group :development do
   gem "guard-minitest"
 end
 
-gemspec :path => "../"
+gemspec path: "../"