slack-ruby-bot-server 0.11.1 → 1.0.0

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

@@ -1,3 +1,3 @@
 module SlackRubyBotServer
-  VERSION = '0.11.1'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/public/index.html.erb

@@ -3,6 +3,7 @@
   <title>Slack Ruby Bot Server</title>
   <script src="/scripts/jquery-1.7.1.min.js"></script>
   <script src="/scripts/url.min.js"></script>
+  <script src="/scripts/messages.js"></script>
   <script src="/scripts/register.js"></script>
   <script src="/scripts/stats.js"></script>
 </head>
@@ -15,7 +16,7 @@
   </p>
   <p id='messages' />
   <p id='register'>
-    <a href="https://slack.com/oauth/authorize?scope=bot&client_id=<%= ENV['SLACK_CLIENT_ID'] %>"><img alt="Add to Slack" height="40" width="139" src="https://platform.slack-edge.com/img/add_to_slack.png" srcset="https://platform.slack-edge.com/img/add_to_slack.png 1x, https://platform.slack-edge.com/img/add_to_slack@2x.png 2x"></a>
+    <a href="https://slack.com/oauth/authorize?scope=<%= SlackRubyBotServer::Config.oauth_scope_s %>&client_id=<%= ENV['SLACK_CLIENT_ID'] %>"><img alt="Add to Slack" height="40" width="139" src="https://platform.slack-edge.com/img/add_to_slack.png" srcset="https://platform.slack-edge.com/img/add_to_slack.png 1x, https://platform.slack-edge.com/img/add_to_slack@2x.png 2x"></a>
   </p>
   <p id='active_teams_count'>&nbsp;</p>
   <p>

data/public/scripts/messages.js

@@ -0,0 +1,33 @@
+var SlackRubyBotServer = {};
+
+$(document).ready(function() {
+
+  SlackRubyBotServer.message = function(text) {
+    $('#messages').fadeOut('slow', function() {
+      $('#messages').fadeIn('slow').html(text)
+    });
+  };
+
+  SlackRubyBotServer.error = function(xhr) {
+    try {
+      var message;
+      if (xhr.responseText) {
+        var rc = JSON.parse(xhr.responseText);
+        if (rc && rc.message) {
+          message = rc.message;
+          if (message == 'invalid_code') {
+            message = 'The code returned from the OAuth workflow was invalid.'
+          } else if (message == 'code_already_used') {
+            message = 'The code returned from the OAuth workflow has already been used.'
+          }
+        }
+      }
+
+      SlackRubyBotServer.message(message || xhr.statusText || xhr.responseText || 'Unexpected Error');
+
+    } catch(err) {
+      SlackRubyBotServer.message(err.message);
+    }
+  };
+
+});

data/public/scripts/register.js

