slack-smart-bot 1.11.0 → 1.12.0

data/lib/slack/smart-bot/commands/general_bot_commands.rb

@@ -76,7 +76,7 @@ def general_bot_commands(user, command, dest, files = [])
         # help: command_id: :add_announcement
         # help: 
       when /\A\s*(add|create)\s+(red\s+|green\s+|white\s+|yellow\s+)?(announcement|statement|declaration|message)\s+(.+)\s*\z/i,
-        /\A\s*(add|create)\s+(:\w+:)\s+(announcement|statement|declaration|message)\s+(.+)\s*\z/i
+        /\A\s*(add|create)\s+(:[\w\-]+:)\s+(announcement|statement|declaration|message)\s+(.+)\s*\z/i
         type = $2.to_s.downcase.strip
         type = 'white' if type == ''
         message = $4
@@ -122,10 +122,10 @@ def general_bot_commands(user, command, dest, files = [])
         # help:    <https://github.com/MarioRuiz/slack-smart-bot#announcements|more info>
         # help: command_id: :see_announcements
         # help: 
-      when /\A\s*see\s+(red\s+|green\s+|white\s+|yellow\s+|:\w+:\s+)?(announcements|statements|declarations|messages)()\s*\z/i,
+      when /\A\s*see\s+(red\s+|green\s+|white\s+|yellow\s+|:[\w\-]+:\s+)?(announcements|statements|declarations|messages)()\s*\z/i,
         /\A\s*see\s+(all\s+)?(announcements|statements|declarations|messages)()\s*\z/i,
-        /\A\s*see\s+(red\s+|green\s+|white\s+|yellow\s+|:\w+:\s+)?(announcements|statements|declarations|messages)\s+#([\w\-]+)\s*\z/i,
-        /\A\s*see\s+(red\s+|green\s+|white\s+|yellow\s+|:\w+:\s+)?(announcements|statements|declarations|messages)\s+<#(\w+)\|.*>\s*\z/i
+        /\A\s*see\s+(red\s+|green\s+|white\s+|yellow\s+|:[\w\-]+:\s+)?(announcements|statements|declarations|messages)\s+#([\w\-]+)\s*\z/i,
+        /\A\s*see\s+(red\s+|green\s+|white\s+|yellow\s+|:[\w\-]+:\s+)?(announcements|statements|declarations|messages)\s+<#(\w+)\|.*>\s*\z/i
 
         type = $1.to_s.downcase.strip
         channel = $3.to_s
@@ -387,6 +387,94 @@ def general_bot_commands(user, command, dest, files = [])
         info = Thread.current[:command_orig].to_s.gsub("\u00A0", " ").scan(/^[^:]+:\s*(.+)\s*$/im).join
         add_team(user, name, options, info)
 
