Skip to content

Commit 304eedc

Browse files
authored
Merge pull request #283 from dblock/async-0.8
Fail when used with incompatible async-websocket > 0.8.0
2 parents 532c020 + bdbf48f commit 304eedc

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

.rubocop_todo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2019-04-09 22:16:03 -0500 using RuboCop version 0.61.1.
3+
# on 2019-07-20 16:45:38 -0400 using RuboCop version 0.61.1.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
@@ -50,7 +50,7 @@ Style/AccessModifierDeclarations:
5050
- 'lib/slack/real_time/concurrency/eventmachine.rb'
5151
- 'lib/slack/real_time/socket.rb'
5252

53-
# Offense count: 154
53+
# Offense count: 155
5454
# Configuration parameters: AllowedVariables.
5555
Style/GlobalVars:
5656
Enabled: false

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
* [#279](https://github.com/slack-ruby/slack-ruby-client/pull/279): Prevent ping worker from dying on unexpected errors - [@dblock](https://github.com/dblock).
44
* [#281](https://github.com/slack-ruby/slack-ruby-client/pull/281): Added `admin_users_session_reset` to Web API - [@dblock](https://github.com/dblock).
5+
* [#283](https://github.com/slack-ruby/slack-ruby-client/pull/283): Fail when used with incompatible async-websocket > 0.8.0 - [@dblock](https://github.com/dblock).
56
* Your contribution here.
67

78
### 0.14.2 (2019/4/12)

Gemfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@ source 'http://rubygems.org'
22

33
gemspec
44

5-
gem ENV['CONCURRENCY'], require: false if ENV.key?('CONCURRENCY')
5+
if ENV.key?('CONCURRENCY')
6+
case ENV['CONCURRENCY']
7+
when 'async-websocket'
8+
gem 'async-websocket', '~> 0.8.0', require: false
9+
else
10+
gem ENV['CONCURRENCY'], require: false
11+
end
12+
end
613

714
group :test do
815
gem 'danger-toc', '~> 0.1.3', require: false

lib/slack/real_time/concurrency/async.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,5 @@ def connect
129129
end
130130
end
131131
end
132+
133+
raise "Incompatible version of async-websocket, #{Async::WebSocket::VERSION}, use \"gem 'async-websocket', '~> 0.8.0'\"." if Gem::Version.new(Async::WebSocket::VERSION) >= Gem::Version.new('0.9.0')

0 commit comments

Comments
 (0)