Merge pull request #83 from bastelfreak/rubocop2

Update rubocop to latest version

Author: bastelfreak

.rubocop.yml

@@ -10,11 +10,9 @@ AllCops:
 
 require:
   - rubocop-performance
+  - rubocop-rake
   - rubocop-rspec
 
-plugins:
-  - rubocop-capybara
-
 Layout/LineLength:
   Enabled: false
 

.rubocop_todo.yml

@@ -1,41 +1,80 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-auto-gen-timestamp`
-# using RuboCop version 1.78.0.
+# using RuboCop version 1.84.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, AllowedPatterns, ForbiddenIdentifiers, ForbiddenPatterns.
-# SupportedStyles: snake_case, camelCase
-# ForbiddenIdentifiers: __id__, __send__
-Naming/MethodName:
-  Exclude:
-    - 'spec/mocks/win32ole.rb'
-    - 'spec/mocks/ffi.rb'
-    - 'spec/facter/util/windows/network_utils_spec.rb'
-
 # Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
 Performance/RegexpMatch:
   Exclude:
     - 'install.rb'
 
+# Offense count: 1
+RSpec/IdenticalEqualityAssertion:
+  Exclude:
+    - 'spec/facter/util/resolvers/ssh_helper_spec.rb'
+
+# Offense count: 50
+# Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
+RSpec/IndexedLet:
+  Enabled: false
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/MatchArray:
+  Exclude:
+    - 'spec/facter/facts/solaris/ldom_spec.rb'
+
+# Offense count: 18
+# Configuration parameters: AllowedPatterns.
+# AllowedPatterns: ^expect_, ^assert_
+RSpec/NoExpectationExample:
+  Exclude:
+    - 'spec/custom_facts/core/execution/fact_manager_spec.rb'
+    - 'spec/custom_facts/core/resolvable_spec.rb'
+    - 'spec/custom_facts/core/suitable_spec.rb'
+    - 'spec/custom_facts/util/collection_spec.rb'
+    - 'spec/custom_facts/util/parser_spec.rb'
+    - 'spec/facter/resolvers/ec2_spec.rb'
+
+# Offense count: 128
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/ReceiveMessages:
+  Enabled: false
+
 # Offense count: 70
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
-# Include: **/*_spec*rb*, **/spec/**/*
-RSpec/FilePath:
+# Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
+# SupportedInflectors: default, active_support
+RSpec/SpecFilePathFormat:
   Enabled: false
 
+# Offense count: 18
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/VerifiedDoubleReference:
+  Exclude:
+    - 'spec/facter/resolvers/aix/serialnumber_spec.rb'
+    - 'spec/facter/resolvers/bsd/ffi_helper_spec.rb'
+    - 'spec/facter/resolvers/solaris/mountpoints_spec.rb'
+    - 'spec/facter/resolvers/windows/fips_spec.rb'
+    - 'spec/facter/resolvers/windows/netkvm_spec.rb'
+    - 'spec/facter/resolvers/windows/networking_spec.rb'
+    - 'spec/facter/resolvers/windows/product_release_spec.rb'
+    - 'spec/facter/resolvers/windows/virtualization_spec.rb'
+    - 'spec/facter/util/windows/network_utils_spec.rb'
+    - 'spec/framework/core/options/option_store_spec.rb'
+    - 'spec/framework/core/options_spec.rb'
+
 # Offense count: 14
 Style/ClassVars:
   Exclude:
     - 'lib/facter/framework/logging/logger.rb'
     - 'spec/custom_facts/puppetlabs_spec/files.rb'
     - 'spec/framework/logging/logger_spec.rb'
 
-# Offense count: 981
+# Offense count: 985
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false

lib/facter/framework/cli/cli.rb

@@ -201,11 +201,11 @@ def add_commands_to_help
         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]],
-            command['description']
-          )
+             help_command_options << build_option(
+               command['name'],
+               [command['usage'].split(',')[1]],
+               command['description']
+             )
         end
 
         help_command_options

lib/facter/resolvers/linux/processors.rb

@@ -70,7 +70,7 @@ def physical_devices_count
                .select { |dir| dir =~ /cpu[0-9]+$/ }
                .select { |dir| File.exist?("/sys/devices/system/cpu/#{dir}/topology/physical_package_id") }
                .map do |dir|
-              Facter::Util::FileHelper.safe_read("/sys/devices/system/cpu/#{dir}/topology/physical_package_id").strip
+                 Facter::Util::FileHelper.safe_read("/sys/devices/system/cpu/#{dir}/topology/physical_package_id").strip
             end
                .uniq.count
           end

openfact.gemspec

@@ -38,9 +38,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'ffi', '>= 1.15.5', '< 1.18.0', '!= 1.16.0', '!= 1.16.1', '!= 1.16.2'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 1.28', '< 1.79'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.5.2'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.10' # last version to support 2.5
+  spec.add_development_dependency 'rubocop', '~> 1.28', '< 1.85'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.5'
+  spec.add_development_dependency 'rubocop-rake', '< 1'
+  spec.add_development_dependency 'rubocop-rspec', '>= 2.10', '< 4'
   spec.add_development_dependency 'simplecov', '~> 0.17'
   spec.add_development_dependency 'sys-filesystem', '~> 1.4'
   spec.add_development_dependency 'webmock', '~> 3.12'

spec/custom_facts/core/aggregate_spec.rb

@@ -7,11 +7,11 @@
   let(:logger) { Facter::Log.class_variable_get(:@@logger) }
 
   it 'can be resolved' do
-    expect(aggregate_res).to be_a_kind_of LegacyFacter::Core::Resolvable
+    expect(aggregate_res).to be_a LegacyFacter::Core::Resolvable
   end
 
   it 'can be confined and weighted' do
-    expect(aggregate_res).to be_a_kind_of LegacyFacter::Core::Suitable
+    expect(aggregate_res).to be_a LegacyFacter::Core::Suitable
   end
 
   it 'can be compared' do
@@ -92,7 +92,7 @@
       end
 
       output = aggregate_res.value
-      expect(output).to match_array(['foo', 'foo bar'])
+      expect(output).to contain_exactly('foo', 'foo bar')
     end
 
     it 'clones and freezes chunk results' do

spec/custom_facts/core/execution/posix_spec.rb

@@ -24,13 +24,13 @@
 
       it 'returns nil if the binary is not executable' do
         allow(File).to receive(:executable?).with('/opt/foo').and_return(false)
-        expect(posix_executor.which('/opt/foo')).to be nil
+        expect(posix_executor.which('/opt/foo')).to be_nil
       end
 
       it 'returns nil if the binary is not a file' do
         allow(File).to receive(:executable?).with('/opt/foo').and_return(true)
         allow(FileTest).to receive(:file?).with('/opt/foo').and_return false
-        expect(posix_executor.which('/opt/foo')).to be nil
+        expect(posix_executor.which('/opt/foo')).to be_nil
       end
     end
 
@@ -46,7 +46,7 @@
         allow(File).to receive(:executable?).with('/bin/foo').and_return false
         allow(File).to receive(:executable?).with('/sbin/foo').and_return false
         allow(File).to receive(:executable?).with('/usr/sbin/foo').and_return false
-        expect(posix_executor.which('foo')).to be nil
+        expect(posix_executor.which('foo')).to be_nil
       end
     end
   end
@@ -88,7 +88,7 @@
 
     it 'returns nil if not found' do
       allow(posix_executor).to receive(:which).with('foo').and_return nil
-      expect(posix_executor.expand_command('foo -a | stuff >> /dev/null')).to be nil
+      expect(posix_executor.expand_command('foo -a | stuff >> /dev/null')).to be_nil
     end
   end
 

spec/custom_facts/core/execution/windows_spec.rb

@@ -44,7 +44,7 @@
       end
 
       it 'disallows other builtin windows commands' do
-        expect(executor.which('dir')).to eq nil
+        expect(executor.which('dir')).to be_nil
       end
     end
 
@@ -64,13 +64,13 @@
       it 'returns nil if the binary path is not executable' do
         allow(File).to receive(:executable?).with('C:\Tools\foo.exe').and_return false
 
-        expect(executor.which('C:\Tools\foo.exe')).to be nil
+        expect(executor.which('C:\Tools\foo.exe')).to be_nil
       end
 
       it 'returns nil if the binary is not executable' do
         allow(File).to receive(:executable?).with('\\\\remote\dir\foo.exe').and_return false
 
-        expect(executor.which('\\\\remote\dir\foo.exe')).to be nil
+        expect(executor.which('\\\\remote\dir\foo.exe')).to be_nil
       end
     end
 
@@ -108,7 +108,7 @@
         allow(File).to receive(:executable?).with('C:\Windows\foo.exe').and_return false
         allow(File).to receive(:executable?).with('C:\Windows\System32\Wbem\foo.exe').and_return false
 
-        expect(executor.which('foo.exe')).to be nil
+        expect(executor.which('foo.exe')).to be_nil
       end
     end
   end
@@ -129,7 +129,7 @@
 
     it 'does not expand single quoted binary' do
       allow(executor).to receive(:which).with('\'C:\My').and_return nil
-      expect(executor.expand_command('\'C:\My Tools\foo.exe\' /a /b')).to be nil
+      expect(executor.expand_command('\'C:\My Tools\foo.exe\' /a /b')).to be_nil
     end
 
     it 'quotes expanded binary if found in path with spaces' do
@@ -146,7 +146,7 @@
 
     it 'returns nil if command not found' do
       allow(executor).to receive(:which).with('foo').and_return nil
-      expect(executor.expand_command('foo /a | stuff >> NUL')).to be nil
+      expect(executor.expand_command('foo /a | stuff >> NUL')).to be_nil
     end
   end
 

spec/custom_facts/util/collection_spec.rb

@@ -144,7 +144,7 @@ def load(collection)
 
     it 'returns nil if it cannot find or load the fact' do
       allow(collection.internal_loader).to receive(:load).with(:testing)
-      expect(collection.fact('testing')).to be nil
+      expect(collection.fact('testing')).to be_nil
     end
   end
 
@@ -268,7 +268,7 @@ def load(collection)
     it 'does not include facts that did not return a value' do
       collection.add(:two, value: nil)
 
-      expect(collection.to_hash).not_to be_include(:two)
+      expect(collection.to_hash).not_to include(:two)
     end
   end
 
@@ -299,7 +299,7 @@ def load(collection)
         facts[fact] = value
       end
 
-      expect(facts).not_to be_include('nil_fact')
+      expect(facts).not_to include('nil_fact')
     end
   end
 

spec/custom_facts/util/config_spec.rb

@@ -113,7 +113,7 @@
     it 'returns nil for windows' do
       allow(LegacyFacter::Util::Config).to receive(:windows?).and_return(true)
       LegacyFacter::Util::Config.setup_default_override_binary_dir
-      expect(LegacyFacter::Util::Config.override_binary_dir).to eq nil
+      expect(LegacyFacter::Util::Config.override_binary_dir).to be_nil
     end
 
     it 'outputs new values when explicitly set' do