Merge pull request #72 from dblock/upgrade-rubocop

Upgrade rubocop to 0.55.0.

Author: dblock

.rubocop.yml

@@ -1,2 +1,15 @@
+Metrics:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 500
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 inherit_from: .rubocop_todo.yml
 

.rubocop_todo.yml

@@ -1,56 +1,42 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-07-01 09:34:39 +0100 using RuboCop version 0.40.0.
+# on 2018-05-06 23:29:13 -0400 using RuboCop version 0.55.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
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-Lint/RescueException:
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
+Layout/IndentHeredoc:
   Exclude:
-    - 'lib/slack-ruby-bot-server/app.rb'
-
-# Offense count: 9
-Metrics/AbcSize:
-  Max: 33
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 117
+    - '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
-Metrics/CyclomaticComplexity:
-  Max: 11
-
-# Offense count: 68
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 163
-
-# Offense count: 8
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 23
-
-# Offense count: 2
-Metrics/PerceivedComplexity:
-  Max: 11
-
-# Offense count: 25
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 2
-# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts.
-Style/FileName:
+# 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|$))
+Naming/HeredocDelimiterNaming:
+  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: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: module_function, extend_self
 Style/ModuleFunction:
   Exclude:
     - 'lib/slack-ruby-bot-server/config.rb'

Gemfile

@@ -2,14 +2,14 @@ source 'https://rubygems.org'
 
 case ENV['DATABASE_ADAPTER']
 when 'mongoid' then
-  gem 'mongoid'
   gem 'kaminari-mongoid'
+  gem 'mongoid'
   gem 'mongoid-scroll'
 when 'activerecord' then
-  gem 'pg'
   gem 'activerecord', '~> 5.0.0'
   gem 'otr-activerecord', '~> 1.2.1'
-  gem 'cursor_pagination'
+  gem 'cursor_pagination' # rubocop:disable Bundler/OrderedGems
+  gem 'pg'
 when nil then
   warn "Missing ENV['DATABASE_ADAPTER']."
 else
@@ -19,23 +19,23 @@ end
 gemspec
 
 group :development, :test do
-  gem 'rack-server-pages'
   gem 'bundler'
-  gem 'rake'
-  gem 'rspec'
-  gem 'rubocop', '0.40.0'
   gem 'byebug'
-  gem 'mongoid-shell'
-  gem 'heroku'
-  gem 'rack-test'
-  gem 'webmock'
-  gem 'vcr'
+  gem 'capybara', '~> 2.15.1'
+  gem 'database_cleaner'
   gem 'fabrication'
   gem 'faker'
-  gem 'database_cleaner'
+  gem 'heroku'
   gem 'hyperclient'
-  gem 'capybara', '~> 2.15.1'
+  gem 'mongoid-shell'
+  gem 'rack-server-pages'
+  gem 'rack-test'
+  gem 'rake'
+  gem 'rspec'
+  gem 'rubocop', '0.55.0'
   gem 'selenium-webdriver', '~> 3.4.4'
+  gem 'vcr'
+  gem 'webmock'
 end
 
 group :test do

Rakefile

@@ -11,6 +11,6 @@ end
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new
 
-task default: [:rubocop, :spec]
+task default: %i[rubocop spec]
 
 import 'tasks/db.rake'

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

@@ -12,7 +12,7 @@ module PaginationParameters
           mutually_exclusive :offset, :cursor
         end
 
-        ALL = %w(cursor size sort offset total_count).freeze
+        ALL = %w[cursor size sort offset total_count].freeze
       end
     end
   end

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

@@ -15,14 +15,12 @@ def self.logger
 
       def self.instance
         @instance ||= Rack::Builder.new do
-          if SlackRubyBotServer::Config.activerecord? && defined?(::OTR)
-            use OTR::ActiveRecord::ConnectionManagement
-          end
+          use OTR::ActiveRecord::ConnectionManagement if SlackRubyBotServer::Config.activerecord? && defined?(::OTR)
 
           use Rack::Cors do
             allow do
               origins '*'
-              resource '*', headers: :any, methods: [:get, :post]
+              resource '*', headers: :any, methods: %i[get post]
             end
           end
 

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

@@ -1,3 +1,3 @@
-%w(bson/object_id grape/sort_extension slack-ruby-bot).each do |ext|
+%w[bson/object_id grape/sort_extension slack-ruby-bot].each do |ext|
   require_relative "ext/#{ext}"
 end

sample_apps/sample_app_activerecord/Gemfile

@@ -1,23 +1,23 @@
 source 'https://rubygems.org'
 
-gem 'pg'
 gem 'activerecord', '~> 5.0.0', require: 'active_record'
-gem 'slack-ruby-bot-server', path: '../../'
 gem 'newrelic-slack-ruby-bot'
+gem 'otr-activerecord', '~> 1.2.1'
+gem 'pg'
 gem 'rack-server-pages'
 gem 'rack-test'
-gem 'otr-activerecord', '~> 1.2.1'
+gem 'slack-ruby-bot-server', path: '../../'
 
 group :development, :test do
-  gem 'standalone_migrations'
+  gem 'standalone_migrations', '~> 5.2'
 end
 
 group :test do
-  gem 'rake'
-  gem 'rspec'
+  gem 'database_cleaner'
   gem 'fabrication'
   gem 'faker'
+  gem 'rake'
+  gem 'rspec'
   gem 'vcr'
   gem 'webmock'
-  gem 'database_cleaner'
 end

sample_apps/sample_app_activerecord/Rakefile

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'bundler/setup'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

sample_apps/sample_app_activerecord/spec/api/root_spec.rb

@@ -11,6 +11,6 @@ def app
     get '/api'
     expect(last_response.status).to eq 200
     links = JSON.parse(last_response.body)['_links']
-    expect(links.keys.sort).to eq(%w(self status team teams).sort)
+    expect(links.keys.sort).to eq(%w[self status team teams].sort)
   end
 end