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

7 files changed, 14 insertions, 14 deletions

diff --git a/lib/puppet/provider/service/base.rb b/lib/puppet/provider/service/base.rb
index 42f2ea01c..50e8790d1 100755
--- a/lib/puppet/provider/service/base.rb
+++ b/lib/puppet/provider/service/base.rb
@@ -32,7 +32,7 @@ Puppet::Type.type(:service).provide :base do
             }
         }
 
-        return nil
+        nil
     end
 
     # How to restart the process.
@@ -128,7 +128,7 @@ Puppet::Type.type(:service).provide :base do
         rescue Puppet::ExecutionFailure => detail
             @resource.fail "Could not #{type} #{@resource.ref}: #{detail}"
         end
-        return nil
+        nil
     end
 
     # Use either a specified command or the default for our provider.
@@ -138,7 +138,7 @@ Puppet::Type.type(:service).provide :base do
         else
             cmd = [send("#{type}cmd")].flatten
         end
-        return texecute(type, cmd, fof)
+        texecute(type, cmd, fof)
     end
 end
 
diff --git a/lib/puppet/provider/service/bsd.rb b/lib/puppet/provider/service/bsd.rb
index 814dbd340..15e4385a1 100644
--- a/lib/puppet/provider/service/bsd.rb
+++ b/lib/puppet/provider/service/bsd.rb
@@ -25,7 +25,7 @@ Puppet::Type.type(:service).provide :bsd, :parent => :init do
         rcfile = File.join(@@rcconf_dir, @model[:name])
         return :true if File.exists?(rcfile)
 
-        return :false
+        :false
     end
 
     # enable service by creating a service file under rc.conf.d with the
diff --git a/lib/puppet/provider/service/daemontools.rb b/lib/puppet/provider/service/daemontools.rb
index e8409860a..f5f2607e3 100644
--- a/lib/puppet/provider/service/daemontools.rb
+++ b/lib/puppet/provider/service/daemontools.rb
@@ -121,7 +121,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
         rescue Puppet::ExecutionFailure => detail
             raise Puppet::Error.new( "Could not get status for service #{resource.ref}: #{detail}" )
         end
-        return :stopped
+        :stopped
     end
 
     def setupservice
diff --git a/lib/puppet/provider/service/freebsd.rb b/lib/puppet/provider/service/freebsd.rb
index 05383a998..3ff81fdfb 100644
--- a/lib/puppet/provider/service/freebsd.rb
+++ b/lib/puppet/provider/service/freebsd.rb
@@ -18,7 +18,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     def rcvar
         rcvar = execute([self.initscript, :rcvar], :failonfail => true, :squelch => false)
         rcvar = rcvar.split("\n")
-        return rcvar
+        rcvar
     end
 
     # Extract service name
@@ -28,7 +28,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
         name = name.gsub!(/# (.*)/, '\1')
         self.error("Service name is empty") if name.nil?
         self.debug("Service name is #{name}")
-        return name
+        name
     end
 
     # Extract rcvar name
@@ -38,7 +38,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
         name = name.gsub!(/(.*)_enable=(.*)/, '\1')
         self.error("rcvar name is empty") if name.nil?
         self.debug("rcvar name is #{name}")
-        return name
+        name
     end
 
     # Extract rcvar value
@@ -48,7 +48,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
         value = value.gsub!(/(.*)_enable=\"?(.*)\"?/, '\2')
         self.error("rcvar value is empty") if value.nil?
         self.debug("rcvar value is #{value}")
-        return value
+        value
     end
 
     # Edit rc files and set the service to yes/no
@@ -74,7 +74,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
                 end
             end
         end
-        return success
+        success
     end
 
     # Add a new setting to the rc files
@@ -109,7 +109,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
             return :true
         end
         self.debug("Is disabled")
-        return :false
+        :false
     end
 
     def enable
diff --git a/lib/puppet/provider/service/launchd.rb b/lib/puppet/provider/service/launchd.rb
index 1813f2cfb..9be961b09 100644
--- a/lib/puppet/provider/service/launchd.rb
+++ b/lib/puppet/provider/service/launchd.rb
@@ -216,7 +216,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
         elsif overrides_disabled == false
             return :true
         end
-        return :false
+        :false
     end
 
 
diff --git a/lib/puppet/provider/service/redhat.rb b/lib/puppet/provider/service/redhat.rb
index c49df3142..b31faa586 100755
--- a/lib/puppet/provider/service/redhat.rb
+++ b/lib/puppet/provider/service/redhat.rb
@@ -42,7 +42,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
             return :false
         end
 
-        return :true
+        :true
     end
 
     # Don't support them specifying runlevels; always use the runlevels
diff --git a/lib/puppet/provider/service/runit.rb b/lib/puppet/provider/service/runit.rb
index 3b49d14ef..26c8954e8 100644
--- a/lib/puppet/provider/service/runit.rb
+++ b/lib/puppet/provider/service/runit.rb
@@ -75,7 +75,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
                 raise Puppet::Error.new( "Could not get status for service #{resource.ref}: #{detail}" )
             end
         end
-        return :stopped
+        :stopped
     end
 
     def stop