+        # help: ----------------------------------------------
+        # help: `add TYPE to TEAM_NAME team : MESSAGE`
+        # help: `add private TYPE to TEAM_NAME team : MESSAGE`
+        # help: `add personal TYPE to TEAM_NAME team : MESSAGE`
+        # help: `add TYPE to TEAM_NAME team TOPIC : MESSAGE`
+        # help: `add private TYPE to TEAM_NAME team TOPIC : MESSAGE`
+        # help: `add personal TYPE to TEAM_NAME team TOPIC : MESSAGE`
+        # help:     It will add a memo to the team. The memos will be displayed with the team info.
+        # help:     Only team members can add a memo.
+        # help:     TYPE: memo, note, issue, task, feature, bug, jira, github
+        # help:     TOPIC: one word, a-z, A-Z, 0-9, - and _
+        # help:     If private then the memo will be only displayed to team members on a DM or the members channel.
+        # help:     If personal then the memo will be only displayed to the creator on a DM.
+        # help:     In case jira type supplied:
+        # help:       The message should be an JQL URL, JQL string or an issue URL.
+        # help:       To be able to use it you need to specify on the SmartBot settings the credentials.
+        # help:       In case no TOPIC is supplied then it will create automatically the topics from the labels specified on every JIRA issue
+        # help:     In case github type supplied:
+        # help:       The message should be a github URL. You can filter by state (open/closed/all) and labels
+        # help:       To be able to use it you need to specify on the SmartBot settings the github token.
+        # help:       In case no TOPIC is supplied then it will create automatically the topics from the labels specified on every Github issue
+        # help:  Examples:
+        # help:     _add memo to sales team : Add tests for Michigan feature_
+        # help:     _add private note to sales team : Bills will need to be deployed before Friday_
+        # help:     _add memo to dev team web : Check last version_
+        # help:     _add private bug to dev team SRE : Logs should not be accessible from outside VPN_
+        # help:     _add memo sales team : Add tests for Michigan feature_
+        # help:     _add memo team sales: Add tests for Michigan feature_
+        # help:     _add personal memo team sales: Check my vacations_
+        # help:     _add jira to sales team : labels = SalesT AND status != Done_
+        # help:     _add github to sales team : PeterBale/SalesBoom/issues?state=open&labels=bug_
+        # help:     _add github to sales team dev: PeterBale/DevProject/issues/71_
+        # help:    <https://github.com/MarioRuiz/slack-smart-bot#teams|more info>
+        # help: command_id: :add_memo_team
+        # help: 
+      when /\A\s*add\s+(private\s+|personal\s+)?(memo|note|issue|task|feature|bug|jira|github)\s+(to\s+)?team\s+([\w\-]+)\s*([^:]+)?\s*:\s+(.+)\s*\z/im,
+           /\A\s*add\s+(private\s+|personal\s+)?(memo|note|issue|task|feature|bug|jira|github)\s+(to\s+)?([\w\-]+)\s+team\s*([^:]+)?\s*:\s+(.+)\s*\z/im 
+        privacy = $1.to_s.strip.downcase
+        type = $2.downcase
+        team_name = $4.downcase
+        topic = $5.to_s.strip
+        message = Thread.current[:command_orig].to_s.gsub("\u00A0", " ").scan(/^[^:]+:\s*(.+)\s*$/im).join
+        add_memo_team(user, privacy, team_name, topic, type, message)
+
+        # help: ----------------------------------------------
+        # help: `delete memo ID from TEAM_NAME team`
+        # help:     It will delete the supplied memo ID on the team specified.
+        # help:     aliases for memo: note, issue, task, feature, bug, jira, github
+        # help:     You have to be a member of the team, the creator or a Master admin to be able to delete a memo.
+        # help:  Examples:
+        # help:     _delete memo 32 from sales team_
+        # help:    <https://github.com/MarioRuiz/slack-smart-bot#teams|more info>
+        # help: command_id: :delete_memo_team
+        # help: 
+      when /\A\s*(delete|remove)\s+(memo|note|issue|task|feature|bug|jira|github)\s+(\d+)\s+(from|on)\s+team\s+([\w\-]+)\s*\z/i, 
+        /\A\s*(delete|remove)\s+(memo|note|issue|task|feature|bug|jira|github)\s+(\d+)\s+(from|on)\s+([\w\-]+)\s+team\s*\z/i
+        memo_id = $3
+        team_name = $5.downcase
+        delete_memo_team(user, team_name, memo_id)
+
+        # help: ----------------------------------------------
+        # help: `set memo ID on TEAM_NAME team STATUS`
+        # help: `set STATUS on memo ID TEAM_NAME team`
+        # help:     It will assign to the ID specified the emoticon status indicated.
+        # help:     aliases for memo: note, issue, task, feature, bug
+        # help:     This command will be only for memo, note, issue, task, feature, bug. Not for jira or github.
+        # help:     You have to be a member of the team, the creator or a Master admin to be able to set a status.
+        # help:  Examples:
+        # help:     _set memo 32 on sales team :runner:_
+        # help:     _set bug 7 on team sales :heavy_check_mark:_
+        # help:     _set :runner: on memo 6 sales team_
+        # help:    <https://github.com/MarioRuiz/slack-smart-bot#teams|more info>
+        # help: command_id: :set_memo_status
+        # help: 
+      when /\A\s*(set)\s+(memo|note|issue|task|feature|bug)\s+(\d+)\s+on\s+team\s+([\w\-]+)\s+(:[\w\-]+:)\s*\z/i, 
+        /\A\s*(set)\s+(memo|note|issue|task|feature|bug)\s+(\d+)\s+on\s+([\w\-]+)\s+team\s+(:[\w\-]+:)\s*\z/i
+        memo_id = $3
+        team_name = $4.downcase
+        status = $5
+        set_memo_status(user, team_name, memo_id, status)
+
+      when /\A\s*(set)\s+(:[\w\-]+:)\s+on\s+(memo|note|issue|task|feature|bug)\s+(\d+)\s+team\s+([\w\-]+)\s*\z/i,
+        /\A\s*(set)\s+(:[\w\-]+:)\s+on\s+(memo|note|issue|task|feature|bug)\s+(\d+)\s+([\w\-]+)\s+team\s*\z/i 
+        memo_id = $4
+        team_name = $5.downcase
+        status = $2
+        set_memo_status(user, team_name, memo_id, status)
+
         # help: ----------------------------------------------
         # help: `see teams`
         # help: `see team TEAM_NAME`
