slack-ruby-bot 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c2b1b2adc7654b7b32b85a73168351eadc504cf
-  data.tar.gz: 2a18eb90029dbc968be4a165e461aa206d445bc2
+  metadata.gz: 875e496a2ad1228dd53fb09a429cef5d26bb2b33
+  data.tar.gz: 115852404bdba1534728728a3cd56cf818c4ac0e
 SHA512:
-  metadata.gz: fbb72cee5e317f55e5cc9a91d290f7ccd9c8ee4053882fc72ef30451f662a49a8f089733685a695ba7d8fc819efc28ecc39b2242c55b33805208c79ad52bf65d
-  data.tar.gz: 7619f31f2cd84de42bd7cc64ccc92de66dbc749d8a2494d9a41a11bc64263f3c8c7af65601ea9b51cde19010e8436efdd18e84a56de4554c2325da3dd558a202
+  metadata.gz: e7442eeded435d0f5b23b63310086946170f8c15b51b9bf4d45592a01197aa3eaf95ef27df7bbaa6bab1290c538b0ebb1847f030d5979cc7e43db0385a7c00bd
+  data.tar.gz: 670e97f790446e1974429ac8dad199e6a3312356df6b55f28ed605e9464262468c9527f0b0f6a768ad9e7f125d8d652c704722db96d018e7a6cea92358b3b65e

data/.rubocop_todo.yml

@@ -1,5 +1,5 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2016-01-24 08:58:25 -0500 using RuboCop version 0.32.1.
+# on 2016-02-02 07:10:58 -0500 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
@@ -9,7 +9,7 @@
 Lint/HandleExceptions:
   Enabled: false
 
-# Offense count: 7
+# Offense count: 6
 Metrics/AbcSize:
   Max: 28
 
@@ -17,21 +17,21 @@ Metrics/AbcSize:
 Metrics/CyclomaticComplexity:
   Max: 8
 
-# Offense count: 113
+# Offense count: 126
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 145
+  Max: 158
 
 # Offense count: 6
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 22
+  Max: 21
 
 # Offense count: 2
 Metrics/PerceivedComplexity:
   Max: 8
 
-# Offense count: 18
+# Offense count: 19
 Style/Documentation:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.6.2 (2/4/2016)
