slack-smart-bot 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7276a93ba8921b2fc6fe95b31d883210acdf5668959f997f4605f4069f4d1050
-  data.tar.gz: '0389132b491c8c7e0d7ee58057b8499a0b5210ccb0b940bb3426aa2a5e2e56b3'
+  metadata.gz: 031aceba04e6017cd314ba2be33d0e6cee0326e74f2301ef17da4ea5e932f315
+  data.tar.gz: 3dc24d0bcf047d2cdab12f8d9dde3ee3f2b4817ce9f94264057fce54ea95f00a
 SHA512:
-  metadata.gz: df45b098eb49a96e57d7c5fb64aca50f28bfc663b6c6f1122d98ef01f3064705b4fbd136273cd53db167bd8fa735b253354a3f1b310525eacf86cd78b59c4dbb
-  data.tar.gz: 2fe9fceb4f7bce3423371abd2185d91e1debe2a37155390838de5d4d0d900d96ffc5264fc613a6d7f75dc6e1bfebd160e422897ec301c93d3b1972aa8507e3c3
+  metadata.gz: 9f067e911e6748530944a0ec7534e54bd631c3549404cd3dd8b6d9ab69c004a8af7318916f68a0bc4e74289abc5f51d9b785147fdb275bc627e46abdd714f988
+  data.tar.gz: 7cac3469e1320b94a4777c48069033b6b0e53d33f1c800b8fb0bed43b93ff4e82a03ce89ee59c158a94ad0964e76544f7a3d4c1af0091787ba6d0dfd241f7d2a

data/README.md

@@ -174,8 +174,8 @@ To run a command on demand:
   **_`!THE_COMMAND`_**  
   **_`@NAME_OF_BOT THE_COMMAND`_**  
   **_`NAME_OF_BOT THE_COMMAND`_**  
-To run a command on demand and add the respond on a thread:
-  **_`^THE_COMMAND`_**
+To run a command on demand and add the respond on a thread:  
+  **_`^THE_COMMAND`_**  
   **_`!!THE_COMMAND`_**
 
 Examples run a command on demand:
@@ -187,21 +187,30 @@ Examples run a command on demand:
 
 >**_Peter>_** `smart-bot see shortcuts`  
 >**_Smart-Bot>_** `Available shortcuts for Peter:`  
->`Spanish account: ruby require 'iso/iban'; 10.times {puts ISO::IBAN.random('ES')}`
->**_Peter>_** `!!echo Example`
->                 **_Smart-Bot>_** `Example`
->**_Peter>_** `^echo Example`
->                 **_Smart-Bot>_** `Example`
+>`Spanish account: ruby require 'iso/iban'; 10.times {puts ISO::IBAN.random('ES')}`  
+>**_Peter>_** `!!echo Example`  
+>. . . . . . . . .**_Smart-Bot>_** `Example`  
+>**_Peter>_** `^echo Example`  
+>. . . . . . . . .**_Smart-Bot>_** `Example`
 
 Also you can always call the Smart Bot from any channel, even from channels without a running Smart Bot. You can use the External Call on Demand: **_`@NAME_OF_BOT on #CHANNEL_NAME COMMAND`_**. In this case you will call the bot on #CHANNEL_NAME.
 
 Example:
 >**_Peter>_** `@smart-bot on #the_channel ruby puts Time.now`  
->**_Smart-Bot>_** `2019-10-23 12:43:42 +0000`
+>**_Smart-Bot>_** `2019-10-23 12:43:42 +0000`  
 >**_Peter>_** `@smart-bot on #the_channel ^ruby puts Time.now`  
-                 >**_Smart-Bot>_** `2019-10-23 12:43:42 +0000`
+>. . . . . . . . .**_Smart-Bot>_** `2019-10-23 12:43:42 +0000`
+
+If you want the Smart Bot just listen to part of the message you send, add the commands you want using '`' and start the line with '-!', '-!!' or '-^'
 
+Examples:
+>**_Peter>_** ``-!This text won't be treated but this one yes `ruby puts 'a'` and also this one `ruby puts 'b'` ``  
+>**_Smart-Bot>_** `a`  
+>**_Smart-Bot>_** `b`
 
+>**_Peter>_** ``-^This text won't be treated but this one yes `ruby puts 'a'` and also this one `ruby puts 'b'` ``  
+>. . . . . . . . .**_Smart-Bot>_** `a`  
+>. . . . . . . . .**_Smart-Bot>_** `b`
 
 ### Bot Help
 To get a full list of all commands and rules for a specific Smart Bot: **_`bot help`_**. It will show only the specific available commands for the user requesting.
@@ -244,7 +253,7 @@ To see the status of the bots, on the MASTER CHANNEL: **_`bot status`_**
 
 To close the Master Bot, run on MASTER CHANNEL: **_`exit bot`_**
 
-If you are a Master Admin on a Direct Message with the Smart Bot you can call the **_`bot stats`_** and get use stats of the users. You need to set to <true> the `stats` settings when initializing the Smart Bot. Take a look at `bot help bot stats` for more info.
+If you are a Master Admin on a Direct Message with the Smart Bot you can call the **_`bot stats`_** and get use stats of the users. You need to set to `true` the `stats` settings when initializing the Smart Bot. Take a look at `bot help bot stats` for more info.
 
 You can also get the bot logs of the bot channel you are using by calling `get bot logs`. You need to be a Master Admin user on a DM with the Smart Bot.
 

