From d7bbb646d060ffec2a853bc4e4069b3e12e7763b Mon Sep 17 00:00:00 2001
From: Henk van der Veen <henk.van.der.veen@roqua.nl>
Date: Wed, 6 May 2020 08:57:19 +0000
Subject: [PATCH] remove rails42,50, remove ruby23,24, add ruby26, allow
appsignal 2.10
---
.gitlab-ci.yml | 48 ++----
Appraisals | 22 +--
Gemfile | 3 +-
Gemfile.lock | 237 +++++++++++++++---------------
gemfiles/rails42.gemfile | 24 ---
gemfiles/rails50.gemfile | 24 ---
gemfiles/rails51.gemfile | 7 +-
gemfiles/rails52.gemfile | 10 +-
gemfiles/rails60.gemfile | 8 +-
roqua-support.gemspec | 5 +-
spec/roqua/support/errors_spec.rb | 1 +
11 files changed, 160 insertions(+), 229 deletions(-)
delete mode 100644 gemfiles/rails42.gemfile
delete mode 100644 gemfiles/rails50.gemfile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16297cd..c9af023 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,25 +2,12 @@ variables:
RAILS_ENV: "test"
before_script:
+ - if [ -x "$(command -v apk)" ]; then apk add sqlite-dev; fi
- export BUNDLE_PATH=$CI_PROJECT_DIR/.gems
- bundle --jobs 2 --retry 3
- bundle exec appraisal
- bundle --jobs 2 --retry 3
-.ruby_23: &ruby_23
- image: registry.roqua.nl/roqua/roqua-build-images:ruby-2.3-rails-base-test
- cache:
- key: ruby_23
- paths:
- - .gems
-
-.ruby_24: &ruby_24
- image: registry.roqua.nl/roqua/roqua-build-images:ruby-2.4-rails-base-test
- cache:
- key: ruby_24
- paths:
- - .gems
-
.ruby_25: &ruby_25
image: registry.roqua.nl/roqua/docker-base-images:ruby-2.5
cache:
@@ -28,33 +15,25 @@ before_script:
paths:
- .gems
-rails_50_ruby_24:
- <<: *ruby_24
- script:
- - bundle exec appraisal rails50 bundle exec rspec
-
-rails_50_ruby_25:
- <<: *ruby_25
- script:
- - bundle exec appraisal rails50 bundle exec rspec
-
-rails_51_ruby_24:
- <<: *ruby_24
- script:
- - bundle exec appraisal rails51 bundle exec rspec
+.ruby_26: &ruby_26
+ image: registry.roqua.nl/roqua/docker-base-images:ruby-2.6-builder
+ cache:
+ key: ruby_26
+ paths:
+ - .gems
rails_51_ruby_25:
<<: *ruby_25
script:
- bundle exec appraisal rails51 bundle exec rspec
-rails_52_ruby_24:
- <<: *ruby_24
+rails_52_ruby_25:
+ <<: *ruby_25
script:
- bundle exec appraisal rails52 bundle exec rspec
-rails_52_ruby_25:
- <<: *ruby_25
+rails_52_ruby_26:
+ <<: *ruby_26
script:
- bundle exec appraisal rails52 bundle exec rspec
@@ -62,3 +41,8 @@ rails_60_ruby_25:
<<: *ruby_25
script:
- bundle exec appraisal rails60 bundle exec rspec
+
+rails_60_ruby_26:
+ <<: *ruby_26
+ script:
+ - bundle exec appraisal rails60 bundle exec rspec
diff --git a/Appraisals b/Appraisals
index 60b3e63..1438b61 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,13 +1,3 @@
-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'
@@ -15,12 +5,12 @@ end
appraise "rails52" do
gem "activesupport", "~> 5.2.0"
- gem 'sqlite3', '~> 1.3.6'
+ gem 'sqlite3', '~> 1.4'
+ gem 'appsignal', '~> 2.9.8' # test each minor versions we support
end
-if RUBY_VERSION.to_f >= 2.5
- appraise "rails60" do
- gem "activesupport", "~> 6.0.0"
- gem 'sqlite3', '~> 1.4'
- end
+appraise "rails60" do
+ gem "activesupport", "~> 6.0.0"
+ gem 'sqlite3', '~> 1.4'
+ gem 'appsignal', '~> 2.10.6'
end
diff --git a/Gemfile b/Gemfile
index e24c6a9..4dfd599 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,6 @@ gem 'roqua_styleguide', git: 'https://gitlab.roqua.nl/roqua/styleguide.git'
group :test do
gem 'actionpack', '>= 4.0'
gem 'active_interaction', '~> 3.0'
- gem 'appsignal', '~> 2.9.8'
gem 'climate_control' # For ENV modification in specs
gem 'combustion', '~> 1.1.1'
gem 'fakefs', require: 'fakefs/safe'
@@ -18,4 +17,4 @@ group :test do
gem 'rspec-instrumentation-matcher'
gem 'rspec-rails'
gem 'pry'
-end
+end
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index c713215..e9e68e7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,79 +1,80 @@
GIT
remote: https://gitlab.roqua.nl/roqua/styleguide.git
- revision: e1fbbb611484e295719ed91c4eef889753ac8d8f
+ revision: 6d98107ef10d2dc5a4a785a4b0977f100475e007
specs:
- roqua_styleguide (0.0.6)
- rubocop (~> 0.50.0)
+ roqua_styleguide (0.0.8)
+ rubocop (~> 0.80.0)
+ rubocop-rails
PATH
remote: .
specs:
roqua-support (0.3.3)
active_interaction (~> 3.0)
- activesupport (>= 3.2, < 6.1)
- appsignal (~> 2.9.8)
+ activesupport (>= 5.1, < 6.1)
+ appsignal (>= 2.9, < 2.11)
naught (~> 1.0)
with_advisory_lock (~> 3.2)
GEM
remote: https://rubygems.org/
specs:
- actionpack (5.0.1)
- actionview (= 5.0.1)
- activesupport (= 5.0.1)
- rack (~> 2.0)
- rack-test (~> 0.6.3)
+ actionpack (6.0.2.2)
+ actionview (= 6.0.2.2)
+ activesupport (= 6.0.2.2)
+ rack (~> 2.0, >= 2.0.8)
+ rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.0.1)
- activesupport (= 5.0.1)
+ rails-html-sanitizer (~> 1.0, >= 1.2.0)
+ actionview (6.0.2.2)
+ activesupport (= 6.0.2.2)
builder (~> 3.1)
- erubis (~> 2.7.0)
+ erubi (~> 1.4)
rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
- active_interaction (3.4.0)
- activemodel (>= 4, < 6)
- activemodel (5.0.1)
- activesupport (= 5.0.1)
- activerecord (5.0.1)
- activemodel (= 5.0.1)
- activesupport (= 5.0.1)
- arel (~> 7.0)
- activesupport (5.0.1)
+ rails-html-sanitizer (~> 1.1, >= 1.2.0)
+ active_interaction (3.8.2)
+ activemodel (>= 4, < 7)
+ activemodel (6.0.2.2)
+ activesupport (= 6.0.2.2)
+ activerecord (6.0.2.2)
+ activemodel (= 6.0.2.2)
+ activesupport (= 6.0.2.2)
+ activesupport (6.0.2.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (~> 0.7)
+ i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
- appraisal (2.1.0)
+ zeitwerk (~> 2.2)
+ appraisal (2.2.0)
bundler
rake
thor (>= 0.14.0)
- appsignal (2.9.8)
+ appsignal (2.9.18)
rack
- arel (7.1.4)
- ast (2.3.0)
- builder (3.2.3)
+ ast (2.4.0)
+ builder (3.2.4)
climate_control (0.2.0)
- coderay (1.1.1)
- combustion (1.1.1)
+ coderay (1.1.2)
+ combustion (1.1.2)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
thor (>= 0.14.6)
- concurrent-ruby (1.0.4)
- delayed_job (4.1.4)
- activesupport (>= 3.0, < 5.2)
- delayed_job_active_record (4.1.2)
- activerecord (>= 3.0, < 5.2)
+ concurrent-ruby (1.1.6)
+ crass (1.0.6)
+ delayed_job (4.1.8)
+ activesupport (>= 3.0, < 6.1)
+ delayed_job_active_record (4.1.4)
+ activerecord (>= 3.0, < 6.1)
delayed_job (>= 3.0, < 5)
diff-lcs (1.3)
- erubis (2.7.0)
- fakefs (0.15.0)
- ffi (1.9.17)
+ erubi (1.9.0)
+ fakefs (1.2.2)
+ ffi (1.12.2)
formatador (0.2.5)
- guard (2.14.0)
+ guard (2.16.2)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
- lumberjack (~> 1.0)
+ lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
@@ -82,97 +83,102 @@ GEM
guard-rspec (4.2.10)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
- i18n (0.7.0)
- listen (3.1.5)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
- ruby_dep (~> 1.2)
- loofah (2.0.3)
+ i18n (1.8.2)
+ concurrent-ruby (~> 1.0)
+ jaro_winkler (1.5.4)
+ listen (3.2.1)
+ rb-fsevent (~> 0.10, >= 0.10.3)
+ rb-inotify (~> 0.9, >= 0.9.10)
+ loofah (2.5.0)
+ crass (~> 1.0.2)
nokogiri (>= 1.5.9)
- lumberjack (1.0.11)
- method_source (0.8.2)
- mini_portile2 (2.1.0)
- minitest (5.10.1)
+ lumberjack (1.2.4)
+ method_source (1.0.0)
+ mini_portile2 (2.4.0)
+ minitest (5.14.0)
naught (1.1.0)
nenv (0.3.0)
- nokogiri (1.7.0.1)
- mini_portile2 (~> 2.1.0)
- notiffany (0.1.1)
+ nokogiri (1.10.9)
+ mini_portile2 (~> 2.4.0)
+ notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
- parallel (1.12.0)
- parser (2.4.0.0)
- ast (~> 2.2)
- powerpack (0.1.1)
- pry (0.10.4)
- coderay (~> 1.1.0)
- method_source (~> 0.8.1)
- slop (~> 3.4)
- rack (2.0.7)
- rack-test (0.6.3)
- rack (>= 1.0)
- rails-dom-testing (2.0.2)
- activesupport (>= 4.2.0, < 6.0)
- nokogiri (~> 1.6)
- rails-html-sanitizer (1.0.3)
- loofah (~> 2.0)
- railties (5.0.1)
- actionpack (= 5.0.1)
- activesupport (= 5.0.1)
+ parallel (1.19.1)
+ parser (2.7.1.2)
+ ast (~> 2.4.0)
+ pry (0.13.1)
+ coderay (~> 1.1)
+ method_source (~> 1.0)
+ rack (2.2.2)
+ rack-test (1.1.0)
+ rack (>= 1.0, < 3)
+ rails-dom-testing (2.0.3)
+ activesupport (>= 4.2.0)
+ nokogiri (>= 1.6)
+ rails-html-sanitizer (1.3.0)
+ loofah (~> 2.3)
+ railties (6.0.2.2)
+ actionpack (= 6.0.2.2)
+ activesupport (= 6.0.2.2)
method_source
rake (>= 0.8.7)
- thor (>= 0.18.1, < 2.0)
- rainbow (2.2.2)
- rake
- rake (12.1.0)
- rb-fsevent (0.9.8)
- rb-inotify (0.9.7)
- ffi (>= 0.5.0)
- responders (2.3.0)
- railties (>= 4.2.0, < 5.1)
- rspec (3.5.0)
- rspec-core (~> 3.5.0)
- rspec-expectations (~> 3.5.0)
- rspec-mocks (~> 3.5.0)
- rspec-core (3.5.4)
- rspec-support (~> 3.5.0)
- rspec-expectations (3.5.0)
+ thor (>= 0.20.3, < 2.0)
+ rainbow (3.0.0)
+ rake (13.0.1)
+ rb-fsevent (0.10.4)
+ rb-inotify (0.10.1)
+ ffi (~> 1.0)
+ responders (3.0.0)
+ actionpack (>= 5.0)
+ railties (>= 5.0)
+ rexml (3.2.4)
+ rspec (3.9.0)
+ rspec-core (~> 3.9.0)
+ rspec-expectations (~> 3.9.0)
+ rspec-mocks (~> 3.9.0)
+ rspec-core (3.9.2)
+ rspec-support (~> 3.9.3)
+ rspec-expectations (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.5.0)
- rspec-instrumentation-matcher (0.0.4)
+ rspec-support (~> 3.9.0)
+ rspec-instrumentation-matcher (0.0.9)
activesupport
rspec-expectations
- rspec-mocks (3.5.0)
+ rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.5.0)
- rspec-rails (3.5.2)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- railties (>= 3.0)
- rspec-core (~> 3.5.0)
- rspec-expectations (~> 3.5.0)
- rspec-mocks (~> 3.5.0)
- rspec-support (~> 3.5.0)
- rspec-support (3.5.0)
- rubocop (0.50.0)
+ rspec-support (~> 3.9.0)
+ rspec-rails (4.0.0)
+ actionpack (>= 4.2)
+ activesupport (>= 4.2)
+ railties (>= 4.2)
+ rspec-core (~> 3.9)
+ rspec-expectations (~> 3.9)
+ rspec-mocks (~> 3.9)
+ rspec-support (~> 3.9)
+ rspec-support (3.9.3)
+ rubocop (0.80.1)
+ jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
- parser (>= 2.3.3.1, < 3.0)
- powerpack (~> 0.1)
- rainbow (>= 2.2.2, < 3.0)
+ parser (>= 2.7.0.1)
+ rainbow (>= 2.2.2, < 4.0)
+ rexml
ruby-progressbar (~> 1.7)
- unicode-display_width (~> 1.0, >= 1.0.1)
- ruby-progressbar (1.8.3)
- ruby_dep (1.5.0)
+ unicode-display_width (>= 1.4.0, < 1.7)
+ rubocop-rails (2.5.2)
+ activesupport
+ rack (>= 1.1)
+ rubocop (>= 0.72.0)
+ ruby-progressbar (1.10.1)
shellany (0.0.1)
- slop (3.6.0)
- thor (0.19.4)
- thread_safe (0.3.5)
+ thor (1.0.1)
+ thread_safe (0.3.6)
timecop (0.9.1)
- tzinfo (1.2.2)
+ tzinfo (1.2.7)
thread_safe (~> 0.1)
- unicode-display_width (1.3.0)
+ unicode-display_width (1.6.1)
with_advisory_lock (3.2.0)
activerecord (>= 3.2)
+ zeitwerk (2.3.0)
PLATFORMS
ruby
@@ -181,7 +187,6 @@ DEPENDENCIES
actionpack (>= 4.0)
active_interaction (~> 3.0)
appraisal
- appsignal (~> 2.9.8)
bundler (~> 2.0)
climate_control
combustion (~> 1.1.1)
diff --git a/gemfiles/rails42.gemfile b/gemfiles/rails42.gemfile
deleted file mode 100644
index abcbfd9..0000000
--- a/gemfiles/rails42.gemfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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", "~> 4.2.10"
-gem "sqlite3", "~> 1.3.6"
-
-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 => "../"
diff --git a/gemfiles/rails50.gemfile b/gemfiles/rails50.gemfile
deleted file mode 100644
index 0931494..0000000
--- a/gemfiles/rails50.gemfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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", "~> 5.0.0"
-gem "sqlite3", "~> 1.3.6"
-
-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 => "../"
diff --git a/gemfiles/rails51.gemfile b/gemfiles/rails51.gemfile
index 48b8e80..8d854c2 100644
--- a/gemfiles/rails51.gemfile
+++ b/gemfiles/rails51.gemfile
@@ -3,17 +3,16 @@
source "https://rubygems.org"
gem "appraisal"
-gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
+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", "~> 2.9.8"
gem "climate_control"
gem "combustion", "~> 1.1.1"
- gem "fakefs", :require => "fakefs/safe"
+ gem "fakefs", require: "fakefs/safe"
gem "guard-rspec", "~> 4.2.6"
gem "responders"
gem "rspec-instrumentation-matcher"
@@ -21,4 +20,4 @@ group :test do
gem "pry"
end
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile
index 6f73eab..7299095 100644
--- a/gemfiles/rails52.gemfile
+++ b/gemfiles/rails52.gemfile
@@ -3,17 +3,17 @@
source "https://rubygems.org"
gem "appraisal"
-gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
+gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
gem "activesupport", "~> 5.2.0"
-gem "sqlite3", "~> 1.3.6"
+gem "sqlite3", "~> 1.4"
+gem "appsignal", "~> 2.9.8"
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 "fakefs", require: "fakefs/safe"
gem "guard-rspec", "~> 4.2.6"
gem "responders"
gem "rspec-instrumentation-matcher"
@@ -21,4 +21,4 @@ group :test do
gem "pry"
end
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile
index 5b29f17..441fc36 100644
--- a/gemfiles/rails60.gemfile
+++ b/gemfiles/rails60.gemfile
@@ -3,17 +3,17 @@
source "https://rubygems.org"
gem "appraisal"
-gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
+gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
gem "activesupport", "~> 6.0.0"
gem "sqlite3", "~> 1.4"
+gem "appsignal", "~> 2.10.6"
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 "fakefs", require: "fakefs/safe"
gem "guard-rspec", "~> 4.2.6"
gem "responders"
gem "rspec-instrumentation-matcher"
@@ -21,4 +21,4 @@ group :test do
gem "pry"
end
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/roqua-support.gemspec b/roqua-support.gemspec
index 3fb9aa6..4da4b8c 100644
--- a/roqua-support.gemspec
+++ b/roqua-support.gemspec
@@ -18,11 +18,12 @@ Gem::Specification.new do |gem|
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
gem.require_paths = ["lib"]
+ gem.required_ruby_version = '>= 2.5'
gem.add_dependency 'active_interaction', '~> 3.0'
- gem.add_dependency 'activesupport', '>= 3.2', '< 6.1'
+ gem.add_dependency 'activesupport', '>= 5.1', '< 6.1'
gem.add_dependency 'naught', '~> 1.0'
gem.add_dependency 'with_advisory_lock', '~> 3.2'
- gem.add_dependency 'appsignal', '~> 2.9.8'
+ gem.add_dependency 'appsignal', '>= 2.9', '< 2.11'
gem.add_development_dependency 'bundler', '~> 2.0'
gem.add_development_dependency 'delayed_job_active_record'
diff --git a/spec/roqua/support/errors_spec.rb b/spec/roqua/support/errors_spec.rb
index c6a1737..acd2da7 100644
--- a/spec/roqua/support/errors_spec.rb
+++ b/spec/roqua/support/errors_spec.rb
@@ -94,6 +94,7 @@ describe 'Error reporting' do
let(:transaction) { double("transaction") }
before do
+ Appsignal.config = Appsignal::Config.new(Dir.pwd, "test")
allow(Appsignal).to receive(:active?).and_return(true)
allow(Appsignal).to receive(:is_ignored_exception?).and_return(false)
allow(Appsignal).to receive(:agent).and_return(agent)
--
GitLab