Merge pull request #157 from collectiveidea/dg-sort-out-travis

Try to cleanup and group the build matrix better

.rubocop.yml

@@ -93,9 +93,6 @@ Style/Semicolon:
 Style/SingleLineBlockParams:
  Enabled: false
 
-Style/TrailingCommaInLiteral:
- Enabled: false
-
 Style/WordArray:
  Enabled: false
 

.travis.yml

@@ -13,15 +13,12 @@ env:
  - COMMAND=rspec
 gemfile: # Supported
  - gemfiles/mysql2/4-2.gemfile
- - gemfiles/mysql2/5-0.gemfile
  - gemfiles/mysql2/5-1.gemfile
  - gemfiles/mysql2/5-2.gemfile
  - gemfiles/postgresql/4-2.gemfile
- - gemfiles/postgresql/5-0.gemfile
  - gemfiles/postgresql/5-1.gemfile
  - gemfiles/postgresql/5-2.gemfile
  - gemfiles/sqlite3/4-2.gemfile
- - gemfiles/sqlite3/5-0.gemfile
  - gemfiles/sqlite3/5-1.gemfile
  - gemfiles/sqlite3/5-2.gemfile
 rvm: # Supported
@@ -45,12 +42,14 @@ matrix:
  # https://github.com/jruby/activerecord-jdbc-adapter/issues/700
  - rvm: jruby-9.1.8.0
  gemfile: gemfiles/mysql2/5-1.gemfile
- - rvm: jruby-9.1.8.0
- gemfile: gemfiles/mysql2/5-2.gemfile
  - rvm: jruby-9.1.8.0
  gemfile: gemfiles/postgresql/5-1.gemfile
+ - rvm: jruby-9.1.8.0
+ gemfile: gemfiles/mysql2/5-2.gemfile
  - rvm: jruby-9.1.8.0
  gemfile: gemfiles/postgresql/5-2.gemfile
+ - rvm: jruby-9.1.8.0
+ gemfile: gemfiles/sqlite3/5-2.gemfile
 
  include:
  #
@@ -64,6 +63,12 @@ matrix:
  # The future
  #
  # MRI 2.5.1
+ - rvm: 2.5.1
+ gemfile: gemfiles/mysql2/5-1.gemfile
+ - rvm: 2.5.1
+ gemfile: gemfiles/postgresql/5-1.gemfile
+ - rvm: 2.5.1
+ gemfile: gemfiles/sqlite3/5-1.gemfile
  - rvm: 2.5.1
  gemfile: gemfiles/mysql2/5-2.gemfile
  - rvm: 2.5.1
@@ -95,45 +100,56 @@ matrix:
  # The past
  #
  # EOL Active Record
