Drop support for EOL rubies and simplify test matrix (#503)

* Drop Ruby 2.2, add Ruby 2.6
* Drop Mongoid < 6
* Add Mongoid 6 and 7 in test matrix
* Allow mongoid tests to fail for now
* Simplify the test matrix

.travis.yml

@@ -11,60 +11,34 @@ script: bundle exec rake
 after_success:
   - bundle exec codeclimate-test-reporter
 
-matrix:
-  include:
-    - rvm: 2.5.1
-      gemfile: gemfiles/activerecord_4.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.4.4
-      gemfile: gemfiles/activerecord_4.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.3.7
-      gemfile: gemfiles/activerecord_4.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.2.10
-      gemfile: gemfiles/activerecord_4.gemfile
-      env: ADAPTER=active_record
+rvm:
+  - 2.6.1
+  - 2.5.3
+  - 2.4.5
+  - 2.3.8
+
+gemfile:
+  - gemfiles/activerecord_4.gemfile
+  - gemfiles/activerecord_5.gemfile
+  - gemfiles/mongoid_6.gemfile
+  - gemfiles/mongoid_7.gemfile
+
+env: 
+  - ADAPTER=active_record
+  - ADAPTER=mongoid
 
-    - rvm: 2.5.1
-      gemfile: gemfiles/activerecord_5.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.4.4
-      gemfile: gemfiles/activerecord_5.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.3.7
-      gemfile: gemfiles/activerecord_5.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.2.10
-      gemfile: gemfiles/activerecord_5.gemfile
-      env: ADAPTER=active_record
-
-    - rvm: 2.5.1
-      gemfile: gemfiles/mongoid_4.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.4.4
-      gemfile: gemfiles/mongoid_4.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.3.7
-      gemfile: gemfiles/mongoid_4.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.2.10
-      gemfile: gemfiles/mongoid_4.gemfile
-      env: ADAPTER=mongoid
-
-    - rvm: 2.5.1
-      gemfile: gemfiles/mongoid_5.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.4.4
-      gemfile: gemfiles/mongoid_5.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.3.7
-      gemfile: gemfiles/mongoid_5.gemfile
+matrix:
+  exclude:
+    - gemfile: gemfiles/activerecord_4.gemfile
       env: ADAPTER=mongoid
-    - rvm: 2.2.10
-      gemfile: gemfiles/mongoid_5.gemfile
+    - gemfile: gemfiles/activerecord_5.gemfile
       env: ADAPTER=mongoid
-
+    - gemfile: gemfiles/mongoid_6.gemfile
+      env: ADAPTER=active_record
+    - gemfile: gemfiles/mongoid_7.gemfile
+      env: ADAPTER=active_record
+  allow_failures:
+    - env: ADAPTER=mongoid
 
 services: mongodb
 

Appraisals

@@ -1,20 +1,20 @@
-appraise 'mongoid-4' do
-  gem "mongoid", "~> 4"
+appraise 'mongoid-6' do
+  gem "mongoid", "~> 6"
   gem "bson_ext", :platform => "ruby"
 end
 
-appraise 'mongoid-5' do
-  gem "mongoid", "~> 5"
+appraise 'mongoid-7' do
+  gem "mongoid", "~> 7"
   gem "bson_ext", :platform => "ruby"
 end
 
 appraise 'activerecord-4' do
-  gem "sqlite3", :platform => "ruby"
-  gem "activerecord", "~> 4.2.5", :require => "active_record"
+  gem "sqlite3", "~> 1.3.6", :platform => "ruby"
+  gem "activerecord", "~> 4.2.11", :require => "active_record"
 end
 
 appraise 'activerecord-5' do
-  gem "sqlite3", :platform => "ruby"
+  gem "sqlite3", "~> 1.3.6", :platform => "ruby"
   gem "activerecord", ">= 5.2.0", :require => "active_record"
 
   # Ammeter dependencies:

gemfiles/activerecord_4.gemfile

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", platform: "ruby"
-gem "activerecord", "~> 4.2.5", require: "active_record"
+gem "sqlite3", "~> 1.3.6", platform: "ruby"
+gem "activerecord", "~> 4.2.11", require: "active_record"
 
 group :test do
   gem "appraisal"

gemfiles/activerecord_5.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", platform: "ruby"
+gem "sqlite3", "~> 1.3.6", platform: "ruby"
 gem "activerecord", ">= 5.2.0", require: "active_record"
 gem "actionpack", ">= 5.2.0"
 gem "activemodel", ">= 5.2.0"

gemfiles/mongoid_5.gemfile → gemfiles/mongoid_6.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 5"
+gem "mongoid", "~> 6"
 gem "bson_ext", platform: "ruby"
 
 group :test do

gemfiles/mongoid_4.gemfile → gemfiles/mongoid_7.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 4"
+gem "mongoid", "~> 7"
 gem "bson_ext", platform: "ruby"
 
 group :test do

rolify.gemspec

@@ -27,10 +27,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.2'
+  s.required_ruby_version = '>= 2.3'
 
   s.add_development_dependency 'ammeter',     '~> 1.1' # Spec generator
-  s.add_development_dependency 'bundler',     '~> 1.13' # packaging feature
-  s.add_development_dependency 'rake',        '~> 11.3' # Tasks manager
-  s.add_development_dependency 'rspec-rails', '~> 3.4'
+  s.add_development_dependency 'bundler',     '~> 2.0' # packaging feature
+  s.add_development_dependency 'rake',        '~> 12.3' # Tasks manager
+  s.add_development_dependency 'rspec-rails', '~> 3.8'
 end

spec/support/adapters/mongoid_3.yml → spec/support/adapters/mongoid_7.yml

@@ -1,6 +1,6 @@
 test:
-  sessions:
+  clients:
     default:
       database: godfather
       hosts:
-        - localhost:27017
+        - localhost:27017