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/reports/rrdgraph.rb b/lib/puppet/reports/rrdgraph.rb
index e478912b2..0b1bd873e 100644
--- a/lib/puppet/reports/rrdgraph.rb
+++ b/lib/puppet/reports/rrdgraph.rb
@@ -42,7 +42,7 @@ Puppet::Reports.register_report(:rrdgraph) do
             of.puts "</body></html>"
         end
 
-        return file
+        file
     end
 
     def mkhtml
diff --git a/lib/puppet/reports/store.rb b/lib/puppet/reports/store.rb
index aa99a7260..384f0eb0a 100644
--- a/lib/puppet/reports/store.rb
+++ b/lib/puppet/reports/store.rb
@@ -54,7 +54,7 @@ Puppet::Reports.register_report(:store) do
         end
 
         # Only testing cares about the return value
-        return file
+        file
     end
 end
 
diff --git a/lib/puppet/reports/tagmail.rb b/lib/puppet/reports/tagmail.rb
index 1e6c52bfc..f77d3c9fb 100644
--- a/lib/puppet/reports/tagmail.rb
+++ b/lib/puppet/reports/tagmail.rb
@@ -64,7 +64,7 @@ Puppet::Reports.register_report(:tagmail) do
             end
         end
 
-        return matching_logs
+        matching_logs
     end
 
     # Load the config file
@@ -100,7 +100,7 @@ Puppet::Reports.register_report(:tagmail) do
             emails = emails.sub(/\s+$/,'').split(/\s*,\s*/)
             taglists << [emails, pos, neg]
         end
-        return taglists
+        taglists
     end
 
     # Process the report.  This just calls the other associated messages.