Resolve gradual RuboCop issues

Author: autobolt

.rubocop_gradual.lock

@@ -1,2 +1,2 @@
 direnv 2.32.2
-ruby 3.4.3
+ruby   4.0.4

.tool-versions

@@ -60,12 +60,14 @@ module_function
     Regexp.last_match(1)
   end
 
+  # rubocop:disable ThreadSafety/ClassInstanceVariable
   def bundler_requirement
     @bundler_requirement ||=
       env_var_version ||
       cli_arg_version ||
       bundler_requirement_for(lockfile_version)
   end
+  # rubocop:enable ThreadSafety/ClassInstanceVariable
 
   def bundler_requirement_for(version)
     return "#{Gem::Requirement.default}.a" unless version

bin/bundle

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 gem_version =
-  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.1")
+  if Gem.ruby_version >= Gem::Version.new("3.1")
     # Loading Version into an anonymous module allows version.rb to get code coverage from SimpleCov!
     # See: https://github.com/simplecov-ruby/simplecov/issues/557#issuecomment-2630782358
     Module.new.tap { |mod| Kernel.load("lib/snaky_hash/version.rb", mod) }::SnakyHash::Version::VERSION

snaky_hash.gemspec

@@ -4,12 +4,12 @@
 #
 # @example Using the shared context
 #   RSpec.describe MyClass do
-#     include_context "base hash"
+#     include_context "with a base hash"
 #     it "has data" do
 #       expect(base_hash["varOne"]).to eq(1)
 #     end
 #   end
-RSpec.shared_context "base hash" do
+RSpec.shared_context "with a base hash" do
   let(:base_hash) do
     bh = {
       "varOne" => 1,

spec/shared_contexts/base_hash.rb

@@ -19,7 +19,7 @@
         hash_klass.new(base_hash)
       end
 
-      include_context "base hash"
+      include_context "with a base hash"
 
       it_behaves_like "a snaky hash instance"
     end
@@ -41,7 +41,7 @@
         hash_klass.new("apple" => "tart")
       end
 
-      include_context "base hash"
+      include_context "with a base hash"
 
       it_behaves_like "a snaky hash instance"
     end

spec/shared_examples/a_snaked_hash.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "a bad one" do
+RSpec.describe SnakyHash::Snake do
   subject(:bad_snake) do
     Class.new(Hashie::Mash) do
       include SnakyHash::Snake.new(key_type: :slartibartfarst)

spec/snaky_hash/bad_snake_spec.rb …ec/snaky_hash/snake_bad_key_type_spec.rbspec/snaky_hash/bad_snake_spec.rb renamed to spec/snaky_hash/snake_bad_key_type_spec.rb spec/snaky_hash/bad_snake_spec.rb renamed to spec/snaky_hash/snake_bad_key_type_spec.rb

@@ -1,35 +1,37 @@
 # frozen_string_literal: true
 
 RSpec.describe SnakyHash::Snake do
-  class TheSnakedHash < Hashie::Mash
-    include SnakyHash::Snake.new(key_type: :string)
+  subject(:instance) do
+    the_snaked_hash.new(base_hash)
   end
 
-  subject(:instance) do
-    TheSnakedHash.new(base_hash)
+  let(:the_snaked_hash) do
+    Class.new(Hashie::Mash) do
+      include described_class.new(key_type: :string)
+    end
   end
 
-  include_context "base hash"
+  include_context "with a base hash"
 
   it_behaves_like "a snaky hash instance"
 
   it "returns a SnakyHash::Snake from a snake + snake merge" do
-    a = TheSnakedHash.new("asd" => "asd")
-    b = TheSnakedHash.new(zxc: "zxc")
-    expect(a.merge(b)).to be_a(TheSnakedHash)
+    a = the_snaked_hash.new("asd" => "asd")
+    b = the_snaked_hash.new(zxc: "zxc")
+    expect(a.merge(b)).to be_a(the_snaked_hash)
   end
 
   it "returns a SnakyHash::Snake from a snake + hash merge" do
-    a = TheSnakedHash.new("asd" => "asd")
+    a = the_snaked_hash.new("asd" => "asd")
     b = {zxc: "zxc"}
-    expect(a.merge(b)).to be_a(TheSnakedHash)
+    expect(a.merge(b)).to be_a(the_snaked_hash)
   end
 
   it "returns a Hash from a hash + snake merge" do
-    a = TheSnakedHash.new("asd" => "asd")
+    a = the_snaked_hash.new("asd" => "asd")
     b = {zxc: "zxc"}
     res = b.merge(a)
-    expect(res).not_to be_a(TheSnakedHash)
+    expect(res).not_to be_a(the_snaked_hash)
     expect(res).to be_a(Hash)
   end
 

spec/snaky_hash/snake_spec.rb

@@ -5,7 +5,7 @@
     described_class.new(base_hash)
   end
 
-  include_context "base hash"
+  include_context "with a base hash"
 
   it_behaves_like "a snaky hash instance"
 

spec/snaky_hash/string_keyed_spec.rb

@@ -5,7 +5,7 @@
     described_class.new(base_hash)
   end
 
-  include_context "base hash"
+  include_context "with a base hash"
 
   it_behaves_like "a snaky hash instance"