- - gemfile: gemfiles/mysql2/3-0.gemfile
- rvm: 2.2.10
- - gemfile: gemfiles/mysql2/3-1.gemfile
- rvm: 2.2.10
- - gemfile: gemfiles/mysql2/3-2.gemfile
- rvm: 2.2.10
- - gemfile: gemfiles/mysql2/4-0.gemfile
- rvm: 2.3.7
- - gemfile: gemfiles/mysql2/4-1.gemfile
- rvm: 2.3.7
- - gemfile: gemfiles/postgresql/3-0.gemfile
- rvm: 2.2.10
- - gemfile: gemfiles/postgresql/3-1.gemfile
- rvm: 2.2.10
- - gemfile: gemfiles/postgresql/3-2.gemfile
- rvm: 2.2.10
- - gemfile: gemfiles/postgresql/4-0.gemfile
- rvm: 2.3.7
- - gemfile: gemfiles/postgresql/4-1.gemfile
- rvm: 2.3.7
- - gemfile: gemfiles/sqlite3/3-0.gemfile
- rvm: 2.2.10
- - gemfile: gemfiles/sqlite3/3-1.gemfile
- rvm: 2.2.10
- - gemfile: gemfiles/sqlite3/3-2.gemfile
- rvm: 2.2.10
- - gemfile: gemfiles/sqlite3/4-0.gemfile
- rvm: 2.3.7
- - gemfile: gemfiles/sqlite3/4-1.gemfile
- rvm: 2.3.7
+ # Rails 3.2 was maintained longer and is ruby 2.2 compatible
+ - rvm: 2.2.10
+ gemfile: gemfiles/mysql2/3-2.gemfile
+ - rvm: 2.2.10
+ gemfile: gemfiles/postgresql/3-2.gemfile
+ - rvm: 2.2.10
+ gemfile: gemfiles/sqlite3/3-2.gemfile
+ # Rails <= 4.0 was only compatible with ruby 2.0
+ # The test were running, but there are known incompatibilites
+ - rvm: 2.0.0-p648
+ gemfile: gemfiles/mysql2/3-0.gemfile
+ - rvm: 2.0.0-p648
+ gemfile: gemfiles/mysql2/3-1.gemfile
+ - rvm: 2.0.0-p648
+ gemfile: gemfiles/postgresql/3-0.gemfile
+ - rvm: 2.0.0-p648
+ gemfile: gemfiles/postgresql/3-1.gemfile
+ - rvm: 2.0.0-p648
+ gemfile: gemfiles/sqlite3/3-0.gemfile
+ - rvm: 2.0.0-p648
+ gemfile: gemfiles/sqlite3/3-1.gemfile
+ - rvm: 2.0.0-p648
+ gemfile: gemfiles/mysql2/4-0.gemfile
+ - rvm: 2.0.0-p648
+ gemfile: gemfiles/postgresql/4-0.gemfile
+ - rvm: 2.0.0-p648
+ gemfile: gemfiles/sqlite3/4-0.gemfile
+ # Rails 4.1 was only compatible with ruby 2.1
+ - rvm: 2.1.9
+ gemfile: gemfiles/mysql2/4-1.gemfile
+ - rvm: 2.1.9
+ gemfile: gemfiles/postgresql/4-1.gemfile
+ - rvm: 2.1.9
+ gemfile: gemfiles/sqlite3/4-1.gemfile
+ # Rails 5.0 was EOL with the release of 5.2
+ - rvm: 2.4.4
+ gemfile: gemfiles/mysql2/5-0.gemfile
+ - rvm: 2.4.4
+ gemfile: gemfiles/postgresql/5-0.gemfile
+ - rvm: 2.4.4
+ gemfile: gemfiles/sqlite3/5-0.gemfile
  #
  # The parallel dimension
  #
  # Rubinius
- - gemfile: gemfiles/mysql2/5-1.gemfile
- rvm: rbx-2
- - gemfile: gemfiles/postgresql/5-1.gemfile
- rvm: rbx-2
- - gemfile: gemfiles/sqlite3/5-1.gemfile
- rvm: rbx-2
+ - rvm: rbx-2
+ gemfile: gemfiles/mysql2/5-1.gemfile
+ - rvm: rbx-2
+ gemfile: gemfiles/postgresql/5-1.gemfile
+ - rvm: rbx-2
+ gemfile: gemfiles/sqlite3/5-1.gemfile
 
 sudo: false

gemfiles/mysql2/3-0.gemfile

@@ -1,15 +1,15 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
- gem 'activerecord-mysql2-adapter'
+ gem "activerecord-mysql2-adapter"
 
- gem 'coveralls', :require => false
- gem 'rspec', '>= 2.11'
- gem 'simplecov', :require => false
+ gem "coveralls", require: false
+ gem "rspec", ">= 2.11"
+ gem "simplecov", require: false
 
- gem 'activerecord', "~> 3.0.0"
+ gem "activerecord", "~> 3.0.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"

gemfiles/mysql2/3-1.gemfile

@@ -1,14 +1,13 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
-gem 'mysql2', '~> 0.3.10'
+gem "mysql2", "~> 0.3.10"
 
-gem 'coveralls', :require => false
-gem 'rspec', '>= 2.11'
-gem 'simplecov', :require => false
+gem "coveralls", require: false
+gem "rspec", ">= 2.11"
+gem "simplecov", require: false
 
-gem 'activerecord', "~> 3.1.0"
+gem "activerecord", "~> 3.1.0"
 
-
-gemspec :path => "../../"
+gemspec path: "../../"

gemfiles/mysql2/3-2.gemfile

@@ -1,13 +1,13 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
-gem 'mysql2', '~> 0.3.10'
+gem "mysql2", "~> 0.3.10"
 
