slack-ruby-bot 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ce2b630c8c8febedc5e967ff7fddeaa50cea17b881fb73fa2a7bf58e486005c
-  data.tar.gz: 7eb5553808ed92fbcb256e35f2d7fb85b5943841a5205fb3b05b73f271f18817
+  metadata.gz: 22dc3beb892b34e2ac402dda4e3406b06ad7b60d25c6db1098517934f599a000
+  data.tar.gz: 8d089bd14bf6a096a89711627f459504bc3ba6a1dc04d1c45eff4c40476cf8ab
 SHA512:
-  metadata.gz: 3b6b488d4b4b2aa1911429abac4d591a977926c715580d534d8b21ebc88f9c3babad8dcbf5e9a773e123abaa882e2a98267aa8befefe9d8f11dc396c307246c0
-  data.tar.gz: 12859a82a5f268068b630efe1535c18206d2cee981839110aa6113e05fabf02f5024a0d3ca297972f4de81de7403d3b77f26af6e5f6f08c58fbea2e65ea4e111
+  metadata.gz: ff99ab182faab024601afe41a40fa8b66c589aeaf66d02819ad05196200e4ef3d6cd7e5fae6c670630f3b7225d96fc33d0031e370852b3ba6bdd33acfc182a22
+  data.tar.gz: dd313bbae823189799d92888222f9433a6cba629aba7ac7e922dfd7154317c3332ad1ff1246a6537ec2000626826866bb4ebcf2fb857aac614609cedcd6ba0b2

data/CHANGELOG.md

