slackbot_frd 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23cd85c4a4b08ca1c27c5b7b86a4cd1572762787
-  data.tar.gz: 2fc8953394f69e1c326f070d43cad528c174a52e
+  metadata.gz: 8f18d78abc8751ff7cf6ccab669a856f3e5896eb
+  data.tar.gz: 7ccd3d4e72331455e3ae954225dea63421cbc696
 SHA512:
-  metadata.gz: b4ac51d2f8b06597245eaa3b18f253eb786718e7254f9e0402e6fef175ce1d6e5630278789783a24785a4c52359922d25a2e145a0b3a513e78d0ba8eacf7f9bf
-  data.tar.gz: 5201344b4cbb5ec4be6bf21cb31714166fe22a3ad5d6cbdac5c7008a2040c9b23d1eacb80b90fad3443f3ec131945a181f15883af5b890f24c9138c8312f78e3
+  metadata.gz: cd865011f64fd16a8d53f39ce099f0ca62308b0228117b598471817cf06be91eab66d4e8ee84e3b388c1a345a7bd94e4dbe1c56b45bd46cd46d7894f4a98e529
+  data.tar.gz: 088ccc188cc9f8f4b1bad887ce5beb91107e8053393a927aa6bf36ef29f265036c51c7cfd46ca25994533119ab8101688a6fab6c5c2fe75d78e3e34368bc9740

data/bin/slackbot-frd

@@ -16,15 +16,15 @@ end
 
 DEBUG = true
 
-PID_FILE_WATCHER = "/tmp/slackbot-frd-watcher.pid"
-PID_FILE_CONNECTION = "/tmp/slackbot-frd-connection.pid"
-BOT_LIST_FILE = "/tmp/slackbot-frd-bot-list.pid"
-ERROR_FILE = "/tmp/slackbot-frd.errors"
-DEFAULT_CONFIG_FILE = "slackbot-frd.conf"
-LOG_FILE = "slackbot-frd.log"
+PID_FILE_WATCHER = '/tmp/slackbot-frd-watcher.pid'
+PID_FILE_CONNECTION = '/tmp/slackbot-frd-connection.pid'
+BOT_LIST_FILE = '/tmp/slackbot-frd-bot-list.pid'
+ERROR_FILE = '/tmp/slackbot-frd.errors'
+DEFAULT_CONFIG_FILE = 'slackbot-frd.conf'
+LOG_FILE = 'slackbot-frd.log'
 
 class SlackbotFrdBin < Thor
-  desc "list", "List all bots"
+  desc 'list', 'List all bots'
   long_desc <<-LONGDESC
     list will print out all available bots
 
@@ -34,16 +34,16 @@ class SlackbotFrdBin < Thor
     # TODO
   end
 
-  desc "status", "Report status on daemon procs"
+  desc 'status', 'Report status on daemon procs'
   def status
     if running?(watcher_pid)
       puts "Daemon running as pid '#{watcher_pid}'".green
     else
-      puts "Daemon not running".red
+      puts 'Daemon not running'.red
     end
   end
 
-  desc "new <project-name>", "Generate a new slackbot_frd project"
+  desc 'new <project-name>', 'Generate a new slackbot_frd project'
   long_desc <<-LONGDESC
     new will generate a skeleton for a new slackbot_frd project
   LONGDESC
@@ -56,25 +56,25 @@ class SlackbotFrdBin < Thor
     Dir.mkdir(proj_name)
     Dir.chdir(proj_name)
     genconfig
-    File.write("Gemfile", <<-GEMFILE.strip_heredoc)
+    File.write('Gemfile', <<-GEMFILE.strip_heredoc)
       source "https://rubygems.org"
 
       gem "slackbot_frd"
     GEMFILE
-    Dir.mkdir("bots")
-    write_example_bot("bots/example_bot.rb")
-    Dir.mkdir("lib")
+    Dir.mkdir('bots')
+    write_example_bot('bots/example_bot.rb')
+    Dir.mkdir('lib')
 
     unless options[:nospec]
-      File.append("Gemfile", <<-GEMFILE.strip_heredoc)
+      File.append('Gemfile', <<-GEMFILE.strip_heredoc)
 
       gem "rspec", "~> 3.2"
       GEMFILE
-      Dir.mkdir("spec")
+      Dir.mkdir('spec')
     end
   end
 
