slack-ruby-bot 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1348b71125e07ba882c91f785c185b39fd6f169
-  data.tar.gz: be83b12cf72deed88f2b7a85bf4cb68dcb6bf6fa
+  metadata.gz: d81a287c11826ef682f08066d61ea77084f30fac
+  data.tar.gz: ad1bca7b36da88557f9ee1b50acb1f4f929073a4
 SHA512:
-  metadata.gz: ce40f511fb328ea0574b6189ad8dcef5de8401ac79a7c1bee9fb0c06d1bfcf0ccb6744e9fe71c29b302973ac8af713628229cf1a85aea41ae2ec910b185b37da
-  data.tar.gz: 89df71def40ed033436c1703cd15ac08e6f2999f4187c4996101ae022651a6c52a8e60e78466ce4551b357e6f5b53fe95e50b08d650be73677fd744ade9125ce
+  metadata.gz: cfd33b6f5f6e5121d88fb74a24525ce792002e4cb1cf16b4ad36ed242f75df6cfcf7ed055899e61b1d9a2d8a9cdd58d3c85ec41f5894df3cc6dca20c7056dc1f
+  data.tar.gz: 855abd25109430b68e93a7bd1d3f21fc7f5ae54919ea0419a22ce5ecf6624ea35b9eaeed504babc368128077b72df1bbe09216930e971cbcdeb60f5a032f4a57

data/.travis.yml

@@ -1,6 +1,22 @@
-rvm:
-  - 2.3.0
-env:
-  - CONCURRENCY=celluloid-io
-  - CONCURRENCY=faye-websocket
+language: ruby
 
+cache: bundler
+
+matrix:
+  include:
+    - rvm: 2.3.0
+      script:
+        - bundle exec danger
+    - rvm: 2.3.0
+      env: CONCURRENCY=celluloid-io
+    - rvm: 2.3.0
+      env: CONCURRENCY=faye-websocket
+    - rvm: 2.3.0
+      env: CONCURRENCY=celluloid-io WITH_GIPHY=true
+    - rvm: 2.3.0
+      env: CONCURRENCY=faye-websocket WITH_GIPHY=true
+    - rvm: ruby-head
+    - rvm: jruby-head
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head

data/CHANGELOG.md

