Skip to content
This repository has been archived by the owner on Jun 19, 2020. It is now read-only.

Commit

Permalink
(maint )Rubocop fixes (#438)
Browse files Browse the repository at this point in the history
* (FACT-2536) Added platform Arch Linux with working implementation from Debian
* (FACT-2536) Fixed rubocop offenses
* (maint) Did some rubocop fixes and removed the Arch implementation
Co-authored-by: Andrei Filipovici <[email protected]>
  • Loading branch information
Filipovici-Andrei authored Apr 8, 2020
1 parent ffc83aa commit 83adfc2
Show file tree
Hide file tree
Showing 85 changed files with 600 additions and 389 deletions.
86 changes: 3 additions & 83 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config --exclude-limit 1000`
# on 2020-04-02 14:42:50 +0300 using RuboCop version 0.74.0.
# on 2020-04-07 19:23:35 +0300 using RuboCop version 0.74.0.
# 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
Expand Down Expand Up @@ -108,7 +108,7 @@ RSpec/LeakyConstantDeclaration:
- 'spec/facter/resolvers/macosx/mountpoints_resolver_spec.rb'
- 'spec/facter/resolvers/utils/windows/network_utils_spec.rb'

# Offense count: 166
# Offense count: 121
# Configuration parameters: EnforcedStyle.
# SupportedStyles: have_received, receive
RSpec/MessageSpies:
Expand All @@ -128,55 +128,20 @@ RSpec/MessageSpies:
- 'spec/custom_facts/util/parser_spec.rb'
- 'spec/custom_facts/util/resolution_spec.rb'
- 'spec/facter/facter_spec.rb'
- 'spec/facter/facts/aix/networking/domain_spec.rb'
- 'spec/facter/facts/aix/networking/fqdn_spec.rb'
- 'spec/facter/facts/aix/networking/hostname_spec.rb'
- 'spec/facter/facts/aix/networking/ip_spec.rb'
- 'spec/facter/facts/aix/networking/primary_spec.rb'
- 'spec/facter/facts/aix/os/name_spec.rb'
- 'spec/facter/facts/aix/os/release_spec.rb'
- 'spec/facter/facts/aix/ruby/version_spec.rb'
- 'spec/facter/facts/debian/networking/domain_spec.rb'
- 'spec/facter/facts/debian/networking/fqdn_spec.rb'
- 'spec/facter/facts/debian/networking/hostname_spec.rb'
- 'spec/facter/facts/debian/networking/interfaces_spec.rb'
- 'spec/facter/facts/debian/networking/ip_spec.rb'
- 'spec/facter/facts/debian/networking/primary_spec.rb'
- 'spec/facter/facts/debian/ruby/version_spec.rb'
- 'spec/facter/facts/el/networking/domain_spec.rb'
- 'spec/facter/facts/el/networking/fqdn_spec.rb'
- 'spec/facter/facts/el/networking/hostname_spec.rb'
- 'spec/facter/facts/el/networking/interfaces_spec.rb'
- 'spec/facter/facts/el/networking/ip_spec.rb'
- 'spec/facter/facts/el/networking/primary_spec.rb'
- 'spec/facter/facts/macosx/is_virtual_spec.rb'
- 'spec/facter/facts/macosx/mountpoints_spec.rb'
- 'spec/facter/facts/macosx/networking/domain_spec.rb'
- 'spec/facter/facts/macosx/networking/fqdn_spec.rb'
- 'spec/facter/facts/macosx/networking/hostname_spec.rb'
- 'spec/facter/facts/macosx/os/architecture_spec.rb'
- 'spec/facter/facts/macosx/os/family_spec.rb'
- 'spec/facter/facts/macosx/os/name_spec.rb'
- 'spec/facter/facts/macosx/ruby/version_spec.rb'
- 'spec/facter/facts/sles/facterversion_spec.rb'
- 'spec/facter/facts/sles/networking/domain_spec.rb'
- 'spec/facter/facts/sles/networking/fqdn_spec.rb'
- 'spec/facter/facts/sles/networking/hostname_spec.rb'
- 'spec/facter/facts/sles/networking/interfaces_spec.rb'
- 'spec/facter/facts/sles/networking/ip_spec.rb'
- 'spec/facter/facts/sles/networking/primary_spec.rb'
- 'spec/facter/facts/sles/os/architecture_spec.rb'
- 'spec/facter/facts/sles/os/name_spec.rb'
- 'spec/facter/facts/sles/os/release_spec.rb'
- 'spec/facter/facts/solaris/facterversion_spec.rb'
- 'spec/facter/facts/solaris/networking/domain_spec.rb'
- 'spec/facter/facts/solaris/networking/fqdn_spec.rb'
- 'spec/facter/facts/solaris/networking/hostname_spec.rb'
- 'spec/facter/facts/solaris/os/architecture_spec.rb'
- 'spec/facter/facts/solaris/os/name_spec.rb'
- 'spec/facter/facts/solaris/ruby/platform_spec.rb'
- 'spec/facter/facts/solaris/ruby/sitedir_spec.rb'
- 'spec/facter/facts/solaris/ruby/version_spec.rb'
- 'spec/facter/facts/windows/dmi/manufacturer_spec.rb'
- 'spec/facter/facts/windows/dmi/product/name_spec.rb'
- 'spec/facter/facts/windows/dmi/product/serial_number_spec.rb'
Expand All @@ -195,15 +160,6 @@ RSpec/MessageSpies:
- 'spec/facter/facts/windows/netmask_interfaces_spec.rb'
- 'spec/facter/facts/windows/network6_interfaces_spec.rb'
- 'spec/facter/facts/windows/network_interfaces_spec.rb'
- 'spec/facter/facts/windows/networking/domain_spec.rb'
- 'spec/facter/facts/windows/networking/hostname_spec.rb'
- 'spec/facter/facts/windows/networking/ip6_spec.rb'
- 'spec/facter/facts/windows/networking/mac_spec.rb'
- 'spec/facter/facts/windows/networking/netmask6_spec.rb'
- 'spec/facter/facts/windows/networking/netmask_spec.rb'
- 'spec/facter/facts/windows/networking/network6_spec.rb'
- 'spec/facter/facts/windows/networking/network_spec.rb'
- 'spec/facter/facts/windows/networking/scope6_spec.rb'
- 'spec/facter/facts/windows/os/architecture_spec.rb'
- 'spec/facter/facts/windows/os/family_spec.rb'
- 'spec/facter/facts/windows/os/hardware_spec.rb'
Expand All @@ -218,7 +174,6 @@ RSpec/MessageSpies:
- 'spec/facter/facts/windows/processors/physicalcount_spec.rb'
- 'spec/facter/facts/windows/ruby/platform_spec.rb'
- 'spec/facter/facts/windows/ruby/sitedir_spec.rb'
- 'spec/facter/facts/windows/ruby/version_spec.rb'
- 'spec/facter/facts/windows/scope6_interfaces_spec.rb'
- 'spec/facter/resolvers/utils/aix/odm_query_spec.rb'
- 'spec/framework/config/config_reader_spec.rb'
Expand All @@ -235,7 +190,7 @@ RSpec/SubjectStub:
- 'spec/custom_facts/util/fact_spec.rb'
- 'spec/custom_facts/util/resolution_spec.rb'

# Offense count: 233
# Offense count: 193
# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
RSpec/VerifiedDoubles:
Exclude:
Expand All @@ -246,46 +201,12 @@ RSpec/VerifiedDoubles:
- 'spec/custom_facts/util/fact_spec.rb'
- 'spec/custom_facts/util/resolution_spec.rb'
- 'spec/facter/facter_spec.rb'
- 'spec/facter/facts/aix/facterversion_spec.rb'
- 'spec/facter/facts/aix/kernel_spec.rb'
- 'spec/facter/facts/aix/kernelmajversion_spec.rb'
- 'spec/facter/facts/aix/kernelrelease_spec.rb'
- 'spec/facter/facts/aix/kernelversion_spec.rb'
- 'spec/facter/facts/aix/path_spec.rb'
- 'spec/facter/facts/aix/ssh_spec.rb'
- 'spec/facter/facts/debian/facterversion_spec.rb'
- 'spec/facter/facts/debian/kernel_spec.rb'
- 'spec/facter/facts/debian/kernelmajversion_spec.rb'
- 'spec/facter/facts/debian/kernelrelease_spec.rb'
- 'spec/facter/facts/debian/kernelversion_spec.rb'
- 'spec/facter/facts/debian/path_spec.rb'
- 'spec/facter/facts/el/facterversion_spec.rb'
- 'spec/facter/facts/el/kernel_spec.rb'
- 'spec/facter/facts/el/kernelmajversion_spec.rb'
- 'spec/facter/facts/el/kernelrelease_spec.rb'
- 'spec/facter/facts/el/kernelversion_spec.rb'
- 'spec/facter/facts/el/path_spec.rb'
- 'spec/facter/facts/macosx/facterversion_spec.rb'
- 'spec/facter/facts/macosx/kernel_spec.rb'
- 'spec/facter/facts/macosx/kernelrelease_spec.rb'
- 'spec/facter/facts/macosx/kernelversion_spec.rb'
- 'spec/facter/facts/macosx/memory/swap/capacity_spec.rb'
- 'spec/facter/facts/macosx/memory/swap/used_bytes_spec.rb'
- 'spec/facter/facts/macosx/memory/system/capacity_spec.rb'
- 'spec/facter/facts/macosx/memory/system/used_bytes_spec.rb'
- 'spec/facter/facts/macosx/path_spec.rb'
- 'spec/facter/facts/sles/kernel_spec.rb'
- 'spec/facter/facts/sles/kernelmajversion_spec.rb'
- 'spec/facter/facts/sles/kernelrelease_spec.rb'
- 'spec/facter/facts/sles/kernelversion_spec.rb'
- 'spec/facter/facts/sles/path_spec.rb'
- 'spec/facter/facts/solaris/kernel_spec.rb'
- 'spec/facter/facts/solaris/kernelmajversion_spec.rb'
- 'spec/facter/facts/solaris/kernelrelease_spec.rb'
- 'spec/facter/facts/solaris/kernelversion_spec.rb'
- 'spec/facter/facts/solaris/path_spec.rb'
- 'spec/facter/facts/windows/dmi/product/serial_number_spec.rb'
- 'spec/facter/facts/windows/facterversion_spec.rb'
- 'spec/facter/facts/windows/hypervisors/hyperv_spec.rb'
- 'spec/facter/facts/windows/hypervisors/kvm_spec.rb'
- 'spec/facter/facts/windows/hypervisors/virtualbox_spec.rb'
Expand All @@ -298,7 +219,6 @@ RSpec/VerifiedDoubles:
- 'spec/facter/facts/windows/networking/interfaces_spec.rb'
- 'spec/facter/facts/windows/networking/mtu_spec.rb'
- 'spec/facter/facts/windows/networking/primary_spec.rb'
- 'spec/facter/facts/windows/path_spec.rb'
- 'spec/facter/facts/windows/processors/models_spec.rb'
- 'spec/facter/facts/windows/virtualization/is_virtual_spec.rb'
- 'spec/facter/facts/windows/virtualization/virtual_spec.rb'
Expand Down
21 changes: 15 additions & 6 deletions spec/facter/facts/aix/facterversion_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,22 @@

describe Facts::Aix::Facterversion do
describe '#call_the_resolver' do
it 'returns a fact' do
expected_fact = double(Facter::ResolvedFact, name: 'facterversion', value: 'value')
allow(Facter::Resolvers::Facterversion).to receive(:resolve).with(:facterversion).and_return('value')
allow(Facter::ResolvedFact).to receive(:new).with('facterversion', 'value').and_return(expected_fact)
subject(:fact) { Facts::Aix::Facterversion.new }

fact = Facts::Aix::Facterversion.new
expect(fact.call_the_resolver).to eq(expected_fact)
let(:value) { '4.0.3' }

before do
allow(Facter::Resolvers::Facterversion).to receive(:resolve).with(:facterversion).and_return(value)
end

it 'calls Facter::Resolvers::Facterversion' do
fact.call_the_resolver
expect(Facter::Resolvers::Facterversion).to have_received(:resolve).with(:facterversion)
end

it 'returns facterversion fact' do
expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
have_attributes(name: 'facterversion', value: value)
end
end
end
21 changes: 15 additions & 6 deletions spec/facter/facts/aix/kernel_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,22 @@

describe Facts::Aix::Kernel do
describe '#call_the_resolver' do
it 'returns a fact' do
expected_fact = double(Facter::ResolvedFact, name: 'kernel', value: 'AIX')
allow(Facter::Resolvers::OsLevel).to receive(:resolve).with(:kernel).and_return('AIX')
allow(Facter::ResolvedFact).to receive(:new).with('kernel', 'AIX').and_return(expected_fact)
subject(:fact) { Facts::Aix::Kernel.new }

fact = Facts::Aix::Kernel.new
expect(fact.call_the_resolver).to eq(expected_fact)
let(:value) { 'AIX' }

before do
allow(Facter::Resolvers::OsLevel).to receive(:resolve).with(:kernel).and_return(value)
end

it 'calls Facter::Resolvers::OsLevel' do
fact.call_the_resolver
expect(Facter::Resolvers::OsLevel).to have_received(:resolve).with(:kernel)
end

it 'returns kernel fact' do
expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
have_attributes(name: 'kernel', value: value)
end
end
end
22 changes: 16 additions & 6 deletions spec/facter/facts/aix/kernelmajversion_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,23 @@

describe Facts::Aix::Kernelmajversion do
describe '#call_the_resolver' do
it 'returns a fact' do
expected_fact = double(Facter::ResolvedFact, name: 'kernelmajversion', value: '6100')
allow(Facter::Resolvers::OsLevel).to receive(:resolve).with(:build).and_return('6100-09-00-0000')
allow(Facter::ResolvedFact).to receive(:new).with('kernelmajversion', '6100').and_return(expected_fact)
subject(:fact) { Facts::Aix::Kernelmajversion.new }

fact = Facts::Aix::Kernelmajversion.new
expect(fact.call_the_resolver).to eq(expected_fact)
let(:fact_value) { '6100' }
let(:resolver_value) { '6100-09-00-0000' }

before do
allow(Facter::Resolvers::OsLevel).to receive(:resolve).with(:build).and_return(resolver_value)
end

it 'calls Facter::Resolvers::OsLevel' do
fact.call_the_resolver
expect(Facter::Resolvers::OsLevel).to have_received(:resolve).with(:build)
end

it 'returns kernelmajversion fact' do
expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
have_attributes(name: 'kernelmajversion', value: fact_value)
end
end
end
21 changes: 15 additions & 6 deletions spec/facter/facts/aix/kernelrelease_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,22 @@

describe Facts::Aix::Kernelrelease do
describe '#call_the_resolver' do
it 'returns a fact' do
expected_fact = double(Facter::ResolvedFact, name: 'kernelrelease', value: '6100-09-00-0000')
allow(Facter::Resolvers::OsLevel).to receive(:resolve).with(:build).and_return('6100-09-00-0000')
allow(Facter::ResolvedFact).to receive(:new).with('kernelrelease', '6100-09-00-0000').and_return(expected_fact)
subject(:fact) { Facts::Aix::Kernelrelease.new }

fact = Facts::Aix::Kernelrelease.new
expect(fact.call_the_resolver).to eq(expected_fact)
let(:value) { '6100-09-00-0000' }

before do
allow(Facter::Resolvers::OsLevel).to receive(:resolve).with(:build).and_return(value)
end

it 'calls Facter::Resolvers::OsLevel' do
fact.call_the_resolver
expect(Facter::Resolvers::OsLevel).to have_received(:resolve).with(:build)
end

it 'returns kernelrelease fact' do
expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
have_attributes(name: 'kernelrelease', value: value)
end
end
end
22 changes: 16 additions & 6 deletions spec/facter/facts/aix/kernelversion_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,23 @@

describe Facts::Aix::Kernelversion do
describe '#call_the_resolver' do
it 'returns a fact' do
expected_fact = double(Facter::ResolvedFact, name: 'kernelversion', value: '6100')
allow(Facter::Resolvers::OsLevel).to receive(:resolve).with(:build).and_return('6100-09-00-0000')
allow(Facter::ResolvedFact).to receive(:new).with('kernelversion', '6100').and_return(expected_fact)
subject(:fact) { Facts::Aix::Kernelversion.new }

fact = Facts::Aix::Kernelversion.new
expect(fact.call_the_resolver).to eq(expected_fact)
let(:resolver_value) { '6100-09-00-0000' }
let(:fact_value) { '6100' }

before do
allow(Facter::Resolvers::OsLevel).to receive(:resolve).with(:build).and_return(resolver_value)
end

it 'calls Facter::Resolvers::OsLevel' do
fact.call_the_resolver
expect(Facter::Resolvers::OsLevel).to have_received(:resolve).with(:build)
end

it 'returns kernelversion fact' do
expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
have_attributes(name: 'kernelversion', value: fact_value)
end
end
end
2 changes: 1 addition & 1 deletion spec/facter/facts/aix/networking/domain_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
end

it 'calls Facter::Resolvers::Hostname' do
expect(Facter::Resolvers::Hostname).to receive(:resolve).with(:domain)
fact.call_the_resolver
expect(Facter::Resolvers::Hostname).to have_received(:resolve).with(:domain)
end

it 'returns domain fact' do
Expand Down
2 changes: 1 addition & 1 deletion spec/facter/facts/aix/networking/fqdn_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
end

it 'calls Facter::Resolvers::Hostname' do
expect(Facter::Resolvers::Hostname).to receive(:resolve).with(:fqdn)
fact.call_the_resolver
expect(Facter::Resolvers::Hostname).to have_received(:resolve).with(:fqdn)
end

it 'returns fqdn fact' do
Expand Down
2 changes: 1 addition & 1 deletion spec/facter/facts/aix/networking/hostname_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
end

it 'calls Facter::Resolvers::Hostname' do
expect(Facter::Resolvers::Hostname).to receive(:resolve).with(:hostname)
fact.call_the_resolver
expect(Facter::Resolvers::Hostname).to have_received(:resolve).with(:hostname)
end

it 'returns hostname fact' do
Expand Down
2 changes: 1 addition & 1 deletion spec/facter/facts/aix/networking/ip_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
end

it 'calls Facter::Resolvers::Networking' do
expect(Facter::Resolvers::Aix::Networking).to receive(:resolve).with(:ip)
fact.call_the_resolver
expect(Facter::Resolvers::Aix::Networking).to have_received(:resolve).with(:ip)
end

it 'returns ipv4 address fact' do
Expand Down
2 changes: 1 addition & 1 deletion spec/facter/facts/aix/networking/primary_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
end

it 'calls Facter::Resolvers::Networking' do
expect(Facter::Resolvers::Aix::Networking).to receive(:resolve).with(:primary)
fact.call_the_resolver
expect(Facter::Resolvers::Aix::Networking).to have_received(:resolve).with(:primary)
end

it 'returns primary interface name' do
Expand Down
22 changes: 15 additions & 7 deletions spec/facter/facts/aix/path_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,23 @@

describe Facts::Aix::Path do
describe '#call_the_resolver' do
it 'returns a fact' do
value = '/usr/bin:/etc:/usr/sbin:/usr/ucb:/usr/bin/X11:/sbin:/usr/java6/jre/bin:/usr/java6/bin'
subject(:fact) { Facts::Aix::Path.new }

expected_fact = double(Facter::ResolvedFact, name: 'path', value: value)
allow(Facter::Resolvers::Path).to receive(:resolve).with(:path).and_return(value)
allow(Facter::ResolvedFact).to receive(:new).with('path', value).and_return(expected_fact)
let(:value) { '/usr/bin:/etc:/usr/sbin:/usr/ucb:/usr/bin/X11:/sbin:/usr/java6/jre/bin:/usr/java6/bin' }

fact = Facts::Aix::Path.new
expect(fact.call_the_resolver).to eq(expected_fact)
before do
allow(Facter::Resolvers::Path).to \
receive(:resolve).with(:path).and_return(value)
end

it 'calls Facter::Resolvers::Path' do
fact.call_the_resolver
expect(Facter::Resolvers::Path).to have_received(:resolve).with(:path)
end

it 'returns path fact' do
expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
have_attributes(name: 'path', value: value)
end
end
end
2 changes: 1 addition & 1 deletion spec/facter/facts/aix/ruby/version_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
end

it 'calls Facter::Resolvers::Ruby' do
expect(Facter::Resolvers::Ruby).to receive(:resolve).with(:version)
fact.call_the_resolver
expect(Facter::Resolvers::Ruby).to have_received(:resolve).with(:version)
end

it 'returns ruby version fact' do
Expand Down
Loading

0 comments on commit 83adfc2

Please sign in to comment.