Rubocop.

Author: dblock

.rubocop_todo.yml

@@ -1,11 +1,18 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-04-06 18:44:21 -0400 using RuboCop version 0.61.1.
+# on 2019-04-07 11:03:29 -0400 using RuboCop version 0.61.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 2
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Exclude:
+    - 'lib/slack/real_time/concurrency/async.rb'
+    - 'lib/slack/real_time/socket.rb'
+
 # Offense count: 4
 Lint/HandleExceptions:
   Exclude:
@@ -45,10 +52,11 @@ Style/AccessModifierDeclarations:
 Style/GlobalVars:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
+    - 'lib/slack/real_time/socket.rb'
     - 'lib/slack/real_time/stores/store.rb'
     - 'lib/slack/web/faraday/response/raise_error.rb'
 

lib/slack/real_time/client.rb

@@ -105,31 +105,29 @@ def run_loop
       end
 
       # Ensure the server is running, and ping the remote server if no other messages were sent.
-      def keep_alive
+      def keep_alive?
         # We can't ping the remote server if we aren't connected.
-        return false if @socket.nil? or !@socket.connected?
+        return false if @socket.nil? || !@socket.connected?
 
         time_since_last_message = @socket.time_since_last_message
 
         # If the server responded within the specified time, we are okay:
         return true if time_since_last_message < websocket_ping
 
         # If the server has not responded for a while:
-        if time_since_last_message > (websocket_ping * 2)
-          return false
-        end
+        return false if time_since_last_message > (websocket_ping * 2)
 
         # Kick off the next ping message:
-        self.ping
+        ping
 
-        return true
+        true
       end
 
       # Check if the remote server is responsive, and if not, restart the connection.
       def run_ping!
-        unless self.keep_alive
-          restart_async
-        end
+        return if keep_alive?
+
+        restart_async
       end
 
       def run_ping?

lib/slack/real_time/concurrency/async.rb

@@ -41,9 +41,7 @@ def start_reactor(client)
               end
 
               while @restart
-                if @client_task
-                  @client_task.stop
-                end
+                @client_task.stop if @client_task
 
                 @client_task = task.async do |subtask|
                   subtask.annotate 'client run-loop'
@@ -57,7 +55,7 @@ def start_reactor(client)
             end
           end
 
-          def restart_async(client, new_url)
+          def restart_async(_client, new_url)
             @url = new_url
             @last_message_at = current_time
 

spec/integration/integration_spec.rb

@@ -36,7 +36,7 @@ def start
         logger.debug "connection.on :open, data=#{data}"
         queue.push :opened
       end
-      
+
       yield driver if block_given?
     end
   end

spec/spec_helper.rb

@@ -16,5 +16,5 @@
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
-  config.example_status_persistence_file_path = ".rspec_status"
+  config.example_status_persistence_file_path = '.rspec_status'
 end