Lint/ReturnInVoidContext

Ruby does not allow the initialize method or setters to return a value, so stop
pretending that we can.

Author: joshcooper

.rubocop_todo.yml

@@ -661,11 +661,6 @@ Lint/RescueException:
     - 'lib/puppet/util/command_line/trollop.rb'
     - 'util/rspec_grouper'
 
-Lint/ReturnInVoidContext:
-  Exclude:
-    - 'lib/puppet/type/component.rb'
-    - 'lib/puppet/util/suidmanager.rb'
-
 Lint/SelfAssignment:
   Exclude:
     - 'lib/puppet/pops/evaluator/evaluator_impl.rb'

lib/puppet/type/component.rb

@@ -15,15 +15,21 @@
   # Override how parameters are handled so that we support the extra
   # parameters that are used with defined resource types.
   def [](param)
-    return super if self.class.valid_parameter?(param)
-    @extra_parameters[param.to_sym]
+    if self.class.valid_parameter?(param)
+      super
+    else
+      @extra_parameters[param.to_sym]
+    end
   end
 
   # Override how parameters are handled so that we support the extra
   # parameters that are used with defined resource types.
   def []=(param, value)
-    return super if self.class.valid_parameter?(param)
-    @extra_parameters[param.to_sym] = value
+    if self.class.valid_parameter?(param)
+      super
+    else
+      @extra_parameters[param.to_sym] = value
+    end
   end
 
   # Initialize a new component

lib/puppet/util/suidmanager.rb

@@ -24,7 +24,7 @@ def osx_maj_ver
 
   def groups=(grouplist)
     begin
-      return Process.groups = grouplist
+      Process.groups = grouplist
     rescue Errno::EINVAL => e
       #We catch Errno::EINVAL as some operating systems (OS X in particular) can
       # cause troubles when using Process#groups= to change *this* user / process
@@ -37,9 +37,7 @@ def groups=(grouplist)
       # operating system side.  Therefore we catch the exception and look whether
       # we run under OS X or not -- if so, then we acknowledge the problem and
       # re-throw the exception otherwise.
-      if osx_maj_ver and not osx_maj_ver.empty?
-        return true
-      else
+      if !osx_maj_ver || osx_maj_ver.empty?
         raise e
       end
     end