rubocop: autofix

bastelfreak · bastelfreak · commit ec47563f4b89 · 2026-02-15T20:38:03.000+01:00
diff --git a/lib/facter/framework/cli/cli.rb b/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
diff --git a/lib/facter/resolvers/linux/processors.rb b/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
diff --git a/spec/custom_facts/core/aggregate_spec.rb b/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
diff --git a/spec/custom_facts/util/collection_spec.rb b/spec/custom_facts/util/collection_spec.rb
@@ -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
 
diff --git a/spec/custom_facts/util/fact_spec.rb b/spec/custom_facts/util/fact_spec.rb
@@ -94,17 +94,17 @@
 
     it 'creates a simple resolution when the type is nil' do
       fact.define_resolution('named')
-      expect(fact.resolution('named')).to be_a_kind_of Facter::Util::Resolution
+      expect(fact.resolution('named')).to be_a Facter::Util::Resolution
     end
 
     it 'creates a simple resolution when the type is :simple' do
       fact.define_resolution('named', type: :simple)
-      expect(fact.resolution('named')).to be_a_kind_of Facter::Util::Resolution
+      expect(fact.resolution('named')).to be_a Facter::Util::Resolution
     end
 
     it 'creates an aggregate resolution when the type is :aggregate' do
       fact.define_resolution('named', type: :aggregate)
-      expect(fact.resolution('named')).to be_a_kind_of Facter::Core::Aggregate
+      expect(fact.resolution('named')).to be_a Facter::Core::Aggregate
     end
 
     it 'raises an error if there is an existing resolution with a different type' do
diff --git a/spec/custom_facts/util/loader_spec.rb b/spec/custom_facts/util/loader_spec.rb
@@ -72,7 +72,7 @@ def loader_from(places)
       allow(File).to receive(:directory?).with('/two').and_return false
 
       paths = loader.search_path
-      expect(paths).to match_array(['/one'])
+      expect(paths).to contain_exactly('/one')
     end
 
     describe 'and the FACTERLIB environment variable is set' do
diff --git a/spec/custom_facts/util/resolution_spec.rb b/spec/custom_facts/util/resolution_spec.rb
@@ -31,7 +31,7 @@
   describe 'when setting the code' do
     it 'creates a block when given a command' do
       resolution.setcode 'foo'
-      expect(resolution.code).to be_a_kind_of Proc
+      expect(resolution.code).to be_a Proc
     end
 
     it 'stores the provided block when given a block' do
diff --git a/spec/facter/facts/debian/os/release_spec.rb b/spec/facter/facts/debian/os/release_spec.rb
@@ -6,14 +6,9 @@
 
     shared_examples 'returns os release fact' do
       it 'returns os release fact' do
-        expect(fact.call_the_resolver).to match_array \
-          [
-            having_attributes(name: 'os.release', value: fact_value),
-            having_attributes(name: 'operatingsystemmajrelease', value: fact_value['major'],
-                              type: :legacy),
-            having_attributes(name: 'operatingsystemrelease', value: fact_value['full'],
-                              type: :legacy)
-          ]
+        expect(fact.call_the_resolver).to contain_exactly(having_attributes(name: 'os.release', value: fact_value), having_attributes(name: 'operatingsystemmajrelease', value: fact_value['major'],
+                                                                                                                                      type: :legacy), having_attributes(name: 'operatingsystemrelease', value: fact_value['full'],
+                                                                                                                                                                        type: :legacy))
       end
     end
 
diff --git a/spec/facter/facts/linux/kernelversion_spec.rb b/spec/facter/facts/linux/kernelversion_spec.rb
@@ -17,7 +17,7 @@
   end
 
   describe '#call_the_resolver' do
-    context 'when full version includes ' do
+    context 'when full version includes' do
       let(:resolver_value) { '4.11.5-19-generic' }
       let(:fact_value) { '4.11.5' }
 
diff --git a/spec/facter/facts/solaris/ldom_spec.rb b/spec/facter/facts/solaris/ldom_spec.rb
@@ -42,21 +42,8 @@
       end
 
       it 'returns virtual fact as ldom' do