@@ -488,6 +576,86 @@ def general_bot_commands(user, command, dest, files = [])
         name = $2.downcase
         delete_team(user, name)
 
+
+        # help: ----------------------------------------------
+        # help: `add vacation from YYYY/MM/DD to YYYY/MM/DD`
+        # help: `add vacation YYYY/MM/DD`
+        # help: `add sick from YYYY/MM/DD to YYYY/MM/DD`
+        # help: `add sick YYYY/MM/DD`
+        # help: `add sick child YYYY/MM/DD`
+        # help:     It will add the supplied period to your plan.
+        # help:     Instead of YYYY/MM/DD you can use 'today' or 'tomorrow' or 'next week'
+        # help:     To see your plan call `see my time off`
+        # help:     If you want to see the vacation plan for the team `see team NAME`
+        # help:     Also you can see the vacation plan for the team for a specific period: `vacations team NAME YYYY/MM/DD`
+        # help:     The SmartBot will automatically set the users status to :palm_tree:, :baby: or :face_with_thermometer: and the expiration date.
+        # help:  Examples:
+        # help:     _add vacation from 2022/10/01 to 2022/10/22_
+        # help:     _add sick 2022/08/22_
+        # help:     _add vacation tomorrow_
+        # help:     _add sick baby today_
+        # help:    <https://github.com/MarioRuiz/slack-smart-bot#time-off-management|more info>
+        # help: command_id: :add_vacation
+        # help: 
+      when /\A\s*add\s+(sick|vacation|sick\s+baby|sick\s+child)\s+from\s+(\d\d\d\d\/\d\d\/\d\d)\s+to\s+(\d\d\d\d\/\d\d\/\d\d)\s*\z/i,
+        /\A\s*add\s+(sick|vacation|sick\s+baby|sick\s+child)\s+from\s+(\d\d\d\d-\d\d-\d\d)\s+to\s+(\d\d\d\d-\d\d-\d\d)\s*\z/i,
+        /\A\s*add\s+(sick|vacation|sick\s+baby|sick\s+child)\s+(\d\d\d\d-\d\d-\d\d)()\s*\z/i,
+        /\A\s*add\s+(sick|vacation|sick\s+baby|sick\s+child)\s+(\d\d\d\d\/\d\d\/\d\d)()\s*\z/i,
+        /\A\s*add\s+(sick|vacation|sick\s+baby|sick\s+child)\s+(today|tomorrow|next\sweek)()\s*\z/i
+        type = $1
+        from = $2.downcase
+        to = $3
+        add_vacation(user, type, from, to)
+
+        # help: ----------------------------------------------
+        # help: `remove vacation ID`
+        # help: `remove vacation period ID`
+        # help: `remove sick period ID`
+        # help: `remove time off period ID`
+        # help: `delete vacation ID`
+        # help:     It will remove the specified period from your vacations/sick periods.
+        # help:  Examples:
+        # help:     _remove vacation 20_
+        # help:    <https://github.com/MarioRuiz/slack-smart-bot#time-off-management|more info>
+        # help: command_id: :remove_vacation
+        # help: 
+      when /\A\s*(delete|remove)\s+(vacation|sick|time\s+off)(\s+period)?\s+(\d+)\s*\z/i
+        vacation_id = $4
+        remove_vacation(user, vacation_id)
+
+        # help: ----------------------------------------------
+        # help: `see my vacations`
+        # help: `see my time off`
+        # help: `see vacations @USER`
+        # help:     It will display current and past time off.
+        # help:    <https://github.com/MarioRuiz/slack-smart-bot#time-off-management|more info>
+        # help: command_id: :see_vacations
+        # help: 
+      when /\A\s*see\s+my\s+vacations\s*()\z/i,
+        /\A\s*see\s+my\s+time\s+off\s*()\z/i,
+        /\A\s*see\s+time\s+off\s+<@(\w+)>\s*\z/i,
+        /\A\s*see\s+vacations\s+<@(\w+)>\s*\z/i
+        from_user = $1
+        see_vacations(user, from_user: from_user)
+
+        # help: ----------------------------------------------
+        # help: `vacations team NAME`
+        # help: `time off team NAME`
+        # help: `vacations team NAME YYYY/MM/DD`
+        # help: `time off team NAME YYYY/MM/DD`
+        # help:     It will display the time off plan for the team specified.
+        # help:    <https://github.com/MarioRuiz/slack-smart-bot#time-off-management|more info>
+        # help: command_id: :see_vacations_team
+        # help: 
+      when /\A\s*(see\s+)?(vacations|time\s+off)\s+team\s+([\w\-]+)\s*(\d\d\d\d\/\d\d\/\d\d)?\s*\z/i,
+        /\A\s*(see\s+)?(vacations|time\s+off)\s+([\w\-]+)\s+team\s*(\d\d\d\d\/\d\d\/\d\d)?\s*\z/i,
+        /\A\s*(see\s+)?(vacations|time\s+off)\s+team\s+([\w\-]+)\s*(\d\d\d\d-\d\d-\d\d)?\s*\z/i,
+        /\A\s*(see\s+)?(vacations|time\s+off)\s+([\w\-]+)\s+team\s*(\d\d\d\d-\d\d-\d\d)?\s*\z/i        
+        team_name = $3.downcase
+        date = $4.to_s
+        date = Date.today.strftime("%Y/%m/%d") if date.empty?
+        see_vacations_team(user, team_name, date)
+        
     else
       return false
     end

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

