slack-ruby-bot 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7cc27a7b3b83580c0e59dfc18919ac3a6ec68c4
-  data.tar.gz: af0fd175600080e47df3d3285bc9aa0ad665c95e
+  metadata.gz: b416684447c6fb8687ce155f3c86527b82f8e007
+  data.tar.gz: d7d4d84f063816712410b913187089d6fda8a62f
 SHA512:
-  metadata.gz: cc4d80b5c27530ddb7d53e7043e75e44420d2ea3f57ee1aff16993dce0bc22f848523f00982d0f6cd153e90aed0bf4b8dafc622d2474e572b44f949432e6a2ff
-  data.tar.gz: eb6b9f4a8b1233256040854dc9d8642826e3743453b72708adab1f2854be83160bccd5caa7fca767803af09428394758a846babf099ddacacadc3edff68c9e92
+  metadata.gz: eed29c1effba3bc4d3c27a1dada0665cddf57fe785487c45c418f7e7ce3cc2af7c9b4b78ae4a2ac2f1f70875c73f7a6ebf27ccd9249d0f8c2c5674828c687e8e
+  data.tar.gz: cbbc3f361dc13b115a348d2817f62b9702baeac5888398e799b300875d45124d248c2fac142730363fc5011ce48e78f1dd093c538a159157c7d062ace6a6391b

data/.rubocop_todo.yml

@@ -1,5 +1,5 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-10-28 17:37:44 -0700 using RuboCop version 0.32.1.
+# on 2015-11-26 14:43:46 +0900 using RuboCop version 0.32.1.
 # 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
@@ -13,29 +13,34 @@ Lint/HandleExceptions:
 Lint/UselessAccessModifier:
   Enabled: false
 
-# Offense count: 5
+# Offense count: 8
 Metrics/AbcSize:
-  Max: 23
+  Max: 27
 
-# Offense count: 2
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 101
+
+# Offense count: 3
 Metrics/CyclomaticComplexity:
-  Max: 7
+  Max: 8
 
-# Offense count: 91
+# Offense count: 96
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 142
+  Max: 145
 
-# Offense count: 4
+# Offense count: 5
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 21
+  Max: 22
 
-# Offense count: 1
+# Offense count: 2
 Metrics/PerceivedComplexity:
   Max: 8
 
-# Offense count: 15
+# Offense count: 17
 Style/Documentation:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 0.5.0 (12/7/2015)