-  desc "genconfig", "Generate a skeleton config file"
+  desc 'genconfig', 'Generate a skeleton config file'
   long_desc <<-LONGDESC
     genconfig will generate a skeleton config file that
     can be customized
@@ -93,7 +93,7 @@ class SlackbotFrdBin < Thor
     CONFIG_FILE_SKELETON
   end
 
-  desc "start [bot1] [bot2] [botx...]", "Start all specified bots, or all bots"
+  desc 'start [bot1] [bot2] [botx...]', 'Start all specified bots, or all bots'
   long_desc <<-LONGDESC
     start [bot1] [bot2] [botx...] will start the specified bots.
     If no bots are specified, all available bots will be run.
@@ -125,25 +125,25 @@ class SlackbotFrdBin < Thor
     $slackbotfrd_conf.freeze
 
     daemonize = false
-    daemonize = $slackbotfrd_conf["daemonize"] if $slackbotfrd_conf["daemonize"]
-    daemonize = ENV["SLACKBOT_FRD_DAEMONIZE"] if ENV["SLACKBOT_FRD_DAEMONIZE"]
+    daemonize = $slackbotfrd_conf['daemonize'] if $slackbotfrd_conf['daemonize']
+    daemonize = ENV['SLACKBOT_FRD_DAEMONIZE'] if ENV['SLACKBOT_FRD_DAEMONIZE']
     daemonize = options[:daemonize] if options[:daemonize]
 
     botdir = Dir.pwd
-    botdir = $slackbotfrd_conf["botdir"] if $slackbotfrd_conf["botdir"]
-    botdir = ENV["SLACKBOT_FRD_BOTDIR"] if ENV["SLACKBOT_FRD_BOTDIR"]
+    botdir = $slackbotfrd_conf['botdir'] if $slackbotfrd_conf['botdir']
+    botdir = ENV['SLACKBOT_FRD_BOTDIR'] if ENV['SLACKBOT_FRD_BOTDIR']
     botdir = options[:botdir] if options[:botdir]
     botdir = File.expand_path(botdir)
 
     SlackbotFrd::Log.logfile = "#{botdir}/#{LOG_FILE}"
-    SlackbotFrd::Log.logfile = $slackbotfrd_conf["log_file"] if $slackbotfrd_conf["log_file"]
-    SlackbotFrd::Log.logfile = ENV["SLACKBOT_FRD_LOG_FILE"] if ENV["SLACKBOT_FRD_LOG_FILE"]
-    SlackbotFrd::Log.logfile = options["log-file"] if options['log-file']
+    SlackbotFrd::Log.logfile = $slackbotfrd_conf['log_file'] if $slackbotfrd_conf['log_file']
+    SlackbotFrd::Log.logfile = ENV['SLACKBOT_FRD_LOG_FILE'] if ENV['SLACKBOT_FRD_LOG_FILE']
+    SlackbotFrd::Log.logfile = options['log-file'] if options['log-file']
 
     SlackbotFrd::Log.level = :info
-    SlackbotFrd::Log.level = $slackbotfrd_conf["log_level"] if $slackbotfrd_conf["log_level"]
-    SlackbotFrd::Log.level = ENV["SLACKBOT_FRD_LOG_LEVEL"] if ENV["SLACKBOT_FRD_LOG_LEVEL"]
-    SlackbotFrd::Log.level = options["log-level"] if options['log-level']
+    SlackbotFrd::Log.level = $slackbotfrd_conf['log_level'] if $slackbotfrd_conf['log_level']
+    SlackbotFrd::Log.level = ENV['SLACKBOT_FRD_LOG_LEVEL'] if ENV['SLACKBOT_FRD_LOG_LEVEL']
+    SlackbotFrd::Log.level = options['log-level'] if options['log-level']
 
     # If we got a number for log level that is valid, just use that
     if SlackbotFrd::Log.level =~ /\d+/ && SlackbotFrd::Log.levels.values.include?(SlackbotFrd::Log.level.to_i)
@@ -165,11 +165,11 @@ class SlackbotFrdBin < Thor
     SlackbotFrd::Log.warn("Logging to file '#{SlackbotFrd::Log.logfile}'")
     SlackbotFrd::Log.warn("Logging level set to '#{SlackbotFrd::Log.level}'")
 
