Fixes #19895 - Fix Style/RedundantReturn cop

theforeman · Apr 2, 2018 · 5f5b13a · 5f5b13a
1 parent 7386f11
commit 5f5b13a
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 18 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -621,12 +621,6 @@ Style/RaiseArgs:
 Style/RedundantParentheses:
   Enabled: false
 
-# Offense count: 12
-# Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleReturnValues.
-Style/RedundantReturn:
-  Enabled: false
-
 # Offense count: 648
 # Cop supports --auto-correct.
 Style/RedundantSelf:

diff --git a/app/controllers/hosts_controller.rb b/app/controllers/hosts_controller.rb
@@ -740,13 +740,13 @@ def find_multiple
       return false
     end
 
-    return @hosts
+    @hosts
   rescue => error
     message = _("Something went wrong while selecting hosts - %s") % error
     error(message)
     Foreman::Logging.exception(message, error)
     redirect_to hosts_path
-    return false
+    false
   end
 
   def toggle_hostmode(mode = true)

diff --git a/app/models/external_usergroup.rb b/app/models/external_usergroup.rb
@@ -39,7 +39,7 @@ def users
     auth_source.users_in_group(name)
   rescue Net::LDAP::Error, Net::LDAP::LdapError => e
     errors.add :auth_source_id, _("LDAP error - %{message}") % { :message => e.message }
-    return false
+    false
   end
 
   private

diff --git a/app/models/filter.rb b/app/models/filter.rb
@@ -89,7 +89,7 @@ def self.get_resource_class(resource_type)
     resource_type.constantize
   rescue NameError => e
     Foreman::Logging.exception("unknown class #{resource_type}, ignoring", e)
-    return nil
+    nil
   end
 
   def unlimited?

diff --git a/db/migrate/20150612135546_create_host_status.rb b/db/migrate/20150612135546_create_host_status.rb
@@ -69,7 +69,7 @@ def update_statuses(host)
   def update_sub_status(status)
     if status.relevant?
       status.refresh!
-      return true
+      true
     end
   rescue => e
     # if the status is not ready to be saved because of missing migration

diff --git a/lib/foreman/util.rb b/lib/foreman/util.rb
@@ -11,10 +11,10 @@ def which(bin, *path)
         dest = File.join(dir, bin)
         return dest if FileTest.file?(dest) && FileTest.executable?(dest)
       end
-      return false
+      false
     rescue StandardError => e
       logger.warn e
-      return false
+      false
     end
 
     # Generates a URL-safe token for use with Rails for signing cookies

diff --git a/lib/middleware/catch_json_parse_errors.rb b/lib/middleware/catch_json_parse_errors.rb
@@ -10,7 +10,7 @@ def call(env)
       if env['HTTP_ACCEPT'] =~ /application\/json/ || env['CONTENT_TYPE'] =~ /application\/json/
         error_output = "There was a problem in the JSON you submitted: #{error}"
         Rails.logger.debug(error_output)
-        return [
+        [
           400, { "Content-Type" => "application/json" },
           [{ :status => 400, :error => error_output }.to_json]
         ]

diff --git a/lib/proxy_api/dns.rb b/lib/proxy_api/dns.rb
@@ -22,7 +22,7 @@ def delete(key)
       parse(super(key.to_s))
     rescue RestClient::ResourceNotFound
       # entry doesn't exists anyway
-      return true
+      true
     rescue => e
       raise ProxyException.new(url, e, N_("Unable to delete DNS entry"))
     end

diff --git a/lib/proxy_api/template.rb b/lib/proxy_api/template.rb
@@ -8,7 +8,7 @@ def initialize(args)
     # returns the Template URL for this proxy
     def template_url
       if (response = parse(get("templateServer"))) && response["templateServer"].present?
-        return response["templateServer"]
+        response["templateServer"]
       end
     rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET,
            EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,

diff --git a/lib/ws_proxy.rb b/lib/ws_proxy.rb
@@ -26,9 +26,9 @@ def self.start(attributes)
   def free_port?(port)
     socket = Socket.new :INET, :STREAM
     socket.bind(Socket.pack_sockaddr_in(port, '127.0.0.1'))
-    return true
+    true
   rescue Errno::EADDRINUSE
-    return false
+    false
   ensure
     socket.close unless socket.nil?
   end