Merge pull request #31 from kvokka/fix-ci

kvokka · web-flow · commit ce9f380b56c5 · 2025-01-19T06:10:33.000+07:00
Fix ci
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,4 +1,4 @@
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 Style/Documentation:
   Enabled: false
@@ -12,4 +12,6 @@ Lint/ConstantDefinitionInBlock:
     - 'test/**/*'
 AllCops:
   Exclude:
-    - 'gemfiles/**/*'
+    - 'gemfiles/**/*'
+  NewCops: enable
+  SuggestExtensions: false
diff --git a/Appraisals b/Appraisals
@@ -1,44 +1,61 @@
 # frozen_string_literal: true
 
+# rubocop:disable Security/Eval
+skip_gems_snippet = <<~GEMS
+  group :local_development do
+    %w[appraisal overcommit pry reek rubocop rails sqlite3].each { |gem_name| remove_gem gem_name }
+  end
+GEMS
+
 appraise 'rails-7-0' do
   gem 'rails', '~> 7.0.0'
   gem 'sqlite3', '~> 1.6'
+  eval(skip_gems_snippet)
 end
 
 appraise 'rails-7-1' do
   gem 'rails', '~> 7.1.0'
   gem 'sqlite3', '~> 2.0'
+  eval(skip_gems_snippet)
 end
 
 appraise 'rails-7-2' do
   gem 'rails', '~> 7.2.0'
   gem 'sqlite3', '~> 2.0'
+  eval(skip_gems_snippet)
 end
 
 appraise 'rails-8-0' do
   gem 'rails', '~> 8.0.0'
   gem 'sqlite3', '~> 2.0'
+  eval(skip_gems_snippet)
 end
 
 appraise 'activerecord-7-0' do
   gem 'activerecord', '~> 7.0.0'
   gem 'rake'
   gem 'sqlite3', '~> 1.6'
+  eval(skip_gems_snippet)
 end
 
 appraise 'activerecord-7-1' do
   gem 'activerecord', '~> 7.1.0'
   gem 'rake'
   gem 'sqlite3', '~> 2.0'
+  eval(skip_gems_snippet)
 end
 
 appraise 'activerecord-7-2' do
   gem 'activerecord', '~> 7.2.0'
   gem 'rake'
   gem 'sqlite3', '~> 2.0'
+  eval(skip_gems_snippet)
 end
+
 appraise 'activerecord-8-0' do
   gem 'activerecord', '~> 8.0.0'
   gem 'rake'
   gem 'sqlite3', '~> 2.0'
+  eval(skip_gems_snippet)
 end
+# rubocop:enable Security/Eval
diff --git a/Gemfile b/Gemfile
@@ -15,10 +15,19 @@ gemspec
 # To use a debugger
 # gem 'byebug', group: [:development, :test]
 #
+
+# https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror
+gem 'concurrent-ruby', '1.3.4'
+gem 'minitest'
+gem 'minitest-focus'
+gem 'minitest-reporters'
+
 group :local_development do
   gem 'appraisal'
   gem 'overcommit'
   gem 'pry'
+  gem 'rails', '>= 7.0'
   gem 'reek'
   gem 'rubocop', '~> 1.69.0'
+  gem 'sqlite3', '>= 1.4'
 end
diff --git a/gemfiles/activerecord_7_0.gemfile b/gemfiles/activerecord_7_0.gemfile
@@ -2,16 +2,16 @@
 
 source "https://rubygems.org"
 
+gem "concurrent-ruby", "1.3.4"
+gem "minitest"
+gem "minitest-focus"
+gem "minitest-reporters"
 gem "activerecord", "~> 7.0.0"
 gem "rake"
 gem "sqlite3", "~> 1.6"
 
 group :local_development do
-  gem "appraisal"
-  gem "overcommit"
-  gem "pry"
-  gem "reek"
-  gem "rubocop", "~> 0.71.0"
+
 end
 
 gemspec path: "../"
diff --git a/gemfiles/activerecord_7_1.gemfile b/gemfiles/activerecord_7_1.gemfile
@@ -2,16 +2,16 @@
 
 source "https://rubygems.org"
 
+gem "concurrent-ruby", "1.3.4"
+gem "minitest"
+gem "minitest-focus"
+gem "minitest-reporters"
 gem "activerecord", "~> 7.1.0"
 gem "rake"
 gem "sqlite3", "~> 2.0"
 
 group :local_development do
-  gem "appraisal"
-  gem "overcommit"
-  gem "pry"
-  gem "reek"
-  gem "rubocop", "~> 0.71.0"
+
 end
 
 gemspec path: "../"
diff --git a/gemfiles/activerecord_7_2.gemfile b/gemfiles/activerecord_7_2.gemfile
@@ -2,16 +2,16 @@
 
 source "https://rubygems.org"
 
+gem "concurrent-ruby", "1.3.4"
+gem "minitest"
+gem "minitest-focus"
+gem "minitest-reporters"
 gem "activerecord", "~> 7.2.0"
 gem "rake"
 gem "sqlite3", "~> 2.0"
 
 group :local_development do
