slack-ruby-bot-server 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86a1479af364899fd951bee2d75f30d3fd32d2ccb60f3804716d574746f1b85e
-  data.tar.gz: 88cfbd7ed0bec93439f327f5389f9bff6a8eeeb0eeeb2d89f35fa3b08cefc416
+  metadata.gz: c2e8d227e46164c37274bc2fc72c30074f7496835c08a20c5ed6da960336fdf9
+  data.tar.gz: 35a54416b198e2fc372c1613922b28fd1a9f7a5bac39ab0229c3ea7afbd3ed82
 SHA512:
-  metadata.gz: 9efdeede9435e4d5bca785b0dbd567a65119892a2521882477e3e5e79480257886375f2170dd54166e6e05fa9be186e4f8da2f878bdae0674c7b76061ac9e66a
-  data.tar.gz: 2a7bf1ee2397aaca5a3337503209009e679e0ebf5daaeed374c8a75fb4ffb102d7a4298d87a8c5c092789932f1f259919119c7959ee21f0c3130c8d90195b673
+  metadata.gz: 1e2bcb076d7d28570316239a3584dbd2fd80386dd2468dd0c99038c832f08297c1cb71e94261e38a9e17858c375bed512fe2e5162e5994f4bef1c97faace8f5d
+  data.tar.gz: 170b0bb0da5086f2c135ceda394ce0184394e0ff49b5a00e0942d45279f2410a002199ef46fcd23e25b241597689f42bb16025419d33cd8bfc8900dd3d3be3a8

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ### Changelog
 
