Updated travis matrix (#42)

* Updated travis matrix

* Update rake to avoid CVE-2020-8130

* Rails 6 support is not ready

Author: JonRowe

.travis.yml

@@ -7,46 +7,60 @@ before_install:
   - gem --version
 matrix:
   include:
-    # Rails dev / 6 builds >= 2.5.0
-    - rvm: 2.6.2
-      env: RAILS_VERSION=master
-    - rvm: 2.5.5
-      env: RAILS_VERSION=master
+    # Rails dev / 6 builds >= 2.4.10
+    - rvm: 2.7.1
+      env: RAILS_VERSION='~> 6.0.0'
+    - rvm: 2.6.6
+      env: RAILS_VERSION='~> 6.0.0'
+    - rvm: 2.5.8
+      env: RAILS_VERSION='~> 6.0.0'
 
     # Rails 5.2 builds >= 2.2.2
-    - rvm: 2.5.5
+    - rvm: 2.7.1
       env: RAILS_VERSION='~> 5.2.0'
-    - rvm: 2.4.6
+    - rvm: 2.6.6
+      env: RAILS_VERSION='~> 5.2.0'
+    - rvm: 2.5.8
+      env: RAILS_VERSION='~> 5.2.0'
+    - rvm: 2.4.10
       env: RAILS_VERSION='~> 5.2.0'
     - rvm: 2.3.8
       env: RAILS_VERSION='~> 5.2.0'
     - rvm: 2.2.10
       env: RAILS_VERSION='~> 5.2.0'
 
     # Rails 5.1 Builds >= 2.2.2
-    - rvm: 2.5.5
+    - rvm: 2.7.1
+      env: RAILS_VERSION='~> 5.1.0'
+    - rvm: 2.6.6
       env: RAILS_VERSION='~> 5.1.0'
-    - rvm: 2.4.6
+    - rvm: 2.5.8
+      env: RAILS_VERSION='~> 5.1.0'
+    - rvm: 2.4.10
       env: RAILS_VERSION='~> 5.1.0'
     - rvm: 2.3.8
       env: RAILS_VERSION='~> 5.1.0'
     - rvm: 2.2.10
       env: RAILS_VERSION='~> 5.1.0'
 
     # Rails 5.0 Builds >= 2.2.2
-    - rvm: 2.5.5
+    - rvm: 2.7.1
+      env: RAILS_VERSION='~> 5.0.0'
+    - rvm: 2.6.6
+      env: RAILS_VERSION='~> 5.0.0'
+    - rvm: 2.5.8
       env: RAILS_VERSION='~> 5.0.0'
-    - rvm: 2.4.6
+    - rvm: 2.4.10
       env: RAILS_VERSION='~> 5.0.0'
     - rvm: 2.3.8
       env: RAILS_VERSION='~> 5.0.0'
     - rvm: 2.2.10
       env: RAILS_VERSION='~> 5.0.0'
 
     # Rails 4.2 Builds >= 1.9.3
-    - rvm: 2.4.6
+    - rvm: 2.4.10
       env: RAILS_VERSION='~> 4.2.0'
-    - rvm: 2.4.6
+    - rvm: 2.4.10
       env: RAILS_VERSION=4-2-stable
     - rvm: 2.3.8
       env: RAILS_VERSION='~> 4.2.0'
@@ -164,7 +178,7 @@ matrix:
       env: RAILS_VERSION='~> 3.0.20'
 
   allow_failures:
-    - env: RAILS_VERSION=master
+    - env: RAILS_VERSION='~> 6.0.0'
 
   fast_finish: true
 

Gemfile

@@ -19,23 +19,25 @@ group :documentation do
   gem 'github-markup', '1.0.0'
 end
 
-case version = ENV.fetch('RAILS_VERSION', '4.2.4')
-when /\Amaster\z/, /stable\z/
+version = ENV.fetch('RAILS_VERSION', '6.0.0')
+version_float = version.tr('-', '.').tr('~> ', '').to_f
+
+if version_float < 4
+  gem 'sqlite3', '~> 1.3.5'
+elsif version_float < 6
+  gem 'sqlite3', '~> 1.3.6'
+else
+  gem 'sqlite3', '~> 1.4'
+end
+
+if version =~ /stable\z/
   gem "activerecord", :github => "rails/rails", :branch => version
   gem "activemodel", :github => "rails/rails", :branch => version
   gem "activesupport", :github => "rails/rails", :branch => version
-  if version.start_with?('4')
-    gem 'sqlite3', '~> 1.3.6'
-  elsif version.start_with?('3')
-    gem 'sqlite3', '~> 1.3.5'
-  else
-    gem 'sqlite3'
-  end
 else
   gem "activerecord", version
   gem "activemodel", version
   gem "activesupport", version
-  gem 'sqlite3', '~> 1.3.6'
 end
 
 if version < '4.0.0'

rspec-activemodel-mocks.gemspec

@@ -36,7 +36,16 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<activemodel>,   [">= 3.0"])
   s.add_runtime_dependency(%q<rspec-mocks>,   [">= 2.99", "< 4.0"])
 
-  s.add_development_dependency 'rake',     '~> 10.0.0'
+  if RUBY_VERSION.to_f < 1.9 || RUBY_VERSION == '1.9.2'
+    s.add_development_dependency "rake",     "~> 10.0.0"
+  elsif RUBY_VERSION.to_f < 2
+    s.add_development_dependency "rake",     "~> 11.0.0"
+  elsif RUBY_VERSION.to_f < 2.3
+    s.add_development_dependency "rake",     "~> 12.3.2"
+  else
+    s.add_development_dependency "rake",     "~> 13.0.0"
+  end
+
   s.add_development_dependency 'cucumber', '~> 1.3'
   s.add_development_dependency 'aruba',    '~> 0.4.11'
   s.add_development_dependency 'ZenTest',  '~> 4.11.2'

script/update_rubygems_and_install_bundler

@@ -1,23 +1,16 @@
 #!/bin/bash
-#
-This file was generated on 2019-01-03T20:34:23+00:00 from the rspec-dev repo.
-# DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e
 
-function is_ruby_23_plus_and_not_rails_5 {
+function is_ruby_23_plus {
   if ruby -e "exit(RUBY_VERSION.to_f >= 2.3)"; then
-    if ruby -e "exit(ENV['RAILS_VERSION'].to_f < 5)"; then
-      return 1
-    else
-      return 0
-    fi
+    return 0
   else
     return 1
   fi
 }
 
-if is_ruby_23_plus_and_not_rails_5; then
+if is_ruby_23_plus; then
   gem update --system
   gem install bundler
 else