slack-smart-bot 1.6.4 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f07b09cbcf1e3546a38bf8f34ac6eff1d3e19c53af22cc38663b1cf932da7440
-  data.tar.gz: '05639afadac3c32459fed0999db003d162fa1d61db6e89e085acab95c4f76f1b'
+  metadata.gz: cd95efb0ac282a17d1b463fe28293643c0b38b91b3261e0d3899e879950e4655
+  data.tar.gz: 1d332d2651286f4bef95c1172d95bc6ce422166b50bf788773563747ebbf1c30
 SHA512:
-  metadata.gz: bb067ed25c1cf464cb104ba56e3ff995366fc72e5f657dafd99e942092616a9bda58f33bd6f52f8c1b8db37a5f2d0e79a12fed3acf0a2d0f52e795e82fd9b1c1
-  data.tar.gz: f2db5a51c5f74c791c8793efbaf68626c2444ba2b7d6aabdd8485723d9b25bb4a43b0db2fa9d11d788091a011e22ceb2d40c6ee985daa28f4ba26a8e2c47e14b
+  metadata.gz: f48dc2999a22da392d297cb789dfcc7552ce1ef7aad607283f705d39af5eac58ce2ca002b844178184e6bacdc13fe641ddbe762f8a999b17da7532a5cad234b8
+  data.tar.gz: f4ac49668234f24295e79afd842218e40a1a918c1107392af84d3b31c6d8908fadb8319f2e4596ef896c44e7c36665714523fc554f4c8b70a3a5a1f02cc2c872

data/README.md

@@ -159,8 +159,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.
 

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,30 @@
+# 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:     repeats SOMETHING
+        # help:  Examples:
+        # help:     _echo I am the Smart Bot_
+        when /^echo\s(.+)/i
+            save_stats :echo
+            respond $1
+
+      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,96 @@ 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
+            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)
+        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/send_file.rb

@@ -3,8 +3,11 @@ 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]
+      file = 'myfile' if file.to_s == '' and content!=''
       if to[0] == "U" #user
         im = client.web_client.im_open(user: to)
         channel = im["channel"]["id"]
@@ -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/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_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 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 = []
@@ -43,6 +45,7 @@ class SlackSmartBot
                 from+= " 00:00:00 +0000"
                 to+= " 23:59:59 +0000"
                 rows = []
+                rows_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"
@@ -54,6 +57,10 @@ class SlackSmartBot
                                         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])
+                                                    rows_month[row[:date][0..6]] += 1
+                                                end
                                             end
                                         end
                                     end
@@ -79,6 +86,12 @@ class SlackSmartBot
                     message << "*Total calls <##{channel_id}>*: #{total} from #{from_short} to #{to_short}"
                 end
                 if total > 0
+                    if monthly 
+                        message << '*Totals by month*'
+                        rows_month.each do |k,v|
+                            message << "\t#{k}: #{v} (#{(v.to_f*100/total).round(2)}%)"
+                        end
+                    end
 
                     if channel_id == ''
                         message << "*Channels*"

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,7 +101,10 @@ class SlackSmartBot
             require \"amazing_print\"
             bindme' + serialt + ' = binding
             eval(\"require \'nice_http\'\" , bindme' + serialt + ')
-
+            def ls(obj)
+              (obj.methods - Object.methods)
+            end
+            
             file_input_repl = File.open(\"' + Dir.pwd + '/repl/' + @channel_id + '/' + session_name + '.input\", \"r\")
             if File.exist?(\"./.smart-bot-repl\")
               begin
@@ -112,6 +116,7 @@ class SlackSmartBot
               sleep 0.2 
               code_to_run_repl = file_input_repl.read
               if code_to_run_repl.to_s!=''
+                add_to_run_repl = true
                 if code_to_run_repl.to_s.match?(/^quit$/i) or 
                   code_to_run_repl.to_s.match?(/^exit$/i) or 
                   code_to_run_repl.to_s.match?(/^bye bot$/i) or
@@ -119,7 +124,7 @@ class SlackSmartBot
                   exit
                 else
                   if code_to_run_repl.match?(/^\s*ls\s+(.+)/)
-                    code_to_run_repl = \"#{code_to_run_repl.scan(/^\s*ls\s+(.+)/).join}.methods - Object.methods\"
+                    add_to_run_repl = false
                   end
                   error = false
                   begin
@@ -128,10 +133,16 @@ class SlackSmartBot
                     error = true
                   end
                   if resp_repl.to_s != \"\"
-                    open(\"' + Dir.pwd + '/repl/' + @channel_id + '/' + session_name + '.output\", \"a+\") {|f|
-                      f.puts \"\`\`\`#{resp_repl.ai}\`\`\`\"
-                    }
-                    unless error
+                    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
                       }
@@ -168,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
@@ -180,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

@@ -105,12 +105,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 +169,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 +209,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
@@ -127,12 +129,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 +140,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/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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-smart-bot
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.7.0
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
@@ -19,7 +19,7 @@ dependencies:
         version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.5
+        version: 0.14.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.5
+        version: 0.14.6
 - !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.1.0
   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.1.0
 - !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