+#### 0.11.0 (Next)
+
+* [#101](https://github.com/slack-ruby/slack-ruby-bot-server/pull/101): Removed legacy migrations, including `SLACK_API_TOKEN`, team `name`, `team_id` and `active` - [@dblock](https://github.com/dblock).
+* [#98](https://github.com/slack-ruby/slack-ruby-bot-server/pull/98): Removed `unicorn` from gem dependencies - [@dblock](https://github.com/dblock).
+* [#90](https://github.com/slack-ruby/slack-ruby-bot-server/pull/90): Update ActiveRecord sample app to support ENV variables in `postgresql.yml` - [@ashkan18](https://github.com/ashkan18).
+
 #### 0.10.0 (2019/3/23)
 
 * [#97](https://github.com/slack-ruby/slack-ruby-bot-server/pull/97): Added `Config#service_class` to override the `SlackRubyBotServer::Service.instance` singleton - [@dblock](https://github.com/dblock).

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2018 Daniel Doubrovkine & Contributors
+Copyright (c) 2015-2019 Daniel Doubrovkine & Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -5,7 +5,11 @@ Slack Ruby Bot Server
 [![Build Status](https://travis-ci.org/slack-ruby/slack-ruby-bot-server.svg?branch=master)](https://travis-ci.org/slack-ruby/slack-ruby-bot-server)
 [![Code Climate](https://codeclimate.com/github/slack-ruby/slack-ruby-bot-server.svg)](https://codeclimate.com/github/slack-ruby/slack-ruby-bot-server)
 
-A library that enables you to write a complete Slack bot service with Slack button integration, in Ruby. 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). A good demo of a service built on top of this is [missingkidsbot.org](http://missingkidsbot.org).
+Build a complete Slack bot service with Slack button integration, in Ruby.
+
+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).
+
+A good [open-source demo](https://github.com/dblock/slack-strava) of a service built on top of this library is [Strava integration with Slack](https://slava.playplay.io).
 
 ### What is this?
 
@@ -13,7 +17,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, v0.10.0. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
+You're reading the documentation for the **stable** release of slack-ruby-bot-server, v0.11.0. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
 
 ### Try Me
 
@@ -58,13 +62,15 @@ See the [sample app using ActiveRecord](sample_apps/sample_app_activerecord) for
 
 ### Usage
 
-[Create a New Application](https://api.slack.com/applications/new) on Slack.
+Start with one of the samples above, which contain a couple of custom commands, necessary dependencies and tests, then [create a new application](https://api.slack.com/applications/new) on Slack.
 
 ![](images/new.png)
 
-Follow the instructions, note the app's client ID and secret, give the bot a default name, etc. The redirect URL should be the location of your app, for testing purposes use `http://localhost:9292`. Edit your `.env` file and add `SLACK_CLIENT_ID=...` and `SLACK_CLIENT_SECRET=...` in it. Run `bundle install` and `foreman start`. Navigate to [localhost:9292](http://localhost:9292). Register using the Slack button.
+Follow Slack's instructions, note the app client ID and secret, give the bot a default name, etc. The redirect URL should be the location of your app, for local testing purposes use `http://localhost:9292`.
+
+Within your application, edit your `.env` file and add `SLACK_CLIENT_ID=...` and `SLACK_CLIENT_SECRET=...` in it.
 
-If you deploy to Heroku set `SLACK_CLIENT_ID` and `SLACK_CLIENT_SECRET` via `heroku config:add SLACK_CLIENT_ID=... SLACK_CLIENT_SECRET=...`.
+Run `bundle install` and `foreman start` to boot the app. Navigate to [localhost:9292](http://localhost:9292). You should see an "Add to Slack" button. Use it to install the app into your own Slack team.
 
 ### API
 
@@ -212,6 +218,6 @@ You can see a sample implementation in [slack-sup#3a497b](https://github.com/dbl
 
 ### Copyright & License
 
-Copyright [Daniel Doubrovkine](http://code.dblock.org) and Contributors, 2015-2018
+Copyright [Daniel Doubrovkine](http://code.dblock.org) and Contributors, 2015-2019
 
 [MIT License](LICENSE)

data/UPGRADING.md

@@ -1,6 +1,20 @@
 Upgrading Slack-Ruby-Bot-Server
 ===============================
 
+### Upgrading to >= 0.11.0
+
+#### Removed Legacy Migrations
+
+Several legacy migrations have been removed, including the code to automatically create a team from a legacy `SLACK_API_TOKEN`, setting `Team#active`, `name` and `team_id`.
+
+See [#101](https://github.com/slack-ruby/slack-ruby-bot-server/pull/101) for more information.
+
+#### Unicorn Dependency
+
+The dependency on `unicorn` has been removed from gemspec. Use `unicorn` or `puma` or another application server as you see fit by explicitly adding a dependency in your Gemfile.
+
+See [#98](https://github.com/slack-ruby/slack-ruby-bot-server/pull/98) for more information.
+
 ### Upgrading to >= 0.10.0
 
 #### New Team Fields

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

@@ -3,9 +3,6 @@ module SlackRubyBotServer
     def prepare!
       check_database!
       init_database!
-      mark_teams_active!
-      migrate_from_single_team!
-      update_team_name_and_id!
       purge_inactive_teams!
       configure_global_aliases!
     end
@@ -31,30 +28,6 @@ module SlackRubyBotServer
       SlackRubyBotServer::DatabaseAdapter.init!
     end
 
-    def mark_teams_active!
-      Team.where(active: nil).update_all(active: true)
-    end
-
-    def update_team_name_and_id!
-      Team.active.where(team_id: nil).each do |team|
-        begin
-          auth = team.ping![:auth]
-          team.update_attributes!(team_id: auth['team_id'], name: auth['team'])
-        rescue StandardError => e
-          logger.warn "Error pinging team #{team.id}: #{e.message}."
-          team.set(active: false)
-        end
-      end
-    end
-
-    def migrate_from_single_team!
-      return unless ENV.key?('SLACK_API_TOKEN')
-      logger.info 'Migrating from env SLACK_API_TOKEN ...'
-      team = Team.find_or_create_from_env!
-      logger.info "Automatically migrated team: #{team}."
-      logger.warn "You should unset ENV['SLACK_API_TOKEN']."
-    end
-
     def purge_inactive_teams!
       Team.purge!
     end

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

@@ -38,18 +38,5 @@ module Methods
         presence: client.users_getPresence(user: auth['user_id'])
       }
     end
-
-    def self.find_or_create_from_env!
-      token = ENV['SLACK_API_TOKEN']
-      return unless token
-      team = Team.where(token: token).first
-      team ||= Team.new(token: token)
-      info = Slack::Web::Client.new(token: token).team_info
-      team.team_id = info['team']['id']
-      team.name = info['team']['name']
-      team.domain = info['team']['domain']
-      team.save!
-      team
-    end
   end
 end

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

@@ -1,3 +1,3 @@
 module SlackRubyBotServer
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.11.0'.freeze
 end

data/sample_apps/sample_app_activerecord/Gemfile

@@ -7,6 +7,7 @@ gem 'pg'
 gem 'rack-server-pages'
 gem 'rack-test'
 gem 'slack-ruby-bot-server', path: '../../'
+gem 'unicorn'
 
 group :development, :test do
   gem 'standalone_migrations', '~> 5.2'

data/sample_apps/sample_app_activerecord/config.ru

@@ -4,8 +4,15 @@ Bundler.require :default
 
 require_relative 'commands'
 require 'yaml'
+require 'erb'
 
-ActiveRecord::Base.establish_connection(YAML.load_file('config/postgresql.yml')[ENV['RACK_ENV']])
+ActiveRecord::Base.establish_connection(
+  YAML.safe_load(
+    ERB.new(
+      File.read('config/postgresql.yml')
+    ).result, [], [], true
+  )[ENV['RACK_ENV']]
+)
 
 NewRelic::Agent.manual_start
 

data/sample_apps/sample_app_activerecord/config/postgresql.yml

@@ -14,4 +14,4 @@ test:
 
 production:
   <<: *default
-  database: slack_ruby_bot_server_production
+  url: <%= ENV["DATABASE_URL"] %>

data/sample_apps/sample_app_mongoid/Gemfile

@@ -6,6 +6,7 @@ gem 'slack-ruby-bot-server', path: '../../'
 
 gem 'kaminari-mongoid'
 gem 'mongoid-scroll'
+gem 'unicorn'
 
 group :test do
   gem 'database_cleaner'

data/slack-ruby-bot-server.gemspec

@@ -24,5 +24,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rack-rewrite'
   spec.add_dependency 'rack-server-pages'
   spec.add_dependency 'slack-ruby-bot', '>= 0.12.0'
-  spec.add_dependency 'unicorn'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot-server
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-24 00:00:00.000000000 Z
+date: 2019-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-websocket
@@ -150,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
-- !ruby/object:Gem::Dependency
-  name: unicorn
-  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'
 description: 
 email:
 - dblock@dblock.org
@@ -187,7 +173,6 @@ files:
 - RELEASING.md
 - Rakefile
 - UPGRADING.md
-- app.json
 - images/new.png
 - images/slackbotserver.gif
 - images/slackbutton.gif

data/app.json

@@ -1,9 +0,0 @@
-{
-	"name": "Slack Bot Server",
-	"description": "A Slack bot server.",
-	"respository": "https://github.com/slack-ruby/slack-ruby-bot-server",
-	"keywords": ["slack", "bots"],
-	"addons": [
-		"mongolab"
-	]
-}