-    token = $slackbotfrd_conf["token"]
-    token = ENV["SLACKBOT_FRD_TOKEN"] if ENV["SLACKBOT_FRD_TOKEN"]
+    token = $slackbotfrd_conf['token']
+    token = ENV['SLACKBOT_FRD_TOKEN'] if ENV['SLACKBOT_FRD_TOKEN']
     token = options[:token] if options[:token]
     unless token
-      SlackbotFrd::Log.error("No token found.  Cannot authenticate to Slack")
+      SlackbotFrd::Log.error('No token found.  Cannot authenticate to Slack')
       return
     end
 
@@ -180,7 +180,7 @@ class SlackbotFrdBin < Thor
     end
   end
 
-  desc "stop", "Stop all bots"
+  desc 'stop', 'Stop all bots'
   long_desc <<-LONGDESC
     stop will stop all bots
 
@@ -195,7 +195,7 @@ class SlackbotFrdBin < Thor
     delfile(ERROR_FILE)
   end
 
-  desc "bump", "Kill the bots, but not the watcher"
+  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
@@ -208,7 +208,7 @@ class SlackbotFrdBin < Thor
     kill_pid(connection_pid)
   end
 
-  desc "restart", "Stop all bots and restart them"
+  desc 'restart', 'Stop all bots and restart them'
   long_desc <<-LONGDESC
     restart will restart all bots
 

data/lib/slackbot_frd/initializer/bot_starter.rb

@@ -17,11 +17,13 @@ class BotStarter
     bot_enabled = ->(bot) do
       enabled_bots.empty? ||
       enabled_bots.include?(bot) ||
-      enabled_bots.include?(bot.gsub("-", "_").camelize)
+      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)
+    slack_connection = SlackbotFrd::SlackConnection.new(
+      token: token, errors_file: errors_file, monitor_connection: true
+    )
 
     load_bot_files(botdir)
 
@@ -37,12 +39,12 @@ class BotStarter
     end
 
     if bots.count == 0
-      SlackbotFrd::Log.error("Not starting: no bots found")
-      File.append(errors_file, "Not starting: no bots found")
+      SlackbotFrd::Log.error('Not starting: no bots found')
+      File.append(errors_file, 'Not starting: no bots found')
     else
-      SlackbotFrd::Log.debug("Starting SlackConnection")
+      SlackbotFrd::Log.debug('Starting SlackConnection')
       slack_connection.start
-      SlackbotFrd::Log.debug("Connection closed")
+      SlackbotFrd::Log.debug('Connection closed')
     end
   end
 

data/lib/slackbot_frd/lib/bot.rb

@@ -12,7 +12,7 @@ module SlackbotFrd
 
     # This is where the bot adds all of their callbacks to the bpbot
     def add_callbacks(slack_connection)
-      raise StandardError.new("You must override the define() method for your bot to do anything")
+      raise StandardError.new('You must override the define() method for your bot to do anything')
     end
   end
 end

data/lib/slackbot_frd/lib/errors.rb

@@ -5,7 +5,7 @@ module SlackbotFrd
       if message
         super(message)
       else
-        super("An API token is required for authenticating to the Slack API")
+        super('An API token is required for authenticating to the Slack API')
       end
     end
   end

data/lib/slackbot_frd/lib/log.rb

@@ -48,7 +48,7 @@ module SlackbotFrd
       om = "#{DateTime.now.strftime('%Y-%m-%e %H:%M:%S.%L %z')}: [#{loglevel}]: #{message}\n"
       print om.send(color)
       begin
-        raise StandardError.new("No log file specified. (Set with SlackbotFrd::Log.logfile=)") unless @logfile
+        raise StandardError.new('No log file specified. (Set with SlackbotFrd::Log.logfile=)') unless @logfile
         File.open(@logfile, 'a') do |f|
           f.write(om)
         end

data/lib/slackbot_frd/lib/slack_connection.rb

@@ -21,16 +21,17 @@ module SlackbotFrd
     FILE_DIR = File.dirname(FILE_PATH)
     LOG_FILE = "#{APP_ROOT}/bp-slackbot.log"
     PID_FILE_NAME = "#{APP_ROOT}/bp-slackbot.pid"
+    PING_INTERVAL_SECONDS = 5
 
     attr_accessor :token
 
-    def initialize(token, errors_file)
-      unless token
-        log_and_add_to_error_file("No token passed to #{self.class}")
-      end
+    def initialize(token:, errors_file:, monitor_connection: true)
+      log_and_add_to_error_file("No token passed to #{self.class}") unless token
 
       @token = token
       @errors_file = errors_file
