(SQUASH ME) rubocop changes

tvpartytonight · tvpartytonight · commit 5be53d59cb34 · 2025-11-12T17:28:32.000-08:00
diff --git a/lib/puppet/provider/augeas/augeas.rb b/lib/puppet/provider/augeas/augeas.rb
@@ -88,7 +88,7 @@ def parse_commands(data)
       sc = StringScanner.new(line)
       cmd = sc.scan(%r{\w+|==|!=})
       formals = COMMANDS[cmd]
-      raise(_('Unknown command %{cmd}') % { cmd: cmd }) unless formals
+      raise(_('Unknown command %{cmd}') % { cmd: }) unless formals
       argline << cmd
       narg = 0
       formals.each do |f|
@@ -112,7 +112,7 @@ def parse_commands(data)
           len = sc.pos - start
           len -= 1 unless sc.eos?
           p = sc.string[start, len]
-          raise(_('missing path argument %{narg} for %{cmd}') % { narg: narg, cmd: cmd }) if p.nil?
+          raise(_('missing path argument %{narg} for %{cmd}') % { narg:, cmd: }) if p.nil?
 
           # Rip off any ticks if they are there.
           p = p[1, (p.size - 2)] if p[0, 1] == "'" || p[0, 1] == '"'
@@ -138,12 +138,12 @@ def parse_commands(data)
           else
             argline << sc.scan(%r{[^\s]+})
           end
-          raise(_('missing string argument %{narg} for %{cmd}') % { narg: narg, cmd: cmd }) unless argline[-1]
+          raise(_('missing string argument %{narg} for %{cmd}') % { narg:, cmd: }) unless argline[-1]
         elsif f == :comparator
           argline << sc.scan(%r{(==|!=|=~|<=|>=|<|>)})
           unless argline[-1]
             puts sc.rest
-            raise(_('invalid comparator for command %{cmd}') % { cmd: cmd })
+            raise(_('invalid comparator for command %{cmd}') % { cmd: })
           end
         elsif f == :int
           argline << sc.scan(%r{\d+}).to_i
@@ -270,7 +270,7 @@ def process_values(cmd_array)
 
     # Get the match paths from augeas
     result = @aug.match(path) || []
-    raise(_("Error trying to get path '%{path}'") % { path: path }) if result == -1
+    raise(_("Error trying to get path '%{path}'") % { path: }) if result == -1
 
     # Get the values of the match paths from augeas
     values = result.map { |r| @aug.get(r) }
@@ -318,7 +318,7 @@ def process_match(cmd_array)
 
     # Get the values from augeas
     result = @aug.match(path) || []
-    raise(_("Error trying to match path '%{path}'") % { path: path }) if result == -1
+    raise(_("Error trying to match path '%{path}'") % { path: }) if result == -1
 
     # Now do the work
     case verb
@@ -440,7 +440,7 @@ def need_to_run?
           when 'match' then return_value = process_match(cmd_array)
           end
         rescue StandardError => e
-          raise(_("Error sending command '%{command}' with params %{param}/%{message}") % { command: command, param: cmd_array[1..-1].inspect, message: e.message })
+          raise(_("Error sending command '%{command}' with params %{param}/%{message}") % { command:, param: cmd_array[1..-1].inspect, message: e.message })
         end
       end
 
@@ -518,37 +518,37 @@ def do_execute_changes
         when 'set'
           debug("sending command '#{command}' with params #{cmd_array.inspect}")
           rv = aug.set(cmd_array[0], cmd_array[1])
-          raise(_("Error sending command '%{command}' with params %{params}") % { command: command, params: cmd_array.inspect }) unless rv
+          raise(_("Error sending command '%{command}' with params %{params}") % { command:, params: cmd_array.inspect }) unless rv
         when 'setm'
           if aug.respond_to?(command)
             debug("sending command '#{command}' with params #{cmd_array.inspect}")
             rv = aug.setm(cmd_array[0], cmd_array[1], cmd_array[2])
-            raise(_("Error sending command '%{command}' with params %{params}") % { command: command, params: cmd_array.inspect }) if rv == -1
+            raise(_("Error sending command '%{command}' with params %{params}") % { command:, params: cmd_array.inspect }) if rv == -1
           else
-            raise(_("command '%{command}' not supported in installed version of ruby-augeas") % { command: command })
+            raise(_("command '%{command}' not supported in installed version of ruby-augeas") % { command: })
           end
         when 'rm', 'remove'
           debug("sending command '#{command}' with params #{cmd_array.inspect}")
           rv = aug.rm(cmd_array[0])
-          raise(_("Error sending command '%{command}' with params %{params}") % { command: command, params: cmd_array.inspect }) if rv == -1
+          raise(_("Error sending command '%{command}' with params %{params}") % { command:, params: cmd_array.inspect }) if rv == -1
         when 'clear'
           debug("sending command '#{command}' with params #{cmd_array.inspect}")
           rv = aug.clear(cmd_array[0])
