Merge pull request #106 from dblock/fix-build

Fix build

Author: dblock

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-03-23 14:16:02 -0400 using RuboCop version 0.58.2.
+# on 2019-07-29 10:07:11 -0400 using RuboCop version 0.73.0.
 # 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
@@ -9,13 +9,21 @@
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
+# SupportedStyles: squiggly, active_support, powerpack, unindent
 Layout/IndentHeredoc:
   Exclude:
     - 'lib/slack-ruby-bot-server/info.rb'
     - 'sample_apps/sample_app_activerecord/commands/help.rb'
     - 'sample_apps/sample_app_mongoid/commands/help.rb'
 
+# Offense count: 2
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'lib/slack-ruby-bot-server.rb'
+    - 'lib/slack-ruby-bot-server/ext/slack-ruby-bot.rb'
+
 # Offense count: 3
 # Configuration parameters: Blacklist.
 # Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
@@ -27,7 +35,7 @@ Naming/HeredocDelimiterNaming:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, Autocorrect.
 # SupportedStyles: module_function, extend_self
 Style/ModuleFunction:
   Exclude:

.travis.yml

@@ -4,24 +4,26 @@ cache: bundler
 
 matrix:
   include:
-    - rvm: 2.3.1
+    - rvm: 2.6.2
       script:
         - bundle exec danger
-    - rvm: 2.3.1
+      services:
+        - xvfb
+    - rvm: 2.6.2
       env: DATABASE_ADAPTER=activerecord
       services:
+        - xvfb
         - postgresql
-    - rvm: 2.3.1
+    - rvm: 2.6.2
       env: DATABASE_ADAPTER=mongoid
       services:
+        - xvfb
         - mongodb
 
 addons:
   firefox: 54.0
 
 before_install:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
   - wget https://github.com/mozilla/geckodriver/releases/download/v0.18.0/geckodriver-v0.18.0-linux64.tar.gz
   - mkdir geckodriver
   - tar -xzf geckodriver-v0.18.0-linux64.tar.gz -C geckodriver

Gemfile

@@ -11,7 +11,7 @@ when 'activerecord' then
   gem 'otr-activerecord', '~> 1.2.1'
   gem 'cursor_pagination' # rubocop:disable Bundler/OrderedGems
   gem 'pg'
-when nil then
+when nil
   warn "Missing ENV['DATABASE_ADAPTER']."
 else
   warn "Invalid ENV['DATABASE_ADAPTER']: #{ENV['DATABASE_ADAPTER']}."
@@ -31,7 +31,7 @@ group :development, :test do
   gem 'rack-test'
   gem 'rake'
   gem 'rspec'
-  gem 'rubocop', '0.58.2'
+  gem 'rubocop', '0.73.0'
   gem 'selenium-webdriver', '~> 3.4.4'
   gem 'vcr'
   gem 'webmock'

lib/slack-ruby-bot-server/api/endpoints/teams_endpoint.rb

@@ -60,6 +60,7 @@ class TeamsEndpoint < Grape::API
                 bot_user_id: bot_user_id
               )
               raise "Team #{team.name} is already registered." if team.active?
+
               team.activate!(token)
             else
               team = Team.create!(

lib/slack-ruby-bot-server/api/helpers/cursor_helpers.rb

@@ -11,6 +11,7 @@ module CursorHelpers
         if SlackRubyBotServer::Config.mongoid?
           def paginate_by_cursor(coll, _options)
             raise 'Both cursor and offset parameters are present, these are mutually exclusive.' if params.key?(:offset) && params.key?(:cursor)
+
             results = { results: [], next: nil }
             coll = coll.skip(params[:offset].to_i) if params.key?(:offset)
             size = (params[:size] || 10).to_i
@@ -26,6 +27,7 @@ def paginate_by_cursor(coll, _options)
         elsif SlackRubyBotServer::Config.activerecord?
           def paginate_by_cursor(coll, options)
             raise 'Both cursor and offset parameters are present, these are mutually exclusive.' if params.key?(:offset) && params.key?(:cursor)
+
             results = { results: [], next: nil }
             size = (params[:size] || 10).to_i
             results[:total_count] = coll.count(:all) if params[:total_count]

lib/slack-ruby-bot-server/api/helpers/sort_helpers.rb

@@ -7,6 +7,7 @@ module SortHelpers
         def sort_order(options = {})
           params[:sort] = options[:default_sort_order] unless params[:sort]
           return [] unless params[:sort]
+
           sort_order = params[:sort].to_s
           unless options[:default_sort_order] == sort_order
             supported_sort_orders = route_sort

lib/slack-ruby-bot-server/api/presenters/status_presenter.rb

@@ -23,6 +23,7 @@ def ping
             raise 'Unsupported database driver.'
           end
           return unless team
+
           team.ping!
         end
 

lib/slack-ruby-bot-server/config/database_adapters/mongoid.rb

@@ -6,7 +6,8 @@ module SlackRubyBotServer
   module DatabaseAdapter
     def self.check!
       rc = Mongoid.default_client.command(ping: 1)
-      return if rc && rc.ok?
+      return if rc&.ok?
+
       raise rc.documents.first['error'] || 'Unexpected error.'
     rescue StandardError => e
       warn "Error connecting to MongoDB: #{e.message}"

lib/slack-ruby-bot-server/server.rb

@@ -8,6 +8,7 @@ def initialize(attrs = {})
       attrs = attrs.dup
       @team = attrs.delete(:team)
       raise 'Missing team' unless @team
+
       attrs[:token] = @team.token
       super(attrs)
       open!

lib/slack-ruby-bot-server/service.rb

@@ -49,7 +49,7 @@ def restart!(team, server, wait = 1)
     def stop!(team)
       logger.info "Stopping team #{team}."
       run_callbacks :stopping, team
-      team.server.stop! if team.server
+      team.server&.stop!
       run_callbacks :stopped, team
     rescue StandardError => e
       run_callbacks :error, team, e
@@ -106,6 +106,7 @@ def start_server!(team, server, wait = 1)
     def run_callbacks(type, team = nil, error = nil, options = {})
       callbacks = @callbacks[type.to_s]
       return false unless callbacks
+
       callbacks.each do |c|
         c.call team, error, options
       end