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

12 files changed, 35 insertions, 35 deletions

diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index e5a1dce80..22e7a3b37 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -90,7 +90,7 @@ module PuppetTest
         # what makes things like '-n' work).
         opts.each { |o| ARGV << o }
 
-        return args
+        args
     end
 
     # Find the root of the Puppet tree; this is not the test directory, but
@@ -237,17 +237,17 @@ module PuppetTest
         f = File.join(self.tmpdir(), "tempfile_" + @@tmpfilenum.to_s)
         @@tmpfiles ||= []
         @@tmpfiles << f
-        return f
+        f
     end
 
     def textmate?
-        return !!ENV["TM_FILENAME"]
+        !!ENV["TM_FILENAME"]
     end
 
     def tstdir
         dir = tempfile()
         Dir.mkdir(dir)
-        return dir
+        dir
     end
 
     def tmpdir
diff --git a/test/lib/puppettest/certificates.rb b/test/lib/puppettest/certificates.rb
index 198ec96c4..9ab64d762 100644
--- a/test/lib/puppettest/certificates.rb
+++ b/test/lib/puppettest/certificates.rb
@@ -13,7 +13,7 @@ module PuppetTest::Certificates
             f.print "as;dklj23rlkjzdflij23wr"
         }
 
-        return keyfile
+        keyfile
     end
 
     def mkCA
@@ -22,7 +22,7 @@ module PuppetTest::Certificates
             ca = Puppet::SSLCertificates::CA.new()
         }
 
-        return ca
+        ca
     end
 
     def mkStore(ca)
@@ -41,7 +41,7 @@ module PuppetTest::Certificates
             cert.mkcsr
         }
 
-        return cert
+        cert
     end
 
     def mksignedcert(ca = nil, hostname = nil)
@@ -52,7 +52,7 @@ module PuppetTest::Certificates
         assert_nothing_raised {
             cert, cacert = ca.sign(mkcert(hostname).mkcsr)
         }
-        return cert
+        cert
     end
 end
 
diff --git a/test/lib/puppettest/exetest.rb b/test/lib/puppettest/exetest.rb
index 78f391ddd..105ebc11c 100644
--- a/test/lib/puppettest/exetest.rb
+++ b/test/lib/puppettest/exetest.rb
@@ -39,7 +39,7 @@ module PuppetTest::ExeTest
         Dir.chdir(bindir()) {
             out = %x{#{@ruby} #{cmd}}
         }
-        return out
+        out
     end
 
     def startmasterd(args = "")
@@ -75,7 +75,7 @@ module PuppetTest::ExeTest
             sleep(1)
         end
 
-        return manifest
+        manifest
     end
 
     def stopmasterd(running = true)
diff --git a/test/lib/puppettest/fakes.rb b/test/lib/puppettest/fakes.rb
index 2db045ab5..a05d0f5c5 100644
--- a/test/lib/puppettest/fakes.rb
+++ b/test/lib/puppettest/fakes.rb
@@ -149,7 +149,7 @@ module PuppetTest
                 end
             end
 
-            return ret
+            ret
         end
 
         def store(hash)
diff --git a/test/lib/puppettest/filetesting.rb b/test/lib/puppettest/filetesting.rb
index 2ecfce58f..6f07c2ad4 100644
--- a/test/lib/puppettest/filetesting.rb
+++ b/test/lib/puppettest/filetesting.rb
@@ -26,7 +26,7 @@ module PuppetTest::FileTesting
 
             ret.push item
         }
-        return ret
+        ret
     end
 
     def mkranddirsandfiles(dirs = nil,files = nil,depth = 3)
@@ -63,7 +63,7 @@ module PuppetTest::FileTesting
         FileUtils.cd(dir) {
             list = %x{find . 2>/dev/null}.chomp.split(/\n/)
         }
-        return list
+        list
     end
 
     def assert_trees_equal(fromdir,todir)
@@ -145,7 +145,7 @@ module PuppetTest::FileTesting
             end
         }
 
-        return deleted
+        deleted
     end
 
     def add_random_files(dir)
@@ -168,7 +168,7 @@ module PuppetTest::FileTesting
                 false
             end
         }
-        return added
+        added
     end
 
     def modify_random_files(dir)
@@ -191,7 +191,7 @@ module PuppetTest::FileTesting
                 false
             end
         }
-        return modded
+        modded
     end
 
     def readonly_random_files(dir)
@@ -211,7 +211,7 @@ module PuppetTest::FileTesting
                 false
             end
         }
-        return modded
+        modded
     end
 
     def conffile
diff --git a/test/lib/puppettest/parsertesting.rb b/test/lib/puppettest/parsertesting.rb
index a23bd5601..1165773fd 100644
--- a/test/lib/puppettest/parsertesting.rb
+++ b/test/lib/puppettest/parsertesting.rb
@@ -17,7 +17,7 @@ module PuppetTest::ParserTesting
 
         def evaluate(*args)
             @evaluated = true
-            return @evaluate
+            @evaluate
         end
 
         def initialize(val = nil)
@@ -46,7 +46,7 @@ module PuppetTest::ParserTesting
 
     def mkcompiler(parser = nil)
         node = mknode
