(CONT-773) Rubocop Auto Fixes 11-15

- RSpec/ExampleWording
- RSpec/ImplicitSubject
- Style/IfUnlessModifier
- Style/QuotedSymbols
- Style/RedundantRegexpEscape

Author: david22swan

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-04-21 09:13:34 UTC using RuboCop version 1.48.1.
+# on 2023-04-21 12:46:34 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
@@ -87,18 +87,22 @@ RSpec/ExampleWording:
   Exclude:
     - 'spec/acceptance/apt_key_provider_spec.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/ExcessiveDocstringSpacing:
+# Offense count: 3
+RSpec/LeakyConstantDeclaration:
   Exclude:
     - 'spec/defines/key_compat_spec.rb'
-    - 'spec/defines/setting_spec.rb'
+    - 'spec/defines/source_compat_spec.rb'
+    - 'spec/defines/source_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 6
 
 # Offense count: 204
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: single_line_only, single_statement_only, disallow, require_implicit
-RSpec/ImplicitSubject:
+# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
+# SupportedStyles: always, named_only
+RSpec/NamedSubject:
   Exclude:
     - 'spec/classes/apt_backports_spec.rb'
     - 'spec/classes/apt_spec.rb'
@@ -114,18 +118,6 @@ RSpec/ImplicitSubject:
     - 'spec/defines/source_spec.rb'
     - 'spec/unit/facter/apt_update_last_success_spec.rb'
 
-# Offense count: 3
-RSpec/LeakyConstantDeclaration:
-  Exclude:
-    - 'spec/defines/key_compat_spec.rb'
-    - 'spec/defines/source_compat_spec.rb'
-    - 'spec/defines/source_spec.rb'
-
-# Offense count: 3
-# Configuration parameters: AllowSubject.
-RSpec/MultipleMemoizedHelpers:
-  Max: 6
-
 # Offense count: 2
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
@@ -170,33 +162,11 @@ Style/GlobalStdStream:
   Exclude:
     - 'tasks/init.rb'
 
-# Offense count: 10
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/facter/apt_updates.rb'
-    - 'lib/puppet/provider/apt_key/apt_key.rb'
-    - 'lib/puppet/type/apt_key.rb'
-
 # Offense count: 1
 Style/MixinUsage:
   Exclude:
     - 'spec/spec_helper.rb'
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: same_as_string_literals, single_quotes, double_quotes
-Style/QuotedSymbols:
-  Exclude:
-    - 'spec/unit/puppet/provider/apt_key_spec.rb'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantRegexpEscape:
-  Exclude:
-    - 'lib/puppet/type/apt_key.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.

lib/facter/apt_updates.rb

@@ -23,9 +23,7 @@ def get_updates(upgrade_option)
           %r{ gNewSense[^\s]+-security[, ]},
         ]
         re = Regexp.union(security_matches)
-        if line.match(re)
-          apt_updates[1].push(package)
-        end
+        apt_updates[1].push(package) if line.match(re)
       end
     end
   end
@@ -36,19 +34,15 @@ def get_updates(upgrade_option)
   confine osfamily: 'Debian'
   setcode do
     apt_package_updates = get_updates('upgrade')
-    if !apt_package_updates.nil? && apt_package_updates.length == 2
-      apt_package_updates != [[], []]
-    end
+    apt_package_updates != [[], []] if !apt_package_updates.nil? && apt_package_updates.length == 2
   end
 end
 
 Facter.add('apt_has_dist_updates') do
   confine osfamily: 'Debian'
   setcode do
     apt_dist_updates = get_updates('dist-upgrade')
-    if !apt_dist_updates.nil? && apt_dist_updates.length == 2
-      apt_dist_updates != [[], []]
-    end
+    apt_dist_updates != [[], []] if !apt_dist_updates.nil? && apt_dist_updates.length == 2
   end
 end
 

lib/puppet/provider/apt_key/apt_key.rb

@@ -49,9 +49,7 @@ def self.instances
 
       expired = false
 