@@ -1,35 +1,4 @@
-var SlackRubyBotServer = {};
-
 $(document).ready(function() {
-
-  SlackRubyBotServer.message = function(text) {
-    $('#messages').fadeOut('slow', function() {
-      $('#messages').fadeIn('slow').html(text)
-    });
-  };
-
-  SlackRubyBotServer.error = function(xhr) {
-    try {
-      var message;
-      if (xhr.responseText) {
-        var rc = JSON.parse(xhr.responseText);
-        if (rc && rc.message) {
-          message = rc.message;
-          if (message == 'invalid_code') {
-            message = 'The code returned from the OAuth workflow was invalid.'
-          } else if (message == 'code_already_used') {
-            message = 'The code returned from the OAuth workflow has already been used.'
-          }
-        }
-      }
-
-      SlackRubyBotServer.message(message || xhr.statusText || xhr.responseText || 'Unexpected Error');
-
-    } catch(err) {
-      SlackRubyBotServer.message(err.message);
-    }
-  };
-
   // Slack OAuth
   var code = $.url('?code')
   var state = $.url('?state')

data/slack-ruby-bot-server.gemspec

@@ -1,6 +1,6 @@
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'slack-ruby-bot-server/version'
+require_relative 'lib/slack-ruby-bot-server/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'slack-ruby-bot-server'
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'async-websocket', '~> 0.8.0'
+  spec.add_dependency 'async'
   spec.add_dependency 'foreman'
   spec.add_dependency 'grape'
   spec.add_dependency 'grape-roar', '>= 0.4.0'
@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rack-cors'
   spec.add_dependency 'rack-rewrite'
   spec.add_dependency 'rack-server-pages'
-  spec.add_dependency 'slack-ruby-bot', '>= 0.12.0'
+  spec.add_dependency 'slack-ruby-client'
 end

data/tasks/db.rake

@@ -5,40 +5,4 @@ namespace :db do
       Logger.new(STDOUT)
     end
   end
-
-  namespace :heroku do
-    desc 'Mongodump the BotServer database for a slack-ruby-bot-server Heroku app.'
-    task :backup, [:app] do |_t, args|
-      require 'mongoid-shell'
-
-      logger.info("[#{Time.now}] db:heroku:backup started")
-
-      # get heroku configuration info
-      app = args[:app] || raise('Missing app.')
-      JSON.parse(`bundle exec heroku config --app #{app} --json`).each_pair do |k, v|
-        ENV[k] = v
-      end
-
-      # connect to MongoDB
-      env = (ENV['RACK_ENV'] || 'development').to_s
-      logger.info "Connecting to the #{env} environment."
-      Mongoid.load! 'config/mongoid.yml', env
-
-      # mongodump
-      mongodump = Mongoid::Shell::Commands::Mongodump.new(session: Mongoid.default_client)
-      mongodump.out = File.join(Dir.tmpdir, 'db/' + mongodump.host.tr(':', '_'))
-      logger.info("[#{Time.now}] clearing (#{mongodump.out})")
-      FileUtils.rm_rf mongodump.out if File.directory? mongodump.out
-      logger.info("[#{Time.now}] mongodump to #{mongodump.out}")
-      system mongodump.to_s
-
-      # backup
-      backup_name = "#{app}-#{Time.now.strftime('%Y-%m-%d-%H%M%S')}"
-      tmp_db_filename = File.join(mongodump.out, backup_name)
-      logger.info("[#{Time.now}] compressing (#{tmp_db_filename}.tar.gz)")
-      system "tar -cvf #{tmp_db_filename}.tar #{mongodump.out}/#{mongodump.db}"
-      system "gzip #{tmp_db_filename}.tar"
-      logger.info "Created #{tmp_db_filename}.tar.gz."
-    end
-  end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot-server
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: async-websocket
+  name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
@@ -137,26 +137,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: slack-ruby-bot
+  name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
-description: 
+        version: '0'
+description:
 email:
 - dblock@dblock.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -173,9 +174,7 @@ files:
 - RELEASING.md
 - Rakefile
 - UPGRADING.md
-- images/new.png
-- images/slackbotserver.gif
-- images/slackbutton.gif
+- images/create-app.png
 - lib/slack-ruby-bot-server.rb
 - lib/slack-ruby-bot-server/api.rb
 - lib/slack-ruby-bot-server/api/endpoints.rb
@@ -199,19 +198,16 @@ files:
 - lib/slack-ruby-bot-server/config/database_adapters/activerecord.rb
 - lib/slack-ruby-bot-server/config/database_adapters/mongoid.rb
 - lib/slack-ruby-bot-server/ext.rb
-- lib/slack-ruby-bot-server/ext/activerecord/slack-ruby-bot/commands/base.rb
 - lib/slack-ruby-bot-server/ext/bson/object_id.rb
 - lib/slack-ruby-bot-server/ext/grape/sort_extension.rb
 - lib/slack-ruby-bot-server/ext/mongoid/slack-ruby-bot/commands/base.rb
-- lib/slack-ruby-bot-server/ext/slack-ruby-bot.rb
-- lib/slack-ruby-bot-server/ext/slack-ruby-bot/client.rb
 - lib/slack-ruby-bot-server/info.rb
+- lib/slack-ruby-bot-server/loggable.rb
 - lib/slack-ruby-bot-server/models/team/activerecord.rb
 - lib/slack-ruby-bot-server/models/team/methods.rb
 - lib/slack-ruby-bot-server/models/team/mongoid.rb
 - lib/slack-ruby-bot-server/rspec.rb
 - lib/slack-ruby-bot-server/rspec/fabricators/team.rb
-- lib/slack-ruby-bot-server/server.rb
 - lib/slack-ruby-bot-server/service.rb
 - lib/slack-ruby-bot-server/version.rb
 - public/favicon.ico
@@ -219,51 +215,17 @@ files:
 - public/index.html.erb
 - public/robots.txt
 - public/scripts/jquery-1.7.1.min.js
+- public/scripts/messages.js
 - public/scripts/register.js
 - public/scripts/stats.js
 - public/scripts/url.min.js
-- sample_apps/README.md
-- sample_apps/sample_app_activerecord/.rspec
-- sample_apps/sample_app_activerecord/.standalone_migrations
-- sample_apps/sample_app_activerecord/Gemfile
-- sample_apps/sample_app_activerecord/Procfile
-- sample_apps/sample_app_activerecord/README.md
-- sample_apps/sample_app_activerecord/Rakefile
-- sample_apps/sample_app_activerecord/commands.rb
-- sample_apps/sample_app_activerecord/commands/help.rb
-- sample_apps/sample_app_activerecord/commands/whoami.rb
-- sample_apps/sample_app_activerecord/config.ru
-- sample_apps/sample_app_activerecord/config/newrelic.yml
-- sample_apps/sample_app_activerecord/config/postgresql.yml
-- sample_apps/sample_app_activerecord/db/migrate/20170307164946_create_teams_table.rb
-- sample_apps/sample_app_activerecord/db/migrate/20190323181453_add_activated_fields.rb
-- sample_apps/sample_app_activerecord/db/schema.rb
-- sample_apps/sample_app_activerecord/spec/api/root_spec.rb
-- sample_apps/sample_app_activerecord/spec/commands/help_spec.rb
-- sample_apps/sample_app_activerecord/spec/commands/whoami_spec.rb
-- sample_apps/sample_app_activerecord/spec/spec_helper.rb
-- sample_apps/sample_app_mongoid/.rspec
-- sample_apps/sample_app_mongoid/Gemfile
-- sample_apps/sample_app_mongoid/Procfile
-- sample_apps/sample_app_mongoid/README.md
-- sample_apps/sample_app_mongoid/Rakefile
-- sample_apps/sample_app_mongoid/commands.rb
-- sample_apps/sample_app_mongoid/commands/help.rb
-- sample_apps/sample_app_mongoid/commands/whoami.rb
-- sample_apps/sample_app_mongoid/config.ru
-- sample_apps/sample_app_mongoid/config/mongoid.yml
-- sample_apps/sample_app_mongoid/config/newrelic.yml
-- sample_apps/sample_app_mongoid/spec/api/root_spec.rb
-- sample_apps/sample_app_mongoid/spec/commands/help_spec.rb
-- sample_apps/sample_app_mongoid/spec/commands/whoami_spec.rb
-- sample_apps/sample_app_mongoid/spec/spec_helper.rb
 - script/console
 - slack-ruby-bot-server.gemspec
 - tasks/db.rake
 homepage: https://github.com/slack-ruby/slack-ruby-bot-server
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -278,8 +240,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: A Grape API serving a Slack bot to multiple teams.
 test_files: []

data/lib/slack-ruby-bot-server/ext/activerecord/slack-ruby-bot/commands/base.rb

@@ -1,18 +0,0 @@
-module SlackRubyBot
-  module Commands
-    class Base
-      class << self
-        alias _invoke invoke
-
-        def invoke(client, data)
-          _invoke client, data
-        rescue StandardError => e
-          logger.info "#{name.demodulize.upcase}: #{client.owner}, #{e.class}: #{e}"
-          logger.debug e.backtrace.join("\n")
-          client.say(channel: data.channel, text: e.message, gif: 'error')
-          true
-        end
-      end
-    end
-  end
-end

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

@@ -1,2 +0,0 @@
-require_relative 'slack-ruby-bot/client'
-require_relative "#{SlackRubyBotServer::Config.database_adapter}/slack-ruby-bot/commands/base"

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

@@ -1,12 +0,0 @@
-module SlackRubyBot
-  class Client
-    # keep track of the team that the client is connected to
-    attr_accessor :owner
-  end
-end
-
-SlackRubyBot::Client.logger.level = Logger::WARN
-
-Slack::RealTime::Client.configure do |config|
-  config.store_class = Slack::RealTime::Stores::Starter
-end

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

@@ -1,30 +0,0 @@
-require_relative 'ext/slack-ruby-bot/client'
-
-module SlackRubyBotServer
-  class Server < SlackRubyBot::Server
-    attr_accessor :team
-
-    def initialize(attrs = {})
-      attrs = attrs.dup
-      @team = attrs.delete(:team)
-      raise 'Missing team' unless @team
-      attrs[:token] = @team.token
-      super(attrs)
-      open!
-    end
-
-    def restart!(wait = 1)
-      # when an integration is disabled, a live socket is closed, which causes the default behavior of the client to restart
-      # it would keep retrying without checking for account_inactive or such, we want to restart via service which will disable an inactive team
-      logger.info "#{team.name}: socket closed, restarting ..."
-      SlackRubyBotServer::Service.instance.restart! team, self, wait
-      open!
-    end
-
-    private
-
-    def open!
-      client.owner = team
-    end
-  end
-end

data/sample_apps/README.md

@@ -1,11 +0,0 @@
-To run samples, [register a new Slack app](https://api.slack.com/apps), configure a bot user, and OAuth redirect URL to http://localhost:9292 (for development). Configure your development environment by editing `.env` and setting the client ID and secret you were given during registration.
-
-```
-SLACK_CLIENT_ID=1111111111.2222222
-SLACK_CLIENT_SECRET=abcdef012345679
-PORT=9292
-```
-
-Run tests with `bundle exec rake`.
-
-

data/sample_apps/sample_app_activerecord/.rspec

@@ -1,3 +0,0 @@
---color
---format=documentation
-

data/sample_apps/sample_app_activerecord/.standalone_migrations

@@ -1,3 +0,0 @@
-config:
-  database: config/postgresql.yml
-

data/sample_apps/sample_app_activerecord/Gemfile

@@ -1,24 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 5.0.0', require: 'active_record'
-gem 'newrelic-slack-ruby-bot'
-gem 'otr-activerecord', '~> 1.2.1'
-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'
-end
-
-group :test do
-  gem 'database_cleaner'
-  gem 'fabrication'
-  gem 'faker'
-  gem 'rake'
-  gem 'rspec'
-  gem 'vcr'
-  gem 'webmock'
-end

data/sample_apps/sample_app_activerecord/Procfile

@@ -1 +0,0 @@
-web: bundle exec unicorn -p $PORT