@@ -1,19 +1,24 @@
+### 0.9.0 (8/29/2016)
+
+* [#89](https://github.com/slack-ruby/slack-ruby-bot/pull/89): Drop giphy dependency - [@tmsrjs](https://github.com/tmsrjs).
+* [#92](https://github.com/slack-ruby/slack-ruby-bot/pull/92): Added [danger](http://danger.systems), PR linting - [@dblock](https://github.com/dblock).
+
 ### 0.8.2 (7/10/2016)
 
-* [#85](https://github.com/dblock/slack-ruby-bot/issues/85): Fix: regression in bot instance logging - [@dblock](https://github.com/dblock).
+* [#85](https://github.com/slack-ruby/slack-ruby-bot/issues/85): Fix: regression in bot instance logging - [@dblock](https://github.com/dblock).
 
 ### 0.8.1 (7/10/2016)
 
-* [#69](https://github.com/dblock/slack-ruby-bot/pull/69): Ability to add help info to bot and commands - [@accessd](https://github.com/accessd).
-* [#75](https://github.com/dblock/slack-ruby-bot/issues/75): Guarantee order of command evaluation - [@dblock](https://github.com/dblock).
-* [#76](https://github.com/dblock/slack-ruby-bot/issues/76): Infinity error when app disabled - [@slayershadow](https://github.com/SlayerShadow).
-* [#81](https://github.com/dblock/slack-ruby-bot/pull/81): Removed dependency on Bundler - [@derekddecker](https://github.com/derekddecker).
-* [#84](https://github.com/dblock/slack-ruby-bot/pull/84): Removed dependency on ActiveSupport - [@rmulligan](https://github.com/rmulligan).
+* [#69](https://github.com/slack-ruby/slack-ruby-bot/pull/69): Ability to add help info to bot and commands - [@accessd](https://github.com/accessd).
+* [#75](https://github.com/slack-ruby/slack-ruby-bot/issues/75): Guarantee order of command evaluation - [@dblock](https://github.com/dblock).
+* [#76](https://github.com/slack-ruby/slack-ruby-bot/issues/76): Infinity error when app disabled - [@slayershadow](https://github.com/SlayerShadow).
+* [#81](https://github.com/slack-ruby/slack-ruby-bot/pull/81): Removed dependency on Bundler - [@derekddecker](https://github.com/derekddecker).
+* [#84](https://github.com/slack-ruby/slack-ruby-bot/pull/84): Removed dependency on ActiveSupport - [@rmulligan](https://github.com/rmulligan).
 
 ### 0.8.0 (5/5/2016)
 
-* [#32](https://github.com/dblock/slack-ruby-bot/issues/32): Don't include `faye-websocket` by default, support `celluloid-io` - [@dblock](https://github.com/dblock).
-* [#54](https://github.com/dblock/slack-ruby-bot/pull/54): Improvements to Hook configuration - [@dramalho](https://github.com/dramalho).
+* [#32](https://github.com/slack-ruby/slack-ruby-bot/issues/32): Don't include `faye-websocket` by default, support `celluloid-io` - [@dblock](https://github.com/dblock).
+* [#54](https://github.com/slack-ruby/slack-ruby-bot/pull/54): Improvements to Hook configuration - [@dramalho](https://github.com/dramalho).
 
 ### 0.7.0 (3/6/2016)
 
@@ -23,12 +28,12 @@
 
 ### 0.6.2 (2/4/2016)
 
-* [#44](https://github.com/dblock/slack-ruby-bot/pull/44): Bot graceful shutdown - [@accessd](https://github.com/accessd).
+* [#44](https://github.com/slack-ruby/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).
-* [#40](https://github.com/dblock/slack-ruby-bot/pull/40): Added `SlackRubyBot::Config.reset!` - [@accessd](https://github.com/accessd).
+* [#43](https://github.com/slack-ruby/slack-ruby-bot/issues/43): Issuing a `bot` command terminates bot - [@dblock](https://github.com/dblock).
+* [#40](https://github.com/slack-ruby/slack-ruby-bot/pull/40): Added `SlackRubyBot::Config.reset!` - [@accessd](https://github.com/accessd).
 
 ### 0.6.0 (1/9/2016)
 
@@ -44,7 +49,7 @@
 
 ### 0.5.3 (12/28/2015)
 
-* [#36](https://github.com/dblock/slack-ruby-bot/issues/36): Fix: non-English bot aliases now work - [@dblock](https://github.com/dblock).
+* [#36](https://github.com/slack-ruby/slack-ruby-bot/issues/36): Fix: non-English bot aliases now work - [@dblock](https://github.com/dblock).
 
 ### 0.5.2 (12/26/2015)
 
@@ -53,7 +58,7 @@
 ### 0.5.1 (12/23/2015)
 
 * Fix: restart sync vs. async - [@dblock](https://github.com/dblock).
-* [#33](https://github.com/dblock/slack-ruby-bot/pull/33): `SlackRubyBot::App.instance` now creates an instance of the class on which it is called - [@dmvt](https://github.com/dmvt).
+* [#33](https://github.com/slack-ruby/slack-ruby-bot/pull/33): `SlackRubyBot::App.instance` now creates an instance of the class on which it is called - [@dmvt](https://github.com/dmvt).
 
 ### 0.5.0 (12/7/2015)
 
@@ -63,29 +68,29 @@
 * 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).
+* [#29](https://github.com/slack-ruby/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/slack-ruby/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).
-* [#22](https://github.com/dblock/slack-ruby-bot/issues/22), [slack-ruby-client#17](https://github.com/dblock/slack-ruby-client/issues/17): Do not respond to messages from self, override with `allow_message_loops` - [@dblock](https://github.com/dblock).
+* [#23](https://github.com/slack-ruby/slack-ruby-bot/pull/23): Fixed `match` that forced bot name into the expression being evaluated - [@dblock](https://github.com/dblock).
+* [#22](https://github.com/slack-ruby/slack-ruby-bot/issues/22), [slack-ruby-client#17](https://github.com/slack-ruby/slack-ruby-client/issues/17): Do not respond to messages from self, override with `allow_message_loops` - [@dblock](https://github.com/dblock).
 
 ### 0.4.4 (10/5/2015)
 
-* [#17](https://github.com/dblock/slack-ruby-bot/issues/17): Address bot by `name:` - [@dblock](https://github.com/dblock).
-* [#19](https://github.com/dblock/slack-ruby-bot/issues/19): Retry on `Faraday::Error::TimeoutError`, `TimeoutError` and `SSLError` - [@dblock](https://github.com/dblock).
-* [#3](https://github.com/dblock/slack-ruby-bot/issues/3): Retry on `migration_in_progress` errors during `rtm.start` - [@dblock](https://github.com/dblock).
+* [#17](https://github.com/slack-ruby/slack-ruby-bot/issues/17): Address bot by `name:` - [@dblock](https://github.com/dblock).
+* [#19](https://github.com/slack-ruby/slack-ruby-bot/issues/19): Retry on `Faraday::Error::TimeoutError`, `TimeoutError` and `SSLError` - [@dblock](https://github.com/dblock).
+* [#3](https://github.com/slack-ruby/slack-ruby-bot/issues/3): Retry on `migration_in_progress` errors during `rtm.start` - [@dblock](https://github.com/dblock).
 * Respond to direct messages without being addressed by name - [@dblock](https://github.com/dblock).
 * Added `send_gif`, to allow GIFs to be sent without text - [@maclover7](https://github.com/maclover7).
 
 ### 0.4.3 (8/21/2015)
 
-* [#13](https://github.com/dblock/slack-ruby-bot/issues/13): You can now address the bot by its Slack @id - [@dblock](https://github.com/dblock).
+* [#13](https://github.com/slack-ruby/slack-ruby-bot/issues/13): You can now address the bot by its Slack @id - [@dblock](https://github.com/dblock).
 
 ### 0.4.2 (8/20/2015)
 
-* [#12](https://github.com/dblock/slack-ruby-bot/issues/12): Added support for bot aliases - [@dblock](https://github.com/dblock).
+* [#12](https://github.com/slack-ruby/slack-ruby-bot/issues/12): Added support for bot aliases - [@dblock](https://github.com/dblock).
 
 ### 0.4.1 (7/25/2015)
 
@@ -93,18 +98,18 @@
 
 ### 0.4.0 (7/25/2015)
 
-* Using [slack-ruby-client](https://github.com/dblock/slack-ruby-client) - [@dblock](https://github.com/dblock).
+* Using [slack-ruby-client](https://github.com/slack-ruby/slack-ruby-client) - [@dblock](https://github.com/dblock).
 * Use RealTime API to post messages - [@dblock](https://github.com/dblock).
 
 ### 0.3.1 (7/21/2015)
 
-* [#8](https://github.com/dblock/slack-ruby-bot/issues/8): Fix: `undefined method 'strip!' for nil:NilClass` on nil message - [@dblock](https://github.com/dblock).
+* [#8](https://github.com/slack-ruby/slack-ruby-bot/issues/8): Fix: `undefined method 'strip!' for nil:NilClass` on nil message - [@dblock](https://github.com/dblock).
 
 ### 0.3.0 (7/19/2015)
 
-* [#5](https://github.com/dblock/slack-ruby-bot/issues/5): Added support for free-formed routes via `match` - [@dblock](https://github.com/dblock).
-* [#6](https://github.com/dblock/slack-ruby-bot/issues/6): Commands and operators take blocks - [@dblock](https://github.com/dblock).
-* [#4](https://github.com/dblock/slack-ruby-bot/issues/4): Messages are posted with `as_user: true` by default - [@dblock](https://github.com/dblock).
+* [#5](https://github.com/slack-ruby/slack-ruby-bot/issues/5): Added support for free-formed routes via `match` - [@dblock](https://github.com/dblock).
+* [#6](https://github.com/slack-ruby/slack-ruby-bot/issues/6): Commands and operators take blocks - [@dblock](https://github.com/dblock).
+* [#4](https://github.com/slack-ruby/slack-ruby-bot/issues/4): Messages are posted with `as_user: true` by default - [@dblock](https://github.com/dblock).
 
 ### 0.2.0 (7/10/2015)
 

data/CONTRIBUTING.md

@@ -1,19 +1,19 @@
 # Contributing to SlackRubyBot
 
-This project is work of [many contributors](https://github.com/dblock/slack-ruby-bot/graphs/contributors).
+This project is work of [many contributors](https://github.com/slack-ruby/slack-ruby-bot/graphs/contributors).
 
-You're encouraged to submit [pull requests](https://github.com/dblock/slack-ruby-bot/pulls), [propose features and discuss issues](https://github.com/dblock/slack-ruby-bot/issues).
+You're encouraged to submit [pull requests](https://github.com/slack-ruby/slack-ruby-bot/pulls), [propose features and discuss issues](https://github.com/slack-ruby/slack-ruby-bot/issues).
 
 In the examples below, substitute your Github username for `contributor` in URLs.
 
 ## Fork the Project
 
-Fork the [project on Github](https://github.com/dblock/slack-ruby-bot) and check out your copy.
+Fork the [project on Github](https://github.com/slack-ruby/slack-ruby-bot) and check out your copy.
 
 ```
 git clone https://github.com/contributor/slack-ruby-bot.git
 cd slack-ruby-bot
-git remote add upstream https://github.com/dblock/slack-ruby-bot.git
+git remote add upstream https://github.com/slack-ruby/slack-ruby-bot.git
 ```
 
 ## Bundle Install and Test
@@ -116,7 +116,7 @@ git push origin my-feature-branch -f
 Update the [CHANGELOG](CHANGELOG.md) with the pull request number. A typical entry looks as follows.
 
 ```
-* [#123](https://github.com/dblock/slack-ruby-bot/pull/123): Reticulated splines - [@contributor](https://github.com/contributor).
+* [#123](https://github.com/slack-ruby/slack-ruby-bot/pull/123): Reticulated splines - [@contributor](https://github.com/contributor).
 ```
 
 Amend your previous commit and force push the changes.

data/Dangerfile

@@ -0,0 +1 @@
+# inherits from https://github.com/slack-ruby/danger

data/Gemfile

@@ -3,3 +3,5 @@ source 'http://rubygems.org'
 gemspec
 
 gem ENV['CONCURRENCY'], require: false if ENV.key?('CONCURRENCY')
+gem 'giphy', require: false if ENV.key?('WITH_GIPHY')
+gem 'danger', '~> 2.0'

data/README.md

@@ -2,10 +2,10 @@ 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.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)
+[![Build Status](https://travis-ci.org/slack-ruby/slack-ruby-bot.svg)](https://travis-ci.org/slack-ruby/slack-ruby-bot)
+[![Code Climate](https://codeclimate.com/github/slack-ruby/slack-ruby-bot/badges/gpa.svg)](https://codeclimate.com/github/slack-ruby/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.
+A generic Slack bot framework written in Ruby on top of [slack-ruby-client](https://github.com/slack-ruby/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.
 
 If you are not familiar with Slack bots or Slack API concepts, you might want to watch [this video](http://code.dblock.org/2016/03/11/your-first-slack-bot-service-video.html).
 
@@ -13,8 +13,8 @@ If you are not familiar with Slack bots or Slack API concepts, you might want to
 
 ## Useful to Me?
 
-* If you are just trying to send messages to Slack, use [slack-ruby-client](https://github.com/dblock/slack-ruby-client), which this library is built on top of.
-* If you're trying to roll out a full service with Slack button integration, check out [slack-ruby-bot-server](https://github.com/dblock/slack-ruby-bot-server), which uses this library.
+* If you are just trying to send messages to Slack, use [slack-ruby-client](https://github.com/slack-ruby/slack-ruby-client), which this library is built on top of.
+* If you're trying to roll out a full service with Slack button integration, check out [slack-ruby-bot-server](https://github.com/slack-ruby/slack-ruby-bot-server), which uses this library.
 * Otherwise, this piece of the puzzle will help you create a single bot instance for one team.
 
 ## Stable Release
@@ -132,7 +132,7 @@ You can also capture multiple matchers with `scan`.
 
 ```ruby
 class Market < SlackRubyBot::Bot
-  scan(/(\[A-Z]{2,5})/) do |client, data, stocks|
+  scan(/([A-Z]{2,5})/) do |client, data, stocks|
     # lookup stock market price
   end
 end
@@ -210,11 +210,30 @@ class Phone < SlackRubyBot::Commands::Base
 end
 ```
 
+### Animated GIFs
+
 The `SlackRubyBot::Client` implementation comes with GIF support.
+To enable it simply add `gem 'giphy'` to your **Gemfile**.
+**Note:** Bots send animated GIFs in default commands and errors.
+
+```ruby
+class Phone < SlackRubyBot::Commands::Base
+  command 'call'
 
-#### say(channel: ..., text: ..., gif: ...)
+  def self.call(client, data, match)
+    client.say(channel: data.channel, text: 'called', gif: 'phone')
+    # Sends the text 'called' and a random GIF that matches the keyword 'phone'.
+  end
+end
+```
 
-Sends text and/or a random GIF that matches a keyword using a RealTime client to a channel.
+If you use giphy for something else but don't want your bots to send GIFs you can set `ENV['SLACK_RUBY_BOT_SEND_GIFS']` or `SlackRubyBot::Config.send_gifs` to `false`. The latter takes precedence.
+
+```ruby
+SlackRubyBot.configure do |config|
+  config.send_gifs = false
+end
+```
 
 ### Built-In Commands
 
@@ -291,16 +310,6 @@ These will get pushed into the hook set on initialization.
 
 Either by configuration, explicit assignment or hook blocks, multiple handlers can exist for the same event type.
 
-### 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/RELEASING.md

@@ -11,7 +11,7 @@ bundle install
 rake
 ```
 
-Check that the last build succeeded in [Travis CI](https://travis-ci.org/dblock/slack-ruby-bot) for all supported platforms.
+Check that the last build succeeded in [Travis CI](https://travis-ci.org/slack-ruby/slack-ruby-bot) for all supported platforms.
 
 Increment the version, modify [lib/slack-ruby-bot/version.rb](lib/slack-ruby-bot/version.rb).
 

data/TUTORIAL.md

@@ -10,7 +10,7 @@ A typical production Slack bot is a combination of a vanilla web server and a we
 
 #### Gemfile
 
-Create a `Gemfile` that uses [slack-ruby-bot](https://github.com/dblock/slack-ruby-bot), [sinatra](https://github.com/sinatra/sinatra) (a web framework) and [puma](https://github.com/puma/puma) (a web server). For development we'll also use [foreman](https://github.com/theforeman/foreman) and write tests with [rspec](https://github.com/rspec/rspec).
+Create a `Gemfile` that uses [slack-ruby-bot](https://github.com/slack-ruby/slack-ruby-bot), [sinatra](https://github.com/sinatra/sinatra) (a web framework) and [puma](https://github.com/puma/puma) (a web server). For development we'll also use [foreman](https://github.com/theforeman/foreman) and write tests with [rspec](https://github.com/rspec/rspec).
 
 ```ruby
 source 'http://rubygems.org'

data/UPGRADING.md

@@ -1,6 +1,16 @@
 Upgrading SlackRubyBot
 ======================
 
+### Upgrading to >= 0.9.0
+
+#### Add giphy to your Gemfile for GIF support
+
+The dependency on the `giphy` gem was dropped and GIFs don't appear by default. If you want GIF support, add `gem 'giphy'` to your **Gemfile**.
+
+You should not need to make any changes if you had already disabled GIFs for your bot.
+
+See [#89](https://github.com/slack-ruby/slack-ruby-bot/pull/89) for more information.
+
 ### Upgrading to >= 0.8.0
 
 #### Require a concurrency library
@@ -23,7 +33,7 @@ The regular expression parser for commands will now include a `nil` value for `e
 
 #### Remove any bot.auth! calls
 
-SlackRubyBot 0.6.x versions invoked a method called `auth!`, which caused a pre-flight authentication via Slack Web API `auth_test` method and collected a number of properties, such as client and team ID or name. This method has been removed in favor of using data available in the `Slack::RealTime::Client` local store introduced in [slack-ruby-client#54](https://github.com/dblock/slack-ruby-client/issues/54). Remove any explicit calls to this method.
+SlackRubyBot 0.6.x versions invoked a method called `auth!`, which caused a pre-flight authentication via Slack Web API `auth_test` method and collected a number of properties, such as client and team ID or name. This method has been removed in favor of using data available in the `Slack::RealTime::Client` local store introduced in [slack-ruby-client#54](https://github.com/slack-ruby/slack-ruby-client/issues/54). Remove any explicit calls to this method.
 
 ### Upgrading to >= 0.6.0
 
@@ -132,7 +142,7 @@ Bot.run
 
 ### Upgrading to >= 0.4.0
 
-This version uses [slack-ruby-client](https://github.com/dblock/slack-ruby-client) instead of [slack-ruby-gem](https://github.com/aki017/slack-ruby-gem).
+This version uses [slack-ruby-client](https://github.com/slack-ruby/slack-ruby-client) instead of [slack-ruby-gem](https://github.com/aki017/slack-ruby-gem).
 
 The command interface now takes a `client` parameter, which is the RealTime Messaging API instance. Add the new parameter to all `call` calls in classes that inherit from `SlackRubyBot::Commands::Base`.
 

data/lib/config/boot.rb

@@ -4,4 +4,3 @@ require 'active_support'
 require 'active_support/core_ext'
 require 'hashie'
 require 'slack'
-require 'giphy'

data/lib/initializers/giphy.rb

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

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

@@ -1,7 +1,7 @@
 module SlackRubyBot
   ABOUT = <<-ABOUT.freeze
     #{SlackRubyBot::VERSION}
-    https://github.com/dblock/slack-ruby-bot
+    https://github.com/slack-ruby/slack-ruby-bot
     https://twitter.com/dblockdotorg
   ABOUT
 end

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

@@ -7,7 +7,7 @@ module SlackRubyBot
     def initialize(attrs = {})
       super(attrs)
       @aliases = attrs[:aliases]
-      @send_gifs = attrs.key?(:send_gifs) ? !!attrs[:send_gifs] : true
+      @send_gifs = attrs[:send_gifs]
     end
 
     def names
@@ -30,7 +30,8 @@ module SlackRubyBot
     end
 
     def send_gifs?
-      send_gifs
+      return false unless defined?(Giphy)
+      send_gifs.nil? ? SlackRubyBot::Config.send_gifs? : send_gifs
     end
 
     def name
@@ -52,7 +53,7 @@ module SlackRubyBot
       rescue StandardError => e
         logger.warn "Giphy.random: #{e.message}"
         nil
-      end if SlackRubyBot::Config.send_gifs? && send_gifs? && keywords
+      end if keywords && send_gifs?
       text = [text, gif && gif.image_url.to_s].compact.join("\n")
       message({ text: text }.merge(options))
     end

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

@@ -32,7 +32,7 @@ module SlackRubyBot
 
 For getting description of the command use: *help <command>*
 
-For more information see https://github.com/dblock/slack-ruby-bot, please.
+For more information see https://github.com/slack-ruby/slack-ruby-bot, please.
 TEXT
         end
       end

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

@@ -10,8 +10,9 @@ module SlackRubyBot
     end
 
     def send_gifs?
+      return false unless defined?(Giphy)
       v = boolean_from_env('SLACK_RUBY_BOT_SEND_GIFS')
-      v.nil? ? (send_gifs.nil? || send_gifs) : v
+      send_gifs.nil? ? (v.nil? || v) : send_gifs
     end
 
     def reset!

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

@@ -2,8 +2,6 @@ require 'rspec/expectations'
 
 RSpec::Matchers.define :respond_with_error do |error, error_message|
   match do |actual|
-    allow(Giphy).to receive(:random)
-
     client = if respond_to?(:client)
                send(:client)
              else
@@ -13,6 +11,8 @@ RSpec::Matchers.define :respond_with_error do |error, error_message|
     message_command = SlackRubyBot::Hooks::Message.new
     channel, user, message = parse(actual)
 
+    allow(Giphy).to receive(:random) if defined?(Giphy)
+
     begin
       expect do
         message_command.call(client, Hashie::Mash.new(text: message, channel: channel, user: user))

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

@@ -9,9 +9,9 @@ RSpec::Matchers.define :respond_with_slack_message do |expected|
              end
 
     message_command = SlackRubyBot::Hooks::Message.new
-
     channel, user, message = parse(actual)
-    allow(Giphy).to receive(:random)
+
+    allow(Giphy).to receive(:random) if defined?(Giphy)
 
     expect(client).to receive(:message).with(channel: channel, text: expected)
     message_command.call(client, Hashie::Mash.new(text: message, channel: channel, user: user))

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

@@ -6,4 +6,8 @@ RSpec.configure do |config|
       c.user_id = 'DEADBEEF'
     end
   end
+
+  config.after :each do
+    SlackRubyBot::Config.reset!
+  end
 end

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

@@ -11,7 +11,7 @@ module SlackRubyBot
     def initialize(options = {})
       @token = options[:token]
       @aliases = options[:aliases]
-      @send_gifs = options.key?(:send_gifs) ? !!options[:send_gifs] : true
+      @send_gifs = options[:send_gifs]
 
       # Hook Handling
       flush_hook_blocks

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

@@ -1,3 +1,3 @@
 module SlackRubyBot
-  VERSION = '0.8.2'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/slack-ruby-bot.gemspec

@@ -11,12 +11,11 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
-  s.homepage = 'https://github.com/dblock/slack-ruby-bot'
+  s.homepage = 'https://github.com/slack-ruby/slack-ruby-bot'
   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 'giphy', '~> 2.0.2'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rack-test'

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

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe SlackRubyBot::Client do
+  describe '#send_gifs?' do
+    context 'without giphy is false', unless: ENV.key?('WITH_GIPHY') do
+      it 'by default' do
+        expect(subject.send_gifs?).to be false
+      end
+
+      it 'when set to true' do
+        subject.send_gifs = true
+        expect(subject.send_gifs?).to be false
+      end
+
+      it 'when set to true via config' do
+        SlackRubyBot::Config.send_gifs = true
+        expect(SlackRubyBot::Config.send_gifs?).to be false
+      end
+    end
+
+    context 'with giphy', if: ENV.key?('WITH_GIPHY') do
+      it 'default is true' do
+        expect(subject.send_gifs?).to be true
+      end
+
+      it 'defaults to SlackRubyBot::Config.send_gifs? if set' do
+        SlackRubyBot::Config.send_gifs = false
+        expect(subject.send_gifs?).to be false
+      end
+
+      it 'client setting takes precedence' do
+        SlackRubyBot::Config.send_gifs = true
+        subject.send_gifs = false
+        expect(subject.send_gifs?).to be false
+        SlackRubyBot::Config.send_gifs = false
+        subject.send_gifs = true
+        expect(subject.send_gifs?).to be true
+      end
+    end
+  end
+end

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

@@ -11,7 +11,6 @@ describe SlackRubyBot::Commands do
     end
   end
   it 'sends default text' do
-    allow(Giphy).to receive(:random)
     expect(message: "#{SlackRubyBot.config.user} empty_text", channel: 'channel', user: 'user').to respond_with_slack_message('')
   end
 end

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

@@ -20,7 +20,7 @@ describe SlackRubyBot::Commands::Help do
 
 For getting description of the command use: *help <command>*
 
-For more information see https://github.com/dblock/slack-ruby-bot, please.
+For more information see https://github.com/slack-ruby/slack-ruby-bot, please.
 MSG
 
     expect(message: "#{SlackRubyBot.config.user} help").to respond_with_slack_message(message)

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

@@ -10,7 +10,6 @@ describe SlackRubyBot::App do
 
   before do
     allow(client).to receive(:self).and_return(Hashie::Mash.new('id' => 'UDEADBEEF'))
-    allow(Giphy).to receive(:random)
   end
 
   context 'default' do
@@ -21,18 +20,10 @@ describe SlackRubyBot::App do
   end
   context 'with allow_message_loops=true' do
     before do
-      SlackRubyBot.configure do |config|
-        config.allow_message_loops = true
-      end
-    end
-    after do
-      SlackRubyBot.configure do |config|
-        config.allow_message_loops = nil
-      end
+      SlackRubyBot::Config.allow_message_loops = true
     end
     it 'responds to self' do
-      expect(client).to receive(:message)
-      message_hook.call(client, Hashie::Mash.new(text: "#{SlackRubyBot.config.user} hi", channel: 'channel', user: 'UDEADBEEF'))
+      expect(message: "#{SlackRubyBot.config.user} hi").to respond_with_slack_message('Hi <@user>!')
     end
   end
 end

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

@@ -16,7 +16,6 @@ describe SlackRubyBot::Commands do
   let(:message_hook) { SlackRubyBot::Hooks::Message.new }
 
   it 'ignores nil messages' do
-    allow(Giphy).to receive(:random)
     expect(client).to_not receive(:message)
     message_hook.call(client, Hashie::Mash.new(text: nil, channel: 'channel', user: 'user'))
   end

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SlackRubyBot::Commands do
+describe SlackRubyBot::Commands, if: ENV.key?('WITH_GIPHY') do
   let! :command do
     Class.new(SlackRubyBot::Commands::Base) do
       command 'send_gif_spec' do |client, data, _match|
@@ -10,6 +10,7 @@ describe SlackRubyBot::Commands do
   end
 
   let(:gif_image_url) { 'http://media2.giphy.com/media/pzOijFsdDrsS4/giphy.gif' }
+
   it 'sends a gif' do
     gif = Giphy::RandomGif.new('image_url' => gif_image_url)
     expect(Giphy).to receive(:random).and_return(gif)

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SlackRubyBot::Commands do
+describe SlackRubyBot::Commands, if: ENV.key?('WITH_GIPHY') do
   let! :command do
     Class.new(SlackRubyBot::Commands::Base) do
       command 'send_message_with_gif_spec' do |client, data, match|
@@ -16,7 +16,7 @@ describe SlackRubyBot::Commands do
     expect(message: "#{SlackRubyBot.config.user} send_message_with_gif_spec message").to respond_with_slack_message("message\n#{gif_image_url}")
   end
 
-  it 'eats up the error' do
+  it 'eats up errors' do
     expect(Giphy).to receive(:random) { raise 'oh no!' }
     expect(message: "#{SlackRubyBot.config.user} send_message_with_gif_spec message").to respond_with_slack_message('message')
   end
@@ -26,44 +26,14 @@ describe SlackRubyBot::Commands do
     expect(message: "#{SlackRubyBot.config.user} send_message_with_gif_spec message").to respond_with_slack_message('message')
   end
 
-  context 'send_gifs' do
-    context 'set to false via client' do
-      let(:client) { SlackRubyBot::Client.new }
-
-      before do
-        client.send_gifs = false
-      end
-
-      it 'does not send a gif' do
-        expect(Giphy).to_not receive(:random)
-        expect(message: "#{SlackRubyBot.config.user} send_message_with_gif_spec message").to respond_with_slack_message('message')
-      end
-    end
-
-    context 'set to false via config' do
-      before do
-        SlackRubyBot::Config.send_gifs = false
-      end
-      it 'does not send a gif' do
-        expect(Giphy).to_not receive(:random)
-        expect(message: "#{SlackRubyBot.config.user} send_message_with_gif_spec message").to respond_with_slack_message('message')
-      end
-      after do
-        SlackRubyBot::Config.reset!
-      end
+  context 'when client.send_gifs is false' do
+    let :client do
+      SlackRubyBot::Client.new.tap { |c| c.send_gifs = false }
     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(message: "#{SlackRubyBot.config.user} send_message_with_gif_spec message").to respond_with_slack_message('message')
-      end
-      after do
-        ENV.delete 'SLACK_RUBY_BOT_SEND_GIFS'
-      end
+    it 'does not send a gif' do
+      expect(Giphy).to_not receive(:random)
+      expect(message: "#{SlackRubyBot.config.user} send_message_with_gif_spec message").to respond_with_slack_message('message')
     end
   end
 end

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

@@ -1,57 +1,63 @@
 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
+  describe '.send_gifs?' do
+    after { ENV.delete 'SLACK_RUBY_BOT_SEND_GIFS' }
+
+    context 'without giphy is false', unless: ENV.key?('WITH_GIPHY') do
+      it 'by default' do
         expect(SlackRubyBot::Config.send_gifs?).to be false
       end
-      after do
-        SlackRubyBot::Config.reset!
-      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
+      it 'when set to true' do
+        SlackRubyBot::Config.send_gifs = true
         expect(SlackRubyBot::Config.send_gifs?).to be false
       end
-      after do
-        ENV.delete 'SLACK_RUBY_BOT_SEND_GIFS'
+      it 'when set to true via SLACK_RUBY_BOT_SEND_GIFS' do
+        ENV['SLACK_RUBY_BOT_SEND_GIFS'] = 'true'
+        expect(SlackRubyBot::Config.send_gifs?).to be false
       end
     end
-    context 'set to true' do
-      before do
-        SlackRubyBot::Config.send_gifs = true
-      end
-      it 'is false' do
+    context 'with giphy', if: ENV.key?('WITH_GIPHY') do
+      it 'default is true' do
         expect(SlackRubyBot::Config.send_gifs?).to be true
       end
-      after do
-        SlackRubyBot::Config.reset!
+      context 'set to false' do
+        it 'is false' do
+          SlackRubyBot::Config.send_gifs = false
+          expect(SlackRubyBot::Config.send_gifs?).to be false
+        end
       end
-    end
-    context 'set to true via SLACK_RUBY_BOT_SEND_GIFS' do
-      before do
-        ENV['SLACK_RUBY_BOT_SEND_GIFS'] = 'true'
+      context 'set to false via SLACK_RUBY_BOT_SEND_GIFS' do
+        it 'is false' do
+          ENV['SLACK_RUBY_BOT_SEND_GIFS'] = 'false'
+          expect(SlackRubyBot::Config.send_gifs?).to be false
+        end
       end
-      it 'is false' do
-        expect(SlackRubyBot::Config.send_gifs?).to be true
+      context 'set to true' do
+        it 'is true' do
+          SlackRubyBot::Config.send_gifs = true
+          expect(SlackRubyBot::Config.send_gifs?).to be true
+        end
       end
-      after do
-        ENV.delete 'SLACK_RUBY_BOT_SEND_GIFS'
+      context 'set to true via SLACK_RUBY_BOT_SEND_GIFS' do
+        it 'is true' do
+          ENV['SLACK_RUBY_BOT_SEND_GIFS'] = 'true'
+          expect(SlackRubyBot::Config.send_gifs?).to be true
+        end
+      end
+      context 'when using both methods' do
+        it 'config setting takes precedence' do
+          ENV['SLACK_RUBY_BOT_SEND_GIFS'] = 'true'
+          SlackRubyBot::Config.send_gifs = false
+          expect(SlackRubyBot::Config.send_gifs?).to be false
+          ENV['SLACK_RUBY_BOT_SEND_GIFS'] = 'false'
+          SlackRubyBot::Config.send_gifs = true
+          expect(SlackRubyBot::Config.send_gifs?).to be true
+        end
       end
     end
   end
+
   describe '#reset!' do
     it 'sets all config attributes to nil' do
       SlackRubyBot::Config::ATTRS.each do |attr|

data/spec/slack-ruby-bot/hooks/message_spec.rb

@@ -31,9 +31,6 @@ describe SlackRubyBot::Hooks::Message do
       it do
         expect(message_hook.send(:message_to_self_not_allowed?)).to be false
       end
-      after do
-        SlackRubyBot::Config.reset!
-      end
     end
     context 'with allow_message_loops set to false' do
       before do
@@ -42,9 +39,6 @@ describe SlackRubyBot::Hooks::Message do
       it do
         expect(message_hook.send(:message_to_self_not_allowed?)).to be true
       end
-      after do
-        SlackRubyBot::Config.reset!
-      end
     end
   end
   describe '#message_to_self?' do

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

@@ -3,45 +3,53 @@ require 'spec_helper'
 describe SlackRubyBot::Server do
   let(:logger) { subject.send :logger }
   let(:client) { Slack::RealTime::Client.new }
-  context 'with a token and disabled GIFs' do
-    subject do
-      SlackRubyBot::Server.new(token: 'token', send_gifs: false)
-    end
+
+  describe 'forwards settings to client' do
     before do
       allow(subject).to receive(:sleep)
       allow(logger).to receive(:error)
     end
-    it 'sets GIFs' do
-      expect(subject.send(:client).send_gifs?).to be false
+
+    it 'token' do
+      server = SlackRubyBot::Server.new(token: 'token')
+      expect(server.send(:client).token).to eq 'token'
     end
-  end
-  context 'with a token and aliases' do
-    subject do
-      SlackRubyBot::Server.new(token: 'token', aliases: %w(foo bar))
+
+    it 'send_gifs is false without giphy', unless: ENV.key?('WITH_GIPHY') do
+      server = SlackRubyBot::Server.new(send_gifs: true)
+      expect(server.send(:client).send_gifs?).to be false
     end
-    before do
-      allow(subject).to receive(:sleep)
-      allow(logger).to receive(:error)
+
+    it 'send_gifs', if: ENV.key?('WITH_GIPHY') do
+      server = SlackRubyBot::Server.new(send_gifs: true)
+      expect(server.send(:client).send_gifs?).to be true
+      server = SlackRubyBot::Server.new(send_gifs: false)
+      expect(server.send(:client).send_gifs?).to be false
     end
-    it 'sets aliases' do
-      expect(subject.send(:client).aliases).to eq %w(foo bar)
-      expect(subject.send(:client).names).to include 'foo'
+
+    it 'aliases' do
+      server = SlackRubyBot::Server.new(aliases: %w(foo bar))
+      expect(server.send(:client).aliases).to eq %w(foo bar)
+      expect(server.send(:client).names).to include 'foo'
     end
-    it 'sets GIFs' do
-      expect(subject.send(:client).send_gifs?).to be true
+  end
+
+  describe 'starting/stopping' do
+    subject do
+      SlackRubyBot::Server.new(token: 'token')
     end
     it 'creates a client with a token' do
       expect(client).to receive(:start!) { raise 'expected' }
-      expect(Slack::RealTime::Client).to receive(:new).with(token: 'token', send_gifs: true, aliases: %w(foo bar)).and_return(client)
+      expect(Slack::RealTime::Client).to receive(:new).with(token: 'token', send_gifs: nil, aliases: nil).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) { raise 'expected' }
-      expect(Slack::RealTime::Client).to receive(:new).with(token: 'token', send_gifs: true, aliases: %w(foo bar)).and_return(client)
+      expect(Slack::RealTime::Client).to receive(:new).with(token: 'token', send_gifs: nil, aliases: nil).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', send_gifs: true, aliases: %w(foo bar)).and_return(client)
+      expect(Slack::RealTime::Client).to receive(:new).with(token: 'token', send_gifs: nil, aliases: nil).and_return(client)
       expect(subject.send(:client)).to_not be nil
       expect(client).to receive(:started?).and_return(true)
       subject.stop!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-10 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.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
@@ -150,6 +136,7 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - DEPLOYMENT.md
+- Dangerfile
 - Gemfile
 - LICENSE.md
 - README.md
@@ -212,6 +199,7 @@ files:
 - slack-ruby-bot.gemspec
 - slack.png
 - spec/slack-ruby-bot/app_spec.rb
+- spec/slack-ruby-bot/client_spec.rb
 - spec/slack-ruby-bot/commands/about_spec.rb
 - spec/slack-ruby-bot/commands/aliases_spec.rb
 - spec/slack-ruby-bot/commands/bot_message_spec.rb
@@ -248,7 +236,7 @@ files:
 - spec/slack-ruby-bot/support/loggable_spec.rb
 - spec/slack-ruby-bot/version_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/dblock/slack-ruby-bot
+homepage: https://github.com/slack-ruby/slack-ruby-bot
 licenses:
 - MIT
 metadata: {}
@@ -268,12 +256,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The easiest way to write a Slack bot in Ruby.
 test_files:
 - spec/slack-ruby-bot/app_spec.rb
+- spec/slack-ruby-bot/client_spec.rb
 - spec/slack-ruby-bot/commands/about_spec.rb
 - spec/slack-ruby-bot/commands/aliases_spec.rb
 - spec/slack-ruby-bot/commands/bot_message_spec.rb