@@ -1,14 +1,18 @@
-### 0.11.2 (2018/12/01)
+### 0.12.0 (2019/2/25)
+
+* [#203](https://github.com/slack-ruby/slack-ruby-bot/pull/203): Removing restart logic - [@RodneyU215](https://github.com/RodneyU215).
+
+### 0.11.2 (2018/12/1)
 
 * [#198](https://github.com/slack-ruby/slack-ruby-bot/pull/198): Recommend using `async-websocket` instead of `celluloid-io` - [@dblock](https://github.com/dblock).
 * [#202](https://github.com/slack-ruby/slack-ruby-bot/pull/202): Allow frozen string in Hooks::Message - [@jonosenior](https://github.com/jonosenior).
 
-### 0.11.1 (2018/05/06)
+### 0.11.1 (2018/5/6)
 
 * [#187](https://github.com/slack-ruby/slack-ruby-bot/pull/187): Added support for the [official Giphy SDK](https://github.com/Giphy/giphy-ruby-client) - [@dblock](https://github.com/dblock).
 * [#185](https://github.com/slack-ruby/slack-ruby-bot/pull/185): Log backtrace of exceptions - [@dblock](https://github.com/dblock).
 
-### 0.11.0 (2018/04/02)
+### 0.11.0 (2018/4/2)
 
 * [#182](https://github.com/slack-ruby/slack-ruby-bot/pull/182): Refactor CommandsHelper class and Help module - [@mdudzinski](https://github.com/mdudzinski).
 * [#180](https://github.com/slack-ruby/slack-ruby-bot/pull/180): Allow to respond to text in attachments #177 - [@mdudzinski](https://github.com/mdudzinski).
@@ -24,18 +28,18 @@
 * [#163](https://github.com/slack-ruby/slack-ruby-bot/pull/163): Allow `command` to accept regular expressions - [@kstole](https://github.com/kstole).
 * [#166](https://github.com/slack-ruby/slack-ruby-bot/pull/166): Allow special characters and capitals in bot aliases - [@kstole](https://github.com/kstole).
 
-### 0.10.4 (2017/07/05)
+### 0.10.4 (2017/7/5)
 
 * [#149](https://github.com/slack-ruby/slack-ruby-bot/pull/149): Add `logger` configuration to set a custom logger - [@upscent](https://github.com/upscent).
 * [#147](https://github.com/slack-ruby/slack-ruby-bot/pull/147): Adds `server.on` as a shortcut for `hooks.add` and deprecate `hooks` method - [@laertispappas](https://github.com/laertispappas).
 * [#143](https://github.com/slack-ruby/slack-ruby-bot/pull/143): Provide `permitted?` method to allow for simple authorization extensions - [@chuckremes](https://github.com/chuckremes).
 
-### 0.10.3 (2017/06/15)
+### 0.10.3 (2017/6/15)
 
 * [#145](https://github.com/slack-ruby/slack-ruby-bot/pull/145): Map multiple command strings to same controller method - [@chuckremes](https://github.com/chuckremes).
 * [#144](https://github.com/slack-ruby/slack-ruby-bot/pull/144): Support usage of commands with embedded spaces when using Controller methods - [@chuckremes](https://github.com/chuckremes).
 
-### 0.10.2 (2017/06/03)
+### 0.10.2 (2017/6/3)
 
 * [#137](https://github.com/slack-ruby/slack-ruby-bot/pull/137): Add Model-View-Controller classes to allow for more explicit control over how `command`s are designed - [@chuckremes](https://github.com/chuckremes).
 * [#130](https://github.com/slack-ruby/slack-ruby-bot/issues/130): Added test dependencies in TUTORIAL.md - [@jbristow](https://github.com/jbristow).

data/README.md

@@ -19,7 +19,7 @@ If you are not familiar with Slack bots or Slack API concepts, you might want to
 
 ## Stable Release
 
-You're reading the documentation for the **stable** release of slack-ruby-bot, v0.11.2.
+You're reading the documentation for the **stable** release of slack-ruby-bot, v0.12.0.
 See [CHANGELOG](CHANGELOG.md) for a history of changes and [UPGRADING](UPGRADING.md) for how to upgrade to more recent versions.
 
 ## Usage
@@ -32,7 +32,7 @@ See [CHANGELOG](CHANGELOG.md) for a history of changes and [UPGRADING](UPGRADING
 source 'https://rubygems.org'
 
 gem 'slack-ruby-bot'
-gem 'celluloid-io'
+gem 'async-websocket'
 ```
 
 #### pongbot.rb
@@ -83,7 +83,7 @@ end
 
 Command match data includes `match['bot']`, `match['command']` and `match['expression']`. The `bot` match always checks against the `SlackRubyBot::Config.user` and `SlackRubyBot::Config.user_id` values obtained when the bot starts.
 
-The `command` method can take strings, which will have be escaped with `Regexp.escape`, and regular expressions.
+The `command` method can take strings, which will have to be escaped with `Regexp.escape`, and regular expressions.
 
 ```ruby
 class CallBot < SlackRubyBot::Bot
@@ -145,7 +145,7 @@ This is particularly fun with emoji.
 
 ![](screenshots/aliases.gif)
 
-Bots also will respond to a direct message, with or without the bot name in the message itself.
+Bots will also respond to a direct message, with or without the bot name in the message itself.
 
 ![](screenshots/dms.gif)
 

data/UPGRADING.md

@@ -1,6 +1,12 @@
 Upgrading SlackRubyBot
 ======================
 
+### Upgrading to >= 0.12.0
+
+#### Remove any references to `SlackRubyBot::Server#restart!`
+
+We have removed `SlackRubyBot::Server#restart!` since the [`slack-ruby-client`](https://github.com/slack-ruby/slack-ruby-client/blob/master/CHANGELOG.md) now restarts any connection that was not intentionally stopped via `SlackRubyBot::Server#stop!`.
+
 ### Upgrading to >= 0.10.4
 
 #### Replace `server.hooks.add` with `server.on`

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

@@ -32,37 +32,17 @@ module SlackRubyBot
     end
 
     def start!
-      @stopping = false
-      @async = false
       client.start!
     end
 
     def start_async
-      @stopping = false
-      @async = true
       client.start_async
     end
 
     def stop!
-      @stopping = true
       client.stop! if @client
     end
 
-    def restart!(wait = 1)
-      @async ? start_async : start!
-    rescue StandardError => e
-      case e.message
-      when 'account_inactive', 'invalid_auth'
-        logger.error "#{token}: #{e.message}, team will be deactivated."
-        @stopping = true
-      else
-        sleep wait
-        logger.error "#{e.message}, reconnecting in #{wait} second(s)."
-        logger.debug e
-        restart! [wait * 2, 60].min
-      end
-    end
-
     private
 
     def handle_exceptions
@@ -98,10 +78,6 @@ module SlackRubyBot
     def client
       @client ||= begin
         client = SlackRubyBot::Client.new(aliases: aliases, send_gifs: send_gifs, token: token)
-        client.on :close do |_data|
-          @client = nil
-          restart! unless @stopping
-        end
         _hooks.client = client
 
         client

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

@@ -1,3 +1,3 @@
 module SlackRubyBot
-  VERSION = '0.11.2'.freeze
+  VERSION = '0.12.0'.freeze
 end

data/slack-ruby-bot.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.licenses = ['MIT']
   s.summary = 'The easiest way to write a Slack bot in Ruby.'
   s.add_dependency 'hashie'
-  s.add_dependency 'slack-ruby-client', '>= 0.6.0'
+  s.add_dependency 'slack-ruby-client', '>= 0.14.0'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'

data/spec/slack-ruby-bot/server_spec.rb

@@ -94,21 +94,4 @@ describe SlackRubyBot::Server do
       end
     end
   end
-  context '#restart!' do
-    subject do
-      SlackRubyBot::Server.new(token: 'token')
-    end
-    it 'reloads server after disconnection' do
-      expect(subject).to receive(:restart!)
-      subject.send(:client).send(:callbacks)['close'].first.call
-      expect(subject.instance_variable_get(:@stopping)).to be_falsy
-    end
-    it 'does not reload server for inactive account' do
-      stopping = -> { subject.instance_variable_get :@stopping }
-      allow(subject).to receive(:start!) { raise StandardError, 'account_inactive' }
-      expect(stopping.call).to be_falsy
-      subject.restart!
-      expect(stopping.call).to be true
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-01 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement