From e2302bf586767ba0113a4cf27ebb86b38e2e9e6f Mon Sep 17 00:00:00 2001 From: dblock Date: Mon, 27 Aug 2018 14:19:53 +0200 Subject: [PATCH] Use and recommend async-websocket by default. --- .travis.yml | 2 ++ CHANGELOG.md | 1 + Gemfile | 1 + RELEASING.md | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d106fab..efb1cfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,8 @@ matrix: env: CONCURRENCY=celluloid-io WITH_GIPHY_CLIENT=true - rvm: 2.3.0 env: CONCURRENCY=faye-websocket WITH_GIPHY_CLIENT=true + - rvm: 2.5 + env: CONCURRENCY=async-websocket WITH_GIPHY_CLIENT=true - rvm: ruby-head - rvm: jruby-head allow_failures: diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ce1a98..f5e8415 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ### 0.11.2 (Next) +* [#198](https://github.com/slack-ruby/slack-ruby-bot/pull/198): Recommend using `async-websocket` instead of `celluloid-io` - [@dblock](https://github.com/dblock). * Your contribution here. ### 0.11.1 (05/06/2018) diff --git a/Gemfile b/Gemfile index 7ca9ffa..461d8c4 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,7 @@ source 'http://rubygems.org' gemspec +gem 'slack-ruby-client', github: 'dblock/slack-ruby-client', branch: 'async' gem ENV['CONCURRENCY'], require: false if ENV.key?('CONCURRENCY') # rubocop:enable Bundler/OrderedGems diff --git a/RELEASING.md b/RELEASING.md index 65e3dfe..4efa050 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -7,7 +7,7 @@ There are no particular rules about when to release slack-ruby-bot. Release bug Run tests, check that all tests succeed locally. ``` -export CONCURRENCY=celluloid-io +export CONCURRENCY=async-websocket bundle install rake ```