Merge pull request #324 from dblock/upgrade-slack-ruby-danger

Require Faraday >= 1.0, upgrade slack-ruby-danger.

Author: dblock

.rubocop_todo.yml

@@ -1,24 +1,37 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-12-23 15:50:03 -0500 using RuboCop version 0.73.0.
+# on 2020-05-09 11:15:45 -0400 using RuboCop version 0.82.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: 3
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/NonDeterministicRequireOrder:
+  Exclude:
+    - 'spec/spec_helper.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - 'lib/slack-ruby-client.rb'
+
+# Offense count: 2
 # Configuration parameters: AllowComments.
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Exclude:
-    - 'lib/slack/real_time/concurrency/async.rb'
     - 'spec/slack/real_time/concurrency/celluloid_spec.rb'
     - 'spec/slack/real_time/concurrency/eventmachine_spec.rb'
 
-# Offense count: 10
+# Offense count: 11
+# Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
   Max: 39
 
 # Offense count: 1
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 9
 
@@ -28,21 +41,43 @@ Metrics/MethodLength:
   Max: 32
 
 # Offense count: 1
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 9
 
+# Offense count: 2
+# Cop supports --auto-correct.
+Performance/RegexpMatch:
+  Exclude:
+    - 'lib/tasks/web.rake'
+
 # Offense count: 1
 RSpec/AnyInstance:
   Exclude:
     - 'spec/slack/real_time/concurrency/celluloid_spec.rb'
 
-# Offense count: 70
+# Offense count: 5
+# Cop supports --auto-correct.
+RSpec/ContextMethod:
+  Exclude:
+    - 'spec/slack/messages/formatting_spec.rb'
+    - 'spec/slack/web/api/mixins/channels_spec.rb'
+    - 'spec/slack/web/api/mixins/groups_spec.rb'
+    - 'spec/slack/web/api/mixins/users_spec.rb'
+
+# Offense count: 71
 # Configuration parameters: Prefixes.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Enabled: false
 
-# Offense count: 64
+# Offense count: 129
+# Cop supports --auto-correct.
+# Configuration parameters: AllowConsecutiveOneLiners.
+RSpec/EmptyLineAfterExample:
+  Enabled: false
+
+# Offense count: 65
 # Configuration parameters: Max.
 RSpec/ExampleLength:
   Enabled: false
@@ -66,12 +101,11 @@ RSpec/InstanceVariable:
 RSpec/MessageSpies:
   EnforcedStyle: receive
 
-# Offense count: 93
-# Configuration parameters: AggregateFailuresByDefault.
+# Offense count: 94
 RSpec/MultipleExpectations:
   Max: 5
 
-# Offense count: 34
+# Offense count: 35
 RSpec/NestedGroups:
   Max: 6
 
@@ -92,3 +126,9 @@ RSpec/VerifiedDoubles:
     - 'spec/slack/real_time/concurrency/eventmachine_spec.rb'
     - 'spec/slack/web/faraday/response/raise_error_spec.rb'
     - 'spec/support/real_time/connected_client.rb'
+
+# Offense count: 4
+# Configuration parameters: .
+# SupportedStyles: annotated, template, unannotated
+Style/FormatStringToken:
+  EnforcedStyle: unannotated

.travis.yml

@@ -3,7 +3,6 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.3.8
   - 2.5.3
   - 2.6.0
   - ruby-head

CHANGELOG.md

@@ -1,5 +1,7 @@
-### 0.14.7 (Next)
+### 0.15.0 (Next)
 
+* [#323](https://github.com/slack-ruby/slack-ruby-client/pull/322): Require Faraday >= 1.0 - [@dblock](https://github.com/dblock).
+* [#323](https://github.com/slack-ruby/slack-ruby-client/pull/322): Upgrade slack-ruby-danger, rubocop, rubocop-rspec and rubocop-performance - [@dblock](https://github.com/dblock).
 * [#322](https://github.com/slack-ruby/slack-ruby-client/pull/322): Cache `Faraday::Connection` for persistent adapters - [@drbrain](https://github.com/drbrain).
 * Your contribution here.
 

Dangerfile

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
+
 danger.import_dangerfile(gem: 'slack-ruby-danger')
-toc.check

Gemfile

@@ -13,6 +13,5 @@ if ENV.key?('CONCURRENCY')
 end
 
 group :test do
-  gem 'danger-toc', '~> 0.1.3', require: false
-  gem 'slack-ruby-danger', '~> 0.1.0', require: false
+  gem 'slack-ruby-danger', '~> 0.2.0', require: false
 end

lib/slack-ruby-client.rb

@@ -15,12 +15,12 @@
 require 'logger'
 begin
   require 'picky'
-rescue LoadError # rubocop:disable Lint/HandleExceptions
+rescue LoadError # rubocop:disable Lint/SuppressedException
   # ignore, only used in users_search
 end
 begin
   require 'openssl'
-rescue LoadError # rubocop:disable Lint/HandleExceptions
+rescue LoadError # rubocop:disable Lint/SuppressedException
   # Used in slack/web/config
 end
 require_relative 'slack/web/config'

lib/slack/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Slack
-  VERSION = '0.14.7'
+  VERSION = '0.15.0'
 end

slack-ruby-client.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.licenses = ['MIT']
   s.summary = 'Slack Web and RealTime API client.'
   s.add_dependency 'activesupport'
-  s.add_dependency 'faraday', '>= 0.9'
+  s.add_dependency 'faraday', '>= 1.0'
   s.add_dependency 'faraday_middleware'
   s.add_dependency 'gli'
   s.add_dependency 'hashie'
@@ -27,9 +27,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'json-schema'
   s.add_development_dependency 'rake', '~> 10'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop', '~> 0.73.0'
-  s.add_development_dependency 'rubocop-performance', '~> 1.4.1'
-  s.add_development_dependency 'rubocop-rspec', '~> 1.34.0'
+  s.add_development_dependency 'rubocop', '~> 0.82.0'
+  s.add_development_dependency 'rubocop-performance', '~> 1.5.2'
+  s.add_development_dependency 'rubocop-rspec', '~> 1.39.0'
   s.add_development_dependency 'timecop'
   s.add_development_dependency 'vcr'
   s.add_development_dependency 'webmock'

spec/slack/web/api/errors/service_unavailable_spec.rb

@@ -8,8 +8,8 @@
      vcr: { cassette_name: 'web/503_error' } do
     begin
       client.auth_test
-      raise 'Expected to receive Faraday::ClientError.'
-    rescue Faraday::ClientError => e
+      raise 'Expected to receive Faraday::ServerError.'
+    rescue Faraday::ServerError => e
       expect(e.response).not_to be_nil
       expect(e.response[:status]).to eq 503
     end