diff --git a/libraries/registry_helper.rb b/libraries/registry_helper.rb index 4839f41a..6b20a5a6 100644 --- a/libraries/registry_helper.rb +++ b/libraries/registry_helper.rb @@ -257,9 +257,9 @@ def resolve_user_to_sid(username) end Chef::Log.debug("Resolved user SID to #{sid}") - return sid + sid rescue - return nil + nil end def hive_loaded?(path) @@ -350,7 +350,7 @@ def ensure_hive_unloaded(hive_loaded = false) end module Registry - module_function + module_function # rubocop: disable Lint/UselessAccessModifier extend Windows::RegistryHelper end diff --git a/libraries/windows_helper.rb b/libraries/windows_helper.rb index 3f44bdef..cc7aa82d 100644 --- a/libraries/windows_helper.rb +++ b/libraries/windows_helper.rb @@ -93,7 +93,7 @@ def expand_env_vars(path) buf.strip end - def is_package_installed?(package_name) # rubocop:disable Style/PredicateName + def is_package_installed?(package_name) # rubocop:disable Naming/PredicateName installed_packages.include?(package_name) end diff --git a/libraries/windows_privileged.rb b/libraries/windows_privileged.rb index 5abf08b3..68d96c36 100644 --- a/libraries/windows_privileged.rb +++ b/libraries/windows_privileged.rb @@ -57,7 +57,7 @@ def run(*privileges) unless OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, token) raise get_last_error end - token = token.unpack('L')[0] + token = token.unpack1('L') privileges.each do |name| unless adjust_privilege(token, name, SE_PRIVILEGE_ENABLED) diff --git a/resources/feature_dism.rb b/resources/feature_dism.rb index a8183020..4e6117ce 100644 --- a/resources/feature_dism.rb +++ b/resources/feature_dism.rb @@ -23,6 +23,7 @@ property :all, [true, false], default: false property :timeout, Integer, default: 600 +# @return [Array] lowercase the array unless we're on < Windows 2012 def to_lowercase_array(x) x = x.split(/\s*,\s*/) if x.is_a?(String) # split multiple forms of a comma separated list diff --git a/resources/pagefile.rb b/resources/pagefile.rb index 93b6bf46..983e3a8d 100644 --- a/resources/pagefile.rb +++ b/resources/pagefile.rb @@ -162,7 +162,7 @@ def set_custom_size(pagefile, min, max) # set a pagefile size to be system managed # # @param [String] pagefile path to the pagefile - def set_system_managed(pagefile) # rubocop: disable Style/AccessorMethodName + def set_system_managed(pagefile) # rubocop: disable Naming/AccessorMethodName converge_by("set #{pagefile} to System Managed") do Chef::Log.debug("Running #{wmic} pagefileset where SettingID=\"#{get_setting_id(pagefile)}\" set InitialSize=0,MaximumSize=0") cmd = shell_out("#{wmic} pagefileset where SettingID=\"#{get_setting_id(pagefile)}\" set InitialSize=0,MaximumSize=0", returns: [0]) diff --git a/resources/task.rb b/resources/task.rb index 6a0b754a..a3fe8473 100644 --- a/resources/task.rb +++ b/resources/task.rb @@ -86,7 +86,7 @@ def load_task_hash(task_name) if task_hash.respond_to?(:[]) && task_hash[:TaskName] == pathed_task_name exists true status :running if task_hash[:Status] == 'Running' - enabled task_hash[:ScheduledTaskState] == 'Enabled' ? true : false + enabled task_hash[:ScheduledTaskState] == 'Enabled' cwd task_hash[:StartIn] unless task_hash[:StartIn] == 'N/A' command task_hash[:TaskToRun] user task_hash[:RunAsUser]