(PUP-11993) Style/OrAssignment

This commit enables the Style/OrAssignment cop and fixes 9
autocorrectable offenses.

Author: AriaXLi

.rubocop_todo.yml

@@ -640,18 +640,6 @@ Style/NumericPredicate:
 Style/OptionalBooleanParameter:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-Style/OrAssignment:
-  Exclude:
-    - 'lib/puppet/application/lookup.rb'
-    - 'lib/puppet/file_system/windows.rb'
-    - 'lib/puppet/pops/parser/lexer2.rb'
-    - 'lib/puppet/pops/types/types.rb'
-    - 'lib/puppet/provider/user/directoryservice.rb'
-    - 'lib/puppet/ssl/base.rb'
-    - 'lib/puppet/util/errors.rb'
-    - 'util/rspec_grouper'
-
 # This cop supports safe auto-correction (--auto-correct).
 Style/ParallelAssignment:
   Exclude:

lib/puppet/application/lookup.rb

@@ -354,7 +354,7 @@ def generate_scope
         given_facts = Puppet::Util::Yaml.safe_load_file(fact_file)
       else
         given_facts = Puppet::Util::Json.load_file_if_valid(fact_file)
-        given_facts = Puppet::Util::Yaml.safe_load_file_if_valid(fact_file) unless given_facts
+        given_facts ||= Puppet::Util::Yaml.safe_load_file_if_valid(fact_file)
       end
 
       unless given_facts.instance_of?(Hash)

lib/puppet/file_system/windows.rb

@@ -133,7 +133,7 @@ def replace_file(path, mode = nil)
     end
 
     current_sid = Puppet::Util::Windows::SID.name_to_sid(Puppet::Util::Windows::ADSI::User.current_user_name)
-    current_sid = Puppet::Util::Windows::SID.name_to_sid(Puppet::Util::Windows::ADSI::User.current_sam_compatible_user_name) unless current_sid
+    current_sid ||= Puppet::Util::Windows::SID.name_to_sid(Puppet::Util::Windows::ADSI::User.current_sam_compatible_user_name)
 
     dacl = case mode
            when 0o644

lib/puppet/pops/parser/lexer2.rb

@@ -526,7 +526,7 @@ def initialize
               end
             end
             scn.pos = before
-            invalid_number = scn.peek(after - before) unless invalid_number
+            invalid_number ||= scn.peek(after - before)
           end
           assert_numeric(invalid_number, before)
           scn.pos = before + 1

lib/puppet/pops/types/types.rb

@@ -400,7 +400,7 @@ def alter_type_array(types, method, *method_args)
     modified = false
     modified_types = types.map do |t|
       t_mod = t.send(method, *method_args)
-      modified = !t.equal?(t_mod) unless modified
+      modified ||= !t.equal?(t_mod)
       t_mod
     end
     if modified

lib/puppet/provider/user/directoryservice.rb

@@ -661,7 +661,7 @@ def set_salted_sha512(users_plist, shadow_hash_data, value)
   # the user's plist itself, and the shadow_hash_data hash containing the
   # existing PBKDF2 values.
   def set_salted_pbkdf2(users_plist, shadow_hash_data, field, value)
-    shadow_hash_data = Hash.new unless shadow_hash_data
+    shadow_hash_data ||= Hash.new
     shadow_hash_data['SALTED-SHA512-PBKDF2'] = Hash.new unless shadow_hash_data['SALTED-SHA512-PBKDF2']
     case field
     when 'salt', 'entropy'

lib/puppet/ssl/base.rb

@@ -119,9 +119,7 @@ def fingerprint(md = :SHA256)
   end
 
   def digest(algorithm = nil)
-    unless algorithm
-      algorithm = digest_algorithm
-    end
+    algorithm ||= digest_algorithm
 
     Puppet::SSL::Digest.new(algorithm, content.to_der)
   end

lib/puppet/util/errors.rb

@@ -87,8 +87,8 @@ def self.error_location_with_space(file, line = nil, column = nil)
   def self.error_location_with_unknowns(file, line)
     file = nil if (file.is_a?(String) && file.empty?)
     line = nil if (line.is_a?(String) && line.empty?)
-    file = _('unknown') unless file
-    line = _('unknown') unless line
+    file ||= _('unknown')
+    line ||= _('unknown')
     error_location(file, line)
   end
 

util/rspec_grouper

@@ -42,7 +42,7 @@ module Parallel
         group = nil
         example_count = 0
         @files.each do |file, count|
-          group = [] unless group
+          group ||= []
           group << file
           next unless (example_count += count) > group_size