slackbot_frd 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04cee0faa28be4076894f5b61e49fb303430c138
-  data.tar.gz: 1e72aadc3cab4e5e7a7760a5445a13e28e661028
+  metadata.gz: cb2881a44943ab20e70ea1b0805c5f402273e273
+  data.tar.gz: ead056bcf941443b3618bea5aaff6d7a620743f9
 SHA512:
-  metadata.gz: ad3b57ef770214cc5696afcb3bd1d12a232cad10b38068760dc4a88513fc53c990a0a2d61e0e7039ef1e5b1dabe8cc09b27bd86ea1615a5a2aa4a0e2a7016da6
-  data.tar.gz: 38438e35bba579a89a20ac5c123582981c9ad7eef0f5460756c50b10fbbed03f3c3ebb46c321887ca193f373fa2ec22f7880bed817889d1b613ce7e6af0b58d1
+  metadata.gz: dc6ca7b4a660ec8e3de5f0fbb91b473e5be6ea7b22929d3023d5df5a0766978c1f4202f45f11f86c7c856bfcaaf07339ecec11d195cf93b87777734c01d58c84
+  data.tar.gz: dcd3c54bd7714e2f69a095c593caedaa5b6d361c6448b26af0655365a8895ed4b909a0cfb66a6f8d2cc83040e5585618c1e8ef31cc16a9779b123473d2e08fbf

data/lib/slackbot_frd/initializer/bot_starter.rb

@@ -12,8 +12,8 @@ rescue LoadError
 end
 
 class BotStarter
-  def self.start_bots(errors_file, token, botdir, bots)
-    bot_enabled = ->(bot) { bots.empty? || bots.include?(bot) }
+  def self.start_bots(errors_file, token, botdir, enabled_bots)
+    bot_enabled = ->(bot) { enabled_bots.empty? || enabled_bots.include?(bot) }
 
     # Create a new Connection to pass to the bot classes
     slack_connection = SlackbotFrd::SlackConnection.new(token, errors_file)
@@ -24,9 +24,8 @@ class BotStarter
     # instantiate them, and then call their add_callbacks method
     ObjectSpace.each_object(Class).select do |klass|
       if klass != SlackbotFrd::Bot && klass.ancestors.include?(SlackbotFrd::Bot) && bot_enabled.call(klass.name)
-        SlackbotFrd::Log.debug("Instantiating class '#{klass.to_s}'")
+        SlackbotFrd::Log.debug("Instantiating and adding callbacks to class '#{klass.to_s}'")
         b = klass.new
-        SlackbotFrd::Log.debug("Adding callbacks to bot '#{klass}'")
         b.add_callbacks(slack_connection)
         bots.push(b)
       end

data/lib/slackbot_frd/lib/slack_connection.rb

@@ -25,8 +25,7 @@ module SlackbotFrd
 
     def initialize(token, errors_file)
       unless token
-        SlackbotFrd::Log::error("No token passed to #{self.class}")
-        raise NoTokenError.new
+        log_and_add_to_error_file("No token passed to #{self.class}")
       end
 
       @token = token
@@ -55,11 +54,14 @@ module SlackbotFrd
       SlackbotFrd::Log::info("#{self.class}: starting event machine")
 
       EM.run do
-        wss_url = SlackbotFrd::SlackMethods::RtmStart.wss_url(@token)
+        begin
+          wss_url = SlackbotFrd::SlackMethods::RtmStart.wss_url(@token)
+        rescue SocketError => e
+          log_and_add_to_error_file(socket_error_message(e))
+        end
+
         unless wss_url
-          str = "No Real Time stream opened by slack.  Check for correct authentication token"
-          SlackbotFrd::Log.error(str)
-          File.append(@errors_file, "#{str}\n") if @errors_file
+          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)
@@ -89,36 +91,49 @@ module SlackbotFrd
     end
 
     def on_message(user = :any, channel = :any, &block)
-      @on_message_callbacks.add(user_name_to_id(user), channel_name_to_id(channel), block)
+      wrap_user_or_channel_lookup_on_callback('on_message', user, channel) do
+        @on_message_callbacks.add(user_name_to_id(user), channel_name_to_id(channel), block)
+      end
     end
 
     def on_channel_left(user = :any, channel = :any, &block)
-      @on_channel_left_callbacks.add(user_name_to_id(user), channel_name_to_id(channel), block)
+      wrap_user_or_channel_lookup_on_callback('on_message_channel_left', user, channel) do
+        @on_channel_left_callbacks.add(user_name_to_id(user), channel_name_to_id(channel), block)
+      end
     end
 
     def on_channel_joined(user = :any, channel = :any, &block)