-      if line_hash[:key_expiry]
-        expired = Time.now >= line_hash[:key_expiry]
-      end
+      expired = Time.now >= line_hash[:key_expiry] if line_hash[:key_expiry]
 
       new(
         name: line_hash[:key_fingerprint],
@@ -171,9 +169,7 @@ def tempfile(content)
 
         found_match = false
         extracted_key.each_line do |line|
-          if line.chomp == name
-            found_match = true
-          end
+          found_match = true if line.chomp == name
         end
         unless found_match
           raise(_('The id in your manifest %{_resource} and the fingerprint from content/source don\'t match. Check for an error in the id and content/source is legitimate.') % { _resource: resource[:name] }) # rubocop:disable Layout/LineLength
@@ -196,9 +192,7 @@ def create
       # Breaking up the command like this is needed because it blows up
       # if --recv-keys isn't the last argument.
       command.push('adv', '--no-tty', '--keyserver', resource[:server])
-      unless resource[:options].nil?
-        command.push('--keyserver-options', resource[:options])
-      end
+      command.push('--keyserver-options', resource[:options]) unless resource[:options].nil?
       command.push('--recv-keys', resource[:id])
     elsif resource[:content]
       key_file = tempfile(resource[:content])

lib/puppet/type/apt_key.rb

@@ -25,16 +25,10 @@
   ensurable
 
   validate do
-    if self[:refresh] == true && self[:ensure] == :absent
-      raise(_('ensure => absent and refresh => true are mutually exclusive'))
-    end
-    if self[:content] && self[:source]
-      raise(_('The properties content and source are mutually exclusive.'))
-    end
+    raise(_('ensure => absent and refresh => true are mutually exclusive')) if self[:refresh] == true && self[:ensure] == :absent
+    raise(_('The properties content and source are mutually exclusive.')) if self[:content] && self[:source]
 
-    if self[:id].length < 40
-      warning(_('The id should be a full fingerprint (40 characters), see README.'))
-    end
+    warning(_('The id should be a full fingerprint (40 characters), see README.')) if self[:id].length < 40
   end
 
   newparam(:id, namevar: true) do
@@ -62,16 +56,14 @@
   end
 
   autorequire(:file) do
-    if self[:source] && Pathname.new(self[:source]).absolute?
-      self[:source]
-    end
+    self[:source] if self[:source] && Pathname.new(self[:source]).absolute?
   end
 
   newparam(:server) do
     desc 'The key server to fetch the key from based on the ID. It can either be a domain name or url.'
     defaultto :'keyserver.ubuntu.com'
 
-    newvalues(%r{\A((hkp|hkps|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?(\/[a-zA-Z\d\-_.]+)*\/?$})
+    newvalues(%r{\A((hkp|hkps|http|https)://)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?(/[a-zA-Z\d\-_.]+)*/?$})
   end
 
   newparam(:options) do

spec/classes/apt_backports_spec.rb

@@ -25,10 +25,10 @@
       end
 
       it {
-        is_expected.to contain_apt__source('backports').with(location: 'http://deb.debian.org/debian',
-                                                             repos: 'main contrib non-free',
-                                                             release: 'stretch-backports',
-                                                             pin: { 'priority' => 200, 'release' => 'stretch-backports' })
+        expect(subject).to contain_apt__source('backports').with(location: 'http://deb.debian.org/debian',
+                                                                 repos: 'main contrib non-free',
+                                                                 release: 'stretch-backports',
+                                                                 pin: { 'priority' => 200, 'release' => 'stretch-backports' })
       }
     end
 
@@ -51,11 +51,11 @@
       end
 
       it {
-        is_expected.to contain_apt__source('backports').with(location: 'http://archive.ubuntu.com/ubuntu',
-                                                             key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
-                                                             repos: 'main universe multiverse restricted',
-                                                             release: 'bionac-backports',
-                                                             pin: { 'priority' => 200, 'release' => 'bionac-backports' })
+        expect(subject).to contain_apt__source('backports').with(location: 'http://archive.ubuntu.com/ubuntu',
+                                                                 key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
+                                                                 repos: 'main universe multiverse restricted',
+                                                                 release: 'bionac-backports',
+                                                                 pin: { 'priority' => 200, 'release' => 'bionac-backports' })
       }
     end
 
@@ -87,11 +87,11 @@
       end
 
       it {
-        is_expected.to contain_apt__source('backports').with(location: 'http://archive.ubuntu.com/ubuntu-test',
-                                                             key: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-                                                             repos: 'main',
-                                                             release: 'vivid',
-                                                             pin: { 'priority' => 90, 'release' => 'vivid' })
+        expect(subject).to contain_apt__source('backports').with(location: 'http://archive.ubuntu.com/ubuntu-test',
+                                                                 key: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+                                                                 repos: 'main',
+                                                                 release: 'vivid',
+                                                                 pin: { 'priority' => 90, 'release' => 'vivid' })
       }
     end
 
@@ -124,8 +124,8 @@
       end
 
       it {
-        is_expected.to contain_apt__source('backports').with(key: { 'id' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553' },
-                                                             pin: { 'priority' => '90' })
+        expect(subject).to contain_apt__source('backports').with(key: { 'id' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553' },
+                                                                 pin: { 'priority' => '90' })
       }
     end
   end
@@ -159,11 +159,11 @@
       end
 
       it {
-        is_expected.to contain_apt__source('backports').with(location: 'http://archive.ubuntu.com/ubuntu',
-                                                             key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
-                                                             repos: 'main universe multiverse restricted',
-                                                             release: 'trusty-backports',
-                                                             pin: { 'priority' => 200, 'release' => 'trusty-backports' })
+        expect(subject).to contain_apt__source('backports').with(location: 'http://archive.ubuntu.com/ubuntu',
+                                                                 key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
+                                                                 repos: 'main universe multiverse restricted',
+                                                                 release: 'trusty-backports',
+                                                                 pin: { 'priority' => 200, 'release' => 'trusty-backports' })
       }
     end
 
@@ -177,7 +177,7 @@
       end
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key})
+        expect(subject).to raise_error(Puppet::Error, %r{If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key})
       end
     end
 
@@ -191,7 +191,7 @@
       end
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key})
+        expect(subject).to raise_error(Puppet::Error, %r{If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key})
       end
     end
 
@@ -205,7 +205,7 @@
       end
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key})
+        expect(subject).to raise_error(Puppet::Error, %r{If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key})
       end
     end
 
@@ -219,7 +219,7 @@
       end
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key})
+        expect(subject).to raise_error(Puppet::Error, %r{If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key})
       end
     end
   end
@@ -250,7 +250,7 @@
       end
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{expects a})
+        expect(subject).to raise_error(Puppet::Error, %r{expects a})
       end
     end
 
@@ -262,7 +262,7 @@
       end
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{expects a})
+        expect(subject).to raise_error(Puppet::Error, %r{expects a})
       end
     end
 
@@ -274,7 +274,7 @@
       end
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{expects a})
+        expect(subject).to raise_error(Puppet::Error, %r{expects a})
       end
     end
 
@@ -286,7 +286,7 @@
       end
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{expects a})
+        expect(subject).to raise_error(Puppet::Error, %r{expects a})
       end
     end
 
@@ -298,7 +298,7 @@
       end
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{expects a})
+        expect(subject).to raise_error(Puppet::Error, %r{expects a})
       end
     end
   end