(PUP-11993) Style/RedundantAssignment

This commit enables the Style/RedundantAssignment cop and fixes
64 autocorrectable offenses.

Author: AriaXLi

.rubocop_todo.yml

@@ -646,25 +646,6 @@ Style/OptionalBooleanParameter:
 Style/PreferredHashMethods:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-Style/RedundantAssignment:
-  Exclude:
-    - 'lib/puppet/file_serving/mount/locales.rb'
-    - 'lib/puppet/file_serving/mount/pluginfacts.rb'
-    - 'lib/puppet/file_serving/mount/plugins.rb'
-    - 'lib/puppet/parameter.rb'
-    - 'lib/puppet/parser/ast/pops_bridge.rb'
-    - 'lib/puppet/pops/model/factory.rb'
-    - 'lib/puppet/pops/parser/parser_support.rb'
-    - 'lib/puppet/provider/nameservice/directoryservice.rb'
-    - 'lib/puppet/provider/nameservice/objectadd.rb'
-    - 'lib/puppet/provider/nameservice/pw.rb'
-    - 'lib/puppet/settings.rb'
-    - 'lib/puppet/type.rb'
-    - 'lib/puppet/type/file/ensure.rb'
-    - 'lib/puppet/util.rb'
-    - 'lib/puppet/util/execution.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 Style/RedundantBegin:
   Enabled: false

lib/puppet/file_serving/mount/locales.rb

@@ -11,9 +11,7 @@ def find(relative_path, request)
     mod = request.environment.modules.find { |m| m.locale(relative_path) }
     return nil unless mod
 
-    path = mod.locale(relative_path)
-
-    path
+    mod.locale(relative_path)
   end
 
   def search(relative_path, request)

lib/puppet/file_serving/mount/pluginfacts.rb

@@ -11,9 +11,7 @@ def find(relative_path, request)
     mod = request.environment.modules.find { |m| m.pluginfact(relative_path) }
     return nil unless mod
 
-    path = mod.pluginfact(relative_path)
-
-    path
+    mod.pluginfact(relative_path)
   end
 
   def search(relative_path, request)

lib/puppet/file_serving/mount/plugins.rb

@@ -11,9 +11,7 @@ def find(relative_path, request)
     mod = request.environment.modules.find { |m| m.plugin(relative_path) }
     return nil unless mod
 
-    path = mod.plugin(relative_path)
-
-    path
+    mod.plugin(relative_path)
   end
 
   def search(relative_path, request)

lib/puppet/parameter.rb

@@ -385,8 +385,7 @@ def name
   #
   def noop
     @noop ||= false
-    tmp = @noop || self.resource.noop || Puppet[:noop] || false
-    tmp
+    @noop || self.resource.noop || Puppet[:noop] || false
   end
 
   # Returns an array of strings representing the containment hierarchy

lib/puppet/parser/ast/pops_bridge.rb

@@ -173,15 +173,14 @@ def create_type_map(definition)
 
     # Obtains the scope or issues a warning if :global_scope is not bound
     def obtain_scope
-      scope = Puppet.lookup(:global_scope) do
+      Puppet.lookup(:global_scope) do
         # This occurs when testing and when applying a catalog (there is no scope available then), and
         # when running tests that run a partial setup.
         # This is bad if the logic is trying to compile, but a warning can not be issues since it is a normal
         # use case that there is no scope when requesting the type in order to just get the parameters.
         Puppet.debug { _("Instantiating Resource with type checked parameters - scope is missing, skipping type checking.") }
         nil
       end
-      scope
     end
 
     # Produces a hash with data for Definition and HostClass

lib/puppet/pops/model/factory.rb

@@ -1052,8 +1052,7 @@ def self.transform_resource_wo_title(left, attribute_ops, lbrace_token, rbrace_t
     end
     a_hash = HASH(keyed_entries)
     a_hash.record_position(left[KEY_LOCATOR], lbrace_token, rbrace_token)
-    result = block_or_expression(transform_calls([left, a_hash]))
-    result
+    block_or_expression(transform_calls([left, a_hash]))
   end
 
   def interpolate_Factory(c)

lib/puppet/pops/parser/parser_support.rb

@@ -229,8 +229,7 @@ def create_empty_program
     _, token = @lexer.emit_completed([:NOOP, '', 0], locator.string.bytesize)
     loc(no_op, token)
     # Program with a Noop
-    program = Factory.PROGRAM(no_op, [], locator)
-    program
+    Factory.PROGRAM(no_op, [], locator)
   end
 
   # Performs the parsing and returns the resulting model.

lib/puppet/provider/nameservice/directoryservice.rb

@@ -264,8 +264,8 @@ def self.get_password(guid, username)
         # string. The password_hash provided as a resource attribute is a
         # hex value. We need to convert the Base64 encoded string to a
         # hex value and provide it back to Puppet.
-        password_hash = converted_hash_plist['SALTED-SHA512'].unpack("H*")[0]
-        password_hash
+        converted_hash_plist['SALTED-SHA512'].unpack("H*")[0]
+
       end
     end
   end

lib/puppet/provider/nameservice/objectadd.rb

@@ -15,10 +15,8 @@ def flag(name)
     end
 
     def posixmethod(name)
-      name   = name.intern if name.is_a? String
-      method = self.class.option(name, :method) || name
-
-      method
+      name = name.intern if name.is_a? String
+      self.class.option(name, :method) || name
     end
   end
 end