From c8523fa469816143edbe87de14410f46cf7da14d Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Thu, 6 Aug 2026 14:33:22 -0400 Subject: [PATCH 1/2] dep(style): bump standard, fix style offenses and remove explicit rubocop, which is transitive through standard --- .rubocop.yml | 4 +++- Gemfile | 3 +-- ext/sqlite3/extconf.rb | 2 +- lib/sqlite3/database.rb | 4 +--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 62458687..057021d4 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,10 +1,12 @@ # from https://evilmartians.com/chronicles/rubocoping-with-legacy-bring-your-ruby-code-up-to-standard require: - standard + - rubocop-minitest + +plugins: - standard-custom - standard-performance - rubocop-performance - - rubocop-minitest inherit_gem: standard: config/base.yml diff --git a/Gemfile b/Gemfile index e0ea9427..f2514a85 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,6 @@ end group :development do gem "rdoc", "8.0.0" - gem "rubocop", "1.59.0", require: false gem "rubocop-minitest", "0.34.5", require: false - gem "standard", "1.33.0", require: false + gem "standard", "1.56.0", require: false end diff --git a/ext/sqlite3/extconf.rb b/ext/sqlite3/extconf.rb index 12f4e80f..0c3c40bc 100644 --- a/ext/sqlite3/extconf.rb +++ b/ext/sqlite3/extconf.rb @@ -66,7 +66,7 @@ def configure_packaged_libraries "-DSQLITE_ENABLE_DBSTAT_VTAB=1" ] env["CFLAGS"] = [user_cflags, env["CFLAGS"], more_cflags].flatten.join(" ") - recipe.configure_options += env.select { |k, v| ENV_ALLOWLIST.include?(k) } + recipe.configure_options += env.slice(*ENV_ALLOWLIST) .map { |key, value| "#{key}=#{value.strip}" } end diff --git a/lib/sqlite3/database.rb b/lib/sqlite3/database.rb index 32a78360..4759f405 100644 --- a/lib/sqlite3/database.rb +++ b/lib/sqlite3/database.rb @@ -458,9 +458,7 @@ def create_function name, arity, text_rep = Constants::TextRep::UTF8, &block # # See also #create_aggregate_handler for a more object-oriented approach to # aggregate functions. - def create_aggregate(name, arity, step = nil, finalize = nil, - text_rep = Constants::TextRep::ANY, &block) - + def create_aggregate(name, arity, step = nil, finalize = nil, text_rep = Constants::TextRep::ANY, &block) proxy = Class.new do def self.step(&block) define_method(:step_with_ctx, &block) From 623dd444e4048ac3ce5111d7d48c2d6eba043eaf Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Thu, 6 Aug 2026 19:19:22 -0400 Subject: [PATCH 2/2] ping to queue CI