+      @monitor_connection = monitor_connection
+
       @event_id = 0
       @on_connected_callbacks = []
       @on_disconnected_callbacks = []
@@ -44,7 +45,8 @@ module SlackbotFrd
       @channel_id_to_name = {}
       @channel_name_to_id = {}
 
-      restrict_actions_to_channels_joined
+      @pong_received = true
+
       SlackbotFrd::Log.debug("Done initializing #{self.class}")
     end
 
@@ -62,7 +64,9 @@ module SlackbotFrd
         end
 
         unless wss_url
-          log_and_add_to_error_file("No Real Time stream opened by slack.  Check for network connection and correct authentication token")
+          log_and_add_to_error_file(
+            'No Real Time stream opened by slack.  Check for network connection and correct authentication token'
+          )
           return
         end
         @ws = Faye::WebSocket::Client.new(wss_url)
@@ -72,10 +76,15 @@ module SlackbotFrd
         @ws.on(:message) { |event| process_message_received(event) }
 
         # Clean up our pid file
-        @ws.on(:close) { |event| File.delete(PID_FILE_NAME) }
+        @ws.on(:close) { |_event| File.delete(PID_FILE_NAME) }
+
+        # This should ensure that we get a pong back at least every
+        # PING_INTERVAL_SECONDS, otherwise we die because our
+        # connection is probably toast
+        EM.add_periodic_timer(PING_INTERVAL_SECONDS) { check_ping }
       end
 
-      SlackbotFrd::Log.debug("#{self.class}: event machine started")
+      SlackbotFrd::Log.info("#{self.class}: event machine loop terminated")
     end
 
     def event_id
@@ -93,13 +102,21 @@ module SlackbotFrd
 
     def on_message(user: :any, channel: :any, &block)
       wrap_user_or_channel_lookup_on_callback('on_message', user, channel) do
-        @on_message_callbacks.add(user: user_name_to_id(user), channel: channel_name_to_id(channel), callback: block)
+        @on_message_callbacks.add(
+          user: user_name_to_id(user),
+          channel: channel_name_to_id(channel),
+          callback: block
+        )
       end
     end
 
     def on_channel_left(user: :any, channel: :any, &block)
       wrap_user_or_channel_lookup_on_callback('on_message_channel_left', user, channel) do
-        @on_channel_left_callbacks.add(user: user_name_to_id(user), channel: channel_name_to_id(channel), callback: block)
+        @on_channel_left_callbacks.add(
+          user: user_name_to_id(user),
+          channel: channel_name_to_id(channel),
+          callback: block
+        )
       end
     end
 
@@ -138,7 +155,9 @@ module SlackbotFrd
     end
 
     def post_reaction(name:, channel: nil, timestamp: nil)