+
+* Disable animated GIFs via `SlackRubyBot::Config.send_gifs` or ENV['SLACK_RUBY_BOT_SEND_GIFS'] - [@dblock](https://github.com/dblock).
+* `SlackRubyBot::Server` supports `restart!` with retry - [@dblock](https://github.com/dblock).
+* `SlackRubyBot::Server` publicly supports `auth!`, `start!` and `start_async` that make up a `run` loop - [@dblock](https://github.com/dblock).
+* Extracted `SlackRubyBot::Server` from `SlackRubyBot::App` - [@dblock](https://github.com/dblock).
+* Fix: explicitly require 'giphy' - [@dblock](https://github.com/dblock).
+* Fix: undefined method `stop` for `Slack::RealTime::Client` - [@dblock](https://github.com/dblock).
+* [#29](https://github.com/dblock/slack-ruby-bot/pull/29): Fixed bot failing to correctly respond to unknown commands when queried with format `@botname` - [@crayment](https://github.com/crayment).
+* [#30](https://github.com/dblock/slack-ruby-bot/pull/30): Fix RegexpError when parsing command - [@kuboshizuma](https://github.com/kuboshizuma).
+
 ### 0.4.5 (10/29/2015)
 
 * [#23](https://github.com/dblock/slack-ruby-bot/pull/23): Fixed `match` that forced bot name into the expression being evaluated - [@dblock](https://github.com/dblock).

data/README.md

@@ -2,12 +2,17 @@ Slack-Ruby-Bot
 ==============
 
 [![Gem Version](https://badge.fury.io/rb/slack-ruby-bot.svg)](http://badge.fury.io/rb/slack-ruby-bot)
-[![Build Status](https://travis-ci.org/dblock/slack-ruby-bot.png)](https://travis-ci.org/dblock/slack-ruby-bot)
+[![Build Status](https://travis-ci.org/dblock/slack-ruby-bot.svg)](https://travis-ci.org/dblock/slack-ruby-bot)
+[![Code Climate](https://codeclimate.com/github/dblock/slack-ruby-bot/badges/gpa.svg)](https://codeclimate.com/github/dblock/slack-ruby-bot)
 
 A generic Slack bot framework written in Ruby on top of [slack-ruby-client](https://github.com/dblock/slack-ruby-client). This library does all the heavy lifting, such as message parsing, so you can focus on implementing slack bot commands. It also attempts to introduce the bare minimum number of requirements or any sorts of limitations. It's a Slack bot boilerplate.
 
 ![](slack.png)
 
+## Stable Release
+
+You're reading the documentation for the [stable release, v0.5.0](https://github.com/dblock/slack-ruby-bot/tree/v0.5.0).
+
 ## Usage
 
 ### A Minimal Bot
@@ -49,8 +54,9 @@ A typical production Slack bot is a combination of a vanilla web server and a we
 
 ### More Involved Examples
 
-The following examples of production-grade bots based on slack-ruby-bot are listed in growing order of complexity.
+The following examples of bots based on slack-ruby-bot are listed in growing order of complexity.
 
+* [slack-bot-on-rails](https://github.com/dblock/slack-bot-on-rails): A bot running on Rails and using React to display Slack messages on a website.
 * [slack-mathbot](https://github.com/dblock/slack-mathbot): Slack integration with math.
 * [slack-google-bot](https://github.com/dblock/slack-google-bot): A Slack bot that searches Google, including CSE.
 * [slack-aws](https://github.com/dblock/slack-aws): Slack integration with Amazon Web Services.
@@ -195,6 +201,16 @@ module MyBot
 end
 ```
 
+### Disable Animated GIFs
+
+By default bots send animated GIFs in default commands and errors. To disable animated GIFs set `send_gifs` or `ENV['SLACK_RUBY_BOT_SEND_GIFS']` to `false`.
+
+```ruby
+SlackRubyBot.configure do |config|
+  config.send_gifs = false
+end
+```
+
 ### Message Loop Protection
 
 By default bots do not respond to their own messages. If you wish to change that behavior, set `allow_message_loops` to `true`.

data/TUTORIAL.md

@@ -87,7 +87,7 @@ end
 
 #### Config.ru
 
-Tie all the pieces togehter in `config.ru` which creates a thread for the bot and runs the web server on the main thread.
+Tie all the pieces together in `config.ru` which creates a thread for the bot and runs the web server on the main thread.
 
 ```ruby
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/examples/weather/Procfile

@@ -0,0 +1 @@
+console: bundle exec ruby weatherbot.rb

data/lib/initializers/giphy.rb

@@ -1,3 +1,5 @@
+require 'giphy'
+
 Giphy::Configuration.configure do |config|
   config.api_key = ENV['GIPHY_API_KEY'] || 'dc6zaTOxFJmzC' # from https://github.com/Giphy/GiphyAPI
 end

data/lib/slack-ruby-bot.rb

@@ -17,5 +17,8 @@ module SlackRubyBot
   end
 end
 
+require 'slack-ruby-client'
 require 'slack-ruby-bot/commands'
+require 'slack-ruby-bot/client'
+require 'slack-ruby-bot/server'
 require 'slack-ruby-bot/app'

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

@@ -1,10 +1,5 @@
 module SlackRubyBot
-  class App
-    cattr_accessor :hooks
-
-    include SlackRubyBot::Hooks::Hello
-    include SlackRubyBot::Hooks::Message
-
+  class App < Server
     def initialize
       SlackRubyBot.configure do |config|
         config.token = ENV['SLACK_API_TOKEN'] || fail("Missing ENV['SLACK_API_TOKEN'].")
@@ -23,82 +18,21 @@ module SlackRubyBot
       @instance ||= SlackRubyBot::App.new
     end
 
-    def run
-      auth!
-      start!
-    end
-
-    def stop!
-      client.stop
-    end
-
     private
 
-    def logger
-      @logger ||= begin
-        $stdout.sync = true
-        Logger.new(STDOUT)
-      end
-    end
-
-    def start!
-      loop do
-        begin
-          client.start!
-        rescue Slack::Web::Api::Error => e
-          logger.error e
-          case e.message
-          when 'migration_in_progress'
-            sleep 1 # ignore, try again
-          else
-            raise e
-          end
-        rescue Faraday::Error::TimeoutError, Faraday::Error::ConnectionFailed, Faraday::Error::SSLError => e
-          logger.error e
-          sleep 1 # ignore, try again
-        rescue StandardError => e
-          logger.error e
-          raise e
-        ensure
-          @client = nil
-        end
-      end
-    end
-
-    def client
-      @client ||= begin
-        client = Slack::RealTime::Client.new
-        hooks.each do |hook|
-          client.on hook do |data|
-            begin
-              send hook, client, data
-            rescue StandardError => e
-              logger.error e
-              begin
-                client.message(channel: data['channel'], text: e.message) if data.key?('channel')
-              rescue
-                # ignore
-              end
-            end
-          end
-        end
-        client
-      end
-    end
-
     def auth!
-      auth = client.web_client.auth_test
+      super
       SlackRubyBot.configure do |config|
-        config.url = auth['url']
-        config.team = auth['team']
-        config.user = auth['user']
-        config.team_id = auth['team_id']
-        config.user_id = auth['user_id']
+        config.url = client.auth['url']
+        config.team = client.auth['team']
+        config.user = client.auth['user']
+        config.team_id = client.auth['team_id']
+        config.user_id = client.auth['user_id']
       end
-      logger.info "Welcome '#{SlackRubyBot.config.user}' to the '#{SlackRubyBot.config.team}' team at #{SlackRubyBot.config.url}."
     end
 
     def reset!
+      super
       SlackRubyBot.configure do |config|
         config.url = nil
         config.team = nil

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

@@ -0,0 +1,31 @@
+module SlackRubyBot
+  class Client < Slack::RealTime::Client
+    attr_accessor :auth
+
+    def names
+      [
+        SlackRubyBot::Config.user,
+        auth ? auth['user'] : nil,
+        SlackRubyBot::Config.aliases,
+        auth ? "<@#{auth['user_id'].downcase}>" : nil,
+        SlackRubyBot::Config.user_id ? "<@#{SlackRubyBot::Config.user_id.downcase}>" : nil,
+        auth ? "<@#{auth['user_id'].downcase}>:" : nil,
+        SlackRubyBot::Config.user_id ? "<@#{SlackRubyBot::Config.user_id.downcase}>:" : nil,
+        auth ? "#{auth['user']}:" : nil,
+        SlackRubyBot::Config.user ? "#{SlackRubyBot::Config.user}:" : nil
+      ].compact.flatten
+    end
+
+    def name?(name)
+      name && names.include?(name.downcase)
+    end
+
+    def name
+      SlackRubyBot.config.user || (auth && auth['user'])
+    end
+
+    def url
+      SlackRubyBot.config.url || (auth && auth['url'])
+    end
+  end
+end

data/lib/slack-ruby-bot/commands/base.rb

@@ -47,20 +47,21 @@ module SlackRubyBot
 
       def self.command(*values, &block)
         values.each do |value|
-          match Regexp.new("^(?<bot>[\\w[:punct:]@<>]*)[\\s]+(?<command>#{value})$", Regexp::IGNORECASE), &block
-          match Regexp.new("^(?<bot>[\\w[:punct:]@<>]*)[\\s]+(?<command>#{value})[\\s]+(?<expression>.*)$", Regexp::IGNORECASE), &block
+          escaped = Regexp.escape(value)
+          match Regexp.new("^(?<bot>[\\w[:punct:]@<>]*)[\\s]+(?<command>#{escaped})$", Regexp::IGNORECASE), &block
+          match Regexp.new("^(?<bot>[\\w[:punct:]@<>]*)[\\s]+(?<command>#{escaped})[\\s]+(?<expression>.*)$", Regexp::IGNORECASE), &block
         end
       end
 
       def self.invoke(client, data)
         self.finalize_routes!
-        expression, text = parse(data)
+        expression, text = parse(client, data)
         called = false
         routes.each_pair do |route, method|
           match = route.match(expression)
           match ||= route.match(text) if text
           next unless match
-          next if match.names.include?('bot') && !SlackRubyBot.config.name?(match['bot'])
+          next if match.names.include?('bot') && !client.name?(match['bot'])
           called = true
           if method
             method.call(client, data, match)
@@ -81,15 +82,15 @@ module SlackRubyBot
 
       private
 
-      def self.parse(data)
+      def self.parse(client, data)
         text = data.text
         return text unless data.channel && data.channel[0] == 'D' && data.user && data.user != SlackRubyBot.config.user_id
-        SlackRubyBot.config.names.each do |name|
+        client.names.each do |name|
           text.downcase.tap do |td|
             return text if td == name || td.starts_with?("#{name} ")
           end
         end
-        ["#{SlackRubyBot.config.user} #{text}", text]
+        ["#{client.name} #{text}", text]
       end
 
       def self.finalize_routes!
@@ -99,13 +100,13 @@ module SlackRubyBot
 
       def self.get_gif_and_send(options = {})
         options = options.dup
+        keywords = options.delete(:keywords)
         gif = begin
-          keywords = options.delete(:keywords)
           Giphy.random(keywords)
         rescue StandardError => e
           logger.warn "Giphy.random: #{e.message}"
           nil
-        end
+        end if SlackRubyBot::Config.send_gifs?
         client = options.delete(:client)
         text = options.delete(:text)
         text = [text, gif && gif.image_url.to_s].compact.join("\n")

data/lib/slack-ruby-bot/commands/unknown.rb

@@ -1,7 +1,7 @@
 module SlackRubyBot
   module Commands
     class Unknown < Base
-      match(/^(?<bot>\w*)[\s]*(?<expression>.*)$/)
+      match(/^(?<bot>\S*)[\s]*(?<expression>.*)$/)
 
       def self.call(client, data, _match)
         send_message_with_gif client, data.channel, "Sorry <@#{data.user}>, I don't understand that command!", 'idiot'

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

@@ -10,13 +10,31 @@ module SlackRubyBot
     attr_accessor :team
     attr_accessor :team_id
     attr_accessor :allow_message_loops
+    attr_accessor :send_gifs
 
-    def names
-      [user, aliases, "<@#{user_id.downcase}>", "<@#{user_id.downcase}>:", "#{user}:"].compact.flatten
+    def allow_message_loops?
+      allow_message_loops
     end
 
-    def name?(name)
-      name && names.include?(name.downcase)
+    def send_gifs?
+      v = boolean_from_env('SLACK_RUBY_BOT_SEND_GIFS')
+      v.nil? ? (send_gifs.nil? || send_gifs) : v
+    end
+
+    private
+
+    def boolean_from_env(key)
+      value = ENV[key]
+      case value
+      when nil
+        nil
+      when 0, 'false', 'no'
+        false
+      when 1, 'true', 'yes'
+        true
+      else
+        fail ArgumentError, "Invalid value for #{key}: #{value}."
+      end
     end
   end
 end

data/lib/slack-ruby-bot/hooks/hello.rb

@@ -3,8 +3,8 @@ module SlackRubyBot
     module Hello
       extend Base
 
-      def hello(_client, _data)
-        logger.info "Successfully connected to #{SlackRubyBot.config.url}."
+      def hello(client, _data)
+        logger.info "Successfully connected to #{client.url || 'slack'}."
       end
     end
   end

data/lib/slack-ruby-bot/hooks/message.rb

@@ -5,7 +5,7 @@ module SlackRubyBot
 
       def message(client, data)
         data = Hashie::Mash.new(data)
-        return if !SlackRubyBot::Config.allow_message_loops && (client.self && client.self['id'] == data.user)
+        return if !SlackRubyBot::Config.allow_message_loops? && (client.self && client.self['id'] == data.user)
         data.text.strip! if data.text
         result = child_command_classes.detect { |d| d.invoke(client, data) }
         result ||= built_in_command_classes.detect { |d| d.invoke(client, data) }

data/lib/slack-ruby-bot/rspec/support/slack-ruby-bot/it_behaves_like_a_slack_bot.rb

@@ -15,9 +15,6 @@ shared_examples 'a slack ruby bot' do
       before do
         subject.send(:auth!)
       end
-      after do
-        subject.send(:reset!)
-      end
       it 'succeeds auth' do
         expect(subject.config.url).to eq 'https://rubybot.slack.com/'
         expect(subject.config.team).to eq 'team_name'

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

@@ -0,0 +1,101 @@
+module SlackRubyBot
+  class Server
+    cattr_accessor :hooks
+    attr_accessor :token
+
+    include SlackRubyBot::Hooks::Hello
+    include SlackRubyBot::Hooks::Message
+
+    def initialize(options = {})
+      @token = options[:token]
+    end
+
+    def run
+      auth!
+      loop do
+        begin
+          start!
+        rescue Slack::Web::Api::Error => e
+          logger.error e
+          case e.message
+          when 'migration_in_progress'
+            sleep 1 # ignore, try again
+          else
+            raise e
+          end
+        rescue Faraday::Error::TimeoutError, Faraday::Error::ConnectionFailed, Faraday::Error::SSLError => e
+          logger.error e
+          sleep 1 # ignore, try again
+        rescue StandardError => e
+          logger.error e
+          raise e
+        ensure
+          @client = nil
+        end
+      end
+    end
+
+    def auth!
+      client.auth = client.web_client.auth_test
+      logger.info "Welcome '#{client.auth['user']}' to the '#{client.auth['team']}' team at #{client.auth['url']}."
+    end
+
+    def start!
+      @stopping = false
+      client.start!
+    end
+
+    def start_async
+      @stopping = false
+      client.start_async
+    end
+
+    def stop!
+      @stopping = true
+      client.stop! if @client
+    end
+
+    def restart!(wait = 1)
+      start!
+    rescue StandardError => e
+      sleep wait
+      logger.error "#{e.message}, reconnecting in #{wait} second(s)."
+      logger.debug e
+      restart! [wait * 2, 60].min
+    end
+
+    private
+
+    def logger
+      @logger ||= begin
+        $stdout.sync = true
+        Logger.new(STDOUT)
+      end
+    end
+
+    def client
+      @client ||= begin
+        client = SlackRubyBot::Client.new(token: token)
+        client.on :close do |_data|
+          @client = nil
+          restart! unless @stopping
+        end
+        hooks.each do |hook|
+          client.on hook do |data|
+            begin
+              send hook, client, data
+            rescue StandardError => e
+              logger.error e
+              begin
+                client.message(channel: data['channel'], text: e.message) if data.key?('channel')
+              rescue
+                # ignore
+              end
+            end
+          end
+        end
+        client
+      end
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module SlackRubyBot
-  VERSION = '0.4.5'
+  VERSION = '0.5.0'
 end

data/slack-ruby-bot.gemspec

@@ -15,10 +15,10 @@ 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'
+  s.add_dependency 'slack-ruby-client', '>= 0.5.0'
+  s.add_dependency 'faye-websocket'
   s.add_dependency 'activesupport'
   s.add_dependency 'giphy', '~> 2.0.2'
-  s.add_dependency 'websocket-driver', '~> 0.5.4'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rack-test'

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

@@ -5,27 +5,4 @@ describe SlackRubyBot::App do
     SlackRubyBot::App.new
   end
   it_behaves_like 'a slack ruby bot'
-  context 'retries on rtm.start errors' do
-    let(:client) { Slack::RealTime::Client.new }
-    let(:logger) { subject.send :logger }
-    before do
-      allow(subject).to receive(:sleep)
-      expect(Slack::RealTime::Client).to receive(:new).twice.and_return(client)
-      expect(logger).to receive(:error).twice
-    end
-    it 'migration_in_progress', vcr: { cassette_name: 'migration_in_progress' } do
-      expect do
-        subject.send :start!
-      end.to raise_error Slack::Web::Api::Error, 'unknown'
-    end
-    [Faraday::Error::ConnectionFailed, Faraday::Error::TimeoutError, Faraday::Error::SSLError].each do |err|
-      it "#{err}" do
-        expect(client).to receive(:start!) { fail err, 'Faraday' }
-        expect(client).to receive(:start!) { fail 'unknown' }
-        expect do
-          subject.send :start!
-        end.to raise_error 'unknown'
-      end
-    end
-  end
 end

data/spec/slack-ruby-bot/commands/commands_regexp_escape_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe SlackRubyBot::Commands do
+  let! :command do
+    Class.new(SlackRubyBot::Commands::Base) do
+      command '(' do |client, data, match|
+        send_message client, data.channel, "#{match[:command]}: #{match[:expression]}"
+      end
+    end
+  end
+  def app
+    SlackRubyBot::App.new
+  end
+  it 'does not return error' do
+    expect(message: "#{SlackRubyBot.config.user} ( /").to respond_with_slack_message('(: /')
+  end
+end

data/spec/slack-ruby-bot/commands/send_message_with_gif_spec.rb

@@ -29,4 +29,32 @@ describe SlackRubyBot::Commands do
     expect(SlackRubyBot::Commands::Base).to receive(:send_client_message).with(client, channel: 'channel', text: 'message')
     app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
   end
+  context 'send_gifs' do
+    context 'set to false' do
+      before do
+        SlackRubyBot::Config.send_gifs = false
+      end
+      it 'does not send a gif' do
+        expect(Giphy).to_not receive(:random)
+        expect(SlackRubyBot::Commands::Base).to receive(:send_client_message).with(client, channel: 'channel', text: 'message')
+        app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
+      end
+      after do
+        SlackRubyBot::Config.send_gifs = nil
+      end
+    end
+    context 'set to false via SLACK_RUBY_BOT_SEND_GIFS' do
+      before do
+        ENV['SLACK_RUBY_BOT_SEND_GIFS'] = 'false'
+      end
+      it 'does not send a gif' do
+        expect(Giphy).to_not receive(:random)
+        expect(SlackRubyBot::Commands::Base).to receive(:send_client_message).with(client, channel: 'channel', text: 'message')
+        app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
+      end
+      after do
+        ENV.delete 'SLACK_RUBY_BOT_SEND_GIFS'
+      end
+    end
+  end
 end

data/spec/slack-ruby-bot/commands/unknown_spec.rb

@@ -8,6 +8,9 @@ describe SlackRubyBot::Commands::Unknown do
   it 'invalid command' do
     expect(message: "#{SlackRubyBot.config.user} foobar").to respond_with_slack_message("Sorry <@user>, I don't understand that command!")
   end
+  it 'invalid command with @bot:' do
+    expect(message: "<@#{SlackRubyBot.config.user_id}>: foobar").to respond_with_slack_message("Sorry <@user>, I don't understand that command!")
+  end
   it 'does not respond to sad face' do
     expect(SlackRubyBot::Commands::Base).to_not receive(:send_message)
     SlackRubyBot::App.new.send(:message, client, text: ':((')

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

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe SlackRubyBot::Config do
+  context 'send_gifs?' do
+    context 'default' do
+      it 'is true' do
+        expect(SlackRubyBot::Config.send_gifs?).to be true
+      end
+    end
+    context 'set to false' do
+      before do
+        SlackRubyBot::Config.send_gifs = false
+      end
+      it 'is false' do
+        expect(SlackRubyBot::Config.send_gifs?).to be false
+      end
+      after do
+        SlackRubyBot::Config.send_gifs = nil
+      end
+    end
+    context 'set to false via SLACK_RUBY_BOT_SEND_GIFS' do
+      before do
+        ENV['SLACK_RUBY_BOT_SEND_GIFS'] = 'false'
+      end
+      it 'is false' do
+        expect(SlackRubyBot::Config.send_gifs?).to be false
+      end
+      after do
+        ENV.delete 'SLACK_RUBY_BOT_SEND_GIFS'
+      end
+    end
+    context 'set to true' do
+      before do
+        SlackRubyBot::Config.send_gifs = true
+      end
+      it 'is false' do
+        expect(SlackRubyBot::Config.send_gifs?).to be true
+      end
+      after do
+        SlackRubyBot::Config.send_gifs = nil
+      end
+    end
+    context 'set to true via SLACK_RUBY_BOT_SEND_GIFS' do
+      before do
+        ENV['SLACK_RUBY_BOT_SEND_GIFS'] = 'true'
+      end
+      it 'is false' do
+        expect(SlackRubyBot::Config.send_gifs?).to be true
+      end
+      after do
+        ENV.delete 'SLACK_RUBY_BOT_SEND_GIFS'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe SlackRubyBot::Server do
+  context 'with a token' do
+    let(:client) { Slack::RealTime::Client.new }
+    let(:logger) { subject.send :logger }
+    subject do
+      SlackRubyBot::Server.new(token: 'token')
+    end
+    before do
+      allow(subject).to receive(:sleep)
+      allow(logger).to receive(:error)
+    end
+    it 'creates a client with a token' do
+      expect(client).to receive(:start!) { fail 'expected' }
+      expect(Slack::RealTime::Client).to receive(:new).with(token: 'token').and_return(client)
+      expect { subject.start! }.to raise_error RuntimeError, 'expected'
+    end
+    it 'asynchronously creates a client with a token' do
+      expect(client).to receive(:start_async) { fail 'expected' }
+      expect(Slack::RealTime::Client).to receive(:new).with(token: 'token').and_return(client)
+      expect { subject.start_async }.to raise_error RuntimeError, 'expected'
+    end
+    it 'stops client' do
+      expect(Slack::RealTime::Client).to receive(:new).with(token: 'token').and_return(client)
+      expect(subject.send(:client)).to_not be nil
+      expect(client).to receive(:started?).and_return(true)
+      subject.stop!
+    end
+  end
+  context 'retries on rtm.start errors' do
+    let(:client) { Slack::RealTime::Client.new }
+    let(:logger) { subject.send :logger }
+    before do
+      allow(subject).to receive(:auth!)
+      allow(subject).to receive(:sleep)
+      allow(SlackRubyBot::Server).to receive(:auth!)
+      expect(Slack::RealTime::Client).to receive(:new).twice.and_return(client)
+      expect(logger).to receive(:error).twice
+    end
+    it 'migration_in_progress', vcr: { cassette_name: 'migration_in_progress' } do
+      expect do
+        subject.run
+      end.to raise_error Slack::Web::Api::Error, 'unknown'
+    end
+    [Faraday::Error::ConnectionFailed, Faraday::Error::TimeoutError, Faraday::Error::SSLError].each do |err|
+      it "#{err}" do
+        expect(client).to receive(:start!) { fail err, 'Faraday' }
+        expect(client).to receive(:start!) { fail 'unknown' }
+        expect do
+          subject.run
+        end.to raise_error 'unknown'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -30,16 +30,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: giphy
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: websocket-driver
+  name: giphy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -186,10 +186,10 @@ files:
 - TUTORIAL.md
 - UPGRADING.md
 - examples/minimal/Gemfile
-- examples/minimal/Gemfile.lock
 - examples/minimal/Procfile
 - examples/minimal/pongbot.rb
 - examples/weather/Gemfile
+- examples/weather/Procfile
 - examples/weather/weatherbot.rb
 - lib/config/application.rb
 - lib/config/boot.rb
@@ -198,6 +198,7 @@ files:
 - lib/slack-ruby-bot.rb
 - lib/slack-ruby-bot/about.rb
 - lib/slack-ruby-bot/app.rb
+- lib/slack-ruby-bot/client.rb
 - lib/slack-ruby-bot/commands.rb
 - lib/slack-ruby-bot/commands/about.rb
 - lib/slack-ruby-bot/commands/base.rb
@@ -218,6 +219,7 @@ files:
 - lib/slack-ruby-bot/rspec/support/slack_api_key.rb
 - lib/slack-ruby-bot/rspec/support/slack_ruby_bot_configure.rb
 - lib/slack-ruby-bot/rspec/support/vcr.rb
+- lib/slack-ruby-bot/server.rb
 - lib/slack-ruby-bot/version.rb
 - lib/slack_ruby_bot.rb
 - screenshots/aliases.gif
@@ -231,6 +233,7 @@ files:
 - spec/slack-ruby-bot/commands/about_spec.rb
 - spec/slack-ruby-bot/commands/aliases_spec.rb
 - spec/slack-ruby-bot/commands/commands_precedence_spec.rb
+- spec/slack-ruby-bot/commands/commands_regexp_escape_spec.rb
 - spec/slack-ruby-bot/commands/commands_spaces_spec.rb
 - spec/slack-ruby-bot/commands/commands_spec.rb
 - spec/slack-ruby-bot/commands/commands_with_block_spec.rb
@@ -248,7 +251,9 @@ files:
 - spec/slack-ruby-bot/commands/send_message_spec.rb
 - spec/slack-ruby-bot/commands/send_message_with_gif_spec.rb
 - spec/slack-ruby-bot/commands/unknown_spec.rb
+- spec/slack-ruby-bot/config_spec.rb
 - spec/slack-ruby-bot/rspec/respond_with_error_spec.rb
+- spec/slack-ruby-bot/server_spec.rb
 - spec/slack-ruby-bot/version_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/dblock/slack-ruby-bot
@@ -280,6 +285,7 @@ test_files:
 - spec/slack-ruby-bot/commands/about_spec.rb
 - spec/slack-ruby-bot/commands/aliases_spec.rb
 - spec/slack-ruby-bot/commands/commands_precedence_spec.rb
+- spec/slack-ruby-bot/commands/commands_regexp_escape_spec.rb
 - spec/slack-ruby-bot/commands/commands_spaces_spec.rb
 - spec/slack-ruby-bot/commands/commands_spec.rb
 - spec/slack-ruby-bot/commands/commands_with_block_spec.rb
@@ -297,6 +303,8 @@ test_files:
 - spec/slack-ruby-bot/commands/send_message_spec.rb
 - spec/slack-ruby-bot/commands/send_message_with_gif_spec.rb
 - spec/slack-ruby-bot/commands/unknown_spec.rb
+- spec/slack-ruby-bot/config_spec.rb
 - spec/slack-ruby-bot/rspec/respond_with_error_spec.rb
+- spec/slack-ruby-bot/server_spec.rb
 - spec/slack-ruby-bot/version_spec.rb
 - spec/spec_helper.rb