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

5 files changed, 11 insertions, 11 deletions

diff --git a/lib/puppet/ssl/certificate.rb b/lib/puppet/ssl/certificate.rb
index f9297f380..07dd0c8e6 100644
--- a/lib/puppet/ssl/certificate.rb
+++ b/lib/puppet/ssl/certificate.rb
@@ -29,6 +29,6 @@ class Puppet::SSL::Certificate < Puppet::SSL::Base
 
     def expiration
         return nil unless content
-        return content.not_after
+        content.not_after
     end
 end
diff --git a/lib/puppet/ssl/certificate_authority.rb b/lib/puppet/ssl/certificate_authority.rb
index 1c6e76f86..357e54e9f 100644
--- a/lib/puppet/ssl/certificate_authority.rb
+++ b/lib/puppet/ssl/certificate_authority.rb
@@ -34,7 +34,7 @@ class Puppet::SSL::CertificateAuthority
     def self.ca?
         return false unless Puppet[:ca]
         return false unless Puppet.run_mode.master?
-        return true
+        true
     end
 
     # If this process can function as a CA, then return a singleton
@@ -75,7 +75,7 @@ class Puppet::SSL::CertificateAuthority
         return true if ['true', true].include?(auto)
 
         raise ArgumentError, "The autosign configuration '#{auto}' must be a fully qualified file" unless auto =~ /^\//
-        return FileTest.exist?(auto) && auto
+        FileTest.exist?(auto) && auto
     end
 
     # Create an AuthStore for autosigning.
@@ -165,7 +165,7 @@ class Puppet::SSL::CertificateAuthority
 
         @password = pass
 
-        return pass
+        pass
     end
 
     # List all signed certificates.
@@ -190,7 +190,7 @@ class Puppet::SSL::CertificateAuthority
             f << "%04X" % (serial + 1)
         }
 
-        return serial
+        serial
     end
 
     # Does the password file exist?
@@ -200,7 +200,7 @@ class Puppet::SSL::CertificateAuthority
 
     # Print a given host's certificate as text.
     def print(name)
-        return (cert = Puppet::SSL::Certificate.find(name)) ? cert.to_text : nil
+        (cert = Puppet::SSL::Certificate.find(name)) ? cert.to_text : nil
     end
 
     # Revoke a given certificate.
@@ -254,7 +254,7 @@ class Puppet::SSL::CertificateAuthority
         # And remove the CSR if this wasn't self signed.
         Puppet::SSL::CertificateRequest.destroy(csr.name) unless self_signing_csr
 
-        return cert
+        cert
     end
 
     # Verify a given host's certificate.
diff --git a/lib/puppet/ssl/certificate_factory.rb b/lib/puppet/ssl/certificate_factory.rb
index 9273bb902..e794c770c 100644
--- a/lib/puppet/ssl/certificate_factory.rb
+++ b/lib/puppet/ssl/certificate_factory.rb
@@ -86,7 +86,7 @@ class Puppet::SSL::CertificateFactory
 
         raise ArgumentError, "Invalid ca_ttl #{ttl}" unless ttl =~ /^(\d+)(y|d|h|s)$/
 
-        return $1.to_i * UNITMAP[$2]
+        $1.to_i * UNITMAP[$2]
     end
 
     def set_ttl
diff --git a/lib/puppet/ssl/host.rb b/lib/puppet/ssl/host.rb
index 2b1db7e42..cfc40fd1f 100644
--- a/lib/puppet/ssl/host.rb
+++ b/lib/puppet/ssl/host.rb
@@ -150,7 +150,7 @@ class Puppet::SSL::Host
             raise
         end
 
-        return true
+        true
     end
 
     def certificate
@@ -173,7 +173,7 @@ class Puppet::SSL::Host
         return false unless key
         return false unless certificate
 
-        return certificate.content.check_private_key(key.content)
+        certificate.content.check_private_key(key.content)
     end
 
     # Generate all necessary parts of our ssl host.
diff --git a/lib/puppet/ssl/inventory.rb b/lib/puppet/ssl/inventory.rb
index 38cbf46e9..6fb2ea8c2 100644
--- a/lib/puppet/ssl/inventory.rb
+++ b/lib/puppet/ssl/inventory.rb
@@ -20,7 +20,7 @@ class Puppet::SSL::Inventory
     # Format our certificate for output.
     def format(cert)
         iso = '%Y-%m-%dT%H:%M:%S%Z'
-        return "0x%04x %s %s %s\n" % [cert.serial,  cert.not_before.strftime(iso), cert.not_after.strftime(iso), cert.subject]
+        "0x%04x %s %s %s\n" % [cert.serial,  cert.not_before.strftime(iso), cert.not_after.strftime(iso), cert.subject]
     end
 
     def initialize