-          raise(_("Error sending command '%{command}' with params %{params}") % { command: command, params: cmd_array.inspect }) unless rv
+          raise(_("Error sending command '%{command}' with params %{params}") % { command:, params: cmd_array.inspect }) unless rv
         when 'clearm'
           # Check command exists ... doesn't currently in ruby-augeas 0.4.1
           if aug.respond_to?(command)
             debug("sending command '#{command}' with params #{cmd_array.inspect}")
             rv = aug.clearm(cmd_array[0], cmd_array[1])
-            raise(_("Error sending command '%{command}' with params %{params}") % { command: command, params: cmd_array.inspect }) unless rv
+            raise(_("Error sending command '%{command}' with params %{params}") % { command:, params: cmd_array.inspect }) unless rv
           else
-            raise(_("command '%{command}' not supported in installed version of ruby-augeas") % { command: command })
+            raise(_("command '%{command}' not supported in installed version of ruby-augeas") % { command: })
           end
         when 'touch'
           debug("sending command '#{command}' (match, set) with params #{cmd_array.inspect}")
           if aug.match(cmd_array[0]).empty?
             rv = aug.clear(cmd_array[0])
-            raise(_("Error sending command '%{command}' with params %{params}") % { command: command, params: cmd_array.inspect }) unless rv
+            raise(_("Error sending command '%{command}' with params %{params}") % { command:, params: cmd_array.inspect }) unless rv
           end
         when 'insert', 'ins'
           label = cmd_array[0]
@@ -557,31 +557,31 @@ def do_execute_changes
           case where
           when 'before' then before = true
           when 'after' then before = false
-          else raise(_("Invalid value '%{where}' for where param") % { where: where })
+          else raise(_("Invalid value '%{where}' for where param") % { where: })
           end
           debug("sending command '#{command}' with params #{[label, where, path].inspect}")
           rv = aug.insert(path, label, before)
-          raise(_("Error sending command '%{command}' with params %{params}") % { command: command, params: cmd_array.inspect }) if rv == -1
+          raise(_("Error sending command '%{command}' with params %{params}") % { command:, params: cmd_array.inspect }) if rv == -1
         when 'defvar'
           debug("sending command '#{command}' with params #{cmd_array.inspect}")
           rv = aug.defvar(cmd_array[0], cmd_array[1])
-          raise(_("Error sending command '%{command}' with params %{params}") % { command: command, params: cmd_array.inspect }) unless rv
+          raise(_("Error sending command '%{command}' with params %{params}") % { command:, params: cmd_array.inspect }) unless rv
         when 'defnode'
           debug("sending command '#{command}' with params #{cmd_array.inspect}")
           rv = aug.defnode(cmd_array[0], cmd_array[1], cmd_array[2])
-          raise(_("Error sending command '%{command}' with params %{params}") % { command: command, params: cmd_array.inspect }) unless rv
+          raise(_("Error sending command '%{command}' with params %{params}") % { command:, params: cmd_array.inspect }) unless rv
         when 'mv', 'move'
           debug("sending command '#{command}' with params #{cmd_array.inspect}")
           rv = aug.mv(cmd_array[0], cmd_array[1])
-          raise(_("Error sending command '%{command}' with params %{params}") % { command: command, params: cmd_array.inspect }) if rv == -1
+          raise(_("Error sending command '%{command}' with params %{params}") % { command:, params: cmd_array.inspect }) if rv == -1
         when 'rename'
           debug("sending command '#{command}' with params #{cmd_array.inspect}")
           rv = aug.rename(cmd_array[0], cmd_array[1])
-          raise(_("Error sending command '%{command}' with params %{params}") % { command: command, params: cmd_array.inspect }) if rv == -1
-        else raise(_("Command '%{command}' is not supported") % { command: command })
+          raise(_("Error sending command '%{command}' with params %{params}") % { command:, params: cmd_array.inspect }) if rv == -1
+        else raise(_("Command '%{command}' is not supported") % { command: })
         end
       rescue StandardError => e
-        raise(_("Error sending command '%{command}' with params %{params}/%{message}") % { command: command, params: cmd_array.inspect, message: e.message })
+        raise(_("Error sending command '%{command}' with params %{params}/%{message}") % { command:, params: cmd_array.inspect, message: e.message })
       end
     end
   end
diff --git a/lib/puppet_x/augeas/util/parser.rb b/lib/puppet_x/augeas/util/parser.rb
@@ -8,22 +8,22 @@ module PuppetX::Augeas::Util; end
 
 # Container for helpers to parse user provided data contained in manifests.
 module PuppetX::Augeas::Util::Parser
