Code smell: Avoid explicit returns

Replaced 583 occurances of

    (DEF)
        (LINES)
        return (.*)
    end

with

3 Examples:

    The code:
        def consolidate_failures(failed)
            filters = Hash.new { |h,k| h[k] = [] }
            failed.each do |spec, failed_trace|
                if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) }
                    filters[f] << spec
                    break
                end
            end
            return filters
        end
    becomes:
        def consolidate_failures(failed)
            filters = Hash.new { |h,k| h[k] = [] }
            failed.each do |spec, failed_trace|
                if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) }
                    filters[f] << spec
                    break
                end
            end
            filters
        end
    The code:
        def retrieve
            return_value = super
            return_value = return_value[0] if return_value && return_value.is_a?(Array)

            return return_value
        end
    becomes:
        def retrieve
            return_value = super
            return_value = return_value[0] if return_value && return_value.is_a?(Array)

            return_value
        end
    The code:
        def fake_fstab
            os = Facter['operatingsystem']
            if os == "Solaris"
                name = "solaris.fstab"
            elsif os == "FreeBSD"
                name = "freebsd.fstab"
            else
                # Catchall for other fstabs
                name = "linux.fstab"
            end
            oldpath = @provider_class.default_target
            return fakefile(File::join("data/types/mount", name))
        end
    becomes:
        def fake_fstab
            os = Facter['operatingsystem']
            if os == "Solaris"
                name = "solaris.fstab"
            elsif os == "FreeBSD"
                name = "freebsd.fstab"
            else
                # Catchall for other fstabs
                name = "linux.fstab"
            end
            oldpath = @provider_class.default_target
            fakefile(File::join("data/types/mount", name))
        end

3 files changed, 4 insertions, 4 deletions

diff --git a/lib/puppet/external/event-loop/signal-system.rb b/lib/puppet/external/event-loop/signal-system.rb
index 0ea3552f2..09498c9f4 100644
--- a/lib/puppet/external/event-loop/signal-system.rb
+++ b/lib/puppet/external/event-loop/signal-system.rb
@@ -76,7 +76,7 @@ module SignalEmitter
     def add_signal_handler (name, &handler)
         __maybe_initialize_signal_emitter
         @signal_handlers[name] << handler
-        return handler
+        handler
     end
 
     define_soft_aliases [:on, :on_signal] => :add_signal_handler
diff --git a/lib/puppet/external/nagios.rb b/lib/puppet/external/nagios.rb
index d7f64d59b..2dd040dba 100755
--- a/lib/puppet/external/nagios.rb
+++ b/lib/puppet/external/nagios.rb
@@ -38,7 +38,7 @@ module Nagios
                 }
             }
             parser = Nagios::Parser.new
-            return parser.parse(text)
+            parser.parse(text)
         end
 
         def Config.each
diff --git a/lib/puppet/external/nagios/base.rb b/lib/puppet/external/nagios/base.rb
index 9ffac4391..b526a805a 100755
--- a/lib/puppet/external/nagios/base.rb
+++ b/lib/puppet/external/nagios/base.rb
@@ -129,7 +129,7 @@ class Nagios::Base
     # Is the specified name a valid parameter?
     def self.parameter?(name)
         name = name.intern if name.is_a? String
-        return @parameters.include?(name)
+        @parameters.include?(name)
     end
 
     # Manually set the namevar
@@ -237,7 +237,7 @@ class Nagios::Base
     end
 
     def namevar
-        return (self.type + "_name").intern
+        (self.type + "_name").intern
     end
 
     def parammap(param)