From 7a46911bc8a0b06eefaf8177e476b773700c8804 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 7 Nov 2024 10:44:50 -0500 Subject: [PATCH 1/8] Add `arm64-darwin-24` to bundle platforms --- Gemfile.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile.lock b/Gemfile.lock index 2bf1f1e..9bc7586 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,6 +92,7 @@ PLATFORMS arm64-darwin-21 arm64-darwin-22 arm64-darwin-23 + arm64-darwin-24 x86_64-linux DEPENDENCIES From 222726ce5a5feee51ce8e5d4c1e15a0182e50651 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 7 Nov 2024 10:45:58 -0500 Subject: [PATCH 2/8] Update parser to version 3.3.6.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9bc7586..e135643 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,7 +37,7 @@ GEM method_source (1.1.0) minitest (5.25.1) parallel (1.26.3) - parser (3.3.4.2) + parser (3.3.6.0) ast (~> 2.4.1) racc racc (1.8.1) From 6b612998c8dc7d914ade755445f222bd44e3bdf0 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 7 Nov 2024 10:46:30 -0500 Subject: [PATCH 3/8] Use bundler version 2.5.23 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e135643..2715a5f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,4 +103,4 @@ DEPENDENCIES standard-rails! BUNDLED WITH - 2.5.17 + 2.5.23 From 9cbbd5ac4c9443d40ce0b3e9cfd6e54997b7ccbb Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 7 Nov 2024 10:52:54 -0500 Subject: [PATCH 4/8] Update standard to version 1.41.1 --- Gemfile.lock | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2715a5f..09c56c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,7 +27,7 @@ GEM drb (2.2.1) i18n (1.14.5) concurrent-ruby (~> 1.0) - json (2.7.2) + json (2.8.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) logger (1.6.0) @@ -45,22 +45,19 @@ GEM rainbow (3.1.1) rake (13.2.1) regexp_parser (2.9.2) - rexml (3.3.6) - strscan - rubocop (1.65.1) + rubocop (1.66.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.4, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.31.1, < 2.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.32.1) + rubocop-ast (1.34.0) parser (>= 3.3.1.0) - rubocop-performance (1.21.1) + rubocop-performance (1.22.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rails (2.26.0) @@ -70,22 +67,21 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) securerandom (0.3.1) - standard (1.40.0) + standard (1.41.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.65.0) + rubocop (~> 1.66.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.4) + standard-performance (~> 1.5) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.4.0) + standard-performance (1.5.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.21.0) - strscan (3.1.0) + rubocop-performance (~> 1.22.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) PLATFORMS arm64-darwin-20 From 6626a7926b15c1a13be3e0d70fd74799faf3a545 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 7 Nov 2024 11:45:25 -0500 Subject: [PATCH 5/8] Add simplecov configuration --- Gemfile | 5 +++-- Gemfile.lock | 8 ++++++++ test/test_helper.rb | 8 ++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 5521082..687403b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,8 @@ source "https://rubygems.org" gemspec -gem "rake" +gem "m" gem "minitest" +gem "rake" +gem "simplecov" gem "standard" -gem "m" diff --git a/Gemfile.lock b/Gemfile.lock index 09c56c8..4d37fce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,6 +24,7 @@ GEM bigdecimal (3.1.8) concurrent-ruby (1.3.4) connection_pool (2.4.1) + docile (1.4.1) drb (2.2.1) i18n (1.14.5) concurrent-ruby (~> 1.0) @@ -67,6 +68,12 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) securerandom (0.3.1) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.13.1) + simplecov_json_formatter (0.1.4) standard (1.41.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -95,6 +102,7 @@ DEPENDENCIES m minitest rake + simplecov standard standard-rails! diff --git a/test/test_helper.rb b/test/test_helper.rb index f24dca8..d5bb0c9 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,4 +1,12 @@ $LOAD_PATH.unshift File.expand_path("../lib", __dir__) +begin + require "simplecov" + SimpleCov.start do + load_profile "test_frameworks" + end +rescue LoadError +end + require "standard/rails" require "minitest/autorun" From e8d95e838502e63fdea1c2aed09aa11958007bc7 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 8 Nov 2024 15:52:56 -0500 Subject: [PATCH 6/8] Update rubocop-ast to version 1.34.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4d37fce..e78c103 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,7 +56,7 @@ GEM rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.34.0) + rubocop-ast (1.34.1) parser (>= 3.3.1.0) rubocop-performance (1.22.1) rubocop (>= 1.48.1, < 2.0) From 5e1d772f3661804e7a1cd0259a3c8af6b5d72cdf Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 8 Nov 2024 16:33:20 -0500 Subject: [PATCH 7/8] Add 3.0 to CI matrix --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e58fbbd..b561d3e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,6 +17,7 @@ jobs: matrix: os: [ubuntu-latest] ruby-version: + - '3.0' - '3.1' - '3.2' - '3.3' From 7899a453757088c3627ce0cf88502d8c0d603ec6 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 8 Nov 2024 16:40:36 -0500 Subject: [PATCH 8/8] Downgrade activesupport local dependency for ruby 3.0 compatibility --- Gemfile.lock | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e78c103..9590368 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,35 +8,39 @@ PATH GEM remote: https://rubygems.org/ specs: - activesupport (7.2.1) + activesupport (7.1.5) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.3.1) + concurrent-ruby (~> 1.0, >= 1.0.2) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) logger (>= 1.4.2) minitest (>= 5.1) + mutex_m securerandom (>= 0.3) - tzinfo (~> 2.0, >= 2.0.5) + tzinfo (~> 2.0) ast (2.4.2) base64 (0.2.0) + benchmark (0.4.0) bigdecimal (3.1.8) concurrent-ruby (1.3.4) connection_pool (2.4.1) docile (1.4.1) drb (2.2.1) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) json (2.8.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) - logger (1.6.0) + logger (1.6.1) m (1.6.2) method_source (>= 0.6.7) rake (>= 0.9.2.2) method_source (1.1.0) minitest (5.25.1) + mutex_m (0.2.0) parallel (1.26.3) parser (3.3.6.0) ast (~> 2.4.1)