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, 5 insertions, 5 deletions

diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb
index aeb651ffd..a823ea9a5 100644
--- a/lib/puppet/type/file.rb
+++ b/lib/puppet/type/file.rb
@@ -326,7 +326,7 @@ Puppet::Type.newtype(:file) do
             asuser = self.should(:owner) if writeable
         end
 
-        return asuser
+        asuser
     end
 
     def bucket
@@ -348,7 +348,7 @@ Puppet::Type.newtype(:file) do
 
         @bucket = filebucket.bucket
 
-        return @bucket
+        @bucket
     end
 
     def default_bucket
@@ -438,7 +438,7 @@ Puppet::Type.newtype(:file) do
             options.delete(param) if options.include?(param)
         end
 
-        return self.class.new(options)
+        self.class.new(options)
     end
 
     # Files handle paths specially, because they just lengthen their
@@ -514,7 +514,7 @@ Puppet::Type.newtype(:file) do
 
         val = @parameters[:recurse].value
 
-        return !!(val and (val == true or val == :remote))
+        !!(val and (val == true or val == :remote))
     end
 
     # Recurse the target of the link.
@@ -668,7 +668,7 @@ Puppet::Type.newtype(:file) do
         # If we've gotten here, then :ensure isn't set
         return true if self[:content]
         return true if stat and stat.ftype == "file"
-        return false
+        false
     end
 
     # Stat our file.  Depending on the value of the 'links' attribute, we