-gem 'coveralls', :require => false
-gem 'rspec', '>= 2.11'
-gem 'simplecov', :require => false
+gem "coveralls", require: false
+gem "rspec", ">= 2.11"
+gem "simplecov", require: false
 
-gem 'activerecord', "~> 3.2.0"
+gem "activerecord", "~> 3.2.0"
 
-gemspec :path => "../../"
+gemspec path: "../../"

gemfiles/mysql2/4-0.gemfile

@@ -1,13 +1,13 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
-gem 'mysql2', '~> 0.3.10'
+gem "mysql2", "~> 0.3.10"
 
-gem 'coveralls', :require => false
-gem 'rspec', '>= 2.11'
-gem 'simplecov', :require => false
+gem "coveralls", require: false
+gem "rspec", ">= 2.11"
+gem "simplecov", require: false
 
-gem 'activerecord', "~> 4.0.0"
+gem "activerecord", "~> 4.0.0"
 
-gemspec :path => "../../"
+gemspec path: "../../"

gemfiles/mysql2/4-1.gemfile

@@ -1,13 +1,13 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
-gem 'mysql2', '~> 0.3.13'
+gem "mysql2", "~> 0.3.13"
 
-gem 'coveralls', :require => false
-gem 'rspec', '>= 2.11'
-gem 'simplecov', :require => false
+gem "coveralls", require: false
+gem "rspec", ">= 2.11"
+gem "simplecov", require: false
 
-gem 'activerecord', "~> 4.1.0"
+gem "activerecord", "~> 4.1.0"
 
-gemspec :path => "../../"
+gemspec path: "../../"

gemfiles/mysql2/4-2.gemfile

@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcmysql-adapter', '< 50.0'
+ gem "activerecord-jdbcmysql-adapter", "< 50.0"
  end
 
  platforms :ruby, :mswin, :mingw do
- gem 'mysql2', '>= 0.3.13', '< 0.5'
+ gem "mysql2", ">= 0.3.13", "< 0.5"
  end
 
- gem 'coveralls', :require => false
- gem 'rspec', '>= 2.11'
- gem 'simplecov', :require => false
+ gem "coveralls", require: false
+ gem "rspec", ">= 2.11"
+ gem "simplecov", require: false
 
- gem 'activerecord', "~> 4.2.0"
+ gem "activerecord", "~> 4.2.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"

gemfiles/mysql2/5-0.gemfile

@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcmysql-adapter'
+ gem "activerecord-jdbcmysql-adapter"
  end
 
  platforms :ruby, :mswin, :mingw do
- gem 'mysql2'
+ gem "mysql2"
  end
 
- gem 'coveralls', :require => false
- gem 'rspec', '>= 2.11'
- gem 'simplecov', :require => false
+ gem "coveralls", require: false
+ gem "rspec", ">= 2.11"
+ gem "simplecov", require: false
 
- gem 'activerecord', "~> 5.0.0"
+ gem "activerecord", "~> 5.0.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"

gemfiles/mysql2/5-1.gemfile

@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcmysql-adapter'
+ gem "activerecord-jdbcmysql-adapter"
  end
 
  platforms :ruby, :mswin, :mingw do
- gem 'mysql2'
+ gem "mysql2"
  end
 
- gem 'coveralls', :require => false
- gem 'rspec', '>= 2.11'
- gem 'simplecov', :require => false
+ gem "coveralls", require: false
+ gem "rspec", ">= 2.11"
+ gem "simplecov", require: false
 
- gem 'activerecord', "~> 5.1.0"
+ gem "activerecord", "~> 5.1.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"

gemfiles/mysql2/5-2.gemfile

@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcmysql-adapter'
+ gem "activerecord-jdbcmysql-adapter"
  end
 
  platforms :ruby, :mswin, :mingw do
- gem 'mysql2'
+ gem "mysql2"
  end
 
- gem 'coveralls', :require => false
- gem 'rspec', '>= 2.11'
- gem 'simplecov', :require => false
+ gem "coveralls", require: false
+ gem "rspec", ">= 2.11"
+ gem "simplecov", require: false
 
- gem 'activerecord', "~> 5.2.0"
+ gem "activerecord", "~> 5.2.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"