-        return Compiler.new(node)
+        Compiler.new(node)
     end
 
     def mknode(name = nil)
@@ -330,7 +330,7 @@ module PuppetTest::ParserTesting
             )
         end
 
-        return func
+        func
     end
 
     # This assumes no nodes
@@ -356,7 +356,7 @@ module PuppetTest::ParserTesting
             obj["mode"] = "644"
         }
 
-        return obj
+        obj
     end
 
     def mk_transbucket(*resources)
@@ -369,7 +369,7 @@ module PuppetTest::ParserTesting
 
         resources.each { |o| bucket << o }
 
-        return bucket
+        bucket
     end
 
     # Make a tree of resources, yielding if desired
@@ -404,7 +404,7 @@ module PuppetTest::ParserTesting
             bucket = newbucket
         end
 
-        return top
+        top
     end
 
     # Take a list of AST resources, evaluate them, and return the results
@@ -423,6 +423,6 @@ module PuppetTest::ParserTesting
             trans = scope.evaluate(:ast => top)
         }
 
-        return trans
+        trans
     end
 end
diff --git a/test/lib/puppettest/reporttesting.rb b/test/lib/puppettest/reporttesting.rb
index 49520d23a..b0cb0f2ec 100644
--- a/test/lib/puppettest/reporttesting.rb
+++ b/test/lib/puppettest/reporttesting.rb
@@ -10,7 +10,7 @@ module PuppetTest::Reporttesting
             report << log
         }
 
-        return report
+        report
     end
 end
 
diff --git a/test/lib/puppettest/servertest.rb b/test/lib/puppettest/servertest.rb
index 0a7b7f01a..df78159c8 100644
--- a/test/lib/puppettest/servertest.rb
+++ b/test/lib/puppettest/servertest.rb
@@ -27,7 +27,7 @@ module PuppetTest::ServerTest
         @@tmpfiles << @createdfile
         @@tmpfiles << file
 
-        return file
+        file
     end
 
     # create a server, forked into the background
@@ -67,7 +67,7 @@ module PuppetTest::ServerTest
 
         # give the server a chance to do its thing
         sleep 1
-        return spid
+        spid
     end
 
 end
diff --git a/test/lib/puppettest/support/assertions.rb b/test/lib/puppettest/support/assertions.rb
index b918e28f6..8426869eb 100644
--- a/test/lib/puppettest/support/assertions.rb
+++ b/test/lib/puppettest/support/assertions.rb
@@ -50,7 +50,7 @@ module PuppetTest
 
         run_events(:evaluate, transaction, events, msg)
 
-        return transaction
+        transaction
     end
 
     # A simpler method that just applies what we have.
diff --git a/test/lib/puppettest/support/resources.rb b/test/lib/puppettest/support/resources.rb
index 6b771dda8..0eec20aae 100755
--- a/test/lib/puppettest/support/resources.rb
+++ b/test/lib/puppettest/support/resources.rb
@@ -19,7 +19,7 @@ module PuppetTest::Support::Resources
             config.add_edge(comp, resource)
             config.add_resource resource unless config.resource(resource.ref)
         end
-        return comp
+        comp
     end
 
     def mktree
@@ -30,6 +30,6 @@ module PuppetTest::Support::Resources
             top = treenode(config, "top", "g", "h", middle, one)
         end
 
-        return catalog
+        catalog
     end
 end
diff --git a/test/lib/puppettest/support/utils.rb b/test/lib/puppettest/support/utils.rb
index 61ab6e754..466798abe 100644
--- a/test/lib/puppettest/support/utils.rb
+++ b/test/lib/puppettest/support/utils.rb
@@ -35,7 +35,7 @@ module PuppetTest::Support::Utils
             config = Puppet::Resource::Catalog.new
             resources.each { |res| config.add_resource res }
         end
-        return config
+        config
     end
 
     # stop any services that might be hanging around
@@ -80,7 +80,7 @@ module PuppetTest::Support::Utils
 
         assert_equal(events, newevents, "Incorrect #{type} #{msg} events")
 
-        return trans
+        trans
     end
 
     def fakefile(name)
@@ -88,7 +88,7 @@ module PuppetTest::Support::Utils
         ary += name.split("/")
         file = File.join(ary)
         raise Puppet::DevError, "No fakedata file #{file}" unless FileTest.exists?(file)
-        return file
+        file
     end
 
     # wrap how to retrieve the masked mode
@@ -137,7 +137,7 @@ module PuppetTest::Support::Utils
             resources.each { |resource| conf.add_resource resource }
         end
 
-        return config
+        config
     end
 end
 
diff --git a/test/lib/rake/puppet_testtask.rb b/test/lib/rake/puppet_testtask.rb
index a4b8d8b7f..dfdf72332 100644
--- a/test/lib/rake/puppet_testtask.rb
+++ b/test/lib/rake/puppet_testtask.rb
@@ -12,7 +12,7 @@ module Rake
                 file = find_file('rake/puppet_test_loader') or
                     fail "unable to find rake test loader"
             end
-            return file
+            file
         end
     end
 end