-      u = user_name_to_id(user)
-      c = channel_name_to_id(channel)
-      @on_channel_joined_callbacks.add(u, c, block)
+      wrap_user_or_channel_lookup_on_callback('on_message_channel_joined', user, channel) do
+        u = user_name_to_id(user)
+        c = channel_name_to_id(channel)
+        @on_channel_joined_callbacks.add(u, c, block)
+      end
     end
 
     def send_message_as_user(channel, message)
       unless @ws
-        SlackbotFrd::Log::error("Cannot send message '#{message}' as user to channel '#{channel}' because not connected to wss stream")
-        raise NotConnectedError.new("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
 
-      resp = @ws.send({
-        id: event_id,
-        type: "message",
-        channel: channel_name_to_id(channel),
-        text: message
-      }.to_json)
+      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}'.  Response: #{resp}")
+      begin
+        resp = @ws.send({
+          id: event_id,
+          type: "message",
+          channel: channel_name_to_id(channel),
+          text: message
+        }.to_json)
+
+        SlackbotFrd::Log::debug("#{self.class}: Received response:  #{resp}")
+      rescue SocketError => e
+        log_and_add_to_error_file(socket_error_message(e))
+      end
     end
 
     def send_message(channel, message, username, avatar, avatar_is_emoji)
+      SlackbotFrd::Log::debug("#{self.class}: Sending message '#{message}' as user '#{username}' to channel '#{channel}'")
+
       resp = SlackbotFrd::SlackMethods::ChatPostMessage.postMessage(
         @token,
         channel_name_to_id(channel),
@@ -127,7 +142,8 @@ module SlackbotFrd
         avatar,
         avatar_is_emoji
       )
-      SlackbotFrd::Log::debug("#{self.class}: sending message '#{message}' as user '#{username}' to channel '#{channel}'.  Response: #{resp}")
+
+      SlackbotFrd::Log::debug("#{self.class}: Received response:  #{resp}")
     end
 
     def restrict_actions_to_channels_joined(value = true)
@@ -170,6 +186,17 @@ module SlackbotFrd
       @channel_name_to_id[nc]
     end
 
+    private
+    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 channel name to ID failed.  Check network connection and ensure user exists")
+      end
+    end
+
     private
     def normalize_channel_name(channel_name)
       return channel_name[1..-1] if channel_name.start_with?('#')
@@ -254,20 +281,39 @@ module SlackbotFrd
 
     private
     def refresh_user_info
-      users_list = SlackbotFrd::SlackMethods::UsersList.new(@token).connect
-      @user_id_to_name = users_list.ids_to_names
-      @user_name_to_id = users_list.names_to_ids
+      begin
+        users_list = SlackbotFrd::SlackMethods::UsersList.new(@token).connect
+        @user_id_to_name = users_list.ids_to_names
+        @user_name_to_id = users_list.names_to_ids
+      rescue SocketError => e
+        log_and_add_to_error_file(socket_error_message(e))
+      end
     end
 
     private
     def refresh_channel_info
-      channels_list = SlackbotFrd::SlackMethods::ChannelsList.new(@token).connect
-      @channel_id_to_name = channels_list.ids_to_names
-      @channel_name_to_id = channels_list.names_to_ids
+      begin
+        channels_list = SlackbotFrd::SlackMethods::ChannelsList.new(@token).connect
+        @channel_id_to_name = channels_list.ids_to_names
+        @channel_name_to_id = channels_list.names_to_ids
+
+        im_channels_list = SlackbotFrd::SlackMethods::ImChannelsList.new(@token).connect
+        @channel_id_to_name.merge!(im_channels_list.ids_to_names)
+        @channel_name_to_id.merge!(im_channels_list.names_to_ids)
+      rescue SocketError => e
+        log_and_add_to_error_file(socket_error_message(e))
+      end
+    end
 
-      im_channels_list = SlackbotFrd::SlackMethods::ImChannelsList.new(@token).connect
-      @channel_id_to_name.merge!(im_channels_list.ids_to_names)
-      @channel_name_to_id.merge!(im_channels_list.names_to_ids)
+    private
+    def socket_error_message(e)
+      "SocketError: Check your connection: #{e.message}"
+    end
+
+    private
+    def log_and_add_to_error_file(err)
+      SlackbotFrd::Log::error(err)
+      File.append(@errors_file, "#{err}\n")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slackbot_frd
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ben Porter
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-- !ruby/object:Gem::Dependency
-  name: daemons
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement