slackbot_frd 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd42f15c6b386a233d064d8dd584806014af4435
-  data.tar.gz: 0d7fa366f7141f126df3aa80316dabea78f1ae1c
+  metadata.gz: f8e1ae54ee35f6483bf1a209d5c233dc94e2b937
+  data.tar.gz: c8dbcc68b6a1dfcebb81226c0a16455792acae6b
 SHA512:
-  metadata.gz: da8f260a9cb49e4506e14a7f3eca4ac994fbb1c24a7312427a65f61d80424a13cb8f1a9df45d645e3b13a2ca965dd803be19a615670fe02e96c9ceba0e6c17da
-  data.tar.gz: 82d2a87547f7ef172814b67b5b694ec88b14aa438395cf5e396f81601aa6998c22c70b5a98a2bc1aa5c2b554aa245b3f58e39537282216c7fa6f88250bcb5c93
+  metadata.gz: a180c87abea6a0e14aacd4a280274458cdef7ef224649c2a58b464630d5462f74c0fed7beebd5ea344afeefe2ea87802721fbc2fcd1d9231fba6a2fb5d096c04
+  data.tar.gz: be3640e1231e738f9e5304096745437bb0759880b6726307c274fbfe193995878fc3485b5bc8bffd2873277f39a28681d88e4055eeabf49b6d90fb01679d1786

data/bin/slackbot-frd

@@ -109,7 +109,7 @@ class SlackbotFrdBin < Thor
   option 'log-file', type: :string, aliases: 'lf'
   def start(*bots)
     if running?(watcher_pid)
-      SlackbotFrd::Log.warn("Already running.  Not starting again")
+      SlackbotFrd::Log.warn("Already running (watcher pid: '#{watcher_pid}').  Not starting again")
       return
     end
 

data/lib/slackbot_frd/lib/slack_connection.rb

@@ -45,14 +45,14 @@ module SlackbotFrd
       @channel_name_to_id = {}
 
       restrict_actions_to_channels_joined
-      SlackbotFrd::Log::debug("Done initializing #{self.class}")
+      SlackbotFrd::Log.debug("Done initializing #{self.class}")
     end
 
     def start
       # Write pid file
       File.write(PID_FILE_NAME, "#{Process.pid}")
 
-      SlackbotFrd::Log::info("#{self.class}: starting event machine")
+      SlackbotFrd::Log.info("#{self.class}: starting event machine")
 
       EM.run do
         begin
@@ -75,7 +75,7 @@ module SlackbotFrd
         @ws.on(:close) { |event| File.delete(PID_FILE_NAME) }
       end
 
-      SlackbotFrd::Log::debug("#{self.class}: event machine started")
+      SlackbotFrd::Log.debug("#{self.class}: event machine started")
     end
 
     def event_id
@@ -116,7 +116,7 @@ module SlackbotFrd
         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({
@@ -126,14 +126,14 @@ module SlackbotFrd
           text: message
         }.to_json)
 
-        SlackbotFrd::Log::debug("#{self.class}: Received response:  #{resp}")
+        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_as_user(channel, message, username, avatar, avatar_is_emoji)
-      SlackbotFrd::Log::debug("#{self.class}: Sending message '#{message}' as user '#{username}' to channel '#{channel}'")
+      SlackbotFrd::Log.debug("#{self.class}: Sending message '#{message}' as user '#{username}' to channel '#{channel}'")
 
       resp = SlackbotFrd::SlackMethods::ChatPostMessage.postMessage(
         @token,
@@ -144,7 +144,19 @@ module SlackbotFrd
         avatar_is_emoji
       )
 
-      SlackbotFrd::Log::debug("#{self.class}: Received response:  #{resp}")
+      SlackbotFrd::Log.debug("#{self.class}: Received response:  #{resp}")
+    end
+
+    def invite_user(user, channel)
+      SlackbotFrd::Log.debug("#{self.class}: Inviting user '#{user}' to channel '#{channel}'")
+
+      resp = SlackbotFrd::SlackMethods::ChannelsInvite.invite(
+        @token,
+        user_name_to_id(user),
+        channel_name_to_id(channel),
+      )
+
+      SlackbotFrd::Log.debug("#{self.class}: Received response:  #{resp}")
     end
 
     def restrict_actions_to_channels_joined(value = true)
@@ -156,19 +168,19 @@ module SlackbotFrd
       a.map{ |id| user_id_to_name(id) }
     end
 
-    def user_ids(force_refresh = false)
+    def user_ids(_force_refresh = false)
       @user_id_to_name.keys
     end
 
-    def user_names(force_refresh = false)
+    def user_names(_force_refresh = false)
       @user_name_to_id.keys
     end
 
-    def channel_ids(force_refresh = false)
+    def channel_ids(_force_refresh = false)
       @user_id_to_name.keys
     end
 
-    def channel_names(force_refresh = false)
+    def channel_names(_force_refresh = false)
       @channel_name_to_id.keys
     end
 
@@ -177,7 +189,7 @@ module SlackbotFrd
       unless @user_id_to_name && @user_id_to_name.has_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)
+      SlackbotFrd::Log.warn("#{self.class}: User id '#{user_id}' not found") unless @user_id_to_name.include?(user_id)
       @user_id_to_name[user_id]
     end
 
@@ -186,7 +198,7 @@ module SlackbotFrd
       unless @user_name_to_id && @user_name_to_id.has_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)
+      SlackbotFrd::Log.warn("#{self.class}: User name '#{user_name}' not found") unless @user_name_to_id.include?(user_name)
       @user_name_to_id[user_name]
     end
 
@@ -194,7 +206,7 @@ module SlackbotFrd
       unless @channel_id_to_name && @channel_id_to_name.has_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)
+      SlackbotFrd::Log.warn("#{self.class}: Channel id '#{channel_id}' not found") unless @channel_id_to_name.include?(channel_id)
       @channel_id_to_name[channel_id]
     end
 
@@ -204,7 +216,7 @@ module SlackbotFrd
       unless @channel_name_to_id && @channel_name_to_id.has_key?(nc)
         refresh_channel_info
       end
-      SlackbotFrd::Log::warn("#{self.class}: Channel name '#{nc}' not found") unless @channel_name_to_id.include?(nc)
+      SlackbotFrd::Log.warn("#{self.class}: Channel name '#{nc}' not found") unless @channel_name_to_id.include?(nc)
       @channel_name_to_id[nc]
     end
 
@@ -228,7 +240,7 @@ module SlackbotFrd
     private
     def process_message_received(event)
       message = JSON.parse(event.data)
-      SlackbotFrd::Log::verbose("#{self.class}: Message received: #{message}")
+      SlackbotFrd::Log.verbose("#{self.class}: Message received: #{message}")
       if message["type"] == "message"
         if message["subtype"] == "channel_join"
           process_join_message(message)
@@ -244,13 +256,13 @@ module SlackbotFrd
 
     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 process_chat_message(message)
-      SlackbotFrd::Log::verbose("#{self.class}: Processing chat message: #{message}")
+      SlackbotFrd::Log.verbose("#{self.class}: Processing chat message: #{message}")
 
       user = message["user"]
       user = :bot if message["subtype"] == "bot_message"
@@ -258,12 +270,12 @@ module SlackbotFrd
       text = message["text"]
 
       unless user
-        SlackbotFrd::Log::warn("#{self.class}: Chat message doesn't include user! message: #{message}")
+        SlackbotFrd::Log.warn("#{self.class}: Chat message doesn't include user! message: #{message}")
         return
       end
 
       unless channel
-        SlackbotFrd::Log::warn("#{self.class}: Chat message doesn't include channel! message: #{message}")
+        SlackbotFrd::Log.warn("#{self.class}: Chat message doesn't include channel! message: #{message}")
         return
       end
 
@@ -281,7 +293,7 @@ module SlackbotFrd
 
     private
     def process_join_message(message)
-      SlackbotFrd::Log::verbose("#{self.class}: Processing 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"]
@@ -292,7 +304,7 @@ module SlackbotFrd
 
     private
     def process_leave_message(message)
-      SlackbotFrd::Log::verbose("#{self.class}: Processing 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"]
@@ -334,7 +346,7 @@ module SlackbotFrd
 
     private
     def log_and_add_to_error_file(err)
-      SlackbotFrd::Log::error(err)
+      SlackbotFrd::Log.error(err)
       File.append(@errors_file, "#{err}\n")
     end
   end

data/lib/slackbot_frd/slack_methods/channels_invite.rb

@@ -0,0 +1,35 @@
+require 'httparty'
+require 'json'
+
+module SlackbotFrd
+  module SlackMethods
+    class ChannelsInvite
+      include HTTParty
+      base_uri 'https://slack.com/api/channels.invite'
+
+      attr_reader :response
+
+      def self.invite(token, user, channel)
+        ChannelsInvite.new(token, user, channel).run
+      end
+
+      def initialize(token, user, channel)
+        @token = token
+        @user = user
+        @channel = channel
+      end
+
+      def run
+        @response = JSON.parse(
+          self.class.post(
+            '',
+            body: {
+              token: @token, channel: @channel, user: @user
+            }
+          ).body
+        )
+        @response
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slackbot_frd
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-16 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -173,6 +173,7 @@ files:
 - lib/slackbot_frd/lib/slack_connection.rb
 - lib/slackbot_frd/lib/user_channel_callbacks.rb
 - lib/slackbot_frd/slack_methods/channels_info.rb
+- lib/slackbot_frd/slack_methods/channels_invite.rb
 - lib/slackbot_frd/slack_methods/channels_list.rb
 - lib/slackbot_frd/slack_methods/chat_post_message.rb
 - lib/slackbot_frd/slack_methods/im_channels_list.rb
@@ -198,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: slackbot_frd provides a dirt-simple framework for implementing one or more