Switch rubocop to omakase styles

Author: dhh

.rubocop.yml

@@ -1 +1,2 @@
-inherit_from: https://raw.githubusercontent.com/rails/rails/main/.rubocop.yml
+# Omakase Ruby styling for Rails
+inherit_gem: { rubocop-rails-omakase: rubocop.yml }

Gemfile

@@ -6,9 +6,4 @@ gemspec
 
 gem "rake"
 gem "debug", ">= 1.0.0"
-gem "rubocop"
-gem "rubocop-minitest"
-gem "rubocop-packaging"
-gem "rubocop-performance"
-gem "rubocop-rails"
-gem "rubocop-md"
+gem "rubocop-rails-omakase"

Gemfile.lock

@@ -84,7 +84,7 @@ GEM
     io-console (0.6.0)
     irb (1.7.1)
       reline (>= 0.3.0)
-    json (2.6.3)
+    json (2.7.1)
     language_server-protocol (3.17.0.3)
     loofah (2.9.0)
       crass (~> 1.0.2)
@@ -104,8 +104,8 @@ GEM
       racc (~> 1.4)
     nokogiri (1.15.2-x86_64-darwin)
       racc (~> 1.4)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    parallel (1.24.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     racc (1.7.1)
@@ -144,36 +144,39 @@ GEM
       redis-client (>= 0.9.0)
     redis-client (0.17.0)
       connection_pool
-    regexp_parser (2.8.1)
+    regexp_parser (2.8.3)
     reline (0.3.6)
       io-console (~> 0.5)
-    rexml (3.2.5)
-    rubocop (1.54.1)
+    rexml (3.2.6)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-md (1.2.0)
-      rubocop (>= 1.0)
-    rubocop-minitest (0.31.0)
+    rubocop-minitest (0.34.2)
       rubocop (>= 1.39, < 2.0)
-    rubocop-packaging (0.5.2)
-      rubocop (>= 1.33, < 2.0)
-    rubocop-performance (1.18.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.20.2)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-performance (1.20.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-rails (2.23.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-rails-omakase (1.0.0)
+      rubocop
+      rubocop-minitest
+      rubocop-performance
+      rubocop-rails
     ruby-progressbar (1.13.0)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
@@ -185,7 +188,7 @@ GEM
     thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -201,12 +204,7 @@ DEPENDENCIES
   kredis!
   rails (>= 6.0.0)
   rake
-  rubocop
-  rubocop-md
-  rubocop-minitest
-  rubocop-packaging
-  rubocop-performance
-  rubocop-rails
+  rubocop-rails-omakase
 
 BUNDLED WITH
    2.3.12

bin/rubocop

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rubocop", "rubocop")

test/attributes_test.rb

@@ -12,9 +12,9 @@ class Person
   kredis_list :names
   kredis_list :names_with_custom_key_via_lambda, key: ->(p) { "person:#{p.id}:names_customized" }
   kredis_list :names_with_custom_key_via_method, key: :generate_key
-  kredis_list :names_with_default_via_lambda, default: ->(p) { ["Random", p.name] }
+  kredis_list :names_with_default_via_lambda, default: ->(p) { [ "Random", p.name ] }
   kredis_unique_list :skills, limit: 2
-  kredis_unique_list :skills_with_default_via_lambda, default: ->(p) { ["Random", "Random", p.name] }
+  kredis_unique_list :skills_with_default_via_lambda, default: ->(p) { [ "Random", "Random", p.name ] }
   kredis_ordered_set :reading_list, limit: 2
   kredis_flag :special
   kredis_flag :temporary_special, expires_in: 1.second
@@ -70,7 +70,7 @@ def eye_color
   end
 
   def scores
-    [10, 28, 2, 7].to_json
+    [ 10, 28, 2, 7 ].to_json
   end
 
   def hourly_wage

test/callbacks_test.rb

@@ -48,7 +48,7 @@ class CallbacksTest < ActiveSupport::TestCase
     vacations = Kredis.set "vacations", after_change: ->(set) { @callback_check = set.members }
     vacations.add "paris"
 
-    assert_equal ["paris"], @callback_check
+    assert_equal [ "paris" ], @callback_check
   end
 
   test "hash with after_change proc callback" do

test/connections_test.rb

@@ -34,20 +34,20 @@ class ConnectionsTest < ActiveSupport::TestCase
 
     Kredis.configurator.stub(:config_for, fixture_config) do
       Kredis.configurator.stub(:root, Pathname.new(Dir.pwd).join("test/fixtures")) do
-        assert_match %r|redis://127.0.0.1:6379/4|, Kredis.redis.inspect
+        assert_match %r{redis://127.0.0.1:6379/4}, Kredis.redis.inspect
       end
     end
   end
 
   test "default config in env" do
     ENV["REDIS_URL"] = "redis://127.0.0.1:6379/3"
-    assert_match %r|redis://127.0.0.1:6379/3|, Kredis.redis.inspect
+    assert_match %r{redis://127.0.0.1:6379/3}, Kredis.redis.inspect
   ensure
     ENV.delete("REDIS_URL")
   end
 
   test "default config without env" do
-    assert_match %r|redis://127.0.0.1:6379/0|, Kredis.redis.inspect
+    assert_match %r{redis://127.0.0.1:6379/0}, Kredis.redis.inspect
   end
 
   test "custom config is missing" do

test/types/hash_test.rb

@@ -97,9 +97,9 @@ class HashTest < ActiveSupport::TestCase
     @hash = Kredis.hash "myhash", typed: :integer, default: { space_invaders: "100", pong: "42" }
     assert_equal({ "space_invaders" => 100, "pong" => 42 }, @hash.to_h)
     assert_equal(%w[ space_invaders pong ], @hash.keys)
-    assert_equal([100, 42], @hash.values)
+    assert_equal([ 100, 42 ], @hash.values)
     assert_equal(100, @hash["space_invaders"])
-    assert_equal([100, 42], @hash.values_at("space_invaders", "pong"))
+    assert_equal([ 100, 42 ], @hash.values_at("space_invaders", "pong"))
   end
 
   test "update with default" do

test/types/ordered_set_test.rb

@@ -23,7 +23,7 @@ class OrderedSetTest < ActiveSupport::TestCase
   test "mass append maintains ordering" do
     @set = Kredis.ordered_set "ordered-set" # no limit
 
-    thousand_elements = 1000.times.map { [*"A".."Z"].sample(10).join }
+    thousand_elements = 1000.times.map { [ *"A".."Z" ].sample(10).join }
     @set.append(thousand_elements)
     assert_equal thousand_elements, @set.elements
 

test/types/scalar_test.rb

@@ -79,8 +79,8 @@ class ScalarTest < ActiveSupport::TestCase
     json.value = { "one" => 1, "string" => "hello" }
     assert_equal({ "one" => 1, "string" => "hello" }, json.value)
 
-    json.value = { "json_class" => "String", "raw" => [97, 98, 99] }
-    assert_equal({ "json_class" => "String", "raw" => [97, 98, 99] }, json.value)
+    json.value = { "json_class" => "String", "raw" => [ 97, 98, 99 ] }
+    assert_equal({ "json_class" => "String", "raw" => [ 97, 98, 99 ] }, json.value)
   end
 
   test "invalid type" do