+
+* [#44](https://github.com/dblock/slack-ruby-bot/pull/44): Bot graceful shutdown - [@accessd](https://github.com/accessd).
+
 ### 0.6.1 (1/29/2016)
 
 * [#43](https://github.com/dblock/slack-ruby-bot/issues/43): Issuing a `bot` command terminates bot - [@dblock](https://github.com/dblock).

data/README.md

@@ -17,7 +17,7 @@ A generic Slack bot framework written in Ruby on top of [slack-ruby-client](http
 
 ## Stable Release
 
-You're reading the documentation for the **stable** release of slack-ruby-bot 0.6.1. See [CHANGELOG](CHANGELOG.md) for a history of changes and [UPGRADING](UPGRADING.md) for how to upgrade to more recent versions.
+You're reading the documentation for the **stable** release of slack-ruby-bot. See [CHANGELOG](CHANGELOG.md) for a history of changes and [UPGRADING](UPGRADING.md) for how to upgrade to more recent versions.
 
 ## Usage
 

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

@@ -4,93 +4,97 @@ module SlackRubyBot
       include Loggable
       class_attribute :routes
 
-      def self.send_message(client, channel, text, options = {})
-        logger.warn '[DEPRECATION] `send_message` is deprecated.  Please use `client.say` instead.'
-        if text && text.length > 0
-          client.say(options.merge(channel: channel, text: text))
-        else
-          client.say(options.merge(channel: channel, text: 'Nothing to see here.', gif: 'nothing'))
+      class << self
+        def send_message(client, channel, text, options = {})
+          logger.warn '[DEPRECATION] `send_message` is deprecated.  Please use `client.say` instead.'
+          if text && text.length > 0
+            client.say(options.merge(channel: channel, text: text))
+          else
+            client.say(options.merge(channel: channel, text: 'Nothing to see here.', gif: 'nothing'))
+          end
         end
-      end
 
-      def self.send_message_with_gif(client, channel, text, keywords, options = {})
-        logger.warn '[DEPRECATION] `send_message_with_gif` is deprecated.  Please use `client.say` instead.'
-        client.say(options.merge(channel: channel, text: text, gif: keywords))
-      end
+        def send_message_with_gif(client, channel, text, keywords, options = {})
+          logger.warn '[DEPRECATION] `send_message_with_gif` is deprecated.  Please use `client.say` instead.'
+          client.say(options.merge(channel: channel, text: text, gif: keywords))
+        end
 
-      def self.send_gif(client, channel, keywords, options = {})
-        logger.warn '[DEPRECATION] `send_gif` is deprecated.  Please use `client.say` instead.'
-        client.say(options.merge(channel: channel, text: '', gif: keywords))
-      end
+        def send_gif(client, channel, keywords, options = {})
+          logger.warn '[DEPRECATION] `send_gif` is deprecated.  Please use `client.say` instead.'
+          client.say(options.merge(channel: channel, text: '', gif: keywords))
+        end
 
-      def self.default_command_name
-        name && name.split(':').last.downcase
-      end
+        def default_command_name
+          name && name.split(':').last.downcase
+        end
 
-      def self.operator(*values, &block)
-        values.each do |value|
-          match Regexp.new("^(?<operator>\\#{value})(?<expression>.*)$", Regexp::IGNORECASE), &block
+        def operator(*values, &block)
+          values.each do |value|
+            match Regexp.new("^(?<operator>\\#{value})(?<expression>.*)$", Regexp::IGNORECASE), &block
+          end
         end
-      end
 
-      def self.command(*values, &block)
-        values.each do |value|
-          escaped = Regexp.escape(value)
-          match Regexp.new("^(?<bot>[[:alnum:][:punct:]@<>]*)[\\s]+(?<command>#{escaped})$", Regexp::IGNORECASE), &block
-          match Regexp.new("^(?<bot>[[:alnum:][:punct:]@<>]*)[\\s]+(?<command>#{escaped})[\\s]+(?<expression>.*)$", Regexp::IGNORECASE), &block
+        def command(*values, &block)
+          values.each do |value|
+            escaped = Regexp.escape(value)
+            match Regexp.new("^(?<bot>[[:alnum:][:punct:]@<>]*)[\\s]+(?<command>#{escaped})$", Regexp::IGNORECASE), &block
+            match Regexp.new("^(?<bot>[[:alnum:][:punct:]@<>]*)[\\s]+(?<command>#{escaped})[\\s]+(?<expression>.*)$", Regexp::IGNORECASE), &block
+          end
         end
-      end
 
-      def self.invoke(client, data)
-        self.finalize_routes!
-        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') && !client.name?(match['bot'])
-          called = true
-          if method
-            method.call(client, data, match)
-          elsif self.respond_to?(:call)
-            send(:call, client, data, match)
-          else
-            fail NotImplementedError, data.text
+        def invoke(client, data)
+          finalize_routes!
+          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') && !client.name?(match['bot'])
+            called = true
+            if method
+              method.call(client, data, match)
+            elsif respond_to?(:call)
+              send(:call, client, data, match)
+            else
+              fail NotImplementedError, data.text
+            end
+            break
           end
-          break
+          called
         end
-        called
-      end
 
-      def self.match(match, &block)
-        self.routes ||= {}
-        self.routes[match] = block
-      end
+        def match(match, &block)
+          self.routes ||= {}
+          self.routes[match] = block
+        end
 
-      def self.parse(client, data)
-        text = data.text
-        return text unless direct_message?(data) && message_from_another_user?(data)
-        return text if bot_mentioned_in_message?(text, client.names)
-        ["#{client.name} #{text}", text]
-      end
+        private
 
-      def self.direct_message?(data)
-        data.channel && data.channel[0] == 'D'
-      end
+        def parse(client, data)
+          text = data.text
+          return text unless direct_message?(data) && message_from_another_user?(data)
+          return text if bot_mentioned_in_message?(text, client.names)
+          ["#{client.name} #{text}", text]
+        end
 
-      def self.message_from_another_user?(data)
-        data.user && data.user != SlackRubyBot.config.user_id
-      end
+        def direct_message?(data)
+          data.channel && data.channel[0] == 'D'
+        end
 
-      def self.bot_mentioned_in_message?(text, bot_names)
-        bot_names = bot_names.join('|')
-        !!text.downcase.match(/\A(#{bot_names})\s|\A(#{bot_names})\z/)
-      end
+        def message_from_another_user?(data)
+          data.user && data.user != SlackRubyBot.config.user_id
+        end
 
-      def self.finalize_routes!
-        return if self.routes && self.routes.any?
-        command default_command_name
+        def bot_mentioned_in_message?(text, bot_names)
+          bot_names = bot_names.join('|')
+          !!text.downcase.match(/\A(#{bot_names})\s|\A(#{bot_names})\z/)
+        end
+
+        def finalize_routes!
+          return if routes && routes.any?
+          command default_command_name
+        end
       end
     end
   end

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

@@ -4,7 +4,6 @@ module SlackRubyBot
       extend Base
 
       def message(client, data)
-        data = Hashie::Mash.new(data)
         return if message_to_self_not_allowed? && message_to_self?(client, data)
         data.text.strip! if data.text
         result = child_command_classes.detect { |d| d.invoke(client, data) }
@@ -20,7 +19,7 @@ module SlackRubyBot
       end
 
       def message_to_self?(client, data)
-        client.self && client.self['id'] == data.user
+        client.self && client.self.id == data.user
       end
 
       #

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

@@ -7,7 +7,7 @@ RSpec::Matchers.define :respond_with_error do |error, error_message|
     begin
       expect do
         client = app.send(:client)
-        app.send(:message, client, text: message, channel: channel, user: user)
+        app.send(:message, client, Hashie::Mash.new(text: message, channel: channel, user: user))
       end.to raise_error error, error_message
     rescue RSpec::Expectations::ExpectationNotMetError => e
       @error_message = e.message

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

@@ -6,7 +6,7 @@ RSpec::Matchers.define :respond_with_slack_message do |expected|
     allow(Giphy).to receive(:random)
     client = app.send(:client)
     expect(client).to receive(:message).with(channel: channel, text: expected)
-    app.send(:message, client, text: message, channel: channel, user: user)
+    app.send(:message, client, Hashie::Mash.new(text: message, channel: channel, user: user))
     true
   end
 

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

@@ -2,9 +2,9 @@ module SlackRubyBot
   class Server
     include Loggable
     cattr_accessor :hooks
-    attr_accessor :token
-    attr_accessor :aliases
-    attr_accessor :send_gifs
+    attr_accessor :token, :aliases, :send_gifs
+
+    TRAPPED_SIGNALS = %w(INT TERM).freeze
 
     include SlackRubyBot::Hooks::Hello
     include SlackRubyBot::Hooks::Message
@@ -18,24 +18,9 @@ module SlackRubyBot
     def run
       auth!
       loop do
-        begin
+        handle_execeptions do
+          handle_signals
           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
@@ -63,11 +48,7 @@ module SlackRubyBot
     end
 
     def restart!(wait = 1)
-      if @async
-        start_async
-      else
-        start!
-      end
+      @async ? start_async : start!
     rescue StandardError => e
       sleep wait
       logger.error "#{e.message}, reconnecting in #{wait} second(s)."
@@ -77,6 +58,35 @@ module SlackRubyBot
 
     private
 
+    def handle_execeptions
+      yield
+    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
+
+    def handle_signals
+      TRAPPED_SIGNALS.each do |signal|
+        Signal.trap(signal) do
+          stop!
+          exit
+        end
+      end
+    end
+
     def client
       @client ||= begin
         client = SlackRubyBot::Client.new(aliases: aliases, send_gifs: send_gifs, token: token)

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

@@ -1,3 +1,3 @@
 module SlackRubyBot
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 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.5.0'
+  s.add_dependency 'slack-ruby-client', '>= 0.6.0'
   s.add_dependency 'faye-websocket'
   s.add_dependency 'activesupport'
   s.add_dependency 'giphy', '~> 2.0.2'

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

@@ -14,7 +14,7 @@ describe SlackRubyBot::Bot do
   let(:client) { app.send(:client) }
   it 'sends a message' do
     expect(client).to receive(:message).with(channel: 'channel', text: 'message')
-    app.send(:message, client, text: "#{SlackRubyBot.config.user} bot_spec message", channel: 'channel', user: 'user')
+    app.send(:message, client, Hashie::Mash.new(text: "#{SlackRubyBot.config.user} bot_spec message", channel: 'channel', user: 'user'))
   end
   it 'sends a message' do
     expect(message: "#{SlackRubyBot.config.user} bot_spec message").to respond_with_slack_message('message')

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

@@ -19,21 +19,21 @@ describe SlackRubyBot::Commands do
     expect(message: "#{SlackRubyBot.config.user} saybye arg1 arg2").to respond_with_slack_message('saybye: arg1 arg2')
   end
   it 'checks for direct message' do
-    expect(command.direct_message?(Hashie::Mash.new(channel: 'D0K79RKJ7'))).to be true
-    expect(command.direct_message?(Hashie::Mash.new(channel: 'S0K79RKJ7'))).to be false
+    expect(command.send(:direct_message?, Hashie::Mash.new(channel: 'D0K79RKJ7'))).to be true
+    expect(command.send(:direct_message?, Hashie::Mash.new(channel: 'S0K79RKJ7'))).to be false
   end
   it 'checks that message from another user' do
     SlackRubyBot.config.user_id = 'UDEADBEEF'
-    expect(command.message_from_another_user?(Hashie::Mash.new(user: 'U0CPHNZ2N'))).to be true
-    expect(command.message_from_another_user?(Hashie::Mash.new(user: 'UDEADBEEF'))).to be false
+    expect(command.send(:message_from_another_user?, Hashie::Mash.new(user: 'U0CPHNZ2N'))).to be true
+    expect(command.send(:message_from_another_user?, Hashie::Mash.new(user: 'UDEADBEEF'))).to be false
   end
   it 'checks that bot mentioned in message' do
     bot_names = ['rubybot', '<@deadbeef>', '<@deadbeef>:', 'rubybot:']
-    expect(command.bot_mentioned_in_message?('rubybot', bot_names)).to be true
-    expect(command.bot_mentioned_in_message?('rubybot ', bot_names)).to be true
-    expect(command.bot_mentioned_in_message?('rubybotbot', bot_names)).to be false
-    expect(command.bot_mentioned_in_message?('rubybot:', bot_names)).to be true
-    expect(command.bot_mentioned_in_message?('rubybot: ', bot_names)).to be true
-    expect(command.bot_mentioned_in_message?('rubybot:bot', bot_names)).to be false
+    expect(command.send(:bot_mentioned_in_message?, 'rubybot', bot_names)).to be true
+    expect(command.send(:bot_mentioned_in_message?, 'rubybot ', bot_names)).to be true
+    expect(command.send(:bot_mentioned_in_message?, 'rubybotbot', bot_names)).to be false
+    expect(command.send(:bot_mentioned_in_message?, 'rubybot:', bot_names)).to be true
+    expect(command.send(:bot_mentioned_in_message?, 'rubybot: ', bot_names)).to be true
+    expect(command.send(:bot_mentioned_in_message?, 'rubybot:bot', bot_names)).to be false
   end
 end

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

@@ -17,6 +17,6 @@ describe SlackRubyBot::Commands do
   it 'sends default text' do
     allow(Giphy).to receive(:random)
     expect(client).to receive(:message).with(channel: 'channel', text: '')
-    app.send(:message, client, text: "#{SlackRubyBot.config.user} empty_text", channel: 'channel', user: 'user')
+    app.send(:message, client, Hashie::Mash.new(text: "#{SlackRubyBot.config.user} empty_text", channel: 'channel', user: 'user'))
   end
 end

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

@@ -6,13 +6,13 @@ describe SlackRubyBot::App do
   end
   let(:client) { subject.send(:client) }
   before do
-    allow(client).to receive(:self).and_return('id' => 'UDEADBEEF')
+    allow(client).to receive(:self).and_return(Hashie::Mash.new('id' => 'UDEADBEEF'))
     allow(Giphy).to receive(:random)
   end
   context 'default' do
     it 'does not respond to self' do
       expect(client).to_not receive(:message)
-      subject.send(:message, client, text: "#{SlackRubyBot.config.user} hi", channel: 'channel', user: 'UDEADBEEF')
+      subject.send(:message, client, Hashie::Mash.new(text: "#{SlackRubyBot.config.user} hi", channel: 'channel', user: 'UDEADBEEF'))
     end
   end
   context 'with allow_message_loops=true' do
@@ -28,7 +28,7 @@ describe SlackRubyBot::App do
     end
     it 'responds to self' do
       expect(client).to receive(:message)
-      subject.send(:message, client, text: "#{SlackRubyBot.config.user} hi", channel: 'channel', user: 'UDEADBEEF')
+      subject.send(:message, client, Hashie::Mash.new(text: "#{SlackRubyBot.config.user} hi", channel: 'channel', user: 'UDEADBEEF'))
     end
   end
 end

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

@@ -17,6 +17,6 @@ describe SlackRubyBot::Commands do
   it 'ignores nil messages' do
     allow(Giphy).to receive(:random)
     expect(client).to_not receive(:message)
-    app.send(:message, client, text: nil, channel: 'channel', user: 'user')
+    app.send(:message, client, Hashie::Mash.new(text: nil, channel: 'channel', user: 'user'))
   end
 end

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

@@ -17,16 +17,16 @@ describe SlackRubyBot::Commands do
     gif = Giphy::RandomGif.new('image_url' => gif_image_url)
     expect(Giphy).to receive(:random).and_return(gif)
     expect(client).to receive(:message).with(channel: 'channel', text: gif_image_url)
-    app.send(:message, client, text: "#{SlackRubyBot.config.user} send_gif_spec message", channel: 'channel', user: 'user')
+    app.send(:message, client, Hashie::Mash.new(text: "#{SlackRubyBot.config.user} send_gif_spec message", channel: 'channel', user: 'user'))
   end
   it 'eats up the error' do
     expect(Giphy).to receive(:random) { fail 'oh no!' }
     expect(client).to receive(:message).with(channel: 'channel', text: '')
-    app.send(:message, client, text: "#{SlackRubyBot.config.user} send_gif_spec message", channel: 'channel', user: 'user')
+    app.send(:message, client, Hashie::Mash.new(text: "#{SlackRubyBot.config.user} send_gif_spec message", channel: 'channel', user: 'user'))
   end
   it 'eats up nil gif' do
     expect(Giphy).to receive(:random).and_return(nil)
     expect(client).to receive(:message).with(channel: 'channel', text: '')
-    app.send(:message, client, text: "#{SlackRubyBot.config.user} send_gif_spec message", channel: 'channel', user: 'user')
+    app.send(:message, client, Hashie::Mash.new(text: "#{SlackRubyBot.config.user} send_gif_spec message", channel: 'channel', user: 'user'))
   end
 end

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

@@ -14,6 +14,6 @@ describe SlackRubyBot::Commands do
   let(:client) { app.send(:client) }
   it 'sends a message' do
     expect(client).to receive(:message).with(channel: 'channel', text: 'message')
-    app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_spec message", channel: 'channel', user: 'user')
+    app.send(:message, client, Hashie::Mash.new(text: "#{SlackRubyBot.config.user} send_message_spec message", channel: 'channel', user: 'user'))
   end
 end

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

@@ -17,17 +17,17 @@ describe SlackRubyBot::Commands do
     gif = Giphy::RandomGif.new('image_url' => gif_image_url)
     expect(Giphy).to receive(:random).and_return(gif)
     expect(client).to receive(:message).with(channel: 'channel', text: "message\n#{gif_image_url}")
-    app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
+    app.send(:message, client, Hashie::Mash.new(text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user'))
   end
   it 'eats up the error' do
     expect(Giphy).to receive(:random) { fail 'oh no!' }
     expect(client).to receive(:message).with(channel: 'channel', text: 'message')
-    app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
+    app.send(:message, client, Hashie::Mash.new(text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user'))
   end
   it 'eats up nil gif' do
     expect(Giphy).to receive(:random).and_return(nil)
     expect(client).to receive(:message).with(channel: 'channel', text: 'message')
-    app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
+    app.send(:message, client, Hashie::Mash.new(text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user'))
   end
   context 'send_gifs' do
     context 'set to false via client' do
@@ -37,7 +37,7 @@ describe SlackRubyBot::Commands do
       it 'does not send a gif' do
         expect(Giphy).to_not receive(:random)
         expect(client).to receive(:message).with(channel: 'channel', text: 'message')
-        app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
+        app.send(:message, client, Hashie::Mash.new(text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user'))
       end
       after do
         client.send_gifs = true
@@ -50,7 +50,7 @@ describe SlackRubyBot::Commands do
       it 'does not send a gif' do
         expect(Giphy).to_not receive(:random)
         expect(client).to receive(:message).with(channel: 'channel', text: 'message')
-        app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
+        app.send(:message, client, Hashie::Mash.new(text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user'))
       end
       after do
         SlackRubyBot::Config.reset!
@@ -63,7 +63,7 @@ describe SlackRubyBot::Commands do
       it 'does not send a gif' do
         expect(Giphy).to_not receive(:random)
         expect(client).to receive(:message).with(channel: 'channel', text: 'message')
-        app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
+        app.send(:message, client, Hashie::Mash.new(text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user'))
       end
       after do
         ENV.delete 'SLACK_RUBY_BOT_SEND_GIFS'

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

@@ -13,6 +13,6 @@ describe SlackRubyBot::Commands::Unknown do
   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: ':((')
+    SlackRubyBot::App.new.send(:message, client, Hashie::Mash.new(text: ':(('))
   end
 end

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

@@ -70,4 +70,22 @@ describe SlackRubyBot::Server do
       end
     end
   end
+  context 'exits without error' do
+    subject do
+      SlackRubyBot::Server.new(token: 'token')
+    end
+    before do
+      allow(subject).to receive(:auth!)
+      allow(subject).to receive(:start!)
+    end
+    SlackRubyBot::Server::TRAPPED_SIGNALS.each do |signal|
+      it "if #{signal} signal received" do
+        server_pid = fork { subject.run }
+        sleep 0.1
+        Process.kill(signal, server_pid)
+        _, status = Process.waitpid2(server_pid)
+        expect(status.success?).to be true
+      end
+    end
+  end
 end

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: giphy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -170,11 +170,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - DEPLOYMENT.md
@@ -272,17 +272,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: The easiest way to write a Slack bot in Ruby.