-  TOKEN_ARRAY_CLOSE                 = %r{\s*\]\s*}.freeze
-  TOKEN_ARRAY_OPEN                  = %r{\s*\[\s*}.freeze
-  TOKEN_ARRAY_SEPARATOR             = %r{\s*,\s*}.freeze
-  TOKEN_CLOSE_CURLY                 = %r|}|.freeze
-  TOKEN_DOUBLE_QUOTE                = %r{"}.freeze
-  TOKEN_DOUBLE_QUOTE_ESCAPED_CHAR   = %r{\\(["\\abtnvfres0-7xu])}.freeze
-  TOKEN_DOUBLE_QUOTE_UNESCAPED_CHAR = %r{[^"\\]}.freeze
-  TOKEN_HEX_CHAR                    = %r{[0-9a-fA-F]{1,2}}.freeze
-  TOKEN_OCTAL_CHAR                  = %r{[0-7]{1,3}}.freeze
-  TOKEN_OPEN_CURLY                  = %r|{|.freeze
-  TOKEN_SINGLE_QUOTE                = %r{'}.freeze
-  TOKEN_SINGLE_QUOTE_ESCAPED_CHAR   = %r{\\(['\\])}.freeze
-  TOKEN_SINGLE_QUOTE_UNESCAPED_CHAR = %r{[^'\\]}.freeze
-  TOKEN_SPACE                       = %r{\s}.freeze
-  TOKEN_UNICODE_LONG_HEX_CHAR       = %r{[0-9a-fA-F]{1,6}}.freeze
-  TOKEN_UNICODE_SHORT_HEX_CHAR      = %r{[0-9a-fA-F]{4}}.freeze
+  TOKEN_ARRAY_CLOSE                 = %r{\s*\]\s*}
+  TOKEN_ARRAY_OPEN                  = %r{\s*\[\s*}
+  TOKEN_ARRAY_SEPARATOR             = %r{\s*,\s*}
+  TOKEN_CLOSE_CURLY                 = %r|}|
+  TOKEN_DOUBLE_QUOTE                = %r{"}
+  TOKEN_DOUBLE_QUOTE_ESCAPED_CHAR   = %r{\\(["\\abtnvfres0-7xu])}
+  TOKEN_DOUBLE_QUOTE_UNESCAPED_CHAR = %r{[^"\\]}
+  TOKEN_HEX_CHAR                    = %r{[0-9a-fA-F]{1,2}}
+  TOKEN_OCTAL_CHAR                  = %r{[0-7]{1,3}}
+  TOKEN_OPEN_CURLY                  = %r|{|
+  TOKEN_SINGLE_QUOTE                = %r{'}
+  TOKEN_SINGLE_QUOTE_ESCAPED_CHAR   = %r{\\(['\\])}
+  TOKEN_SINGLE_QUOTE_UNESCAPED_CHAR = %r{[^'\\]}
+  TOKEN_SPACE                       = %r{\s}
+  TOKEN_UNICODE_LONG_HEX_CHAR       = %r{[0-9a-fA-F]{1,6}}
+  TOKEN_UNICODE_SHORT_HEX_CHAR      = %r{[0-9a-fA-F]{4}}
 
   # Parse a string into the (nearly) equivalent Ruby array. This only handles
   # arrays with string members (double-, or single-quoted), and does not
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -53,7 +53,7 @@ def run_puppet_install_helper
 
         agent_sha = ENV['BEAKER_PUPPET_AGENT_SHA'] || ENV['PUPPET_AGENT_SHA']
         if agent_sha.nil? || agent_sha.empty?
-          install_puppet_agent_on(hosts, options.merge(version: version))
+          install_puppet_agent_on(hosts, options.merge(version:))
         else
           # If we have a development sha, assume we're testing internally
           dev_builds_url = ENV['DEV_BUILDS_URL'] || 'http://builds.delivery.puppetlabs.net'
diff --git a/spec/unit/type/augeas_spec.rb b/spec/unit/type/augeas_spec.rb
@@ -86,15 +86,15 @@
   describe 'provider interaction' do
     it 'returns 0 if it does not need to run' do
       provider = instance_double('Puppet::Provider::Augeas', need_to_run?: false)
-      resource = instance_double('Puppet::Type::Augeas', provider: provider, line: nil, file: nil)
-      changes = augeas.attrclass(:returns).new(resource: resource)
+      resource = instance_double('Puppet::Type::Augeas', provider:, line: nil, file: nil)
+      changes = augeas.attrclass(:returns).new(resource:)
       expect(changes.retrieve).to eq(0)
     end
 
     it 'returns :need_to_run if it needs to run' do
       provider = instance_double('Puppet::Provider::Augeas', need_to_run?: true)
-      resource = instance_double('Puppet::Type::Augeas', provider: provider, line: nil, file: nil)
-      changes = augeas.attrclass(:returns).new(resource: resource)
+      resource = instance_double('Puppet::Type::Augeas', provider:, line: nil, file: nil)
+      changes = augeas.attrclass(:returns).new(resource:)
       expect(changes.retrieve).to eq(:need_to_run)
     end
   end
