(FACT-3428) Style/HashEachMethods

Use each_key or each_value instead passing an unused argument to the block.

Author: joshcooper

.rubocop_todo.yml

@@ -215,22 +215,6 @@ Style/GlobalStdStream:
     - 'spec/framework/core/fact/internal/internal_fact_manager_spec.rb'
     - 'spec/framework/logging/logger_spec.rb'
 
-# Offense count: 15
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowedReceivers.
-# AllowedReceivers: Thread.current
-Style/HashEachMethods:
-  Exclude:
-    - 'lib/facter/custom_facts/core/execution/base.rb'
-    - 'lib/facter/custom_facts/util/collection.rb'
-    - 'lib/facter/framework/cli/cli.rb'
-    - 'lib/facter/resolvers/aix/ffi/ffi_helper.rb'
-    - 'lib/facter/resolvers/windows/product_release.rb'
-    - 'scripts/generate_changelog.rb'
-    - 'spec/custom_facts/core/execution/fact_manager_spec.rb'
-    - 'spec/custom_facts/util/collection_spec.rb'
-    - 'spec/facter/resolvers/disks_spec.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/HashTransformKeys:

lib/facter/custom_facts/core/execution/base.rb

@@ -30,7 +30,7 @@ def with_env(values)
         # use an ensure block to make absolutely sure we restore the variables
         ensure
           # restore the old values
-          values.each do |var, _value|
+          values.each_key do |var|
             if old.include?(var)
               ENV[var] = old[var]
             else

lib/facter/custom_facts/util/collection.rb

@@ -80,7 +80,7 @@ def fact(name)
 
       # Flush all cached values.
       def flush
-        @facts.each { |_name, fact| fact.flush }
+        @facts.each_value(&:flush)
         @external_facts_loaded = nil
       end
 

lib/facter/framework/cli/cli.rb

@@ -198,9 +198,9 @@ def add_class_options_to_help
 
       def add_commands_to_help
         help_command_options = +''
-        Cli.commands
-           .select { |_k, command_class| command_class.instance_of?(Thor::Command) }
-           .each do |_k, command|
+        Cli.commands.values
+           .select { |command_class| command_class.instance_of?(Thor::Command) }
+           .each do |command|
           help_command_options << build_option(
             command['name'],
             [command['usage'].split(',')[1]],

lib/facter/resolvers/aix/ffi/ffi_helper.rb

@@ -77,7 +77,7 @@ def self.read_interfaces
 
               family = FFI::AF_UNSPEC
 
-              addresses.each do |_k, addr|
+              addresses.each_value do |addr|
                 if family != FFI::AF_UNSPEC &&
                    addr[:sa_family] != FFI::AF_UNSPEC &&
                    family != addr[:sa_family]

lib/facter/resolvers/windows/product_release.rb

@@ -23,19 +23,19 @@ def read_fact_from_registry(fact_name)
         end
 
         def build_fact_list(reg)
-          reg.each do |name, _value|
+          reg.each do |name, value|
             case name
             when 'EditionID'
-              @fact_list[:edition_id] = reg[name]
+              @fact_list[:edition_id] = value
             when 'InstallationType'
-              @fact_list[:installation_type] = reg[name]
+              @fact_list[:installation_type] = value
             when 'ProductName'
-              @fact_list[:product_name] = reg[name]
+              @fact_list[:product_name] = value
             when 'DisplayVersion'
-              @fact_list[:release_id] = reg[name]
-              @fact_list[:display_version] = reg[name]
+              @fact_list[:release_id] = value
+              @fact_list[:display_version] = value
             when 'ReleaseId'
-              @fact_list[:release_id] = reg[name] unless @fact_list[:release_id]
+              @fact_list[:release_id] = value unless @fact_list[:release_id]
             end
           end
         end

scripts/generate_changelog.rb

@@ -110,7 +110,7 @@ def update_changelog
 
       new_lines << "\n### #{type[:name]}\n"
 
-      type[:entries].each do |_, entry|
+      type[:entries].each_value do |entry|
         new_lines << "- #{entry[:title].strip} [\##{entry[:number]}](#{entry[:url]})" \
                      " ([#{entry[:author]}](#{entry[:profile]}))"
       end

spec/custom_facts/core/execution/fact_manager_spec.rb

@@ -7,7 +7,7 @@
     it "executes the caller's block with the specified env vars" do
       test_env = { 'LANG' => 'C', 'LC_ALL' => 'C', 'FOO' => 'BAR' }
       executor.with_env test_env do
-        test_env.keys.each do |key|
+        test_env.each_key do |key|
           expect(ENV[key]).to eq test_env[key]
         end
       end
@@ -29,7 +29,7 @@
 
       # verify that, during the 'with_env', the new values are used
       executor.with_env new_env do
-        orig_env.keys.each do |key|
+        orig_env.each_key do |key|
           expect(ENV[key]).to eq new_env[key]
         end
       end
@@ -50,7 +50,7 @@
       end
 
       # verify that, after the 'with_env', the old values are restored
-      orig_env.keys.each do |key|
+      orig_env.each_key do |key|
         expect(ENV[key]).to eq orig_env[key]
       end
     end

spec/custom_facts/util/collection_spec.rb

@@ -291,7 +291,7 @@ def load(collection)
     end
 
     it 'converts the fact name to a string' do
-      collection.each do |fact, _value|
+      collection.each do |fact, _value| # rubocop:disable Style/HashEachMethods
         expect(fact).to be_instance_of(String)
       end
     end

spec/facter/resolvers/disks_spec.rb

@@ -96,8 +96,8 @@
         end
 
         before do
-          paths.each do |_key, value|
-            disks.each do |disk, _values|
+          paths.each_value do |value|
+            disks.each_key do |disk|
               if value == '/size'
                 allow(Facter::Util::FileHelper).to receive(:safe_read)
                   .with("/sys/block/#{disk}#{value}", nil).and_return(nil)
@@ -118,8 +118,8 @@
         end
 
         before do
-          paths.each do |_key, value|
-            disks.each do |disk, _values|
+          paths.each_value do |value|
+            disks.each_key do |disk|
               if value != '/size'
                 allow(Facter::Util::FileHelper).to receive(:safe_read)
                   .with("/sys/block/#{disk}#{value}", nil).and_return(nil)
@@ -141,7 +141,7 @@
 
         before do
           paths.each do |fact, value|
-            disks.each do |disk, _values|
+            disks.each_key do |disk|
               next unless value == 'false'
 
               allow(Facter::Core::Execution).to receive(:execute)