slack-smart-bot 1.6.5 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97d3af04c6b231089bad9829779d20b650c878e4782a43d7a43435144c5b9c96
-  data.tar.gz: 111ae9d729118b0e596845c597a613d6f41fb28d34b0e2ce160419aac863d9de
+  metadata.gz: b15c46b5b101a0a31487508457982e8f5d6b81ad41f54338407ecdb2aa9974f3
+  data.tar.gz: d32bfceda9068f5f11d1002f255b77a280f3a7b7068f40a632c03b7cb6378127
 SHA512:
-  metadata.gz: 9a8183b5c24bcd88484932c23bbf0f2df8fd11efedf4c845c6ac39660ab9c9a1c27f2702b6c5e8d312aac083acc968e6c4119ea5f0cffd4a64330824a7f1df90
-  data.tar.gz: 7e5d4ac7c6d6056754d33897ece0475839ce8160be966bf5b37dc6a19f71976944459fc2423899af12de17099635b5f85c277dacd610481af372d401574c120a
+  metadata.gz: 61c6e4060d928a1562176a0596ac968c7d007998c268816af489a0d36624a768ba1eadd3b6d27be7d19d37984b335d70215f718189165c1a9ac0a3a18130c5a0
+  data.tar.gz: 48995f9d416dd8906353508ac9bf86219cd92b2ede2f0043c3752dcc4db95564161ad64f41d86fd9f821fa1dc6d9d5bba3ef5519be037214e0003c3423b595c9

data/README.md

@@ -124,6 +124,7 @@ def rules(user, command, processed, dest)
             respond "zZzzzzzZZZZZZzzzzzzz!"
             react :sleeping
             sleep 10
+            unreact :sleeping
             react :sunny
           when /no/i, /nope/i, /cancel/i
             @questions.delete(from)
@@ -152,6 +153,8 @@ def rules(user, command, processed, dest)
       else
         respond "#{user.name}: #{stdout} #{stderr}"
       end
+      
+      unreact :runner
 
     else
       unless processed
@@ -159,8 +162,11 @@ def rules(user, command, processed, dest)
       end
   end
 end