-      SlackbotFrd::Log.debug("#{self.class}: Posting reaction '#{name}' to channel '#{channel}' with timestamp '#{timestamp}'")
+      SlackbotFrd::Log.debug(
+        "#{self.class}: Posting reaction '#{name}' to channel '#{channel}' with timestamp '#{timestamp}'"
+      )
 
       resp = SlackbotFrd::SlackMethods::ReactionsAdd.add(
         token: @token,
@@ -150,24 +169,25 @@ module SlackbotFrd
       SlackbotFrd::Log.debug("#{self.class}: Received response:  #{resp}")
     end
 
-    def invite_user(user: user, channel: channel)
-      SlackbotFrd::Log.debug("#{self.class}: Inviting user '#{user}' to channel '#{channel}'")
+    def invite_user(user:, channel:)
+      SlackbotFrd::Log.debug(
+        "#{self.class}: Inviting user '#{user}' to channel '#{channel}'"
+      )
 
       resp = SlackbotFrd::SlackMethods::ChannelsInvite.invite(
         token: @token,
         user: user_name_to_id(user),
-        channel: channel_name_to_id(channel),
+        channel: channel_name_to_id(channel)
       )
 
       SlackbotFrd::Log.debug("#{self.class}: Received response:  #{resp}")
     end
 
-    def restrict_actions_to_channels_joined(value = true)
-      @restrict_actions_to_channels_joined = value
-    end
-
     def users_in_channel(channel)
-      a = SlackMethods::ChannelsInfo.members(token: @token, channel: channel_name_to_id(channel))
+      a = SlackMethods::ChannelsInfo.members(
+        token: @token,
+        channel: channel_name_to_id(channel)
+      )
       a.map{ |id| user_id_to_name(id) }
     end
 
@@ -189,52 +209,70 @@ module SlackbotFrd
 
     def user_id_to_name(user_id)
       return user_id if user_id == :any || user_id == :bot
-      unless @user_id_to_name && @user_id_to_name.has_key?(user_id)
+      unless @user_id_to_name && @user_id_to_name.key?(user_id)
         refresh_user_info
       end
-      SlackbotFrd::Log.warn("#{self.class}: User id '#{user_id}' not found") unless @user_id_to_name.include?(user_id)
+      unless @user_id_to_name.include?(user_id)
+        SlackbotFrd::Log.warn("#{self.class}: User id '#{user_id}' not found")
+      end
       @user_id_to_name[user_id]
     end
 
     def user_name_to_id(user_name)
       return user_name if user_name == :any || user_name == :bot
-      unless @user_name_to_id && @user_name_to_id.has_key?(user_name)
+      unless @user_name_to_id && @user_name_to_id.key?(user_name)
         refresh_user_info
       end
-      SlackbotFrd::Log.warn("#{self.class}: User name '#{user_name}' not found") unless @user_name_to_id.include?(user_name)
+      unless @user_name_to_id.include?(user_name)
+        SlackbotFrd::Log.warn(
+          "#{self.class}: User name '#{user_name}' not found"
+        )
+      end
       @user_name_to_id[user_name]
     end
 
     def channel_id_to_name(channel_id)
-      unless @channel_id_to_name && @channel_id_to_name.has_key?(channel_id)
+      unless @channel_id_to_name && @channel_id_to_name.key?(channel_id)
         refresh_channel_info
       end
-      SlackbotFrd::Log.warn("#{self.class}: Channel id '#{channel_id}' not found") unless @channel_id_to_name.include?(channel_id)
+      unless @channel_id_to_name.include?(channel_id)
+        SlackbotFrd::Log.warn(
+          "#{self.class}: Channel id '#{channel_id}' not found"
+        )
+      end
       @channel_id_to_name[channel_id]
     end
 
     def channel_name_to_id(channel_name)
       return channel_name if channel_name == :any
       nc = normalize_channel_name(channel_name)
-      unless @channel_name_to_id && @channel_name_to_id.has_key?(nc)
+      unless @channel_name_to_id && @channel_name_to_id.key?(nc)
         refresh_channel_info
       end
-      SlackbotFrd::Log.warn("#{self.class}: Channel name '#{nc}' not found") unless @channel_name_to_id.include?(nc)
+      unless @channel_name_to_id.include?(nc)
+        SlackbotFrd::Log.warn(
+          "#{self.class}: Channel name '#{nc}' not found"
+        )
+      end
       @channel_name_to_id[nc]
     end
 
     private
-    def send_message_as_user(channel: channel, message: message)
+    def send_message_as_user(channel:, message:)
       unless @ws
-        log_and_add_to_error_file("Cannot send message '#{message}' as user to channel '#{channel}' because not connected to wss stream")
+        log_and_add_to_error_file(
+          "Cannot send message '#{message}' as user to channel '#{channel}' because not connected to wss stream"
+        )
       end
 
-      SlackbotFrd::Log.debug("#{self.class}: Sending message '#{message}' as user to channel '#{channel}'")
+      SlackbotFrd::Log.debug(
+        "#{self.class}: Sending message '#{message}' as user to channel '#{channel}'"
+      )
 
       begin
         resp = @ws.send({
           id: event_id,
-          type: "message",
+          type: 'message',
           channel: channel_name_to_id(channel),
           text: message
         }.to_json)
@@ -247,7 +285,9 @@ module SlackbotFrd
 
     private
     def send_message_as_bot(channel:, message:, username:, avatar_emoji: nil, avatar_url: nil)
-      SlackbotFrd::Log.debug("#{self.class}: Sending message '#{message}' as bot user '#{username}' to channel '#{channel}'")
+      SlackbotFrd::Log.debug(
+        "#{self.class}: Sending message '#{message}' as bot user '#{username}' to channel '#{channel}'"
+      )
 
       resp = SlackbotFrd::SlackMethods::ChatPostMessage.postMessage(
         token: @token,
@@ -265,10 +305,14 @@ module SlackbotFrd
     def wrap_user_or_channel_lookup_on_callback(callback_name, user, channel)
       begin
         return yield
-      rescue SlackbotFrd::InvalidChannelError => e
-        log_and_add_to_error_file("Unable to add #{callback_name} callback for channel '#{channel}'.  Lookup of channel name to ID failed.  Check network connection, and ensure channel exists and is accessible")
-      rescue SlackbotFrd::InvalidUserError => e
-        log_and_add_to_error_file("Unable to add #{callback_name} callback for user '#{user}'.  Lookup of user name to ID failed.  Check network connection and ensure user exists")
+      rescue SlackbotFrd::InvalidChannelError => _e
+        log_and_add_to_error_file(
+          "Unable to add #{callback_name} callback for channel '#{channel}'.  Lookup of channel name to ID failed.  Check network connection, and ensure channel exists and is accessible"
+        )
+      rescue SlackbotFrd::InvalidUserError => _e
+        log_and_add_to_error_file(
+          "Unable to add #{callback_name} callback for user '#{user}'.  Lookup of user name to ID failed.  Check network connection and ensure user exists"
+        )
       end
     end
 
@@ -282,44 +326,48 @@ module SlackbotFrd
     def process_message_received(event)
       message = JSON.parse(event.data)
       SlackbotFrd::Log.verbose("#{self.class}: Message received: #{message}")
-      if message["type"] == "message"
-        if message["subtype"] == "channel_join"
-          process_join_message(message)
-        elsif message["subtype"] == "channel_leave"
-          process_leave_message(message)
-        elsif message["subtype"] == "file_share"
-          process_file_share(message)
-        else
-          process_chat_message(message)
-        end
+
+      return unless message['type'] == 'message'
+      if message['subtype'] == 'channel_join'
+        process_join_message(message)
+      elsif message['subtype'] == 'channel_leave'
+        process_leave_message(message)
+      elsif message['subtype'] == 'file_share'
+        process_file_share(message)
+      else
+        process_chat_message(message)
       end
     end
 
     private
     def process_file_share(message)
-      SlackbotFrd::Log.verbose("#{self.class}: Processing file share: #{message}")
-      SlackbotFrd::Log.debug("#{self.class}: Not processing file share because it is not implemented:")
+      SlackbotFrd::Log.verbose(
+        "#{self.class}: Processing file share: #{message}"
+      )
+      SlackbotFrd::Log.debug(
+        "#{self.class}: Not processing file share because it is not implemented:"
+      )
     end
 
     private
     def extract_user(message)
-      user = message["user"]
-      user = :bot if message["subtype"] == "bot_message"
-      user = message["message"]["user"] if !user && message["message"]
+      user = message['user']
+      user = :bot if message['subtype'] == 'bot_message'
+      user = message['message']['user'] if !user && message['message']
       user
     end
 
     private
     def extract_ts(message)
-      ts = message["ts"]
-      ts = message["message"]["ts"] if message["message"] && message["message"]["ts"]
+      ts = message['ts']
+      ts = message['message']['ts'] if message['message'] && message['message']['ts']
       ts
     end
 
     private
     def extract_text(message)
-      text = message["text"]
-      text = message["message"]["text"] if !text && message["message"]
+      text = message['text']
+      text = message['message']['text'] if !text && message['message']
       text
     end
 
@@ -328,7 +376,7 @@ module SlackbotFrd
       SlackbotFrd::Log.verbose("#{self.class}: Processing chat message: #{message}")
 
       user = extract_user(message)
-      channel = message["channel"]
+      channel = message['channel']
       text = extract_text(message)
       ts = extract_ts(message)
 
@@ -362,9 +410,9 @@ module SlackbotFrd
     private
     def process_join_message(message)
       SlackbotFrd::Log.verbose("#{self.class}: Processing join message: #{message}")
-      user = message["user"]
-      user = :bot if message["subtype"] == "bot_message"
-      channel = message["channel"]
+      user = message['user']
+      user = :bot if message['subtype'] == 'bot_message'
+      channel = message['channel']
       @on_channel_joined_callbacks.where_include_all(user: user, channel: channel).each do |callback|
         callback.call(user: user_id_to_name(user), channel: channel_id_to_name(channel))
       end
@@ -373,9 +421,9 @@ module SlackbotFrd
     private
     def process_leave_message(message)
       SlackbotFrd::Log.verbose("#{self.class}: Processing leave message: #{message}")
-      user = message["user"]
-      user = :bot if message["subtype"] == "bot_message"
-      channel = message["channel"]
+      user = message['user']
+      user = :bot if message['subtype'] == 'bot_message'
+      channel = message['channel']
       @on_channel_left_callbacks.where_include_all(user: user, channel: channel).each do |callback|
         callback.call(user: user_id_to_name(user), channel: channel_id_to_name(channel))
       end
@@ -421,5 +469,29 @@ module SlackbotFrd
       SlackbotFrd::Log.error(err)
       File.append(@errors_file, "#{err}\n")
     end
+
+    private
+    def check_ping
+      @pong_received ? send_ping : die_from_no_pong
+    end
+
+    private
+    def send_ping
+      SlackbotFrd::Log.verbose('Sending ping')
+      @pong_received = false
+      @ws.ping do
+        @pong_received = true
+        SlackbotFrd::Log.verbose('Pong received')
+      end
+    end
+
+    private
+    def die_from_no_pong
+      SlackbotFrd::Log.error(
+        'Pong not received after 5 seconds.  Stopping EM loop...'
+      )
+      @ws.close
+      EM.stop_event_loop
+    end
   end
 end

data/lib/slackbot_frd/slack_methods/channels_info.rb

@@ -24,8 +24,8 @@ module SlackbotFrd
       end
 
       def members
-        if @response["channel"]
-          @response["channel"]["members"]
+        if @response['channel']
+          @response['channel']['members']
         else
           []
         end

data/lib/slackbot_frd/slack_methods/channels_list.rb

@@ -20,16 +20,16 @@ module SlackbotFrd
 
       def ids_to_names
         retval = {}
-        @response["channels"].each do |channel|
-          retval[channel["id"]] = channel["name"]
+        @response['channels'].each do |channel|
+          retval[channel['id']] = channel['name']
         end
         retval
       end
 
       def names_to_ids
         retval = {}
-        @response["channels"].each do |channel|
-          retval[channel["name"]] = channel["id"]
+        @response['channels'].each do |channel|
+          retval[channel['name']] = channel['id']
         end
         retval
       end

data/lib/slackbot_frd/slack_methods/groups_list.rb

@@ -20,16 +20,16 @@ module SlackbotFrd
 
       def ids_to_names
         retval = {}
-        @response["groups"].each do |group|
-          retval[group["id"]] = group["name"]
+        @response['groups'].each do |group|
+          retval[group['id']] = group['name']
         end
         retval
       end
 
       def names_to_ids
         retval = {}
-        @response["groups"].each do |group|
-          retval[group["name"]] = group["id"]
+        @response['groups'].each do |group|
+          retval[group['name']] = group['id']
         end
         retval
       end

data/lib/slackbot_frd/slack_methods/im_channels_list.rb

@@ -20,16 +20,16 @@ module SlackbotFrd
 
       def ids_to_names
         retval = {}
-        @response["ims"].each do |im|
-          retval[im["id"]] = im["user"]
+        @response['ims'].each do |im|
+          retval[im['id']] = im['user']
         end
         retval
       end
 
       def names_to_ids
         retval = {}
-        @response["ims"].each do |im|
-          retval[im["user"]] = im["id"]
+        @response['ims'].each do |im|
+          retval[im['user']] = im['id']
         end
         retval
       end

data/lib/slackbot_frd/slack_methods/rtm_start.rb

@@ -24,7 +24,7 @@ module SlackbotFrd
 
       def wss_url
         #return "ERR" unless @response.has_key?("url")
-        @response["url"]
+        @response['url']
       end
     end
   end

data/lib/slackbot_frd/slack_methods/users_list.rb

@@ -20,16 +20,16 @@ module SlackbotFrd
 
       def ids_to_names
         retval = {}
-        @response["members"].each do |user|
-          retval[user["id"]] = user["name"]
+        @response['members'].each do |user|
+          retval[user['id']] = user['name']
         end
         retval
       end
 
       def names_to_ids
         retval = {}
-        @response["members"].each do |user|
-          retval[user["name"]] = user["id"]
+        @response['members'].each do |user|
+          retval[user['name']] = user['id']
         end
         retval
       end

data/lib/slackbot_frd.rb

@@ -1,3 +1,3 @@
-Gem.find_files("slackbot_frd/**/*.rb").each do |path|
+Gem.find_files('slackbot_frd/**/*.rb').each do |path|
   require path.gsub(/\.rb$/, '') unless path =~ /bot.*cli/
 end

metadata

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