(PA-7815) Rubocop changes for template 3.5.1

Author: tvpartytonight

lib/puppet/provider/cron/filetype.rb

@@ -34,7 +34,7 @@ def path=(user)
         begin
           @uid = Puppet::Util.uid(user)
         rescue Puppet::Error => detail
-          raise FileReadError, _('Could not retrieve user %{user}: %{detail}') % { user: user, detail: detail }, detail.backtrace
+          raise FileReadError, _('Could not retrieve user %{user}: %{detail}') % ({ user:, detail: }), detail.backtrace
         end
 
         # XXX We have to have the user name, not the uid, because some
@@ -60,7 +60,7 @@ def read
 
           ''
         else
-          raise FileReadError, _('Could not read crontab for %{path}: %{detail}') % { path: @path, detail: detail }, detail.backtrace
+          raise FileReadError, _('Could not read crontab for %{path}: %{detail}') % ({ path: @path, detail: }), detail.backtrace
         end
       end
 
@@ -123,15 +123,15 @@ def read
 
           ''
         else
-          raise FileReadError, _('Could not read crontab for %{path}: %{detail}') % { path: @path, detail: detail }, detail.backtrace
+          raise FileReadError, _('Could not read crontab for %{path}: %{detail}') % ({ path: @path, detail: }), detail.backtrace
         end
       end
 
       # Remove a specific @path's cron tab.
       def remove
         Puppet::Util::Execution.execute(['crontab', '-r'], cronargs).to_s
       rescue => detail
-        raise FileReadError, _('Could not remove crontab for %{path}: %{detail}') % { path: @path, detail: detail }, detail.backtrace
+        raise FileReadError, _('Could not remove crontab for %{path}: %{detail}') % ({ path: @path, detail: }), detail.backtrace
       end
 
       # Overwrite a specific @path's cron tab; must be passed the @path name
@@ -146,7 +146,7 @@ def write(text)
           File.chown(Puppet::Util.uid(@path), nil, output_file.path)
           Puppet::Util::Execution.execute(['crontab', output_file.path], cronargs).to_s
         rescue => detail
-          raise FileReadError, _('Could not write crontab for %{path}: %{detail}') % { path: @path, detail: detail }, detail.backtrace
+          raise FileReadError, _('Could not write crontab for %{path}: %{detail}') % ({ path: @path, detail: }), detail.backtrace
         ensure
           output_file.close
           output_file.unlink
@@ -174,15 +174,15 @@ def read
 
           ''
         else
-          raise FileReadError, _('Could not read crontab for %{path}: %{detail}') % { path: @path, detail: detail }, detail.backtrace
+          raise FileReadError, _('Could not read crontab for %{path}: %{detail}') % ({ path: @path, detail: }), detail.backtrace
         end
       end
 
       # Remove a specific @path's cron tab.
       def remove
         Puppet::Util::Execution.execute(['crontab', '-r'], cronargs).to_s
       rescue => detail
-        raise FileReadError, _('Could not remove crontab for %{path}: %{detail}') % { path: @path, detail: detail }, detail.backtrace
+        raise FileReadError, _('Could not remove crontab for %{path}: %{detail}') % ({ path: @path, detail: }), detail.backtrace
       end
 
       # Overwrite a specific @path's cron tab; must be passed the @path name
@@ -198,7 +198,7 @@ def write(text)
           File.chown(Puppet::Util.uid(@path), nil, output_file.path)
           Puppet::Util::Execution.execute(['crontab', output_file.path], cronargs).to_s
         rescue => detail
-          raise FileReadError, _('Could not write crontab for %{path}: %{detail}') % { path: @path, detail: detail }, detail.backtrace
+          raise FileReadError, _('Could not write crontab for %{path}: %{detail}') % ({ path: @path, detail: }), detail.backtrace
         ensure
           output_file.close
           output_file.unlink

lib/puppet/type/cron.rb

@@ -186,7 +186,7 @@ def should=(ary)
         retval = alphacheck(value, alpha)
       end
 
-      raise _('%{value} is not a valid %{name}') % { value: value, name: self.class.name } unless retval
+      raise _('%{value} is not a valid %{name}') % { value:, name: self.class.name } unless retval
       return retval.to_s if retval
     end
   end
@@ -417,7 +417,7 @@ def should_to_s(newvalue = @should)
     [:minute, :hour, :weekday, :monthday, :month].each do |field|
       next unless self[field]
       next if self[field] == :absent
-      raise ArgumentError, _('%{cron} cannot specify both a special schedule and a value for %{field}') % { cron: ref, field: field }
+      raise ArgumentError, _('%{cron} cannot specify both a special schedule and a value for %{field}') % ({ cron: ref, field: })
     end
   end
 

spec/spec_helper_acceptance.rb

@@ -109,7 +109,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'

spec/unit/provider/cron/crontab_spec.rb

@@ -34,7 +34,7 @@ def compare_crontab_record(have, want)
 
     ########################################################################
     # Simple input fixtures for testing.
-    samples = YAML.load(File.read(my_fixture('single_line.yaml'))) # rubocop:disable Security/YAMLLoad
+    samples = YAML.load(File.read(my_fixture('single_line.yaml')))
 
     samples.each do |name, data|
       it "parses crontab line #{name} correctly" do

spec/unit/provider/cron/filetype_spec.rb

@@ -9,7 +9,7 @@
     let(:managedtab)   { File.read(my_fixture('managed_output')) }
     let(:options)      { { failonfail: true, combine: true } }
     let(:uid)          { 'no_such_user' }
-    let(:user_options) { options.merge(uid: uid) }
+    let(:user_options) { options.merge(uid:) }
 
     it 'exists' do
       expect(type).not_to be_nil

spec/unit/provider/cron/parsed_spec.rb

@@ -15,7 +15,7 @@
       name: 'basic',
       command: '/bin/true',
       target: 'root',
-      provider: provider,
+      provider:,
     )
   end
 
@@ -173,7 +173,7 @@
                                                                             month: :absent,
                                                                             weekday: :absent,
                                                                             monthday: :absent,
-                                                                            special: special,
+                                                                            special:,
                                                                             command: '/bin/true')
         end
       end