(CONT-793) - Final tweaks

Author: jordanbreen28

.rubocop_todo.yml

@@ -1,3 +1,11 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2023-04-21 14:47:05 UTC using RuboCop version 1.48.1.
+# 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: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/OrAssignmentToConstant:
@@ -13,17 +21,17 @@ Metrics/AbcSize:
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 90
+  Max: 83
 
 # Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 9
 
-# Offense count: 5
+# Offense count: 4
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 17
+  Max: 14
 
 # Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns.
@@ -62,7 +70,7 @@ RSpec/DescribeClass:
 # Offense count: 6
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 25
+  Max: 26
 
 # Offense count: 15
 # Configuration parameters: .
@@ -106,8 +114,26 @@ RSpec/SubjectStub:
     - 'spec/unit/provider/exec/powershell_spec.rb'
     - 'spec/unit/provider/exec/pwsh_spec.rb'
 
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: prefer_alias, prefer_alias_method
 Style/Alias:
-  Enabled: false
+  Exclude:
+    - 'spec/unit/provider/exec/powershell_spec.rb'
+    - 'spec/unit/provider/exec/pwsh_spec.rb'
 
+# Offense count: 2
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
-  Enabled: false
+  Exclude:
+    - 'lib/puppet/provider/exec/powershell.rb'
+    - 'lib/puppet/provider/exec/pwsh.rb'
+
+# Offense count: 9
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 203

lib/puppet/provider/exec/pwsh.rb

@@ -32,9 +32,7 @@ def run(command, check = false)
       # we redirect powershell's stdin to read from the file. Current
       # versions of Windows use per-user temp directories with strong
       # permissions, but I'd rather not make (poor) assumptions.
-      if Puppet::Util::Platform.windows?
-        return super("cmd.exe /c \"\"#{native_path(@pwsh)}\" #{pwsh_args.join(' ')} -Command - < \"#{native_path}\"\"", check)
-      end
+      return super("cmd.exe /c \"\"#{native_path(@pwsh)}\" #{pwsh_args.join(' ')} -Command - < \"#{native_path}\"\"", check) if Puppet::Util::Platform.windows?
 
       return super("/bin/sh -c \"#{native_path(@pwsh)} #{pwsh_args.join(' ')} -Command - < #{native_path}\"", check)
     end

spec/spec_helper_acceptance_local.rb

@@ -62,9 +62,7 @@ def remove_pwshlib
   uninstall_command = 'puppet module uninstall puppetlabs/pwshlib --force'
   uninstall_command += " --modulepath #{relative_folder('fixtures/modules').path}" if ENV['TARGET_HOST'] == 'localhost'
   Helper.instance.run_shell(uninstall_command, expect_failures: true) do |result|
-    unless result.stderr.include?("Module 'puppetlabs-pwshlib' is not installed") || result.exit_code == 0
-      raise 'Failed to uninstall puppetlabs/pwshlib'
-    end
+    raise 'Failed to uninstall puppetlabs/pwshlib' unless result.stderr.include?("Module 'puppetlabs-pwshlib' is not installed") || result.exit_code == 0
   end
 end