data/lib/slack/smart-bot/comm/send_file.rb

@@ -4,28 +4,31 @@ class SlackSmartBot
   #send_file(dest, 'the message', "#{project_folder}/temp/logs_ptBI.log", 'message to be sent', 'text/plain', "text")
   #send_file(dest, 'the message', "#{project_folder}/temp/example.jpeg", 'message to be sent', 'image/jpeg', "jpg")
   def send_file(to, msg, file, title, format, type = "text")
-    if to[0] == "U" #user
-      im = client.web_client.im_open(user: to)
-      channel = im["channel"]["id"]
-    else
-      channel = to
-    end
-    if Thread.current[:on_thread]
-      ts = Thread.current[:thread_ts]
-    else
-      ts = nil
-    end
+    unless config[:simulate]
+      if to[0] == "U" #user
+        im = client.web_client.im_open(user: to)
+        channel = im["channel"]["id"]
+      else
+        channel = to
+      end
 
-    client.web_client.files_upload(
-      channels: channel,
-      as_user: true,
-      file: Faraday::UploadIO.new(file, format),
-      title: title,
-      filename: file,
-      filetype: type,
-      initial_comment: msg,
-      thread_ts: ts
-    )
+      if Thread.current[:on_thread]
+        ts = Thread.current[:thread_ts]
+      else
+        ts = nil
+      end
+
+      client.web_client.files_upload(
+        channels: channel,
+        as_user: true,
+        file: Faraday::UploadIO.new(file, format),
+        title: title,
+        filename: file,
+        filetype: type,
+        initial_comment: msg,
+        thread_ts: ts
+      )
+    end
   end
 
 end

data/lib/slack/smart-bot/commands/on_bot/admin_master/bot_stats.rb

@@ -44,7 +44,7 @@ class SlackSmartBot
                 to+= " 23:59:59 +0000"
                 rows = []
 
-                Dir["#{config.stats_path}.*.log"].each do |file|
+                Dir["#{config.stats_path}.*.log"].sort.each do |file|
                     if file >= "#{config.stats_path}.#{from_file}.log" or file <= "#{config.stats_path}.#{to_file}.log"
                         CSV.foreach(file, headers: true, header_converters: :symbol, converters: :numeric) do |row|
                             row[:date] = row[:date].to_s

data/lib/slack/smart-bot/listen.rb

@@ -14,9 +14,27 @@ class SlackSmartBot
           channel = message[0].strip
           user = message[1].strip
           command = message[2].to_s.strip
-          # take in consideration that on simulation we are treating all messages even those that are not populated on real cases like when the message is not populated to the specific bot connection when message is sent with the bot
+          # take in consideration that on simulation we are treating all messages even those that are not populated on real cases like when the message is not populated to the specific bot connection when message is sent with the bot          
           @logger.info "treat message: #{message}" if config.testing
-          treat_message({channel: channel, user: user, text: command})
+
+
+          if command.match?(/^\s*\-!!/) or command.match?(/^\s*\-\^/)
+            command.scan(/`([^`]+)`/).flatten.each do |cmd|
+              if cmd.to_s!=''
+                cmd = "^#{cmd}"
+                treat_message({channel: channel, user: user, text: cmd}, false)
+              end
+            end
+          elsif command.match?(/^\s*\-!/)
+            command.scan(/`([^`]+)`/).flatten.each do |cmd|
+              if cmd.to_s!=''
+                cmd = "!#{cmd}"
+                treat_message({channel: channel, user: user, text: cmd}, false)
+              end
+            end
+          else
+            treat_message({channel: channel, user: user, text: command})
+          end
         end
       end
   end
@@ -26,8 +44,26 @@ class SlackSmartBot
     get_bots_created()
 
     client.on :message do |data|
-      unless data.user == "USLACKBOT"
-        treat_message(data)
+      unless data.user == "USLACKBOT" or data.text.nil?
+        if data.text.match?(/^\s*\-!!/) or data.text.match?(/^\s*\-\^/)
+          data.text.scan(/`([^`]+)`/).flatten.each do |cmd|
+            if cmd.to_s!=''
+              datao = data.dup
+              datao.text = "^#{cmd}"
+              treat_message(datao, false)
+            end
+          end
+        elsif data.text.match?(/^\s*\-!/)
+          data.text.scan(/`([^`]+)`/).flatten.each do |cmd|
+            if cmd.to_s!=''
+              datao = data.dup
+              datao.text = "!#{cmd}"
+              treat_message(datao, false)
+            end
+          end
+        else
+          treat_message(data)
+        end
       end
     end
 

data/lib/slack/smart-bot/treat_message.rb

@@ -1,10 +1,10 @@
 class SlackSmartBot
-  def treat_message(data)
+  def treat_message(data, remove_blocks = true)
     begin
       unless data.text.to_s.match(/\A\s*\z/)
         #to remove italic, bold... from data.text since there is no method on slack api
         #only works when no @user or #channel mentioned
-        if !data.blocks.nil? and data.blocks.size > 0
+        if remove_blocks and !data.blocks.nil? and data.blocks.size > 0
           data.blocks.each do |b|
             if b.type == 'rich_text'
               if b.elements.size > 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-smart-bot
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client