From 14eef8a91d5d63e41c68807ca3cef8a233b24436 Mon Sep 17 00:00:00 2001 From: Daniel Pepper Date: Wed, 26 Jun 2024 14:49:43 -0700 Subject: [PATCH 1/3] Bundle updates (#69) * Ruby 3.2 compatibility File.exists? alias removed in favor of File.exist? * bundle updates --- Gemfile.lock | 196 ++++++++++++++++++------------------- spec/support/mock_mysql.rb | 4 +- 2 files changed, 100 insertions(+), 100 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f63501c..6ceadba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,35 +6,35 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (7.1.3.2) - actionpack (= 7.1.3.2) - activesupport (= 7.1.3.2) + actioncable (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3.2) - actionpack (= 7.1.3.2) - activejob (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionmailbox (7.1.3.4) + actionpack (= 7.1.3.4) + activejob (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.3.2) - actionpack (= 7.1.3.2) - actionview (= 7.1.3.2) - activejob (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionmailer (7.1.3.4) + actionpack (= 7.1.3.4) + actionview (= 7.1.3.4) + activejob (= 7.1.3.4) + activesupport (= 7.1.3.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.3.2) - actionview (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionpack (7.1.3.4) + actionview (= 7.1.3.4) + activesupport (= 7.1.3.4) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -42,35 +42,35 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.3.2) - actionpack (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + actiontext (7.1.3.4) + actionpack (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.2) - activesupport (= 7.1.3.2) + actionview (7.1.3.4) + activesupport (= 7.1.3.4) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.3.2) - activesupport (= 7.1.3.2) + activejob (7.1.3.4) + activesupport (= 7.1.3.4) globalid (>= 0.3.6) - activemodel (7.1.3.2) - activesupport (= 7.1.3.2) - activerecord (7.1.3.2) - activemodel (= 7.1.3.2) - activesupport (= 7.1.3.2) + activemodel (7.1.3.4) + activesupport (= 7.1.3.4) + activerecord (7.1.3.4) + activemodel (= 7.1.3.4) + activesupport (= 7.1.3.4) timeout (>= 0.4.0) - activestorage (7.1.3.2) - actionpack (= 7.1.3.2) - activejob (= 7.1.3.2) - activerecord (= 7.1.3.2) - activesupport (= 7.1.3.2) + activestorage (7.1.3.4) + actionpack (= 7.1.3.4) + activejob (= 7.1.3.4) + activerecord (= 7.1.3.4) + activesupport (= 7.1.3.4) marcel (~> 1.0) - activesupport (7.1.3.2) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -81,27 +81,27 @@ GEM mutex_m tzinfo (~> 2.0) base64 (0.2.0) - bigdecimal (3.1.6) - builder (3.2.4) + bigdecimal (3.1.8) + builder (3.3.0) byebug (11.1.3) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) crass (1.0.6) datadog-ci (0.8.3) msgpack date (3.3.4) - ddtrace (1.21.1) + ddtrace (1.23.2) datadog-ci (~> 0.8.1) debase-ruby_core_source (= 3.3.1) - libdatadog (~> 6.0.0.2.0) + libdatadog (~> 7.0.0.1.0) libddwaf (~> 1.14.0.0.0) msgpack debase-ruby_core_source (3.3.1) - diff-lcs (1.5.0) + diff-lcs (1.5.1) docile (1.4.0) dogstatsd-ruby (4.8.3) drb (2.2.1) - erubi (1.12.0) + erubi (1.13.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -125,16 +125,16 @@ GEM faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - ffi (1.16.3) + ffi (1.17.0) globalid (1.2.1) activesupport (>= 6.1) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.12.0) - rdoc + irb (1.13.2) + rdoc (>= 4.0.0) reline (>= 0.4.2) - libdatadog (6.0.0.2.0) + libdatadog (7.0.0.1.0) libddwaf (1.14.0.0.0) ffi (~> 1.0) loofah (2.22.0) @@ -147,30 +147,30 @@ GEM net-smtp marcel (1.0.4) mini_mime (1.1.5) - mini_portile2 (2.8.5) - minitest (5.22.2) + mini_portile2 (2.8.7) + minitest (5.24.0) msgpack (1.7.2) - multipart-post (2.3.0) + multipart-post (2.4.1) mutex_m (0.2.0) - mysql2 (0.5.5) - net-imap (0.4.10) + mysql2 (0.5.6) + net-imap (0.4.14) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.4.0.1) + net-smtp (0.5.0) net-protocol - nio4r (2.7.0) - nokogiri (1.16.3) + nio4r (2.7.3) + nokogiri (1.16.6) mini_portile2 (~> 2.8.2) racc (~> 1.4) - pg (1.5.4) + pg (1.5.6) psych (5.1.2) stringio - racc (1.7.3) - rack (3.0.10) + racc (1.8.0) + rack (3.1.4) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -178,20 +178,20 @@ GEM rackup (2.1.0) rack (>= 3) webrick (~> 1.8) - rails (7.1.3.2) - actioncable (= 7.1.3.2) - actionmailbox (= 7.1.3.2) - actionmailer (= 7.1.3.2) - actionpack (= 7.1.3.2) - actiontext (= 7.1.3.2) - actionview (= 7.1.3.2) - activejob (= 7.1.3.2) - activemodel (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + rails (7.1.3.4) + actioncable (= 7.1.3.4) + actionmailbox (= 7.1.3.4) + actionmailer (= 7.1.3.4) + actionpack (= 7.1.3.4) + actiontext (= 7.1.3.4) + actionview (= 7.1.3.4) + activejob (= 7.1.3.4) + activemodel (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) bundler (>= 1.15.0) - railties (= 7.1.3.2) + railties (= 7.1.3.4) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -199,41 +199,41 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.3.2) - actionpack (= 7.1.3.2) - activesupport (= 7.1.3.2) + railties (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) irb rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) - rake (13.1.0) - rdoc (6.6.3.1) + rake (13.2.1) + rdoc (6.7.0) psych (>= 4.0.0) redis (4.8.1) - reline (0.4.3) + reline (0.5.9) io-console (~> 0.5) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-rails (6.1.0) + rspec-support (~> 3.13.0) + rspec-rails (6.1.3) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.12) - rspec-expectations (~> 3.12) - rspec-mocks (~> 3.12) - rspec-support (~> 3.12) - rspec-support (3.12.1) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) + rspec-support (3.13.1) ruby2_keywords (0.0.5) simplecov (0.22.0) docile (~> 1.1) @@ -241,9 +241,9 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - stringio (3.1.0) + stringio (3.1.1) thor (1.3.1) - timecop (0.9.8) + timecop (0.9.10) timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -251,7 +251,7 @@ GEM websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.13) + zeitwerk (2.6.16) PLATFORMS ruby diff --git a/spec/support/mock_mysql.rb b/spec/support/mock_mysql.rb index f62d6bf..d86eb2a 100644 --- a/spec/support/mock_mysql.rb +++ b/spec/support/mock_mysql.rb @@ -8,7 +8,7 @@ module MockMysql def mock_mysql # raise Mysql2::Error::TimeoutError.new("fake timeout", nil, error_number = 1205) - File.delete(SOCKET_PATH) if File.exists?(SOCKET_PATH) + File.delete(SOCKET_PATH) if File.exist?(SOCKET_PATH) server = UNIXServer.new(SOCKET_PATH) @@ -36,6 +36,6 @@ def mock_mysql config.after(mock_mysql: true) do # clean up socket file - File.delete(Helpers::MockMysql::SOCKET_PATH) if File.exists?(Helpers::MockMysql::SOCKET_PATH) + File.delete(Helpers::MockMysql::SOCKET_PATH) if File.exist?(Helpers::MockMysql::SOCKET_PATH) end end From 686d3ae6e74e65c1cbc7b26238704c2c744122ea Mon Sep 17 00:00:00 2001 From: Daniel Pepper Date: Thu, 8 Aug 2024 11:42:48 -0700 Subject: [PATCH 2/3] bundle up (#75) --- Gemfile.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6ceadba..e93a009 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -90,7 +90,7 @@ GEM datadog-ci (0.8.3) msgpack date (3.3.4) - ddtrace (1.23.2) + ddtrace (1.23.3) datadog-ci (~> 0.8.1) debase-ruby_core_source (= 3.3.1) libdatadog (~> 7.0.0.1.0) @@ -98,7 +98,7 @@ GEM msgpack debase-ruby_core_source (3.3.1) diff-lcs (1.5.1) - docile (1.4.0) + docile (1.4.1) dogstatsd-ruby (4.8.3) drb (2.2.1) erubi (1.13.0) @@ -120,7 +120,7 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) @@ -131,7 +131,7 @@ GEM i18n (1.14.5) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.13.2) + irb (1.14.0) rdoc (>= 4.0.0) reline (>= 0.4.2) libdatadog (7.0.0.1.0) @@ -148,7 +148,7 @@ GEM marcel (1.0.4) mini_mime (1.1.5) mini_portile2 (2.8.7) - minitest (5.24.0) + minitest (5.24.1) msgpack (1.7.2) multipart-post (2.4.1) mutex_m (0.2.0) @@ -163,14 +163,14 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) - nokogiri (1.16.6) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) - pg (1.5.6) + pg (1.5.7) psych (5.1.2) stringio - racc (1.8.0) - rack (3.1.4) + racc (1.8.1) + rack (3.1.7) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -251,7 +251,7 @@ GEM websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.16) + zeitwerk (2.6.17) PLATFORMS ruby From dead17ade03a7e31ae93b3bc0f0c67e0ae481a79 Mon Sep 17 00:00:00 2001 From: Daniel Pepper Date: Thu, 8 Aug 2024 12:45:26 -0700 Subject: [PATCH 3/3] codecov improvements --- spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 828937f..3e8aa1f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -10,7 +10,7 @@ require "timecop" SimpleCov.start do - add_filter "spec/" + add_filter "/spec/" end if ENV["CI"] == "true" || ENV["CODECOV_TOKEN"]