-
 ```
+
+Also you can add general rules that will be available on all Smart Bot channels to `./rules/general_rules.rb`
+
+
 ### How to access the Smart Bot
 You can access the bot directly on the MASTER CHANNEL, on a secondary channel where the bot is running and directly by opening a private chat with the bot, in this case the conversation will be just between you and the bot.
 
@@ -388,6 +394,7 @@ Examples:
 >**_`add routine run_tests every 3h !run tests on customers`_**  
 >**_`add routine clean_db at 17:05 !clean customers temp db`_**  
 >**_`add silent routine clean_db at 17:05 !clean customers temp db`_**  
+>**_`add routine clean_custdb on Mondays at 05:00 !clean customers db`_**  
 
 Also instead of adding a Command to be executed, you can attach a file, then the routine will be created and the attached file will be executed on the criteria specified. Only Master Admins are allowed to use it this way.
 

data/lib/slack-smart-bot.rb

@@ -36,13 +36,7 @@ class SlackSmartBot
     else
       config[:path] = '.'
     end
-    if ENV['BOT_SILENT'].to_s == 'true'
-      config[:silent] = true
-    elsif ENV['BOT_SILENT'].to_s == 'false'
-      config[:silent] = false
-    else
-      config[:silent] = false unless config.key?(:silent)
-    end
+    config[:silent] = false unless config.key?(:silent)
     config[:testing] = false unless config.key?(:testing)
     config[:simulate] = false unless config.key?(:simulate)
     config[:stats] = false unless config.key?(:stats)
@@ -210,7 +204,8 @@ class SlackSmartBot
       if version_remote != VERSION
         version_message = ". There is a new available version: #{version_remote}."
       end
-      unless config[:silent]
+      if !config[:silent] or ENV['BOT_SILENT'].to_s == 'false'
+        ENV['BOT_SILENT'] = 'true' if config[:silent] == 'true' and ENV['BOT_SILENT'].to_s != 'true'
         respond "Smart Bot started v#{VERSION}#{version_message}\nIf you want to know what I can do for you: `bot help`.\n`bot rules` if you want to display just the specific rules of this channel.\nYou can talk to me privately if you prefer it."
       end
       @routines.each do |ch, rout|

data/lib/slack-smart-bot_general_rules.rb

@@ -0,0 +1,33 @@
+# add here the general rules you will be using in all Smart Bots
+def general_rules(user, command, processed, dest, files = [], rules_file = "")
+    from = user.name
+    display_name = user.profile.display_name
+  
+    begin
+      case command
+
+        # help: ----------------------------------------------
+        # help: `echo SOMETHING`
+        # help: `INTEGER echo SOMETHING`
+        # help:     repeats SOMETHING. If INTEGER supplied then that number of times.
+        # help:  Examples:
+        # help:     _echo I am the Smart Bot_
+        # help:     _100 echo :heart:_
+      when /^(\d*)\s*echo\s(.+)/i
+        save_stats :echo
+        $1.to_s == '' ? times = 1 : times = $1.to_i
+        respond ($2*times).to_s
+
+      else
+        return false
+      end
+      return true
+    rescue => exception
+      if defined?(@logger)
+        @logger.fatal exception
+        respond "Unexpected error!! Please contact an admin to solve it: <@#{ADMIN_USERS.join(">, <@")}>"
+      else
+        puts exception
+      end
+    end
+end

data/lib/slack-smart-bot_rules.rb

@@ -38,102 +38,98 @@ def rules(user, command, processed, dest, files = [], rules_file = "")
   from = user.name
   display_name = user.profile.display_name
 
-  begin
-    case command
+  load "#{config.path}/rules/general_rules.rb"
+  
+  unless general_rules(user, command, processed, dest, files, rules_file)
+    begin
+      case command
 
-    # help: ----------------------------------------------
-    # help: `echo SOMETHING`
-    # help:     repeats SOMETHING
-    # help:  Examples:
-    # help:     _echo I am the Smart Bot_
-    when /^echo\s(.+)/i
-      save_stats :echo
-      respond $1
-      react :monkey_face
-
-      # help: ----------------------------------------------
-      # help: `go to sleep`
-      # help:   it will sleep the bot for 5 seconds
-      # help:
-    when /^go\sto\ssleep/i
-      save_stats :to_to_sleep
-      unless @questions.keys.include?(from)
-        ask "do you want me to take a siesta?"
-      else
-        case @questions[from]
-        when /yes/i, /yep/i, /sure/i
-          @questions.delete(from)
-          respond "I'll be sleeping for 5 secs... just for you"
-          respond "zZzzzzzZZZZZZzzzzzzz!"
-          react :sleeping
-          sleep 5
-          react :sunny
-        when /no/i, /nope/i, /cancel/i
-          @questions.delete(from)
-          respond "Thanks, I'm happy to be awake"
+        # help: ----------------------------------------------
+        # help: `go to sleep`
+        # help:   it will sleep the bot for 5 seconds
+        # help:
+      when /^go\sto\ssleep/i
+        save_stats :go_to_sleep
+        unless @questions.keys.include?(from)
+          ask "do you want me to take a siesta?"
         else
-          respond "I don't understand"
-          ask "are you sure do you want me to sleep? (yes or no)"
+          case @questions[from]
+          when /yes/i, /yep/i, /sure/i
+            @questions.delete(from)
+            respond "I'll be sleeping for 5 secs... just for you"
+            respond "zZzzzzzZZZZZZzzzzzzz!"
+            react :sleeping
+            sleep 5
+            unreact :sleeping
+            react :sunny
+          when /no/i, /nope/i, /cancel/i
+            @questions.delete(from)
+            respond "Thanks, I'm happy to be awake"
+          else
+            respond "I don't understand"
+            ask "are you sure do you want me to sleep? (yes or no)"
+          end
         end
-      end
 
-      # help: ----------------------------------------------
-      # help: `run something`
-      # help:   It will run the process and report the results when done
-      # help:
-    when /^run something/i
-      save_stats :run_something
-      react :runner
+        # help: ----------------------------------------------
+        # help: `run something`
+        # help:   It will run the process and report the results when done
+        # help:
+      when /^run something/i
+        save_stats :run_something
+        react :runner
 
-      process_to_run = "ruby -v"
-      process_to_run = ("cd #{project_folder} &&" + process_to_run) if defined?(project_folder)
-      stdout, stderr, status = Open3.capture3(process_to_run)
-      if stderr == ""
-        if stdout == ""
-          respond "#{display_name}: Nothing returned."
+        process_to_run = "ruby -v"
+        process_to_run = ("cd #{project_folder} &&" + process_to_run) if defined?(project_folder)
+        stdout, stderr, status = Open3.capture3(process_to_run)
+        unreact :runner
+        if stderr == ""
+          if stdout == ""
+            respond "#{display_name}: Nothing returned."
+          else
+            respond "#{display_name}: #{stdout}"
+          end
         else
-          respond "#{display_name}: #{stdout}"
+          respond "#{display_name}: #{stdout} #{stderr}"
         end
-      else
-        respond "#{display_name}: #{stdout} #{stderr}"
-      end
-      
-      # Emoticons you can use with `react` command https://www.webfx.com/tools/emoji-cheat-sheet/
-      
-      # Examples for respond and respond_direct
-      #   # send 'the message' to the channel or direct message where the command was written
-      #   respond "the message"
-      #   # send 'the message' privately as a direct message to the user that sent the command
-      #   respond_direct "the message"
-      #   # send 'the message' to a specific channel name
-      #   respond "the message", 'my_channel'
-      #   # send 'the message' to a specific channel id
-      #   respond "the message", 'CSU34D33'
-      #   # send 'the message' to a specific user as direct message
-      #   respond "the message", '@theuser'
-      #   # send 'the message' to a specific user id as direct message
-      #   respond "the message", 'US3344D3'
+        
+        # Emoticons you can use with `react` command https://www.webfx.com/tools/emoji-cheat-sheet/
+        
+        # Examples for respond and respond_direct
+        #   # send 'the message' to the channel or direct message where the command was written
+        #   respond "the message"
+        #   # send 'the message' privately as a direct message to the user that sent the command
+        #   respond_direct "the message"
+        #   # send 'the message' to a specific channel name
+        #   respond "the message", 'my_channel'
+        #   # send 'the message' to a specific channel id
+        #   respond "the message", 'CSU34D33'
+        #   # send 'the message' to a specific user as direct message
+        #   respond "the message", '@theuser'
+        #   # send 'the message' to a specific user id as direct message
+        #   respond "the message", 'US3344D3'
 
-      # Example downloading a file from slack
-      #  if !files.nil? and files.size == 1 and files[0].filetype == 'yaml'
-      #    require 'nice_http'
-      #    http = NiceHttp.new(host: "https://files.slack.com", headers: { "Authorization" => "Bearer #{config[:token]}" })
-      #    http.get(files[0].url_private_download, save_data: './tmp/')
-      #  end
+        # Example downloading a file from slack
+        #  if !files.nil? and files.size == 1 and files[0].filetype == 'yaml'
+        #    require 'nice_http'
+        #    http = NiceHttp.new(host: "https://files.slack.com", headers: { "Authorization" => "Bearer #{config[:token]}" })
+        #    http.get(files[0].url_private_download, save_data: './tmp/')
+        #  end
 
-      # Examples sending a file to slack:
-      #   send_file(to, msg, filepath, title, format, type = "text")
-      #   send_file(dest, 'the message', "#{project_folder}/temp/logs_ptBI.log", 'title', 'text/plain', "text")
-      #   send_file(dest, 'the message', "#{project_folder}/temp/example.jpeg", 'title', 'image/jpeg', "jpg")
+        # Examples sending a file to slack:
+        #   send_file(to, msg, filepath, title, format, type = "text")
+        #   send_file(dest, 'the message', "#{project_folder}/temp/logs_ptBI.log", 'title', 'text/plain', "text")
+        #   send_file(dest, 'the message', "#{project_folder}/temp/example.jpeg", 'title', 'image/jpeg', "jpg")
 
 
-    else
-      unless processed
-        dont_understand()
+      else
+        unless processed
+          dont_understand()
+        end
       end
+    rescue => exception
+      @logger.fatal exception
+      respond "Unexpected error!! Please contact an admin to solve it: <@#{config.admins.join(">, <@")}>"
     end
-  rescue => exception
-    @logger.fatal exception
-    respond "Unexpected error!! Please contact an admin to solve it: <@#{config.admins.join(">, <@")}>"
   end
 end

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

@@ -5,4 +5,5 @@ require_relative 'comm/respond'
 require_relative 'comm/send_file'
 require_relative 'comm/send_msg_channel'
 require_relative 'comm/send_msg_user'
-require_relative 'comm/react'
+require_relative 'comm/react'
+require_relative 'comm/unreact'

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

@@ -38,7 +38,7 @@ class SlackSmartBot
           f.puts "|#{dest}|#{config[:nick_id]}|#{msg}"
         }
       end
-    elsif dest[0] == "D" or dest[0] == "U" # Direct message
+    elsif dest[0] == "D" or dest[0] == "U"  or dest[0] == "W" # Direct message
       send_msg_user(dest, msg)
     elsif dest[0] == "@"
       begin

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

@@ -3,9 +3,12 @@ class SlackSmartBot
   #to send a file to an user or channel
   #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")
+  #send_file(dest, 'the message', "", 'message to be sent', 'text/plain', "ruby", content: "the content to be sent when no file supplied")
+  #send_file(dest, 'the message', "myfile.rb", 'message to be sent', 'text/plain', "ruby", content: "the content to be sent when no file supplied")
+  def send_file(to, msg, file, title, format, type = "text", content: '')
     unless config[:simulate]
-      if to[0] == "U" #user
+      file = 'myfile' if file.to_s == '' and content!=''
+      if to[0] == "U" or to[0] == "W" #user
         im = client.web_client.im_open(user: to)
         channel = im["channel"]["id"]
       else
@@ -18,16 +21,29 @@ class SlackSmartBot
         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
-      )
+      if content.to_s == ''
+        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
+        )
+      else
+        client.web_client.files_upload(
+          channels: channel,
+          as_user: true,
+          content: content,
+          title: title,
+          filename: file,
+          filetype: type,
+          initial_comment: msg,
+          thread_ts: ts
+        )
+      end
     end
   end
 

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

@@ -0,0 +1,16 @@
+class SlackSmartBot
+  # list of available emojis: https://www.webfx.com/tools/emoji-cheat-sheet/
+  # unreact(:thumbsup)
+  def unreact(emoji, parent=false)
+    if parent
+      ts = Thread.current[:thread_ts]
+    else
+      ts = Thread.current[:ts]
+    end
+    begin
+      client.web_client.reactions_remove(channel: Thread.current[:dest], name: emoji, timestamp: ts)
+    rescue Exception => stack
+      @logger.warn stack
+    end
+  end
+end

data/lib/slack/smart-bot/commands/on_bot/admin/add_routine.rb

@@ -5,6 +5,7 @@ class SlackSmartBot
   # helpadmin: `add silent routine NAME every NUMBER PERIOD`
   # helpadmin: `create routine NAME every NUMBER PERIOD`
   # helpadmin: `add routine NAME at TIME COMMAND`
+  # helpadmin: `add routine NAME on DAYWEEK at TIME COMMAND`
   # helpadmin: `add routine NAME at TIME`
   # helpadmin: `add silent routine NAME at TIME`
   # helpadmin: `create routine NAME at TIME`
@@ -15,12 +16,14 @@ class SlackSmartBot
   # helpadmin:    NUMBER: Integer
   # helpadmin:    PERIOD: days, d, hours, h, minutes, mins, min, m, seconds, secs, sec, s
   # helpadmin:    TIME: time at format HH:MM:SS
+  # helpadmin:    DAYWEEK: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday. And their plurals.
   # helpadmin:    COMMAND: any valid smart bot command or rule
   # helpadmin:    Examples:
   # helpadmin:      _add routine example every 30s ruby puts 'a'_
   # helpadmin:      _add routine example every 3 days ruby puts 'a'_
   # helpadmin:      _add routine example at 17:05 ruby puts 'a'_
   # helpadmin:      _create silent routine every 12 hours !Run customer tests_
+  # helpadmin:      _add routine example on Mondays at 05:00 !run customer tests_
   # helpadmin:
   def add_routine(dest, from, user, name, type, number_time, period, command_to_run, files, silent)
     save_stats(__method__)
@@ -30,13 +33,14 @@ class SlackSmartBot
           respond "I'm sorry but there is already a routine with that name.\nCall `see routines` to see added routines", dest
         else
           number_time += ":00" if number_time.split(":").size == 2
-          if (type == "at") && !number_time.match?(/^[01][0-9]:[0-5][0-9]:[0-5][0-9]$/) &&
+          if (type != "every") && !number_time.match?(/^[01][0-9]:[0-5][0-9]:[0-5][0-9]$/) &&
              !number_time.match?(/^2[0-3]:[0-5][0-9]:[0-5][0-9]$/)
             respond "Wrong time specified: *#{number_time}*"
           else
             file_path = ""
             every = ""
             at = ""
+            dayweek = ''
             next_run = Time.now
             case period.downcase
             when "days", "d"
@@ -52,16 +56,31 @@ class SlackSmartBot
               every = "#{number_time} seconds"
               every_in_seconds = number_time.to_i
             else # time
+              if type != 'at'
+                dayweek = type.downcase
+                days = ['sunday','monday','tuesday','wednesday','thursday','friday','saturday']
+                incr = days.index(dayweek) - Time.now.wday
+                if incr < 0 
+                  incr = (7+incr)*24*60*60
+                else
+                  incr = incr * 24 * 60 * 60
+                end
+                days = incr/(24*60*60)
+                every_in_seconds = 7 * 24 * 60 * 60 # one week
+              else
+                days = 0
+                every_in_seconds = 24 * 60 * 60 # one day
+              end
+
               at = number_time
-              if next_run.strftime("%H:%M:%S") < number_time
+              if next_run.strftime("%H:%M:%S") < number_time and days == 0
                 nt = number_time.split(":")
                 next_run = Time.new(next_run.year, next_run.month, next_run.day, nt[0], nt[1], nt[2])
               else
-                next_run += (24 * 60 * 60) # one more day
+                next_run += ((24 * 60 * 60) * days) # one or more days
                 nt = number_time.split(":")
                 next_run = Time.new(next_run.year, next_run.month, next_run.day, nt[0], nt[1], nt[2])
               end
-              every_in_seconds = 24 * 60 * 60
             end
             Dir.mkdir("#{config.path}/routines/#{@channel_id}") unless Dir.exist?("#{config.path}/routines/#{@channel_id}")
 
@@ -78,7 +97,7 @@ class SlackSmartBot
 
             @routines[@channel_id] = {} unless @routines.key?(@channel_id)
             @routines[@channel_id][name] = { channel_name: config.channel, creator: from, creator_id: user.id, status: :on,
-                                             every: every, every_in_seconds: every_in_seconds, at: at, file_path: file_path, 
+                                             every: every, every_in_seconds: every_in_seconds, at: at, dayweek: dayweek, file_path: file_path, 
                                              command: command_to_run.to_s.strip, silent: silent,
                                              next_run: next_run.to_s, dest: dest, last_run: "", last_elapsed: "", 
                                              running: false }

data/lib/slack/smart-bot/commands/on_bot/admin/extend_rules.rb

@@ -54,7 +54,7 @@ class SlackSmartBot
             respond "Now the rules from <##{@channel_id}> are available on *<##{@channels_id[channel]}>*", dest
           end
           respond "<@#{user.id}> extended the rules from <##{@channel_id}> to this channel so now you can talk to the Smart Bot on demand using those rules.", @channels_id[channel]
-          respond "Use `!` before the command you want to run", @channels_id[channel]
+          respond "Use `!` or `^` or `!!` before the command you want to run", @channels_id[channel]
           respond "To see the specific rules for this bot on this channel: `!bot rules` or `!bot rules COMMAND`", @channels_id[channel]
         end
       end

data/lib/slack/smart-bot/commands/on_bot/admin/see_routines.rb

@@ -44,6 +44,7 @@ class SlackSmartBot
             msg << "\tStatus: #{v[:status]}"
             msg << "\tEvery: #{v[:every]}" unless v[:every] == ""
             msg << "\tAt: #{v[:at]}" unless v[:at] == ""
+            msg << "\tOn: #{v[:dayweek]}" unless !v.key?(:dayweek) or v[:dayweek].to_s == "" 
             msg << "\tNext Run: #{v[:next_run]}"
             msg << "\tLast Run: #{v[:last_run]}"
             msg << "\tTime consumed on last run: #{v[:last_elapsed]}" unless v[:command] !=''

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

@@ -13,6 +13,7 @@ class SlackSmartBot
     # helpadmin: `bot stats CHANNEL exclude masters from YYYY/MM/DD to YYYY/MM/DD`
     # helpadmin: `bot stats today`
     # helpadmin: `bot stats exclude COMMAND_ID`
+    # helpadmin: `bot stats monthly`
     # helpadmin:    To see the bot stats
     # helpadmin:    You can use this command only if you are a Master admin user and if you are in a private conversation with the bot
     # helpadmin:    You need to set stats to true to generate the stats when running the bot instance.
@@ -21,8 +22,9 @@ class SlackSmartBot
     # helpadmin:      _bot stats @peter.wind_
     # helpadmin:      _bot stats #sales from 2019/12/15 to 2019/12/31_
     # helpadmin:      _bot stats #sales today_
+    # helpadmin:      _bot stats #sales from 2020-01-01 monthly_
     # helpadmin:
-    def bot_stats(dest, from_user, typem, channel_id, from, to, user, exclude_masters, exclude_command)
+    def bot_stats(dest, from_user, typem, channel_id, from, to, user, exclude_masters, exclude_command, monthly)
         require 'csv'
         if config.stats
             message = []
@@ -34,6 +36,10 @@ class SlackSmartBot
             if !File.exist?("#{config.stats_path}.#{Time.now.strftime("%Y-%m")}.log")
                 message<<'No stats'
             else
+                if user!=''
+                    user_info = client.web_client.users_info(user: user)
+                    user_name = user_info.user.name
+                end
                 from = "#{Time.now.strftime("%Y-%m")}-01" if from == ''
                 to = "#{Time.now.strftime("%Y-%m-%d")}" if to == ''
                 from_short = from
@@ -43,17 +49,28 @@ class SlackSmartBot
                 from+= " 00:00:00 +0000"
                 to+= " 23:59:59 +0000"
                 rows = []
+                rows_month = {}
+                users_month = {}
+                commands_month = {}
 
                 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
                             if !exclude_masters or (exclude_masters and !config.masters.include?(row[:user_name]))
-                                if user=='' or (user!='' and row[:user_id] == user)
+                                if user=='' or (user!='' and row[:user_name] == user_name)
                                     if exclude_command == '' or (exclude_command!='' and row[:command]!=exclude_command)
                                         if row[:bot_channel_id] == channel_id or channel_id == ''
                                             if row[:date] >= from and row[:date] <= to
                                                 rows << row.to_h
+                                                if monthly
+                                                    rows_month[row[:date][0..6]] = 0 unless rows_month.key?(row[:date][0..6])
+                                                    users_month[row[:date][0..6]] = [] unless users_month.key?(row[:date][0..6])
+                                                    commands_month[row[:date][0..6]] = [] unless commands_month.key?(row[:date][0..6])
+                                                    rows_month[row[:date][0..6]] += 1
+                                                    users_month[row[:date][0..6]] << row[:user_name]
+                                                    commands_month[row[:date][0..6]] << row[:command]
+                                                end
                                             end
                                         end
                                     end
@@ -79,6 +96,21 @@ class SlackSmartBot
                     message << "*Total calls <##{channel_id}>*: #{total} from #{from_short} to #{to_short}"
                 end
                 if total > 0
+                    if monthly 
+                        message << '*Totals by month / commands / users (%new)*'
+                        all_users = []
+                        new_users = []
+                        rows_month.each do |k,v|
+                            if all_users.empty?
+                                message_new_users = ''
+                            else
+                                new_users = (users_month[k]-all_users).uniq
+                                message_new_users = "(#{new_users.size*100/users_month[k].uniq.size}%)"
+                            end
+                            all_users += users_month[k]
+                            message << "\t#{k}: #{v} (#{(v.to_f*100/total).round(2)}%) / #{commands_month[k].uniq.size} / #{users_month[k].uniq.size} #{message_new_users}"
+                        end
+                    end
 
                     if channel_id == ''
                         message << "*Channels*"
@@ -89,16 +121,16 @@ class SlackSmartBot
                         end
                     end
                     if user==''
-                        message << "*Users*"
                         users = rows.user_name.uniq.sort
+                        message << "*Users* - #{users.size}"
                         users.each do |user|
                             count = rows.count {|h| h.user_name==user}
                             message << "\t#{user}: #{count} (#{(count.to_f*100/total).round(2)}%)"
                         end
                     end
 
-                    message << "*Commands*"
                     commands = rows.command.uniq.sort
+                    message << "*Commands* - #{commands.size}"
                     commands.each do |command|
                         count = rows.count {|h| h.command==command}
                         message << "\t#{command}: #{count} (#{(count.to_f*100/total).round(2)}%)"

data/lib/slack/smart-bot/commands/on_bot/repl.rb

@@ -82,6 +82,7 @@ class SlackSmartBot
         message = "Session name: *#{session_name}*
         From now on I will execute all you write as a Ruby command and I will keep the session open until you send `quit` or `bye` or `exit`. 
         I will respond with the result so it is not necessary you send `print`, `puts`, `p` or `pp` unless you want it as the output when calling `run repl`. 
+        Use `p` to print a message raw, exacly like it is returned. 
         If you want to avoid a message to be treated by me, start the message with '-'. 
         After 30 minutes of no communication with the Smart Bot the session will be dismissed.
         If you want to see the methods of a class or module you created use _ls TheModuleOrClass_
@@ -100,34 +101,8 @@ class SlackSmartBot
             require \"amazing_print\"
             bindme' + serialt + ' = binding
             eval(\"require \'nice_http\'\" , bindme' + serialt + ')
-            def repl_params(met)
-              res = []
-              met.parameters.each do |par|
-                if par[0]==:req
-                  res << par[1].to_s
-                elsif par[0]==:keyreq
-                  res << par[1].to_s + \":\"
-                elsif par[0]==:key
-                  res << \"?\"+par[1].to_s + \":\"
-                elsif par[0]==:opt
-                  res << \"?\"+par[1].to_s
-                elsif par[0]==:rest
-                  res << \"*\"+par[1].to_s
-                elsif par[0]==:keyrest
-                  res << \"**\"+par[1].to_s
-                else
-                  res << par[1].to_s
-                end
-              end
-              \"(#{res.join(\", \")})\"
-            end
             def ls(obj)
-              mets = (obj.methods - Object.methods)
-              res = []
-              mets.each do |met|
-                res << \"#{met}#{repl_params(obj.method(met))}\"
-              end
-              res
+              (obj.methods - Object.methods)
             end
             
             file_input_repl = File.open(\"' + Dir.pwd + '/repl/' + @channel_id + '/' + session_name + '.input\", \"r\")
@@ -158,9 +133,15 @@ class SlackSmartBot
                     error = true
                   end
                   if resp_repl.to_s != \"\"
-                    open(\"' + Dir.pwd + '/repl/' + @channel_id + '/' + session_name + '.output\", \"a+\") {|f|
-                      f.puts \"\`\`\`\n#{resp_repl.ai}\n\`\`\`\"
-                    }
+                    if code_to_run_repl.match?(/^\s*p\s+/i)
+                      open(\"' + Dir.pwd + '/repl/' + @channel_id + '/' + session_name + '.output\", \"a+\") {|f|
+                        f.puts \"\`\`\`\n#{resp_repl.inspect}\n\`\`\`\"
+                      }
+                    else
+                      open(\"' + Dir.pwd + '/repl/' + @channel_id + '/' + session_name + '.output\", \"a+\") {|f|
+                        f.puts \"\`\`\`\n#{resp_repl.ai}\n\`\`\`\"
+                      }
+                    end
                     unless error or !add_to_run_repl
                       open(\"' + Dir.pwd + '/repl/' + @channel_id + '/' + session_name + '.run\", \"a+\") {|f|
                         f.puts code_to_run_repl
@@ -198,7 +179,13 @@ class SlackSmartBot
             sleep 0.2
             resp_repl = file_output_repl.read
             if resp_repl.to_s!=''
-              respond resp_repl, dest
+              if resp_repl.to_s.lines.count < 60 and resp_repl.to_s.size < 3500
+                respond resp_repl, dest
+              else
+                resp_repl.gsub!(/^\s*```/,'')
+                resp_repl.gsub!(/```\s*$/,'')
+                send_file(dest, "", 'response.rb', "", 'text/plain', "ruby", content: resp_repl)
+              end
             end
           rescue Exception => excp
             @logger.fatal excp
@@ -210,7 +197,7 @@ class SlackSmartBot
         @repl_sessions[from][:command] = ''
         code.gsub!("\\n", "\n")
         code.gsub!("\\r", "\r")
-        # Disabled for the moment sinde it is deleting lines with '}'
+        # Disabled for the moment since it is deleting lines with '}'
         #code.gsub!(/^\W*$/, "") #to remove special chars from slack when copy/pasting.
         if code.match?(/System/i) or code.match?(/Kernel/i) or code.include?("File") or
           code.include?("`") or code.include?("exec") or code.include?("spawn") or code.include?("IO.") or

data/lib/slack/smart-bot/commands/on_bot/run_repl.rb

@@ -52,7 +52,7 @@ class SlackSmartBot
           Dir.mkdir("#{project_folder}/tmp") unless Dir.exist?("#{project_folder}/tmp")
           Dir.mkdir("#{project_folder}/tmp/repl") unless Dir.exist?("#{project_folder}/tmp/repl")
           File.write("#{project_folder}/tmp/repl/#{session_name}.rb", content, mode: "w+")
-          process_to_run = "ruby  #{project_folder}/tmp/repl/#{session_name}.rb"
+          process_to_run = "ruby  ./tmp/repl/#{session_name}.rb"
           process_to_run = ("cd #{project_folder} && #{process_to_run}") if defined?(project_folder)
           respond "Running REPL #{session_name}"
           stdout, stderr, status = Open3.capture3(process_to_run)
@@ -60,10 +60,19 @@ class SlackSmartBot
             if stdout == ""
               respond "*#{session_name}*: Nothing returned."
             else
-              respond "*#{session_name}*: #{stdout}"
+              if stdout.to_s.lines.count < 60 and stdout.to_s.size < 3500
+                respond "*#{session_name}*: #{stdout}"
+              else
+                send_file(dest, "", 'response.rb', "", 'text/plain', "ruby", content: stdout)
+              end
             end
           else
-            respond "*#{session_name}*: #{stdout} #{stderr}"
+            if (stdout.to_s+stderr.to_s).lines.count < 60
+              respond "*#{session_name}*: #{stdout} #{stderr}"
+            else
+              send_file(dest, "", 'response.rb', "", 'text/plain', "ruby", content: (stdout.to_s+stderr.to_s))
+            end
+
           end
         end
       else

data/lib/slack/smart-bot/commands/on_bot/see_repls.rb

@@ -15,7 +15,7 @@ class SlackSmartBot
       message = ""
       @repls.sort.to_h.each do |session_name, repl|
         if (repl.creator_name == user.name or repl.type == :public) or (config.admins.include?(user.name) and typem == :on_dm)
-          message += "(#{repl.type}) *#{session_name}*: #{repl.description} / created: #{repl.created} / accessed: #{repl.accessed} / creator: #{repl.creator} / runs: #{repl.runs_by_creator+repl.runs_by_others} / gets: #{repl.gets} \n"
+          message += "(#{repl.type}) *#{session_name}*: #{repl.description} / created: #{repl.created} / accessed: #{repl.accessed} / creator: #{repl.creator_name} / runs: #{repl.runs_by_creator+repl.runs_by_others} / gets: #{repl.gets} \n"
         end
       end
       message = "No repls created" if message == ''

data/lib/slack/smart-bot/commands/on_master/create_bot.rb

@@ -46,14 +46,19 @@ class SlackSmartBot
               rules_file = "slack-smart-bot_rules_#{channel_id}_#{from.gsub(" ", "_")}.rb"
               if defined?(RULES_FOLDER)
                 rules_file = RULES_FOLDER + rules_file
+                general_rules_file = RULES_FOLDER + 'general_rules.rb'
               else
                 Dir.mkdir("#{config.path}/rules") unless Dir.exist?("#{config.path}/rules")
                 Dir.mkdir("#{config.path}/rules/#{channel_id}") unless Dir.exist?("#{config.path}/rules/#{channel_id}")
                 rules_file = "/rules/#{channel_id}/" + rules_file
+                general_rules_file = "/rules/general_rules.rb"
               end
               default_rules = (__FILE__).gsub(/slack\/smart-bot\/commands\/on_master\/create_bot\.rb$/, "slack-smart-bot_rules.rb")
+              default_general_rules = (__FILE__).gsub(/slack\/smart-bot\/commands\/on_master\/create_bot\.rb$/, "slack-smart-bot_general_rules.rb")
+              
               File.delete(config.path + rules_file) if File.exist?(config.path + rules_file)
               FileUtils.copy_file(default_rules, config.path + rules_file) unless File.exist?(config.path + rules_file)
+              FileUtils.copy_file(default_general_rules, config.path + general_rules_file) unless File.exist?(config.path + general_rules_file)
               admin_users = Array.new()
               creator_info = client.web_client.users_info(user: channel_found.creator)
               admin_users = [from, creator_info.user.name] + config.masters

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

@@ -70,7 +70,8 @@ class SlackSmartBot
         channel = $1
         kill_bot_on_channel(dest, from, channel)
       when /^\s*(add|create)\s+(silent\s+)?routine\s+(\w+)\s+(every)\s+(\d+)\s*(days|hours|minutes|seconds|mins|min|secs|sec|d|h|m|s)\s*(\s.+)?\s*$/i,
-           /^\s*(add|create)\s+(silent\s+)?routine\s+(\w+)\s+(at)\s+(\d+:\d+:?\d+?)\s*()(\s.+)?\s*$/i
+        /^\s*(add|create)\s+(silent\s+)?routine\s+(\w+)\s+on\s+(monday|tuesday|wednesday|thursday|friday|saturday|sunday)s?\s+at\s+(\d+:\d+:?\d+?)\s*()(\s.+)?\s*$/i,
+        /^\s*(add|create)\s+(silent\s+)?routine\s+(\w+)\s+(at)\s+(\d+:\d+:?\d+?)\s*()(\s.+)?\s*$/i
         silent = $2.to_s!=''
         name = $3.downcase
         type = $4
@@ -105,12 +106,15 @@ class SlackSmartBot
         st_to = st_to.gsub('.','-').gsub('/','-')
         st_user = opts.scan(/<@([^>]+)>/).join
         exclude_masters = opts.match?(/exclude\s+masters?/i)
+        monthly = false
         if all_opts.include?('today')
           st_from = st_to = "#{Time.now.strftime("%Y-%m-%d")}"
+        elsif all_opts.include?('monthly')
+          monthly = true
         end
         exclude_command = opts.scan(/exclude\s+([^\s]+)/i).join
         exclude_command = '' if exclude_command == 'masters'
-        bot_stats(dest, from, typem, st_channel, st_from, st_to, st_user, exclude_masters, exclude_command)
+        bot_stats(dest, from, typem, st_channel, st_from, st_to, st_user, exclude_masters, exclude_command, monthly)
       else
         processed = false
       end
@@ -166,11 +170,11 @@ class SlackSmartBot
         ruby_code(dest, user, code, rules_file)
       when /^\s*(private\s+)?(repl|irb|live)\s*()()()$/i, 
         /^\s*(private\s+)?(repl|irb|live)\s+([\w\-]+)()()\s*$/i,
-        /^\s*(private\s+)?(repl|irb|live)\s+([\w\-]+)\s*:\s*"(.+)"()\s*$/i,
-        /^\s*(private\s+)?(repl|irb|live)\s+([\w\-]+)\s*:\s*"(.+)"\s+(.+)\s*$/i,
+        /^\s*(private\s+)?(repl|irb|live)\s+([\w\-]+)\s*:\s+"([^"]+)"()\s*$/i,
+        /^\s*(private\s+)?(repl|irb|live)\s+([\w\-]+)\s*:\s+"([^"]+)"\s+(.+)\s*$/i,
         /^\s*(private\s+)?(repl|irb|live)\s+([\w\-]+)()\s+(.+)\s*$/i,
         /^\s*(private\s+)?(repl|irb|live)()\s+()(.+)\s*$/i