@@ -295,11 +295,27 @@ class SlackSmartBot
                         users_attachment = []
                         if user==''
                             users = rows.user_id.uniq.sort
-                            rows.user_id.each do |usr|
-                                user_info = @users.select { |u| u.id == usr or (u.key?(:enterprise_user) and u.enterprise_user.id == usr) }[-1]
-                                unless user_info.nil? or user_info.is_app_user or user_info.is_bot
-                                    tzone_users[user_info.tz_label] ||= 0
-                                    tzone_users[user_info.tz_label] += 1
+                            if rows[0].key?(:time_zone) #then save_stats is saving the time zone already
+                                rows.time_zone.each do |time_zone|
+                                    unless time_zone == ''
+                                        tzone_users[time_zone] ||= 0
+                                        tzone_users[time_zone] += 1
+                                    end
+                                end
+                            else
+                                rows.user_id.each_with_index do |usr, i|
+                                    if rows[i].values.size >= 12 #then save_stats is saving the time zone already but not all the data
+                                        unless rows[i].values[11] == ''
+                                            tzone_users[rows[i].values[11]] ||= 0
+                                            tzone_users[rows[i].values[11]] += 1    
+                                        end
+                                    else
+                                        user_info = @users.select { |u| u.id == usr or (u.key?(:enterprise_user) and u.enterprise_user.id == usr) }[-1]
+                                        unless user_info.nil? or user_info.is_app_user or user_info.is_bot
+                                            tzone_users[user_info.tz_label] ||= 0
+                                            tzone_users[user_info.tz_label] += 1
+                                        end
+                                    end
                                 end
                             end
                             if users.size > 10

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

@@ -0,0 +1,32 @@
+class SlackSmartBot
+  # help: ----------------------------------------------
+  # help: `kill repl RUN_REPL_ID`
+  # help:     Will kill a running repl previously executed with 'run repl' command.
+  # help:     Only the user that run the repl or a master admin can kill the repl.
+  # help:  Example:
+  # help:       _kill repl X33JK_
+  # help:     <https://github.com/MarioRuiz/slack-smart-bot#repl|more info>
+  # help: command_id: :kill_repl
+  # help:
+  def kill_repl(dest, user, repl_id)
+    #todo: add tests
+    if has_access?(__method__, user)
+      save_stats(__method__)
+      if !@run_repls.key?(repl_id)
+        respond "The run repl with id #{repl_id} doesn't exist"
+      elsif @run_repls[repl_id].user != user.name and !config.masters.include?(user.name)
+        respond "Only #{@run_repls[repl_id].user} or a master admin can kill this repl."
+      else
+        pids = `pgrep -P #{@run_repls[repl_id].pid}`.split("\n").map(&:to_i) #todo: it needs to be adapted for Windows
+        pids.each do |pd|
+          begin
+            Process.kill("KILL", pd)
+          rescue
+          end
+        end
+        respond "The repl #{@run_repls[repl_id].name} (id: #{repl_id}) has been killed."
+        @run_repls.delete(repl_id)
+      end
+    end
+  end
+end

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

@@ -121,6 +121,7 @@ class SlackSmartBot
         process_to_run = '
             ' + env_vars.join("\n") + '
             require \"amazing_print\"
+            require \"stringio\"
             bindme' + serialt + ' = binding
             eval(\"require \'nice_http\'\" , bindme' + serialt + ')
             def ls(obj)

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

@@ -2,28 +2,39 @@ class SlackSmartBot
   # help: ----------------------------------------------
   # help: `run repl SESSION_NAME`
   # help: `run repl SESSION_NAME ENV_VAR=VALUE ENV_VAR=VALUE`
+  # help: `run repl SESSION_NAME PARAMS`
   # help: `run live SESSION_NAME`
   # help: `run irb SESSION_NAME`
-  # help:     Will run the repl session specified and return the output. 
+  # help:     Will run the repl session specified and return the output.
   # help:     You can supply the Environmental Variables you need for the Session
+  # help:     PARAMS: Also it is possible to supply code that will be run before the repl code on the same session.
   # help:     It will return only the values that were print out on the repl with puts, print, p or pp
   # help:     Example:
   # help:       _run repl CreateCustomer LOCATION=spain HOST='https://10.30.40.50:8887'_
   # help:     <https://github.com/MarioRuiz/slack-smart-bot#repl|more info>
   # help: command_id: :run_repl
   # help:
-  def run_repl(dest, user, session_name, env_vars, rules_file)
+  def run_repl(dest, user, session_name, env_vars, prerun, rules_file)
     #todo: add tests
     from = user.name
     if has_access?(__method__, user)
       save_stats(__method__)
       Dir.mkdir("#{config.path}/repl") unless Dir.exist?("#{config.path}/repl")
       Dir.mkdir("#{config.path}/repl/#{@channel_id}") unless Dir.exist?("#{config.path}/repl/#{@channel_id}")
+      code = prerun.join("\n")
       if File.exist?("#{config.path}/repl/#{@channel_id}/#{session_name}.run")
-        if @repls.key?(session_name) and (@repls[session_name][:type] == :private or @repls[session_name][:type] == :private_clean) and 
-          @repls[session_name][:creator_name]!=user.name and 
-          !is_admin?(user.name)
+        if @repls.key?(session_name) and (@repls[session_name][:type] == :private or @repls[session_name][:type] == :private_clean) and
+           @repls[session_name][:creator_name] != user.name and
+           !is_admin?(user.name)
           respond "The REPL with session name: #{session_name} is private", dest
+        elsif !prerun.empty? and (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
+                                  code.match?(/open3/i) or code.match?(/bundle/i) or code.match?(/gemfile/i) or code.include?("%x") or
+                                  code.include?("ENV") or code.match?(/=\s*IO/) or code.include?("Dir.") or
+                                  code.match?(/=\s*File/) or code.match?(/=\s*Dir/) or code.match?(/<\s*File/) or code.match?(/<\s*Dir/) or
+                                  code.match?(/\w+:\s*File/) or code.match?(/\w+:\s*Dir/) or
+                                  code.match?(/=?\s*(require|load)(\(|\s)/i))
+          respond "Sorry I cannot run this due security reasons", dest
         else
           if @repls.key?(session_name) #not temp
             @repls[session_name][:accessed] = Time.now.to_s
@@ -32,55 +43,124 @@ class SlackSmartBot
             else
               @repls[session_name][:runs_by_others] += 1
             end
-            update_repls()        
+            update_repls()
           end
 
           content = env_vars.join("\n")
           content += "\nrequire 'nice_http'\n"
           unless rules_file.empty? # to get the project_folder
             begin
-              eval(File.new(config.path+rules_file).read) if File.exist?(config.path+rules_file)
+              eval(File.new(config.path + rules_file).read) if File.exist?(config.path + rules_file)
             end
           end
-          if File.exist?("#{project_folder}/.smart-bot-repl") and 
-            ((@repls.key?(session_name) and @repls[session_name][:type] != :private_clean and @repls[session_name][:type] != :public_clean) or !@repls.key?(session_name))
+          if File.exist?("#{project_folder}/.smart-bot-repl") and
+             ((@repls.key?(session_name) and @repls[session_name][:type] != :private_clean and @repls[session_name][:type] != :public_clean) or !@repls.key?(session_name))
             content += File.read("#{project_folder}/.smart-bot-repl")
             content += "\n"
           end
-          content += File.read("#{config.path}/repl/#{@channel_id}/#{session_name}.run").gsub(/^(quit|exit|bye)$/i,'') #todo: remove this gsub, it will never contain it
+          unless prerun.empty?
+            content += prerun.join("\n")
+            content += "\n"
+          end
+          content += File.read("#{config.path}/repl/#{@channel_id}/#{session_name}.run").gsub(/^(quit|exit|bye)$/i, "") #todo: remove this gsub, it will never contain it
           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  ./tmp/repl/#{session_name}.rb"
+          if Thread.current[:on_thread] 
+            # to force stdout.each to be performed every 3 seconds
+            content = "Thread.new do
+              while true do
+                puts ''
+                sleep 3
+              end
+            end
+            #{content}
+            "
+          end
+          random = "5:LN&".gen
+          File.write("#{project_folder}/tmp/repl/#{session_name}_#{user.name}_#{random}.rb", content, mode: "w+")
+          process_to_run = "ruby  ./tmp/repl/#{session_name}_#{user.name}_#{random}.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)
-          if stderr == ""
-            if stdout == ""
-              respond "*#{session_name}*: Nothing returned."
-            else
-              if stdout.to_s.lines.count < 60 and stdout.to_s.size < 3500
-                output = ''
-                stdout.each_line do |line|
-                  if line.match?(/^{.+}$/) or line.match?(/^\[.+\]$/)
-                    output += "```\n#{line}```\n"
+          respond "Running REPL #{session_name} (id: #{random})"
+          @run_repls[random] = { user: user.name, name: session_name, pid: '' }
+          react :running
+
+          require "pty"
+          timeout = 60 * 60 * 4 # 4 hours
+
+          started = Time.now
+          results = []
+          begin
+            PTY.spawn(process_to_run) do |stdout, stdin, pid|
+              last_result = -1
+              last_time = Time.now
+              @run_repls[random].pid = pid
+              begin
+                stdout.each do |line|
+                  if (Time.now - started) > timeout
+                    respond "run REPL session finished. Max time reached: #{session_name} (id: #{random})", dest
+                    pids = `pgrep -P #{pid}`.split("\n").map(&:to_i) #todo: it needs to be adapted for Windows
+                    pids.each do |pd|
+                      begin
+                        Process.kill("KILL", pd)
+                      rescue
+                      end
+                    end
+                    break
                   else
-                    output +=line
+                    results << line
+                    if Thread.current[:on_thread]
+                      if (Time.now - last_time) > 2
+                        if (results.size - last_result) < 60 and results[(last_result + 1)..-1].join.size < 3500
+                          output = ""
+                          results[(last_result + 1)..-1].each do |li|
+                            if li.match?(/^\s*{.+}\s*$/) or li.match?(/^\s*\[.+\]\s*$/)
+                              output += "```\n#{li}```\n"
+                            else
+                              output += li
+                            end
+                          end
+                          respond output
+                        else
+                          send_file(dest, "", "response.rb", "", "text/plain", "ruby", content: results[(last_result + 1)..-1].join)
+                        end
+                        last_result = results.size - 1
+                        last_time = Time.now
+                      end
+                    end
                   end
                 end
-                respond "*#{session_name}*: #{output}"
+              rescue Errno::EIO
+                @logger.warn "run_repl PTY Errno:EIO error"
+              end
+              if results.empty?
+                respond "*#{session_name}* (id: #{random}): Nothing returned."
               else
-                send_file(dest, "", 'response.rb', "", 'text/plain', "ruby", content: stdout)
+                if last_result != (results.size - 1)
+                  if (results.size - last_result) < 60 and results[(last_result + 1)..-1].join.size < 3500
+                    output = ""
+                    results[(last_result + 1)..-1].each do |li|
+                      if li.match?(/^\s*{.+}\s*$/) or li.match?(/^\s*\[.+\]\s*$/)
+                        output += "```\n#{li}```\n"
+                      else
+                        output += li
+                      end
+                    end
+                    if Thread.current[:on_thread]
+                      respond output
+                    else
+                      respond "*#{session_name}* (id: #{random}):\n#{output}"
+                    end
+                  else
+                    send_file(dest, "", "response.rb", "", "text/plain", "ruby", content: results[(last_result + 1)..-1].join)
+                  end
+                end
               end
             end
-          else
-            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
-
+          rescue PTY::ChildExited
+            @logger.warn "run_repl PTY The child process exited!"
           end
+          @run_repls.delete(random) if @run_repls.key?(random)
+          unreact :running
         end
       else
         respond "The REPL with session name: #{session_name} doesn't exist on this Smart Bot Channel", dest

data/lib/slack/smart-bot/commands/on_master/admin_master/publish_announcements.rb

@@ -2,6 +2,7 @@ class SlackSmartBot
   # helpmaster: ----------------------------------------------
   # helpmaster: `publish announcements`
   # helpmaster:    It will publish on all channels the announcements added by using 'add announcement' command.
+  # helpmaster:    It won't be published if less than 11 messages published on the channel since last time this command was called.
   # helpmaster:    Only works if you are on Master channel and you are a master admin user
   # helpmaster:    The messages stored on a DM won't be published.
   # helpmaster:    This is very convenient to be called from a *Routine* for example every weekday at 09:00.
@@ -16,8 +17,9 @@ class SlackSmartBot
         channels.select! {|i| i[/\.csv$/]}
         channels.each do |channel|
           channel.gsub!('.csv','')
-          unless channel[0]== 'D'
+          unless channel[0]== 'D' or (@announcements_activity_after.key?(channel) and @announcements_activity_after[channel] <= 10)
             see_announcements(user, '', channel, false, true)
+            @announcements_activity_after[channel] = 0
             sleep 0.5 # to avoid reach ratelimit
           end
         end

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

@@ -6,6 +6,7 @@ require_relative "commands/on_bot/ruby_code"
 require_relative "commands/on_bot/repl"
 require_relative "commands/on_bot/get_repl"
 require_relative "commands/on_bot/run_repl"
+require_relative "commands/on_bot/kill_repl"
 require_relative "commands/on_bot/delete_repl"
 require_relative "commands/on_bot/see_repls"
 require_relative "commands/on_bot/general/whats_new"
@@ -59,7 +60,14 @@ require_relative "commands/general/see_access"
 require_relative "commands/general/allow_access"
 require_relative "commands/general/deny_access"
 require_relative "commands/general/add_team"
+require_relative "commands/general/add_memo_team"
+require_relative "commands/general/set_memo_status"
+require_relative "commands/general/delete_memo_team"
 require_relative "commands/general/see_teams"
 require_relative "commands/general/update_team"
 require_relative "commands/general/ping_team"
 require_relative "commands/general/delete_team"
+require_relative "commands/general/add_vacation"
+require_relative "commands/general/remove_vacation"
+require_relative "commands/general/see_vacations"
+require_relative "commands/general/see_vacations_team"

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

@@ -152,7 +152,9 @@ class SlackSmartBot
           see_routines(dest, from, user, all)
         when /\A\s*get\s+bot\s+logs?\s*$/i
           get_bot_logs(dest, from, typem)
-        when /\A\s*send\s+message\s+(on|to|in)\s*(.+)\s*:\s*(.+)\s*$/im
+        when /\A\s*send\s+message\s+(on|to|in)\s+<(https?:[^:]+)>\s*:\s*(.+)\s*$/im,
+          /\A\s*send\s+message\s+(on|to|in)\s+(https?:[^:]+)\s*:\s*(.+)\s*$/im,
+          /\A\s*send\s+message\s+(on|to|in)\s*([^:]+)\s*:\s*(.+)\s*$/im
           opts = $2
           message = $3
           thread_ts = ''
@@ -174,7 +176,7 @@ class SlackSmartBot
                     
           thread_ts.gsub!('.','')
           send_message(dest, from, typem, to, thread_ts, message)
-        when /\A\s*delete\s+message\s+(.+)\s*$/i
+        when /\A\s*delete\s+message\s+(http.+)\s*$/i
           url = $1
           delete_message(from, typem, url)
         when /\A\s*react\s+(on|to|in)\s*([^\s]+)\s+([p\d\.]+)\s+(.+)\s*$/i,
@@ -396,11 +398,15 @@ class SlackSmartBot
         when /\A\s*get\s+(repl|irb|live)\s+([\w\-]+)\s*/i
           session_name = $2
           get_repl(dest, user, session_name)      
-        when /\A\s*run\s+(repl|irb|live)\s+([\w\-]+)()\s*$/i,
-          /^\s*run\s+(repl|irb|live)\s+([\w\-]+)\s+(.+)\s*$/i
+        when /\A\s*run\s+(repl|irb|live)\s+([\w\-]+)()\s*\z/im,
+          /^\s*run\s+(repl|irb|live)\s+([\w\-]+)\s+(.+)\s*$/im
           session_name = $2
-          opts = " #{$3}"
-          env_vars = opts.scan(/\s+[\w\-]+="[^"]+"/i) + opts.scan(/\s+[\w\-]+='[^']+'/i)  
+          if Thread.current[:command_orig].match(/\s*run\s+(repl|irb|live)\s+([\w\-]+)\s+(.+)\s*$/im)
+            opts = " #{$3}"
+          else
+            opts = ''
+          end
+          env_vars = opts.scan(/\s+[\w\-]+="[^"]+"/i) + opts.scan(/\s+[\w\-]+='[^']+'/i)
           opts.scan(/\s+[\w\-]+=[^'"\s]+/i).flatten.each do |ev|
             env_vars << ev.gsub('=',"='") + "'"
           end
@@ -409,12 +415,16 @@ class SlackSmartBot
               ev.lstrip!
               env_vars[idx] = "ENV['#{ev}"
           end
-          run_repl(dest, user, session_name, env_vars.flatten, rules_file)      
+          prerun = Thread.current[:command_orig].gsub('```', '`').scan(/\s+`(.+)`/m)
+          run_repl(dest, user, session_name, env_vars.flatten, prerun.flatten, rules_file)      
         when /\A\s*(delete|remove)\s+(repl|irb|live)\s+([\w\-]+)\s*$/i
           repl_name = $3
           delete_repl(dest, user, repl_name)
         when /\A\s*see\s+(repls|repl|irb|irbs)\s*$/i
           see_repls(dest, user, typem)
+        when /\A\s*(kill)\s+(repl|irb|live)\s+([\w]+)\s*$/i
+          repl_id = $3
+          kill_repl(dest, user, repl_id)
         else
           processed2 = false
         end #of case

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

@@ -74,6 +74,12 @@ class SlackSmartBot
       if !dest.nil? and config.on_master_bot and !data.text.nil? and data.text.match(/^ping from (.+)\s*$/) and data.user == config[:nick_id]
         @pings << $1
       end
+      if config.on_master_bot and @vacations_check != Date.today
+        @vacations_check = Date.today
+        t = Thread.new do
+          check_vacations(only_first_day: true)
+        end
+      end
       typem = :dont_treat
       if data.nil? or data.user.nil? or data.user.to_s==''
         user_info = nil
@@ -186,7 +192,7 @@ class SlackSmartBot
         end
       end
       load "#{config.path}/rules/general_commands.rb" if File.exist?("#{config.path}/rules/general_commands.rb") and @datetime_general_commands != File.mtime("#{config.path}/rules/general_commands.rb")
-
+      eval(File.new(config.path + config.rules_file).read) if !defined?(rules) and File.exist?(config.path+config.rules_file) and !config.rules_file.empty?
       unless typem == :dont_treat or user_info.nil?
         if (Time.now - @last_activity_check) > 60 * 30 #every 30 minutes
           @last_activity_check = Time.now
@@ -350,6 +356,10 @@ class SlackSmartBot
           end
         end
       end
+      unless data.nil? or data.channel.nil? or data.channel.empty?
+        @announcements_activity_after[data.channel] ||= 0
+        @announcements_activity_after[data.channel] += 1 
+      end
     rescue Exception => stack
       @logger.fatal stack
     end