slack-ruby-bot-server 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d16d65efc278c6cc7ae66e43012323a7675f45d
-  data.tar.gz: 4a4a3392ab0fb18640a23d6f56f848d731b113e9
+  metadata.gz: 1bd761a554a479830a8e142d3550c0ee9bf277dc
+  data.tar.gz: c0cf2c2735e222f9e5818a02dc8766e0fa7e7e9f
 SHA512:
-  metadata.gz: 074ba2f86c6761a2e5c41f4dbca6bd1f8a5b7d226a19370c297b9fc1b6410d1123784f2f7540e6596498a84e502fdb4fabc733055bd5ceb4ef4a270b94f2393a
-  data.tar.gz: 040856718b74ad9f9fd9ecabd7e3d77c1cdd0257051d3aa126bf82007118696aa63a9152df5b14aa3cc15250c0718f8215934066ffc7360082f445b5e3738ec3
+  metadata.gz: d33bd339c7532d61bedc270d34284ccd481780d8c6594d70e9a63802066888e9ae6023eb138ba5d38573ce5ce591ca33c92f28e8c43fe04e6ccf07c2d436952a
+  data.tar.gz: 92c8bf07d7b922adc710d90855a381eb5a021c6e60aade96f6798d06be9e2dc97edae3bff1e645034c5989519289fac390834f728bfffb31cd0bc8f5948661cb

data/.travis.yml

@@ -1,9 +1,23 @@
-rvm:
-  - 2.2.4
 language: ruby
+
 cache: bundler
+
 services:
   - mongodb
+
+matrix:
+  include:
+    - rvm: 2.3.1
+      script:
+        - bundle exec danger
+    - rvm: 2.3.1
+    - rvm: 2.3.0
+    - rvm: ruby-head
+    - rvm: jruby-head
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"

data/CHANGELOG.md

@@ -1,8 +1,15 @@
 ### Changelog
 
