Use slack-ruby-bot.

dblock · Jul 2, 2015 · 365a751 · 365a751
1 parent f6e9475
commit 365a751
Show file tree

Hide file tree

Showing 42 changed files with 68 additions and 548 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,13 +2,10 @@ source 'http://rubygems.org'
 
 ruby '2.1.6'
 
-gem 'hashie'
-gem 'slack-api', '~> 1.1.6', require: 'slack'
+gem 'slack-ruby-bot'
 gem 'puma'
 gem 'sinatra'
-gem 'activesupport'
 gem 'dentaku'
-gem 'giphy', '~> 2.0.2'
 
 group :development, :test do
   gem 'rake', '~> 10.4'
@@ -17,8 +14,8 @@ group :development, :test do
 end
 
 group :test do
-  gem 'rspec', '~> 3.2'
-  gem 'rack-test', '~> 0.6.2'
+  gem 'rspec'
+  gem 'rack-test'
   gem 'vcr'
   gem 'webmock'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.2.1)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -34,13 +34,13 @@ GEM
       faraday_middleware (~> 0.9)
       faraday_middleware-parse_oj (~> 0.3)
       launchy (~> 2.4)
-    hashie (3.4.1)
+    hashie (3.4.2)
     i18n (0.7.0)
-    json (1.8.2)
+    json (1.8.3)
     launchy (2.4.3)
       addressable (~> 2.3)
-    minitest (5.6.1)
-    multi_json (1.11.0)
+    minitest (5.7.0)
+    multi_json (1.11.1)
     multipart-post (2.0.0)
     oj (2.12.9)
     parser (2.3.0.pre.2)
@@ -85,6 +85,11 @@ GEM
       faraday_middleware (~> 0.8)
       faye-websocket (~> 0.9.2)
       multi_json (~> 1.0, >= 1.0.3)
+    slack-ruby-bot (0.1.0)
+      activesupport
+      giphy (~> 2.0.2)
+      hashie
+      slack-api (~> 1.1.6)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
@@ -102,17 +107,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
   dentaku
   foreman
-  giphy (~> 2.0.2)
-  hashie
   puma
-  rack-test (~> 0.6.2)
+  rack-test
   rake (~> 10.4)
-  rspec (~> 3.2)
+  rspec
   rubocop (= 0.31.0)
   sinatra
-  slack-api (~> 1.1.6)
+  slack-ruby-bot
   vcr
   webmock
diff --git a/app/slack-mathbot.rb b/app/slack-mathbot.rb
diff --git a/app/slack-mathbot/app.rb b/app/slack-mathbot/app.rb
diff --git a/app/slack-mathbot/commands/base.rb b/app/slack-mathbot/commands/base.rb
diff --git a/app/slack-mathbot/commands/hi.rb b/app/slack-mathbot/commands/hi.rb
diff --git a/app/slack-mathbot/commands/unknown.rb b/app/slack-mathbot/commands/unknown.rb
diff --git a/app/slack-mathbot/config.rb b/app/slack-mathbot/config.rb
diff --git a/app/slack-mathbot/hooks.rb b/app/slack-mathbot/hooks.rb
diff --git a/app/slack-mathbot/hooks/base.rb b/app/slack-mathbot/hooks/base.rb
diff --git a/app/slack-mathbot/hooks/hello.rb b/app/slack-mathbot/hooks/hello.rb
diff --git a/app/slack-mathbot/hooks/message.rb b/app/slack-mathbot/hooks/message.rb
diff --git a/app/slack_mathbot.rb b/app/slack_mathbot.rb
diff --git a/config.ru b/config.ru
@@ -1,4 +1,7 @@
-require File.expand_path('../app', __FILE__)
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'slack-mathbot'
+require 'web'
 
 Thread.new do
   SlackMathbot::App.instance.run

diff --git a/config/application.rb b/config/application.rb
diff --git a/config/boot.rb b/config/boot.rb
diff --git a/config/environment.rb b/config/environment.rb
diff --git a/config/initializers/giphy.rb b/config/initializers/giphy.rb
diff --git a/config/initializers/slack/request.rb b/config/initializers/slack/request.rb
diff --git a/slack-mathbot.rb b/slack-mathbot.rb
@@ -0,0 +1,5 @@
+require 'slack-ruby-bot'
+require 'slack-mathbot/version'
+require 'slack-mathbot/about'
+require 'slack-mathbot/commands'
+require 'slack-mathbot/app'
diff --git a/app/slack-mathbot/about.rb → slack-mathbot/about.rb b/app/slack-mathbot/about.rb → slack-mathbot/about.rb
diff --git a/slack-mathbot/app.rb b/slack-mathbot/app.rb
@@ -0,0 +1,4 @@
+module SlackMathbot
+  class App < SlackRubyBot::App
+  end
+end
diff --git a/app/slack-mathbot/commands.rb → slack-mathbot/commands.rb b/app/slack-mathbot/commands.rb → slack-mathbot/commands.rb
@@ -1,6 +1,3 @@
-require 'slack-mathbot/commands/base'
 require 'slack-mathbot/commands/calculate'
 require 'slack-mathbot/commands/about'
 require 'slack-mathbot/commands/help'
-require 'slack-mathbot/commands/hi'
-require 'slack-mathbot/commands/unknown'
diff --git a/app/slack-mathbot/commands/about.rb → slack-mathbot/commands/about.rb b/app/slack-mathbot/commands/about.rb → slack-mathbot/commands/about.rb
@@ -1,6 +1,6 @@
 module SlackMathbot
   module Commands
-    class Default < Base
+    class Default < SlackRubyBot::Commands::Base
       def self.call(data, _command, _arguments)
         send_message_with_gif data.channel, SlackMathbot::ABOUT, 'math'
       end

diff --git a/app/slack-mathbot/commands/calculate.rb → slack-mathbot/commands/calculate.rb b/app/slack-mathbot/commands/calculate.rb → slack-mathbot/commands/calculate.rb
@@ -1,6 +1,6 @@
 module SlackMathbot
   module Commands
-    class Calculate < Base
+    class Calculate < SlackRubyBot::Commands::Base
       def self.call(data, _command, arguments)
         result = Dentaku::Calculator.new.evaluate(arguments.join)
         result = result.to_s if result