From 95368d1f057b21d943f9ae31d95588cad21f00c7 Mon Sep 17 00:00:00 2001 From: Lightning Date: Wed, 8 May 2024 17:19:14 +0200 Subject: [PATCH] satisfy rubocop --- lib/facter/power_devices.rb | 42 +++++---- lib/facter/power_schemes.rb | 6 ++ spec/classes/hibernate_spec.rb | 2 + spec/classes/scheme_spec.rb | 132 ++++++++++++++++----------- spec/classes/windows_power_spec.rb | 2 + spec/defines/device_spec.rb | 138 +++++++++++++++++------------ 6 files changed, 192 insertions(+), 130 deletions(-) diff --git a/lib/facter/power_devices.rb b/lib/facter/power_devices.rb index f564e16..ee5e279 100644 --- a/lib/facter/power_devices.rb +++ b/lib/facter/power_devices.rb @@ -1,23 +1,27 @@ -Facter.add(:power_devices, :type => :aggregate) do +# frozen_string_literal: true + +# rubocop:disable Style/RegexpLiteral + +Facter.add(:power_devices, type: :aggregate) do confine kernel: 'windows' chunk(:devices) do - all_devices = Facter::Core::Execution.execute('powercfg /devicequery all_devices').split(/[\n\r]+/).reject{|x| x.eql?('')} - wake_programmable = Facter::Core::Execution.execute('powercfg /devicequery wake_programmable').split(/[\n\r]+/).reject{|x| x.eql?('')} - wake_armed = Facter::Core::Execution.execute('powercfg /devicequery wake_armed').split(/[\n\r]+/).reject{|x| x.eql?('')} - wake_from_any = Facter::Core::Execution.execute('powercfg /devicequery wake_from_any').split(/[\n\r]+/).reject{|x| x.eql?('')} - wake_from_s1_supported = Facter::Core::Execution.execute('powercfg /devicequery wake_from_s1_supported').split(/[\n\r]+/).reject{|x| x.eql?('')} - wake_from_s2_supported = Facter::Core::Execution.execute('powercfg /devicequery wake_from_s2_supported').split(/[\n\r]+/).reject{|x| x.eql?('')} - wake_from_s3_supported = Facter::Core::Execution.execute('powercfg /devicequery wake_from_s3_supported').split(/[\n\r]+/).reject{|x| x.eql?('')} - s1_supported = Facter::Core::Execution.execute('powercfg /devicequery s1_supported').split(/[\n\r]+/).reject{|x| x.eql?('')} - s2_supported = Facter::Core::Execution.execute('powercfg /devicequery s2_supported').split(/[\n\r]+/).reject{|x| x.eql?('')} - s3_supported = Facter::Core::Execution.execute('powercfg /devicequery s3_supported').split(/[\n\r]+/).reject{|x| x.eql?('')} - s4_supported = Facter::Core::Execution.execute('powercfg /devicequery s4_supported').split(/[\n\r]+/).reject{|x| x.eql?('')} + all_devices = Facter::Core::Execution.execute('powercfg /devicequery all_devices').split(/[\n\r]+/).reject { |x| x.eql?('') } + wake_programmable = Facter::Core::Execution.execute('powercfg /devicequery wake_programmable').split(/[\n\r]+/).reject { |x| x.eql?('') } + wake_armed = Facter::Core::Execution.execute('powercfg /devicequery wake_armed').split(/[\n\r]+/).reject { |x| x.eql?('') } + wake_from_any = Facter::Core::Execution.execute('powercfg /devicequery wake_from_any').split(/[\n\r]+/).reject { |x| x.eql?('') } + wake_from_s1_supported = Facter::Core::Execution.execute('powercfg /devicequery wake_from_s1_supported').split(/[\n\r]+/).reject { |x| x.eql?('') } + wake_from_s2_supported = Facter::Core::Execution.execute('powercfg /devicequery wake_from_s2_supported').split(/[\n\r]+/).reject { |x| x.eql?('') } + wake_from_s3_supported = Facter::Core::Execution.execute('powercfg /devicequery wake_from_s3_supported').split(/[\n\r]+/).reject { |x| x.eql?('') } + s1_supported = Facter::Core::Execution.execute('powercfg /devicequery s1_supported').split(/[\n\r]+/).reject { |x| x.eql?('') } + s2_supported = Facter::Core::Execution.execute('powercfg /devicequery s2_supported').split(/[\n\r]+/).reject { |x| x.eql?('') } + s3_supported = Facter::Core::Execution.execute('powercfg /devicequery s3_supported').split(/[\n\r]+/).reject { |x| x.eql?('') } + s4_supported = Facter::Core::Execution.execute('powercfg /devicequery s4_supported').split(/[\n\r]+/).reject { |x| x.eql?('') } devices = {} all_devices.each do |device| - devices[device.to_sym] = {} unless devices.has_key?(device.to_sym) + devices[device.to_sym] = {} unless devices.key?(device.to_sym) devices[device.to_sym].store(:wake_programmable, true) if wake_programmable.include?(device) devices[device.to_sym].store(:wake_armed, true) if wake_armed.include?(device) devices[device.to_sym].store(:wake_from_any, true) if wake_from_any.include?(device) @@ -30,7 +34,7 @@ devices[device.to_sym].store(:s4_supported, true) if s4_supported.include?(device) end - devices.delete_if{|key, value| value.empty?} + devices.delete_if { |_key, value| value.empty? } devices end @@ -46,12 +50,12 @@ caller_type = match[1].downcase.to_sym next end - if caller_type != :unknown + if caller_type != :unknown # rubocop:disable Style/Next line.match(/^(.*?)((?:\s(DISPLAY|SYSTEM|AWAYMODE)(?!.*\b\3\b))+)$/) do |match| request = match[2].strip.split - devices[match[1].to_sym] = {} unless devices.has_key?(match[1].to_sym) - devices[match[1].to_sym][:power_request_overrides] = {} unless devices[match[1].to_sym].has_key?(:power_request_overrides) - devices[match[1].to_sym][:power_request_overrides][caller_type] = {} unless devices[match[1].to_sym][:power_request_overrides].has_key?(caller_type) + devices[match[1].to_sym] = {} unless devices.key?(match[1].to_sym) + devices[match[1].to_sym][:power_request_overrides] = {} unless devices[match[1].to_sym].key?(:power_request_overrides) + devices[match[1].to_sym][:power_request_overrides][caller_type] = {} unless devices[match[1].to_sym][:power_request_overrides].key?(caller_type) devices[match[1].to_sym][:power_request_overrides][caller_type].store(:display, true) if request.include?('DISPLAY') devices[match[1].to_sym][:power_request_overrides][caller_type].store(:system, true) if request.include?('SYSTEM') devices[match[1].to_sym][:power_request_overrides][caller_type].store(:awaymode, true) if request.include?('AWAYMODE') @@ -63,3 +67,5 @@ devices end end + +# rubocop:enable Style/RegexpLiteral diff --git a/lib/facter/power_schemes.rb b/lib/facter/power_schemes.rb index a245787..27cc512 100644 --- a/lib/facter/power_schemes.rb +++ b/lib/facter/power_schemes.rb @@ -1,3 +1,7 @@ +# frozen_string_literal: true + +# rubocop:disable Style/RegexpLiteral + Facter.add(:power_schemes) do confine kernel: 'windows' @@ -18,3 +22,5 @@ power_schemes end end + +# rubocop:enable Style/RegexpLiteral diff --git a/spec/classes/hibernate_spec.rb b/spec/classes/hibernate_spec.rb index e1e734e..e94bb00 100644 --- a/spec/classes/hibernate_spec.rb +++ b/spec/classes/hibernate_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'windows_power::hibernate' do diff --git a/spec/classes/scheme_spec.rb b/spec/classes/scheme_spec.rb index 04ed039..11bfa66 100644 --- a/spec/classes/scheme_spec.rb +++ b/spec/classes/scheme_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'windows_power::scheme' do @@ -14,13 +16,15 @@ context 'activate existing power scheme' do context 'which is not active yet' do let(:facts) do - super().merge({ - power_schemes: { - '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': { - active: false + super().merge( + { + power_schemes: { + '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': { + active: false + } } } - }) + ) end let(:params) do @@ -40,13 +44,15 @@ context 'which is active already' do let(:facts) do - super().merge({ - power_schemes: { - '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': { - active: true + super().merge( + { + power_schemes: { + '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': { + active: true + } } } - }) + ) end let(:params) do @@ -67,11 +73,13 @@ context 'activate non-existing power scheme' do let(:facts) do - super().merge({ - power_schemes: { - '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': {} + super().merge( + { + power_schemes: { + '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': {} + } } - }) + ) end let(:params) do @@ -92,14 +100,16 @@ context 'rename existing power scheme' do context 'to new name' do let(:facts) do - super().merge({ - power_schemes: { - '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': { - active: true, - name: 'High performance' + super().merge( + { + power_schemes: { + '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': { + active: true, + name: 'High performance' + } } } - }) + ) end let(:params) do @@ -120,14 +130,16 @@ context 'to matching name' do let(:facts) do - super().merge({ - power_schemes: { - '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': { - active: true, - name: 'super power' + super().merge( + { + power_schemes: { + '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': { + active: true, + name: 'super power' + } } } - }) + ) end let(:params) do @@ -150,11 +162,13 @@ context 'duplicate existing power scheme' do context 'as new scheme' do let(:facts) do - super().merge({ - power_schemes: { - '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': {} + super().merge( + { + power_schemes: { + '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': {} + } } - }) + ) end let(:params) do @@ -175,14 +189,16 @@ context 'as existing scheme' do let(:facts) do - super().merge({ - power_schemes: { - '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': {}, - '3c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': { - active: true + super().merge( + { + power_schemes: { + '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': {}, + '3c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': { + active: true + } } } - }) + ) end let(:params) do @@ -204,11 +220,13 @@ context 'duplicate non-existing power scheme' do let(:facts) do - super().merge({ - power_schemes: { - '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': {} + super().merge( + { + power_schemes: { + '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': {} + } } - }) + ) end let(:params) do @@ -230,13 +248,15 @@ context 'configure existing power scheme' do context 'which is active already' do let(:facts) do - super().merge({ - power_schemes: { - '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': { - active: true + super().merge( + { + power_schemes: { + '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': { + active: true + } } } - }) + ) end let(:params) do @@ -262,13 +282,15 @@ context 'which is not active yet' do let(:facts) do - super().merge({ - power_schemes: { - '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': { - active: false + super().merge( + { + power_schemes: { + '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': { + active: false + } } } - }) + ) end let(:params) do @@ -295,11 +317,13 @@ context 'configure non-existing power scheme' do let(:facts) do - super().merge({ - power_schemes: { - '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': {} + super().merge( + { + power_schemes: { + '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c': {} + } } - }) + ) end let(:params) do diff --git a/spec/classes/windows_power_spec.rb b/spec/classes/windows_power_spec.rb index cc81a4c..138cc26 100644 --- a/spec/classes/windows_power_spec.rb +++ b/spec/classes/windows_power_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'windows_power' do diff --git a/spec/defines/device_spec.rb b/spec/defines/device_spec.rb index 1d87bb0..e107067 100644 --- a/spec/defines/device_spec.rb +++ b/spec/defines/device_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'windows_power::device' do @@ -22,14 +24,16 @@ context 'if it doesn\'t already' do let(:facts) do - super().merge({ - power_devices: { - 'HID-compliant mouse (001)': { - wake_programmable: true, - wake_armed: false + super().merge( + { + power_devices: { + 'HID-compliant mouse (001)': { + wake_programmable: true, + wake_armed: false + } } } - }) + ) end it { is_expected.to compile.with_all_deps } @@ -41,14 +45,16 @@ context 'if it does already' do let(:facts) do - super().merge({ - power_devices: { - 'HID-compliant mouse (001)': { - wake_programmable: true, - wake_armed: true + super().merge( + { + power_devices: { + 'HID-compliant mouse (001)': { + wake_programmable: true, + wake_armed: true + } } } - }) + ) end it { is_expected.to compile.with_all_deps } @@ -60,9 +66,11 @@ context 'if it doesn\'t exist' do let(:facts) do - super().merge({ - power_devices: {} - }) + super().merge( + { + power_devices: {} + } + ) end it { is_expected.to compile.with_all_deps } @@ -74,13 +82,15 @@ context 'if it doesn\'t allow to' do let(:facts) do - super().merge({ - power_devices: { - 'HID-compliant mouse (001)': { - wake_programmable: false + super().merge( + { + power_devices: { + 'HID-compliant mouse (001)': { + wake_programmable: false + } } } - }) + ) end it { is_expected.to compile.with_all_deps } @@ -102,14 +112,16 @@ context 'if it does' do let(:facts) do - super().merge({ - power_devices: { - 'HID-compliant mouse (001)': { - wake_programmable: true, - wake_armed: true + super().merge( + { + power_devices: { + 'HID-compliant mouse (001)': { + wake_programmable: true, + wake_armed: true + } } } - }) + ) end it { is_expected.to compile.with_all_deps } @@ -121,14 +133,16 @@ context 'if it doesn\'t' do let(:facts) do - super().merge({ - power_devices: { - 'HID-compliant mouse (001)': { - wake_programmable: true, - wake_armed: false + super().merge( + { + power_devices: { + 'HID-compliant mouse (001)': { + wake_programmable: true, + wake_armed: false + } } } - }) + ) end it { is_expected.to compile.with_all_deps } @@ -141,9 +155,11 @@ context 'if device is not in facts' do let(:facts) do - super().merge({ - power_devices: {} - }) + super().merge( + { + power_devices: {} + } + ) end context 'don\'t allow Windows media player to keep system from turning off the display or from going to away mode' do @@ -196,18 +212,20 @@ let(:title) { 'Realtek PCIe GbE Family Controller' } let(:facts) do - super().merge({ - power_devices: { - 'Realtek PCIe GbE Family Controller': { - power_request_overrides: { - driver: { - display: true, - system: true + super().merge( + { + power_devices: { + 'Realtek PCIe GbE Family Controller': { + power_request_overrides: { + driver: { + display: true, + system: true + } } } } } - }) + ) end let(:params) do @@ -237,18 +255,20 @@ let(:title) { 'Realtek PCIe GbE Family Controller' } let(:facts) do - super().merge({ - power_devices: { - 'Realtek PCIe GbE Family Controller': { - power_request_overrides: { - driver: { - system: true, - awaymode: true + super().merge( + { + power_devices: { + 'Realtek PCIe GbE Family Controller': { + power_request_overrides: { + driver: { + system: true, + awaymode: true + } } } } } - }) + ) end let(:params) do @@ -277,17 +297,19 @@ let(:title) { 'VPN Service' } let(:facts) do - super().merge({ - power_devices: { - 'VPN Service': { - power_request_overrides: { - service: { - system: true + super().merge( + { + power_devices: { + 'VPN Service': { + power_request_overrides: { + service: { + system: true + } } } } } - }) + ) end let(:params) do