slackbot_frd 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95177bb299636243714d0259ae9e476d08da1c59
-  data.tar.gz: d8f879518125b1081eb0041ef5d32815bde67fca
+  metadata.gz: fa152b1ba0a87880770f4d05ef4c542e3c8b3ecf
+  data.tar.gz: 3b4575361545d9aa5348587f2e9ce54ee87c68ba
 SHA512:
-  metadata.gz: 20af06d77dd14504cb1881cab32c251f9b7238a883e81af2bdf23a668071a8b505fd05e127df4c43cb93f485dd4661c7e135c0cfaa13eacf5c0ea64c4ddfa0e1
-  data.tar.gz: 84417c2f4dabb6537d0078a0a1a8ac61daebb58cec7436ae703f6ec4b9890eaba4ef5261590fdebe7ed2aaff3a699fa7caf57ac773dc500de776f05704c9f848
+  metadata.gz: 7d97def19fe272337ff98b4f2646a3a1d19f6ee25e546e111e3799c34c92de34fea395a87d552a83035e58c08a36b6f3fdeaebe32554197c7b5e9955711ff29a
+  data.tar.gz: e875be0725ffbdfe47f29b31fc96411ce0bdb096330cb784533a6d3b1c1d4136213f746bc77cfd65877f33993b4f05719e2b4993e6f79547783bc4474c199267

data/bin/slackbot-frd

@@ -186,7 +186,6 @@ class SlackbotFrdBin < Thor
 
     > $ slackbot-frd stop -- Stop all running bots
   LONGDESC
-
   def stop
     # first kill the watcher, then kill the connection
     kill_pid(watcher_pid)
@@ -196,6 +195,19 @@ class SlackbotFrdBin < Thor
     delfile(ERROR_FILE)
   end
 
+  desc "bump", "Kill the bots, but not the watcher"
+  long_desc <<-LONGDESC
+    bump will kill the connection process, but not the watcher.
+    this causes the watcher to restart the connection.  This
+    can be helpful when your slack connection is lost but
+    the WSS event stream is not terminated
+
+    > $ slackbot-frd bump -- Kill all running bots
+  LONGDESC
+  def bump
+    kill_pid(connection_pid)
+  end
+
   desc "restart", "Stop all bots and restart them"
   long_desc <<-LONGDESC
     restart will restart all bots

data/lib/slackbot_frd/initializer/bot_starter.rb

@@ -2,6 +2,7 @@
 
 require 'file-append'
 require 'thor'
+require 'active_support/all'
 
 require 'slackbot_frd/lib/slack_connection'
 require 'slackbot_frd/lib/bot'
@@ -13,7 +14,11 @@ end
 
 class BotStarter
   def self.start_bots(errors_file, token, botdir, enabled_bots)
-    bot_enabled = ->(bot) { enabled_bots.empty? || enabled_bots.include?(bot) }
+    bot_enabled = ->(bot) do
+      enabled_bots.empty? ||
+      enabled_bots.include?(bot) ||
+      enabled_bots.include?(bot.gsub("-", "_").camelize)
+    end
 
     # Create a new Connection to pass to the bot classes
     slack_connection = SlackbotFrd::SlackConnection.new(token, errors_file)

data/lib/slackbot_frd/lib/slack_connection.rb

@@ -309,6 +309,13 @@ module SlackbotFrd
       user
     end
 
+    private
+    def extract_ts(message)
+      ts = message["ts"]
+      ts = message["message"]["ts"] if message["message"] && message["message"]["ts"]
+      ts
+    end
+
     private
     def extract_text(message)
       text = message["text"]
@@ -323,7 +330,7 @@ module SlackbotFrd
       user = extract_user(message)
       channel = message["channel"]
       text = extract_text(message)
-      ts = message["ts"]
+      ts = extract_ts(message)
 
       unless user
         SlackbotFrd::Log.warn("#{self.class}: Chat message doesn't include user! message: #{message}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slackbot_frd
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport