Add Rails 6.0 to the test matrix

.gitlab-ci.yml

@@ -77,3 +77,8 @@ rails_52_ruby_25:
   <<: *ruby_25
   script:
     - bundle exec appraisal rails52 bundle exec rspec
+
+rails_60_ruby_25:
+  <<: *ruby_25
+  script:
+    - bundle exec appraisal rails60 bundle exec rspec

Appraisals

 appraise "rails42" do
   gem "activesupport", "~> 4.2.10"
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise "rails50" do
   gem "activesupport", "~> 5.0.0"
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise "rails51" do
   gem "activesupport", "~> 5.1.0"
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise "rails52" do
   gem "activesupport", "~> 5.2.0"
+  gem 'sqlite3', '~> 1.3.6'
+end
+
+if RUBY_VERSION.to_f >= 2.5
+  appraise "rails60" do
+    gem "activesupport", "~> 6.0.0"
+    gem 'sqlite3', '~> 1.4'
+  end
 end

Gemfile

@@ -11,7 +11,7 @@ group :test do
   gem 'active_interaction', '~> 3.0'
   gem 'appsignal', '~> 2.9.8'
   gem 'climate_control' # For ENV modification in specs
-  gem 'combustion', '~> 0.5.2'
+  gem 'combustion', '~> 1.1.1'
   gem 'fakefs', require: 'fakefs/safe'
   gem 'guard-rspec', '~> 4.2.6'
   gem 'responders'

Gemfile.lock

@@ -10,7 +10,7 @@ PATH
   specs:
     roqua-support (0.3.2)
       active_interaction (~> 3.0)
-      activesupport (>= 3.2, < 6)
+      activesupport (>= 3.2, < 6.1)
       appsignal (~> 2.9.8)
       naught (~> 1.0)
       with_advisory_lock (~> 3.2)
@@ -55,7 +55,7 @@ GEM
     builder (3.2.3)
     climate_control (0.2.0)
     coderay (1.1.1)
-    combustion (0.5.5)
+    combustion (1.1.1)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
@@ -165,7 +165,6 @@ GEM
     ruby_dep (1.5.0)
     shellany (0.0.1)
     slop (3.6.0)
-    sqlite3 (1.3.13)
     thor (0.19.4)
     thread_safe (0.3.5)
     timecop (0.9.1)
@@ -182,10 +181,10 @@ DEPENDENCIES
   actionpack (>= 4.0)
   active_interaction (~> 3.0)
   appraisal
-  appsignal (~> 2.9.6)
+  appsignal (~> 2.9.8)
   bundler (~> 1.0)
   climate_control
-  combustion (~> 0.5.2)
+  combustion (~> 1.1.1)
   delayed_job_active_record
   fakefs
   guard-rspec (~> 4.2.6)
@@ -197,7 +196,6 @@ DEPENDENCIES
   rspec (>= 2.12.0, < 4.0)
   rspec-instrumentation-matcher
   rspec-rails
-  sqlite3 (~> 1.3.6)
   timecop
 
 BUNDLED WITH

gemfiles/rails42.gemfile

@@ -5,18 +5,20 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
 gem "activesupport", "~> 4.2.10"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "actionpack", ">= 4.0"
   gem "active_interaction", "~> 3.0"
-  gem "appsignal"
+  gem "appsignal", "~> 2.9.8"
   gem "climate_control"
-  gem "combustion", "~> 0.5.2"
+  gem "combustion", "~> 1.1.1"
   gem "fakefs", :require => "fakefs/safe"
   gem "guard-rspec", "~> 4.2.6"
   gem "responders"
   gem "rspec-instrumentation-matcher"
   gem "rspec-rails"
+  gem "pry"
 end
 
 gemspec :path => "../"

gemfiles/rails50.gemfile

@@ -5,18 +5,20 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
 gem "activesupport", "~> 5.0.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "actionpack", ">= 4.0"
   gem "active_interaction", "~> 3.0"
-  gem "appsignal"
+  gem "appsignal", "~> 2.9.8"
   gem "climate_control"
-  gem "combustion", "~> 0.5.2"
+  gem "combustion", "~> 1.1.1"
   gem "fakefs", :require => "fakefs/safe"
   gem "guard-rspec", "~> 4.2.6"
   gem "responders"
   gem "rspec-instrumentation-matcher"
   gem "rspec-rails"
+  gem "pry"
 end
 
 gemspec :path => "../"

gemfiles/rails51.gemfile

@@ -5,18 +5,20 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
 gem "activesupport", "~> 5.1.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "actionpack", ">= 4.0"
   gem "active_interaction", "~> 3.0"
-  gem "appsignal"
+  gem "appsignal", "~> 2.9.8"
   gem "climate_control"
-  gem "combustion", "~> 0.5.2"
+  gem "combustion", "~> 1.1.1"
   gem "fakefs", :require => "fakefs/safe"
   gem "guard-rspec", "~> 4.2.6"
   gem "responders"
   gem "rspec-instrumentation-matcher"
   gem "rspec-rails"
+  gem "pry"
 end
 
 gemspec :path => "../"

gemfiles/rails52.gemfile

@@ -5,18 +5,20 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
 gem "activesupport", "~> 5.2.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "actionpack", ">= 4.0"
   gem "active_interaction", "~> 3.0"
-  gem "appsignal"
+  gem "appsignal", "~> 2.9.8"
   gem "climate_control"
-  gem "combustion", "~> 0.5.2"
+  gem "combustion", "~> 1.1.1"
   gem "fakefs", :require => "fakefs/safe"
   gem "guard-rspec", "~> 4.2.6"
   gem "responders"
   gem "rspec-instrumentation-matcher"
   gem "rspec-rails"
+  gem "pry"
 end
 
 gemspec :path => "../"

gemfiles/rails60.gemfile

+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
+gem "activesupport", "~> 6.0.0"
+gem "sqlite3", "~> 1.4"
+
+group :test do
+  gem "actionpack", ">= 4.0"
+  gem "active_interaction", "~> 3.0"
+  gem "appsignal", "~> 2.9.8"
+  gem "climate_control"
+  gem "combustion", "~> 1.1.1"
+  gem "fakefs", :require => "fakefs/safe"
+  gem "guard-rspec", "~> 4.2.6"
+  gem "responders"
+  gem "rspec-instrumentation-matcher"
+  gem "rspec-rails"
+  gem "pry"
+end
+
+gemspec :path => "../"

roqua-support.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'active_interaction', '~> 3.0'
-  gem.add_dependency 'activesupport', '>= 3.2', '< 6'
+  gem.add_dependency 'activesupport', '>= 3.2', '< 6.1'
   gem.add_dependency 'naught', '~> 1.0'
   gem.add_dependency 'with_advisory_lock', '~> 3.2'
   gem.add_dependency 'appsignal', '~> 2.9.8'
@@ -28,6 +28,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'delayed_job_active_record'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '>= 2.12.0', '< 4.0'
-  gem.add_development_dependency 'sqlite3', '~> 1.3.6'
   gem.add_development_dependency 'timecop'
 end