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

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/puppet/util/reference.rb b/lib/puppet/util/reference.rb
index 314f9c136..24da1e5d7 100644
--- a/lib/puppet/util/reference.rb
+++ b/lib/puppet/util/reference.rb
@@ -116,7 +116,7 @@ class Puppet::Util::Reference
     end
 
     def h(name, level)
-        return "#{name}\n#{HEADER_LEVELS[level] * name.to_s.length}\n\n"
+        "#{name}\n#{HEADER_LEVELS[level] * name.to_s.length}\n\n"
     end
 
     def initialize(name, options = {}, &block)
@@ -136,7 +136,7 @@ class Puppet::Util::Reference
 
     # Indent every line in the chunk except those which begin with '..'.
     def indent(text, tab)
-        return text.gsub(/(^|\A)/, tab).gsub(/^ +\.\./, "..")
+        text.gsub(/(^|\A)/, tab).gsub(/^ +\.\./, "..")
     end
 
     def option(name, value)
@@ -152,7 +152,7 @@ class Puppet::Util::Reference
         #str += text.gsub(/\n/, "\n    ")
 
         str += "\n\n"
-        return str
+        str
     end
 
     # Remove all trac links.
@@ -176,7 +176,7 @@ class Puppet::Util::Reference
 
         text += self.class.footer if withcontents
 
-        return text
+        text
     end
 
     def to_text(withcontents = true)