+#### 0.4.0 (8/29/2016)
+
+* [#25](https://github.com/slack-ruby/slack-ruby-bot-server/pull/25): Added [danger](http://danger.systems), PR linting - [@dblock](https://github.com/dblock).
+* The `reset` and `resetting` callbacks have been removed - [@dblock](https://github.com/dblock).
+* Callbacks receive `team` and `error`, but no longer `server` - [@dblock](https://github.com/dblock).
+* [#23](https://github.com/slack-ruby/slack-ruby-bot-server/issues/23): Fix: server-side removal of bot doesn't deactivate it - [@dblock](https://github.com/dblock).
+
 #### 0.3.1 (7/10/2016)
 
-* [#22](https://github.com/dblock/slack-ruby-bot-server/issues/22): Subclassing `SlackRubyBotServer::App` creates an `.instance` of child class - [@dblock](https://github.com/dblock).
+* [#22](https://github.com/slack-ruby/slack-ruby-bot-server/issues/22): Subclassing `SlackRubyBotServer::App` creates an `.instance` of child class - [@dblock](https://github.com/dblock).
 
 #### 0.3.0 (7/4/2016)
 
@@ -12,23 +19,23 @@
 #### 0.2.0 (6/21/2016)
 
 * Relaxed dependency versions, notably enabling grape 0.16.2 and Swagger 0.21.0 that uses Swagger 2.0 spec - [@dblock](https://github.com/dblock).
-* [#21](https://github.com/dblock/slack-ruby-bot-server/issues/21): Fix: pass additional options through into `SlackRubyBot::Server` - [@dblock](https://github.com/dblock).
+* [#21](https://github.com/slack-ruby/slack-ruby-bot-server/issues/21): Fix: pass additional options through into `SlackRubyBot::Server` - [@dblock](https://github.com/dblock).
 
 #### 0.1.1 (6/4/2016)
 
-* [#14](https://github.com/dblock/slack-ruby-bot-server/pull/14): Moved config/initializers into the library - [@tmsrjs](https://github.com/tmsrjs).
+* [#14](https://github.com/slack-ruby/slack-ruby-bot-server/pull/14): Moved config/initializers into the library - [@tmsrjs](https://github.com/tmsrjs).
 
 #### 0.1.0 (6/1/2016)
 
 * Initial public release - [@dblock](https://github.com/dblock).
-* 2016/6/1: Renamed slack-bot-server to slack-ruby-bot-server - [@dblock](https://github.com/dblock).
-* 2016/5/30: [#11](https://github.com/dblock/slack-ruby-bot-server/pull/11) Turn project into gem - [@tmsrjs](https://github.com/tmsrjs).
-* 2016/5/5: Use `celluloid-io` instead of `faye-websocket`, upgrade to slack-ruby-bot 0.8.0 - [@dblock](https://github.com/dblock).
-* 2016/4/18: Fixed `SlackRubyBotServer#reset` - [@dblock](https://github.com/dblock).
-* 2016/4/18: Use Grape 0.15.x - [@dblock](https://github.com/dblock).
-* 2016/4/18: Removed OOB GC - [@dblock](https://github.com/dblock).
-* 2016/2/11: Use Unicorn instead of Puma - [@dblock](https://github.com/dblock).
-* 2016/2/11: Fix: wait for EventMachine reactor to start - [@dblock](https://github.com/dblock).
-* 2016/2/11: Use an OOB GC - [@dblock](https://github.com/dblock).
-* 2016/2/9: Defer start, much faster - [@dblock](https://github.com/dblock).
-* 2016/1/10: Backported changes from slack-metabot and slack-shellbot - [@dblock](https://github.com/dblock).
+* Renamed slack-bot-server to slack-ruby-bot-server - [@dblock](https://github.com/dblock).
+* [#11](https://github.com/slack-ruby/slack-ruby-bot-server/pull/11): Turn project into gem - [@tmsrjs](https://github.com/tmsrjs).
+* Use `celluloid-io` instead of `faye-websocket`, upgrade to slack-ruby-bot 0.8.0 - [@dblock](https://github.com/dblock).
+* Fixed `SlackRubyBotServer#reset` - [@dblock](https://github.com/dblock).
+* Use Grape 0.15.x - [@dblock](https://github.com/dblock).
+* Removed OOB GC - [@dblock](https://github.com/dblock).
+* Use Unicorn instead of Puma - [@dblock](https://github.com/dblock).
+* Fix: wait for EventMachine reactor to start - [@dblock](https://github.com/dblock).
+* Use an OOB GC - [@dblock](https://github.com/dblock).
+* Defer start, much faster - [@dblock](https://github.com/dblock).
+* Backported changes from slack-metabot and slack-shellbot - [@dblock](https://github.com/dblock).

data/Dangerfile

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

data/Gemfile

@@ -19,4 +19,5 @@ group :development, :test do
   gem 'hyperclient'
   gem 'capybara'
   gem 'selenium-webdriver'
+  gem 'danger', '~> 2.0'
 end

data/README.md

@@ -13,7 +13,7 @@ A library that contains a [Grape](http://github.com/ruby-grape/grape) API servin
 
 ### Stable Release
 
-You're reading the documentation for the **stable** release of slack-ruby-bot-server 0.3.1. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
+You're reading the documentation for the **stable** release of slack-ruby-bot-server 0.4.0. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
 
 ### Try Me
 
@@ -76,15 +76,15 @@ You can introduce custom behavior into the service lifecycle via callbacks. This
 ```ruby
 instance = SlackRubyBotServer::Service.instance
 
-instance.on :created do |team, server, error|
+instance.on :created do |team, error|
   # a new team has been registered
 end
 
-instance.on :deactivated do |team, server, error|
+instance.on :deactivated do |team, error|
   # an existing team has been deactivated in Slack
 end
 
-instance.on :error do |team, server, error|
+instance.on :error do |team, error|
   # an error has occurred
 end
 ```
@@ -104,8 +104,6 @@ The following callbacks are supported. All callbacks receive a `team`, except `e
 | started        | the service has (re)connected a team to Slack                    |
 | deactivating   | a team is being deactivated                                      |
 | deactivated    | a team has been deactivated                                      |
-| resetting      | the service is resetting, all teams being stopped                |
-| reset          | the service has been reset, all teams have been stopped          |
 
 #### Server Class
 

data/UPGRADING.md

@@ -1,6 +1,29 @@
 Upgrading Slack-Ruby-Bot-Server
 ===============================
 
+### Upgrading to >= 0.4.0
+
+#### Add giphy to your Gemfile for GIF support
+
+The dependency on the `giphy` gem was dropped in slack-ruby-bot 0.9.0 and GIFs don't appear by default. If you want GIF support, add `gem 'giphy'` to your **Gemfile**.
+
+See [slack-ruby-bot#89](https://github.com/slack-ruby/slack-ruby-bot/pull/89) for more information.
+
+#### Changes in Callbacks
+
+The `SlackRubyBotServer::Service` class used to track services in a `Hash`. This is no longer the case. Callbacks no longer receive a server object for the team, but the latter is assigned as `team.server`.
+
+```ruby
+instance = SlackRubyBotServer::Service.instance
+
+instance.on :started do |team, error|
+  # a new team has been registered
+  # team.server is available
+end
+```
+
+The `reset` and `resetting` callbacks have also been removed.
+
 ### Upgrading to >= 0.3.1
 
 #### Remove Monkey-Patching of SlackRubyBotServer::App

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

@@ -10,6 +10,8 @@ class Team
   field :token, type: String
   field :active, type: Boolean, default: true
 
+  attr_accessor :server # server at runtime
+
   scope :active, -> { where(active: true) }
 
   validates_uniqueness_of :token, message: 'has already been used'

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

@@ -14,8 +14,6 @@ module SlackRubyBotServer
     end
 
     def initialize
-      @lock = Mutex.new
-      @services = {}
       @callbacks = Hash.new { |h, k| h[k] = [] }
     end
 
@@ -25,91 +23,73 @@ module SlackRubyBotServer
 
     def create!(team)
       run_callbacks :creating, team
-      server = start!(team)
-      run_callbacks :created, team, server
+      start!(team)
+      run_callbacks :created, team
     end
 
     def start!(team)
-      raise 'Token already known.' if @services.key?(team.token)
       run_callbacks :starting, team
       logger.info "Starting team #{team}."
       server = SlackRubyBotServer::Config.server_class.new(team: team)
-      @lock.synchronize do
-        @services[team.token] = server
-      end
       start_server! team, server
-      run_callbacks :started, team, server
+      run_callbacks :started, team
       server
     rescue StandardError => e
-      run_callbacks :error, team, nil, e
+      run_callbacks :error, team, e
       logger.error e
     end
 
     def restart!(team, server, wait = 1)
-      run_callbacks :restarting, team, server
+      run_callbacks :restarting, team
       start_server! team, server, wait
-      run_callbacks :restarted, team, server
+      run_callbacks :restarted, team
     end
 
     def stop!(team)
       logger.info "Stopping team #{team}."
-      @lock.synchronize do
-        raise 'Token unknown.' unless @services.key?(team.token)
-        server = @services[team.token]
-        run_callbacks :stopping, team, server
-        server.stop!
-        @services.delete(team.token)
-        run_callbacks :stopped, team, server
-      end
+      run_callbacks :stopping, team
+      team.server.stop! if team.server
+      run_callbacks :stopped, team
     rescue StandardError => e
-      run_callbacks :error, team, @services[team.token], e
+      run_callbacks :error, team, e
       logger.error e
+    ensure
+      team.server = nil
     end
 
     def start_from_database!
       Team.active.each do |team|
         run_callbacks :booting, team
-        server = start!(team)
-        run_callbacks :booted, team, server
+        start!(team)
+        run_callbacks :booted, team
       end
     end
 
     def deactivate!(team)
-      @lock.synchronize do
-        raise 'Token unknown.' unless @services.key?(team.token)
-        server = @services[team.token]
-        run_callbacks :deactivating, team, server
-        team.deactivate!
-        @services.delete(team.token)
-        run_callbacks :deactivated, team, server
-      end
+      run_callbacks :deactivating, team
+      team.deactivate!
+      run_callbacks :deactivated, team
     rescue Mongoid::Errors::Validations => e
-      run_callbacks :error, team, @services[team.token], e
+      run_callbacks :error, team, e
       logger.error "#{team.name}: #{e.message}, error - #{e.document.class}, #{e.document.errors.to_hash}, ignored."
     rescue StandardError => e
-      run_callbacks :error, team, @services[team.token], e
+      run_callbacks :error, team, e
       logger.error "#{team.name}: #{e.class}, #{e.message}, ignored."
-    end
-
-    def reset!
-      run_callbacks :resetting
-      @services.values.to_a.each do |server|
-        stop!(server.team)
-      end
-      run_callbacks :reset
+    ensure
+      team.server = nil
     end
 
     def self.reset!
-      @instance.reset! if @instance
       @instance = nil
     end
 
     private
 
     def start_server!(team, server, wait = 1)
+      team.server = server
       server.start_async
     rescue StandardError => e
-      run_callbacks :error, team, server, e
+      run_callbacks :error, team, e
       case e.message
       when 'account_inactive', 'invalid_auth' then
         logger.error "#{team.name}: #{e.message}, team will be deactivated."
@@ -121,11 +101,11 @@ module SlackRubyBotServer
       end
     end
 
-    def run_callbacks(type, team = nil, server = nil, error = nil)
+    def run_callbacks(type, team = nil, error = nil)
       callbacks = @callbacks[type.to_s]
       return false unless callbacks
       callbacks.each do |c|
-        c.call team, server, error
+        c.call team, error
       end
       true
     rescue StandardError => e

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

@@ -1,3 +1,3 @@
 module SlackRubyBotServer
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/sample_app/README.md

@@ -0,0 +1 @@
+This app is deployed from [github.com/slack-ruby/slack-ruby-bot-server-sample](https://github.com/slack-ruby/slack-ruby-bot-server-sample).

data/sample_app/config.ru

@@ -1,6 +1,6 @@
 ENV['RACK_ENV'] ||= 'development'
 
-require 'slack-ruby-bot-server'
+Bundler.require :default
 
 require_relative 'commands'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot-server
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.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: slack-ruby-bot
@@ -207,6 +207,7 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - DEBUGGING.md
+- Dangerfile
 - Gemfile
 - Guardfile
 - LICENSE
@@ -264,6 +265,7 @@ files:
 - sample_app/.rspec
 - sample_app/Gemfile
 - sample_app/Procfile
+- sample_app/README.md
 - sample_app/Rakefile
 - sample_app/commands.rb
 - sample_app/commands/help.rb
@@ -296,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Grape API serving a Slack bot to multiple teams.