-        expect(fact.call_the_resolver).to match_array(
-          [
-            an_object_having_attributes(name: 'ldom', value: value, type: :core),
-            an_object_having_attributes(name: 'ldom_domainchassis', value: 'AK00358110', type: :legacy),
-            an_object_having_attributes(name: 'ldom_domaincontrol', value: 'opdx-a0-sun2', type: :legacy),
-            an_object_having_attributes(name: 'ldom_domainname', value: 'sol11-9', type: :legacy),
-            an_object_having_attributes(name: 'ldom_domainrole_control', value: 'false', type: :legacy),
-            an_object_having_attributes(name: 'ldom_domainrole_impl', value: 'LDoms', type: :legacy),
-            an_object_having_attributes(name: 'ldom_domainrole_io', value: 'false', type: :legacy),
-            an_object_having_attributes(name: 'ldom_domainrole_root', value: 'false', type: :legacy),
-            an_object_having_attributes(name: 'ldom_domainrole_service', value: 'false', type: :legacy),
-            an_object_having_attributes(name: 'ldom_domainuuid', value: 'd7a3a4df-ce8c-47a9-b396-cb5a5f30c0b2',
-                                        type: :legacy)
-          ]
-        )
+        expect(fact.call_the_resolver).to contain_exactly(an_object_having_attributes(name: 'ldom', value: value, type: :core), an_object_having_attributes(name: 'ldom_domainchassis', value: 'AK00358110', type: :legacy), an_object_having_attributes(name: 'ldom_domaincontrol', value: 'opdx-a0-sun2', type: :legacy), an_object_having_attributes(name: 'ldom_domainname', value: 'sol11-9', type: :legacy), an_object_having_attributes(name: 'ldom_domainrole_control', value: 'false', type: :legacy), an_object_having_attributes(name: 'ldom_domainrole_impl', value: 'LDoms', type: :legacy), an_object_having_attributes(name: 'ldom_domainrole_io', value: 'false', type: :legacy), an_object_having_attributes(name: 'ldom_domainrole_root', value: 'false', type: :legacy), an_object_having_attributes(name: 'ldom_domainrole_service', value: 'false', type: :legacy), an_object_having_attributes(name: 'ldom_domainuuid', value: 'd7a3a4df-ce8c-47a9-b396-cb5a5f30c0b2',
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     type: :legacy))
       end
     end
 
diff --git a/spec/facter/resolvers/base_resolver_spec.rb b/spec/facter/resolvers/base_resolver_spec.rb
@@ -19,7 +19,7 @@ def self.post_resolve(fact_name, _options)
     end
 
     it 'returns the same log instance each time' do
-      expect(resolver.log).to be_equal(resolver.log)
+      expect(resolver.log).to equal(resolver.log)
     end
   end
 
diff --git a/spec/facter/resolvers/dmi_spec.rb b/spec/facter/resolvers/dmi_spec.rb
@@ -110,7 +110,7 @@
       let(:file_content) { 'VMware, Inc.' }
       let(:file) { 'sys_vendor' }
 
-      it ' returns sys_vendor' do
+      it 'returns sys_vendor' do
         expect(resolver.resolve(:sys_vendor)).to eq(file_content)
       end
     end
diff --git a/spec/facter/resolvers/freebsd/dmi_bios_spec.rb b/spec/facter/resolvers/freebsd/dmi_bios_spec.rb
@@ -59,7 +59,7 @@
     end
 
     context 'when sys_vendor is available' do
-      it ' returns sys_vendor' do
+      it 'returns sys_vendor' do
         expect(resolver.resolve(:sys_vendor)).to eq(sys_vendor)
       end
     end
diff --git a/spec/facter/resolvers/openbsd/dmi_bios_spec.rb b/spec/facter/resolvers/openbsd/dmi_bios_spec.rb
@@ -55,7 +55,7 @@
     end
 
     context 'when sys_vendor is available' do
-      it ' returns sys_vendor' do
+      it 'returns sys_vendor' do
         expect(resolver.resolve(:sys_vendor)).to eq(sys_vendor)
       end
     end
diff --git a/spec/facter/resolvers/windows/virtualization_spec.rb b/spec/facter/resolvers/windows/virtualization_spec.rb
@@ -217,7 +217,7 @@
     end
   end
 
-  describe '#resolve  when WMI query returns nil' do
+  describe '#resolve when WMI query returns nil' do
     let(:query_result) { nil }
 
     it 'logs that query failed and virtual nil' do
diff --git a/spec/facter/util/facts/posix/virtual_detector_spec.rb b/spec/facter/util/facts/posix/virtual_detector_spec.rb
@@ -291,7 +291,7 @@
       end
     end
 
-    context 'when all resolvers return nil ' do
+    context 'when all resolvers return nil' do
       let(:vm) { 'physical' }
 
       before do
diff --git a/spec/facter/util/linux/socket_parser_spec.rb b/spec/facter/util/linux/socket_parser_spec.rb
@@ -160,7 +160,7 @@ def ifaddr_obj(name, ip, mac, netmask, ipv4_type)
       end
 
       it 'resolves the mac and ipv6 binding for lo' do
-        expect(socket_parser.retrieve_interfaces(log_spy)['lo'].keys).to match_array([:bindings6])
+        expect(socket_parser.retrieve_interfaces(log_spy)['lo'].keys).to contain_exactly(:bindings6)
       end
     end
 
diff --git a/spec/facter/util/resolvers/http_spec.rb b/spec/facter/util/resolvers/http_spec.rb
@@ -103,7 +103,7 @@
   RSpec.shared_examples 'an http request on windows' do
     it_behaves_like 'an http request'
 
-    context 'when host is unreachable ' do
+    context 'when host is unreachable' do
       before do
         allow(Socket).to receive(:tcp)
           .with('169.254.169.254', 80, { connect_timeout: 0.6 })
diff --git a/spec/framework/config/fact_groups_spec.rb b/spec/framework/config/fact_groups_spec.rb
@@ -86,7 +86,7 @@
   describe '#get_fact_group' do
     before do
       stub_const('Facter::Config::FACT_GROUPS', 'operating system' => %w[os os.name])
-      allow(config_reader).to receive(:ttls).and_return(['operating system' => '30 minutes'])
+      allow(config_reader).to receive(:ttls).and_return([{ 'operating system' => '30 minutes' }])
     end
 
     it 'returns group' do
@@ -99,7 +99,7 @@
   end
 
   describe '#get_group_ttls' do
-    let(:ttls) { ['operating system' => '30 minutes'] }
+    let(:ttls) { [{ 'operating system' => '30 minutes' }] }
 
     before do
       stub_const('Facter::Config::FACT_GROUPS', 'operating system' => %w[os os.name])
@@ -115,7 +115,7 @@
     end
 
     context 'when ttls has short names for units' do
-      let(:ttls) { ['operating system' => '10000000000000 ns', 'memory' => '10000', 'hostname' => '30 h'] }
+      let(:ttls) { [{ 'operating system' => '10000000000000 ns', 'memory' => '10000', 'hostname' => '30 h' }] }
 
       it 'returns os ttl in seconds' do
         expect(fg.get_group_ttls('operating system')).to eq(10_000)
@@ -131,7 +131,7 @@
     end
 
     context 'when ttls has singular hour instead of plural hours' do
-      let(:ttls) { ['operating system' => '1 hour', 'memory' => '1 day'] }
+      let(:ttls) { [{ 'operating system' => '1 hour', 'memory' => '1 day' }] }
 
       it 'returns os ttl in seconds' do
         expect(fg.get_group_ttls('operating system')).to eq(3600)
@@ -143,7 +143,7 @@
     end
 
     context 'when ttls are invalid' do
-      let(:ttls) { ['hostname' => '30 invalid_unit'] }
+      let(:ttls) { [{ 'hostname' => '30 invalid_unit' }] }
 
       let(:logger) { Facter::Log.class_variable_get(:@@logger) }
 
diff --git a/spec/framework/core/fact/internal/internal_fact_manager_spec.rb b/spec/framework/core/fact/internal/internal_fact_manager_spec.rb
@@ -95,7 +95,7 @@
       it 'does not store the fact value' do
         resolved_facts = internal_fact_manager.resolve_facts([searched_fact])
 
-        expect(resolved_facts).to match_array []
+        expect(resolved_facts).to be_empty
       end
 
       it 'logs backtrace as error with --trace option' do
diff --git a/spec_integration/facter_spec.rb b/spec_integration/facter_spec.rb