-        if $1.to_s!=''
+            if $1.to_s!=''
           type = :private
         else
           type = :public
@@ -206,7 +210,7 @@ class SlackSmartBot
         end
         run_repl(dest, user, session_name, env_vars.flatten, rules_file)      
       when /^\s*(delete|remove)\s+(repl|irb|live)\s+([\w\-]+)\s*$/i
-        repl_name = $3.downcase
+        repl_name = $3
         delete_repl(dest, user, repl_name)
       when /^\s*see\s+(repls|repl|irb|irbs)\s*$/i
         see_repls(dest, user, typem)

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

@@ -32,6 +32,8 @@ class SlackSmartBot
         data.text = CGI.unescapeHTML(data.text)
         data.text.gsub!("\u00A0", " ") #to change   (asc char 160) into blank space
       end
+      data.text.gsub!('’', "'")
+      data.text.gsub!('“', '"')
     rescue
       @logger.warn "Impossible to unescape or clean format for data.text:#{data.text}"
     end
@@ -115,6 +117,7 @@ class SlackSmartBot
       begin
         #todo: when changed @questions user_id then move user_info inside the ifs to avoid calling it when not necessary
         user_info = client.web_client.users_info(user: data.user)
+        user_info.user.id = data.user #todo: remove this line when slack issue with Wxxxx Uxxxx fixed
         if @questions.key?(user_info.user.name)
           if data.text.match?(/^\s*(Bye|Bæ|Good\sBye|Adiós|Ciao|Bless|Bless\sBless|Adeu)\s(#{@salutations.join("|")})\s*$/i)
             @questions.delete(user_info.user.name)
@@ -127,12 +130,8 @@ class SlackSmartBot
           ((@repl_sessions[user_info.user.name][:on_thread] and data.thread_ts == @repl_sessions[user_info.user.name][:thread_ts]) or
            (!@repl_sessions[user_info.user.name][:on_thread] and data.thread_ts.to_s == '' ))
           
-          if data.text.size >= 6 and data.text[0..2] == "```" and data.text[-3..-1] == "```"
-            if data.text.size == 6
-              @repl_sessions[user_info.user.name][:command] = ""
-            else
-              @repl_sessions[user_info.user.name][:command] = data.text[3..-4]
-            end
+          if data.text.match(/^\s*```(.*)```\s*$/im)
+              @repl_sessions[user_info.user.name][:command] = $1
           else   
             @repl_sessions[user_info.user.name][:command] = data.text
           end
@@ -142,12 +141,8 @@ class SlackSmartBot
         end
 
         #when added special characters on the message
-        if command.size >= 6 and command[0..2]=="```" and command[-3..-1]=="```"
-          if command.size == 6
-            command = ''
-          else
-            command = command[3..-4]
-          end
+        if command.match(/^\s*```(.*)```\s*$/im)
+          command = $1
         elsif command.size >= 2 and
            ((command[0] == "`" and command[-1] == "`") or (command[0] == "*" and command[-1] == "*") or (command[0] == "_" and command[-1] == "_"))
           command = command[1..-2]

data/lib/slack/smart-bot/utils/create_routine_thread.rb

@@ -13,7 +13,6 @@ class SlackSmartBot
             ruby = ""
           end
           @routines[@channel_id][name][:silent] = false if !@routines[@channel_id][name].key?(:silent)
-
           if @routines[@channel_id][name][:at] == "" or
              (@routines[@channel_id][name][:at] != "" and @routines[@channel_id][name][:running] and
               @routines[@channel_id][name][:next_run] != "" and Time.now.to_s >= @routines[@channel_id][name][:next_run])
@@ -55,11 +54,34 @@ class SlackSmartBot
             require "time"
             every_in_seconds = Time.parse(@routines[@channel_id][name][:next_run]) - Time.now
           elsif @routines[@channel_id][name][:at] != "" #coming from start after pause for 'at'
-            if started.strftime("%H:%M:%S") < @routines[@channel_id][name][:at]
+            if @routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s!=''
+              day = @routines[@channel_id][name][:dayweek]
+              days = ['sunday','monday','tuesday','wednesday','thursday','friday','saturday']
+              incr = days.index(day) - Time.now.wday
+              if incr < 0 
+                incr = (7+incr)*24*60*60
+              else
+                incr = incr * 24 * 60 * 60
+              end
+              days = incr/(24*60*60)
+              weekly = true
+            else
+              days = 0
+              weekly = false
+            end
+
+            if started.strftime("%H:%M:%S") < @routines[@channel_id][name][:at] and days == 0
               nt = @routines[@channel_id][name][:at].split(":")
               next_run = Time.new(started.year, started.month, started.day, nt[0], nt[1], nt[2])
             else
-              next_run = started + (24 * 60 * 60) # one more day
+              if days == 0 and started.strftime("%H:%M:%S") >= @routines[@channel_id][name][:at]
+                if weekly
+                    days = 7
+                else
+                    days = 1
+                end
+              end
+              next_run = started + (days * 24 * 60 * 60) # one more day/week
               nt = @routines[@channel_id][name][:at].split(":")
               next_run = Time.new(next_run.year, next_run.month, next_run.day, nt[0], nt[1], nt[2])
             end

data/lib/slack/smart-bot/utils/get_help.rb

@@ -32,7 +32,11 @@ class SlackSmartBot
       help = @help_messages.deep_copy
     end
     if rules_file != ""
-      help[:rules_file] = IO.readlines(config.path+rules_file).join.scan(/#\s*help\s*\w*:(.*)/i).join("\n")
+      help[:rules_file] = ''
+      help[:rules_file] += IO.readlines(config.path+rules_file).join.scan(/#\s*help\s*\w*:(.*)/i).join("\n") + "\n"
+      if File.exist?(config.path+'/rules/general_rules.rb')
+        help[:rules_file] += IO.readlines(config.path+'/rules/general_rules.rb').join.scan(/#\s*help\s*\w*:(.*)/i).join("\n")
+      end
     end
     help = remove_hash_keys(help, :admin_master) unless user_type == :admin_master
     help = remove_hash_keys(help, :admin) unless user_type == :admin or user_type == :admin_master

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: slack-smart-bot
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.8.0
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.5
+        version: 0.15.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.5
+        version: 0.15.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: nice_http
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +79,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -86,6 +89,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +125,7 @@ files:
 - LICENSE
 - README.md
 - lib/slack-smart-bot.rb
+- lib/slack-smart-bot_general_rules.rb
 - lib/slack-smart-bot_rules.rb
 - lib/slack/smart-bot/comm.rb
 - lib/slack/smart-bot/comm/ask.rb
@@ -129,6 +136,7 @@ files:
 - lib/slack/smart-bot/comm/send_file.rb
 - lib/slack/smart-bot/comm/send_msg_channel.rb
 - lib/slack/smart-bot/comm/send_msg_user.rb
+- lib/slack/smart-bot/comm/unreact.rb
 - lib/slack/smart-bot/commands.rb
 - lib/slack/smart-bot/commands/general/bot_help.rb
 - lib/slack/smart-bot/commands/general/bot_status.rb