-  gem "appraisal"
-  gem "overcommit"
-  gem "pry"
-  gem "reek"
-  gem "rubocop", "~> 0.71.0"
+
 end
 
 gemspec path: "../"
diff --git a/gemfiles/activerecord_8_0.gemfile b/gemfiles/activerecord_8_0.gemfile
@@ -2,16 +2,16 @@
 
 source "https://rubygems.org"
 
+gem "concurrent-ruby", "1.3.4"
+gem "minitest"
+gem "minitest-focus"
+gem "minitest-reporters"
 gem "activerecord", "~> 8.0.0"
 gem "rake"
 gem "sqlite3", "~> 2.0"
 
 group :local_development do
-  gem "appraisal"
-  gem "overcommit"
-  gem "pry"
-  gem "reek"
-  gem "rubocop", "~> 0.71.0"
+
 end
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile
@@ -2,15 +2,15 @@
 
 source "https://rubygems.org"
 
+gem "concurrent-ruby", "1.3.4"
+gem "minitest"
+gem "minitest-focus"
+gem "minitest-reporters"
 gem "rails", "~> 7.0.0"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.6"
 
 group :local_development do
-  gem "appraisal"
-  gem "overcommit"
-  gem "pry"
-  gem "reek"
-  gem "rubocop", "~> 0.71.0"
+
 end
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile
@@ -2,15 +2,15 @@
 
 source "https://rubygems.org"
 
+gem "concurrent-ruby", "1.3.4"
+gem "minitest"
+gem "minitest-focus"
+gem "minitest-reporters"
 gem "rails", "~> 7.1.0"
 gem "sqlite3", "~> 2.0"
 
 group :local_development do
-  gem "appraisal"
-  gem "overcommit"
-  gem "pry"
-  gem "reek"
-  gem "rubocop", "~> 0.71.0"
+
 end
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7_2.gemfile b/gemfiles/rails_7_2.gemfile
@@ -2,15 +2,15 @@
 
 source "https://rubygems.org"
 
+gem "concurrent-ruby", "1.3.4"
+gem "minitest"
+gem "minitest-focus"
+gem "minitest-reporters"
 gem "rails", "~> 7.2.0"
 gem "sqlite3", "~> 2.0"
 
 group :local_development do
-  gem "appraisal"
-  gem "overcommit"
-  gem "pry"
-  gem "reek"
-  gem "rubocop", "~> 0.71.0"
+
 end
 
 gemspec path: "../"
diff --git a/gemfiles/rails_8_0.gemfile b/gemfiles/rails_8_0.gemfile
@@ -2,15 +2,15 @@
 
 source "https://rubygems.org"
 
+gem "concurrent-ruby", "1.3.4"
+gem "minitest"
+gem "minitest-focus"
+gem "minitest-reporters"
 gem "rails", "~> 8.0.0"
 gem "sqlite3", "~> 2.0"
 
 group :local_development do
-  gem "appraisal"
-  gem "overcommit"
-  gem "pry"
-  gem "reek"
-  gem "rubocop", "~> 0.71.0"
+
 end
 
 gemspec path: "../"
diff --git a/lib/pp_sql.rb b/lib/pp_sql.rb
@@ -50,11 +50,11 @@ module LogSubscriberPrettyPrint
     include Formatter
 
     def sql(event)
-      return super event unless ::PpSql.add_rails_logger_formatting
+      return super unless ::PpSql.add_rails_logger_formatting
 
       e = event.dup
       e.payload[:sql] = _sql_formatter.format(e.payload[:sql].dup)
-      super e
+      super(e)
     end
   end
 
diff --git a/pp_sql.gemspec b/pp_sql.gemspec
@@ -23,9 +23,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord'
   s.add_dependency 'anbt-sql-formatter', '~> 0.1.0'
 
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'minitest-focus'
-  s.add_development_dependency 'minitest-reporters'
-  s.add_development_dependency 'rails', '>= 7.0'
-  s.add_development_dependency 'sqlite3', '>= 1.4'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end
diff --git a/test/pp_sql_activerecord_test.rb b/test/pp_sql_activerecord_test.rb
@@ -8,7 +8,7 @@ module ActiveRecord
   class Base
     establish_connection(adapter: 'sqlite3', database: ':memory:')
     connection.create_table(:users) { |t| t.string :name }
-    self.logger = Logger.new(::LOGGER = StringIO.new)
+    self.logger = Logger.new(::LOGGER)
   end
 
   class Relation
diff --git a/test/pp_sql_rails_test.rb b/test/pp_sql_rails_test.rb
@@ -19,7 +19,7 @@ module ActiveRecord
   class Base
     establish_connection(adapter: 'sqlite3', database: ':memory:')
     connection.create_table(:users) { |t| t.string :name }
-    self.logger = Logger.new(::LOGGER = StringIO.new)
+    self.logger = Logger.new(::LOGGER)
   end
 end
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -5,4 +5,7 @@
 require 'pp_sql'
 
 require 'minitest/reporters'
+
+LOGGER = StringIO.new
+
 Minitest::Reporters.use!
