slack-bot-server 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2057d536126e6a0d8c97aeaae58e2e3daaf91de1
-  data.tar.gz: 88d0b466fd378b2478eeb5daf8195e67b28aaa1a
+  metadata.gz: 8cc965f9cb1a969b0ea3f1b58f467084aa308552
+  data.tar.gz: b409898adb366f5420d6403f83015b0c05a366d1
 SHA512:
-  metadata.gz: 691c0b764c00490f6dab7fbd3af1b1aefac684c03dc26260bd182f491cca8a4b928197799b9d6ad0023ae388c3ec84cfaed1bca3512052518f21506f2ce7a557
-  data.tar.gz: ecf4e0f45c96aa35ebe37d46dd06a8cc28d31734f8db62e3cc67ba70d299dcf1c95291ad7929f1bfa995dce0c606b46ea185fb9ea31f4ab3fdbda4425a04276c
+  metadata.gz: e0488b12f7bb24e7310e974e07f24d0775bc4d977783066c94bd0460c27e36d56540807cbd498362d6b163cff19aff16266388dacd8f43123b056031288cba89
+  data.tar.gz: c6a89f534877ea4ca3433ad8ee2e732f2fc4c848750f90a6e7a129a98d4d0e724e2d0af7b027ba5b8b44f452d0f1514246d68e58bb3463acf7ab875a0bb3b55f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Unreleased
+
+### Changes
+- Re-use error raising from within Slack::Web::Api
+- Prevent bots with the same key as existing bots from being added (@keydunov)
+
 ## 0.4.1
 
 ### Changes

data/README.md

@@ -11,7 +11,7 @@ This server is designed to hopefully make it easier to manage running bots for m
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'slack_bot_server'
+gem 'slack-bot-server'
 ```
 
 And then execute:
@@ -20,7 +20,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install slack_bot_server
+    $ gem install slack-bot-server
 
 ## Usage
 
@@ -53,7 +53,16 @@ end
 server.start
 ```
 
-Running this script will start a server and keep it running; you may wish to use a tool like [Foreman](http://ddollar.github.io/foreman/) to actually start it and manage it in production.
+If you're using Rails, I'd suggest you create your script as `bin/slack_server` (i.e. a file called `slack_server` in the `bin` directory you already have)
+
+Running this script will start a server and keep it running; you may wish to use a tool like [Foreman](http://ddollar.github.io/foreman/) to actually start it and manage it in production. Here's a sample `Procfile`:
+
+```
+web: bundle exec rails server
+slack_server: bundle exec rails runner bin/slack_server
+```
+
+By running the `bin/slack_server` script using `rails runner`, your bots get access to all the Rails models and libraries even when they are running outside of the main Rails web processes.
 
 ### Advanced server example
 

data/lib/slack_bot_server/bot.rb

@@ -37,8 +37,8 @@ class SlackBotServer::Bot
 
   attr_reader :key, :token, :client
 
-  # Raised if Slack rejected the token during authentication.
-  class InvalidToken < RuntimeError; end
+  # Raised if there was an error while trying to connect to Slack
+  class ConnectionError < Slack::Web::Api::Error; end
 
   # Create a new bot.
   # This is normally called from within the block passed to
@@ -51,13 +51,10 @@ class SlackBotServer::Bot
   def initialize(token:, key: nil)
     @token = token
     @key = key || @token
-    @client = ::Slack::RealTime::Client.new(token: @token)
     @im_channels = []
     @channels = []
     @connected = false
     @running = false
-
-    raise InvalidToken unless @client.web_client.auth_test['ok']
   end
 
   # Returns the username (for @ replying) of the bot user we are connected as,
@@ -151,6 +148,7 @@ class SlackBotServer::Bot
   # when it is ready for the bot to connect
   # @see Server#start
   def start
+    @client = ::Slack::RealTime::Client.new(token: @token)
     @running = true
 
     @client.on :open do |event|
@@ -192,6 +190,8 @@ class SlackBotServer::Bot
     end
 
     @client.start_async
+  rescue Slack::Web::Api::Error => e
+    raise ConnectionError.new(e.message, e.response)
   end
 
   # Stops the bot from running. You should not call this method; instead
@@ -353,9 +353,7 @@ class SlackBotServer::Bot
   end
 
   on :finish do
-    if @running
-      start
-    end
+    start if @running
   end
 
   # Returns a String representation of this {Bot}
@@ -396,11 +394,11 @@ class SlackBotServer::Bot
   end
 
   def load_channels
-    log "Loading channels"
+    debug "Loading channels"
     @im_channels = @client.ims
-    log im_channels: @im_channels
+    debug im_channels: @im_channels
     @channels = @client.channels.select { |d| d['is_member'] == true }
-    log channels: @channels
+    debug channels: @channels
   end
 
   def channel(id)

data/lib/slack_bot_server/server.rb

@@ -99,7 +99,7 @@ class SlackBotServer::Server
   # @see #on_add
   def add_bot(*args)
     bot = @add_proc.call(*args)
-    if bot.respond_to?(:start)
+    if bot.respond_to?(:start) && !bot(bot.key)
       log "adding bot #{bot}"
       @bots[bot.key.to_sym] = bot
       bot.start if @running
@@ -136,7 +136,7 @@ class SlackBotServer::Server
   def process_instruction(instruction)
     type, *args = instruction
     bot_key = args.shift
-    if type == :add_bot
+    if type.to_sym == :add_bot
       log "adding bot: #{bot_key} #{args.inspect}"
       add_bot(bot_key, *args)
     else

data/lib/slack_bot_server/version.rb

@@ -1,4 +1,4 @@
 module SlackBotServer
   # The current version of the +SlackBotServer+ framework
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/slack_bot_server.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "slack-ruby-client", "~> 0.5"
+  spec.add_dependency "slack-ruby-client", "~> 0.5.3"
   spec.add_dependency "faye-websocket", "~> 0.10"
   spec.add_dependency "multi_json"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-bot-server
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - James Adam
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement