slack-ruby-bot-server 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cc9126666813e0a880a4c970ff259ea90fd0954
-  data.tar.gz: 0eede9635d5aca9c6db238e8bb1a3bcf86614564
+  metadata.gz: c2baab12040f4100e3fb8ece5469b8b4ed6616f2
+  data.tar.gz: 45d3c6c0c456033a0a1c799ab71c298b3b7d72b6
 SHA512:
-  metadata.gz: ea825ac737ceb089ad5460b40ff98607d9424bf2d6b9d196351399e73ce065581303d996c105dc20d9c88d4d21e7fa222f7cc65ad9d07e9b22655c01a9c0bd21
-  data.tar.gz: 91ed370e494c05e9543aba95379dcecdfdd0513f535a75d349983d7244cb9b4f69590584ad25558ccb4c094934f44b02920c7d255d676cb8341930d4c08e19f2
+  metadata.gz: fced549dc1ec1f687223b076c6c73d50e5d14fd1976dcf007f392beb8b9e7f0b2c0519d011acbd1d20db7a86e3cee58b3974f0f444c1013d5edb10e8501f593e
+  data.tar.gz: 383451e38ac282f35ee977179a2e20a1df09ba40664cb2c38dd1a28d5fa1cc28bbf31de19c0bdfe2682df4d7f003d788983927f5973d0fbcc8356add93475f2a

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-08-22 08:29:35 -0400 using RuboCop version 0.58.2.
+# on 2018-09-08 18:09:56 -0400 using RuboCop version 0.58.2.
 # 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
@@ -16,6 +16,11 @@ Layout/IndentHeredoc:
     - 'sample_apps/sample_app_activerecord/commands/help.rb'
     - 'sample_apps/sample_app_mongoid/commands/help.rb'
 
+# Offense count: 1
+Lint/HandleExceptions:
+  Exclude:
+    - 'lib/slack-ruby-bot-server/ping.rb'
+
 # Offense count: 3
 # Configuration parameters: Blacklist.
 # Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))

data/CHANGELOG.md

@@ -1,56 +1,61 @@
 ### Changelog
 
-#### 0.7.0 (8/22/2018)
+#### 0.8.0 (2018/9/8)
+
+* [#75](https://github.com/slack-ruby/slack-ruby-bot-server/pull/75): Default to `async-websocket` instead of `celluloid-io` - [@dblock](https://github.com/dblock).
+* [#76](https://github.com/slack-ruby/slack-ruby-bot-server/pull/76): Adjust wait time on restart on Slack::Web::Api::Errors::TooManyRequestsError - [@dblock](https://github.com/dblock).
+
+#### 0.7.0 (2018/8/22)
 
 * [#60](https://github.com/slack-ruby/slack-ruby-bot-server/pull/60): Log caught Standard::Error backtrace at debug-level - [@alexagranov](https://github.com/alexagranov).
 * [#65](https://github.com/slack-ruby/slack-ruby-bot-server/pull/65): Updated Capybara and selenium-webdriver - [@dblock](https://github.com/dblock).
 * [#67](https://github.com/slack-ruby/slack-ruby-bot-server/pull/67): Only load the OTR::ActiveRecord::ConnectionManagement middleware when the OTR module is included. This module isn't needed when using Rails - [@darbyfrey](https://github.com/darbyfrey).
 * [#74](https://github.com/slack-ruby/slack-ruby-bot-server/pull/74): Added ping worker, will restart offline bots - [@dblock](https://github.com/dblock).
 
-#### 0.6.1 (3/29/2017)
+#### 0.6.1 (2017/3/29)
 
 * [#54](https://github.com/slack-ruby/slack-ruby-bot-server/pull/54): Removing one more Mongoid dependency when rescuing from _invoke - [@alexagranov](https://github.com/alexagranov).
 * [#53](https://github.com/slack-ruby/slack-ruby-bot-server/pull/53): No need for `otr-activerecord` if using activerecord under Rails - [@alexagranov](https://github.com/alexagranov).
 
-#### 0.6.0 (3/12/2017)
+#### 0.6.0 (2017/3/12)
 
 * [#38](https://github.com/slack-ruby/slack-ruby-bot-server/issues/7): Added ActiveRecord support - [@zachfeldman](https://github.com/zachfeldman), [@spencerldixon](https://github.com/spencerldixon), [@dblock](https://github.com/dblock).
 * [#45](https://github.com/slack-ruby/slack-ruby-bot-server/pull/45): Updated grape-roar to 0.4.0 - [@swalberg](https://github.com/swalberg).
 * [#49](https://github.com/slack-ruby/slack-ruby-bot-server/pull/49): Run tests in the sample apps part of CI - [@dblock](https://github.com/dblock).
 
-#### 0.5.0 (2/9/2017)
+#### 0.5.0 (2017/2/9)
 
 * [#43](https://github.com/slack-ruby/slack-ruby-bot-server/pull/43): Fix: `cannot load kaminari/grape` - [@dblock](https://github.com/dblock).
 * [#43](https://github.com/slack-ruby/slack-ruby-bot-server/pull/43): Fix: `undefined method '[]' for nil:NilClass` in APIs - [@dblock](https://github.com/dblock).
 * [#28](https://github.com/slack-ruby/slack-ruby-bot-server/pull/28): Use slack-ruby-danger gem - [@dblock](https://github.com/dblock).
 * [#31](https://github.com/slack-ruby/slack-ruby-bot-server/pull/31): Adds MONGODB_URI as environment variable for MongoDB - [@corprew](https://github.com/corprew).
 
-#### 0.4.0 (8/29/2016)
+#### 0.4.0 (2016/8/29)
 
 * [#25](https://github.com/slack-ruby/slack-ruby-bot-server/pull/25): Added [danger](http://danger.systems), PR linting - [@dblock](https://github.com/dblock).
 * The `reset` and `resetting` callbacks have been removed - [@dblock](https://github.com/dblock).
 * Callbacks receive `team` and `error`, but no longer `server` - [@dblock](https://github.com/dblock).
 * [#23](https://github.com/slack-ruby/slack-ruby-bot-server/issues/23): Fix: server-side removal of bot doesn't deactivate it - [@dblock](https://github.com/dblock).
 
-#### 0.3.1 (7/10/2016)
+#### 0.3.1 (2016/7/10)
 
 * [#22](https://github.com/slack-ruby/slack-ruby-bot-server/issues/22): Subclassing `SlackRubyBotServer::App` creates an `.instance` of child class - [@dblock](https://github.com/dblock).
 
-#### 0.3.0 (7/4/2016)
+#### 0.3.0 (2016/7/4)
 
 * Specify the server class via `SlackRubyBotServer.configure`, default is `SlackRubyBotServer::Server` - [@dblock](https://github.com/dblock).
 * Added service management lifecycle callbacks when a new team is registered, deactivated, etc - [@dblock](https://github.com/dblock).
 
-#### 0.2.0 (6/21/2016)
+#### 0.2.0 (2016/6/21)
 
 * Relaxed dependency versions, notably enabling grape 0.16.2 and Swagger 0.21.0 that uses Swagger 2.0 spec - [@dblock](https://github.com/dblock).
 * [#21](https://github.com/slack-ruby/slack-ruby-bot-server/issues/21): Fix: pass additional options through into `SlackRubyBot::Server` - [@dblock](https://github.com/dblock).
 
-#### 0.1.1 (6/4/2016)
+#### 0.1.1 (2016/6/4)
 
 * [#14](https://github.com/slack-ruby/slack-ruby-bot-server/pull/14): Moved config/initializers into the library - [@tmsrjs](https://github.com/tmsrjs).
 
-#### 0.1.0 (6/1/2016)
+#### 0.1.0 (2016/6/1)
 
 * Initial public release - [@dblock](https://github.com/dblock).
 * Renamed slack-bot-server to slack-ruby-bot-server - [@dblock](https://github.com/dblock).

data/README.md

@@ -13,7 +13,7 @@ A library that contains a [Grape](http://github.com/ruby-grape/grape) API servin
 
 ### Stable Release
 
-You're reading the documentation for the **stable** release of slack-ruby-bot-server, 0.7.0. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
+You're reading the documentation for the **stable** release of slack-ruby-bot-server, v0.8.0. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
 
 ### Try Me
 

data/UPGRADING.md

@@ -1,6 +1,14 @@
 Upgrading Slack-Ruby-Bot-Server
 ===============================
 
+### Upgrading to >= 0.8.0
+
+### Different Asynchronous I/O Library
+
+The library now uses [async-websocket](https://github.com/socketry/async-websocket) instead of [celluloid-io](https://github.com/celluloid/celluloid-io). If your application is built on Celluloid you may need to make changes and use `Async::Reactor.run` and the likes.
+
+See [#75](https://github.com/slack-ruby/slack-ruby-bot-server/pull/75) for more information.
+
 ### Upgrading to >= 0.7.0
 
 #### New Ping Worker

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

@@ -1,4 +1,4 @@
-require 'celluloid/current'
+require 'async/websocket'
 
 require 'grape-swagger'
 require 'slack-ruby-bot'

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

@@ -1,7 +1,7 @@
+require 'active_support/core_ext/string/filters'
+
 module SlackRubyBotServer
   class Ping
-    include Celluloid
-
     attr_reader :client
     attr_reader :options
     attr_reader :error_count
@@ -13,16 +13,29 @@ module SlackRubyBotServer
     end
 
     def start!
-      every ping_interval do
-        check!
+      ::Async::Reactor.run do |task|
+        run(task)
       end
     end
 
     private
 
+    def run(task)
+      logger.debug "PING: #{owner}, every #{ping_interval} second(s)"
+      loop do
+        task.sleep ping_interval
+        break unless check!
+      end
+      logger.debug "PING: #{owner}, done."
+    rescue StandardError => e
+      logger.error e
+      raise e
+    end
+
     def check!
       if online?
         @error_count = 0
+        true
       else
         down!
       end
@@ -30,9 +43,11 @@ module SlackRubyBotServer
       case e.message
       when 'account_inactive', 'invalid_auth' then
         logger.warn "Error pinging team #{owner.id}: #{e.message}, terminating."
-        terminate
+        false
       else
-        logger.warn "Error pinging team #{owner.id}: #{e.message}."
+        message = e.message.truncate(24, separator: "\n", omission: '...')
+        logger.warn "Error pinging team #{owner.id}: #{message}."
+        true
       end
     end
 
@@ -51,14 +66,22 @@ module SlackRubyBotServer
     def down!
       logger.warn "DOWN: #{owner}, #{retries_left} #{retries_left == 1 ? 'retry' : 'retries'} left"
       @error_count += 1
-      return if retries_left?
+      return true if retries_left?
       restart!
+      false
     end
 
     def restart!
       logger.warn "RESTART: #{owner}"
-      driver.emit(:close, WebSocket::Driver::CloseEvent.new(1001, 'bot offline')) if driver
-      terminate
+      begin
+        connection.close
+      rescue Async::Wrapper::Cancelled
+        # ignore, from connection.close
+      end
+      driver.close
+      driver.emit(:close, WebSocket::Driver::CloseEvent.new(1001, 'bot offline'))
+    rescue StandardError => e
+      logger.warn "Error restarting team #{owner.id}: #{e.message}."
     end
 
     def ping_interval
@@ -85,6 +108,10 @@ module SlackRubyBotServer
       socket.instance_variable_get(:@driver) if socket
     end
 
+    def connection
+      driver.instance_variable_get(:@socket) if driver
+    end
+
     def logger
       @logger ||= begin
         STDOUT.sync = true

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

@@ -97,6 +97,7 @@ module SlackRubyBotServer
         logger.error "#{team.name}: #{e.message}, team will be deactivated."
         deactivate!(team)
       else
+        wait = e.retry_after if e.is_a?(Slack::Web::Api::Errors::TooManyRequestsError)
         logger.error "#{team.name}: #{e.message}, restarting in #{wait} second(s)."
         sleep(wait)
         start_server! team, server, [wait * 2, 60].min

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

@@ -1,3 +1,3 @@
 module SlackRubyBotServer
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.0'.freeze
 end

data/sample_apps/sample_app_activerecord/config.ru

@@ -7,12 +7,6 @@ require 'yaml'
 
 ActiveRecord::Base.establish_connection(YAML.load_file('config/postgresql.yml')[ENV['RACK_ENV']])
 
-if ENV['RACK_ENV'] == 'development'
-  puts 'Loading NewRelic in developer mode ...'
-  require 'new_relic/rack/developer_mode'
-  use NewRelic::Rack::DeveloperMode
-end
-
 NewRelic::Agent.manual_start
 
 SlackRubyBotServer::App.instance.prepare!

data/sample_apps/sample_app_mongoid/config.ru

@@ -6,12 +6,6 @@ require_relative 'commands'
 
 Mongoid.load!(File.expand_path('config/mongoid.yml', __dir__), ENV['RACK_ENV'])
 
-if ENV['RACK_ENV'] == 'development'
-  puts 'Loading NewRelic in developer mode ...'
-  require 'new_relic/rack/developer_mode'
-  use NewRelic::Rack::DeveloperMode
-end
-
 NewRelic::Agent.manual_start
 
 SlackRubyBotServer::App.instance.prepare!

data/slack-ruby-bot-server.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'celluloid-io'
+  spec.add_dependency 'async-websocket'
   spec.add_dependency 'foreman'
   spec.add_dependency 'grape'
   spec.add_dependency 'grape-roar', '>= 0.4.0'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot-server
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2018-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: celluloid-io
+  name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A Grape API serving a Slack bot to multiple teams.