slack-smart-bot 1.7.0 → 1.9.2

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

@@ -3,7 +3,6 @@ class SlackSmartBot
   # help: `get repl SESSION_NAME`
   # help: `get irb SESSION_NAME`
   # help: `get live SESSION_NAME`
-  # help: 
   # help:     Will get the Ruby commands sent on that SESSION_NAME.
   # help:
   def get_repl(dest, user, session_name)
@@ -16,22 +15,23 @@ class SlackSmartBot
       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}")
       if File.exist?("#{config.path}/repl/#{@channel_id}/#{session_name}.run")
-        if @repls.key?(session_name) and @repls[session_name][:type] == :private and 
+        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 
           !config.admins.include?(user.name)
           respond "The REPL with session name: #{session_name} is private", dest
         else
+          content = "require 'nice_http'\n"
           if @repls.key?(session_name)
             @repls[session_name][:accessed] = Time.now.to_s
             @repls[session_name][:gets] += 1
             update_repls()
           end
-
-          content = "require 'nice_http'\n"
-          if File.exist?("#{project_folder}/.smart-bot-repl")
+          if !@repls.key?(session_name) or 
+            (File.exist?("#{project_folder}/.smart-bot-repl") and @repls[session_name][:type] != :private_clean and @repls[session_name][:type] != :public_clean)
             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
           File.write("#{config.path}/repl/#{@channel_id}/#{session_name}.rb", content, mode: "w+")
           send_file(dest, "REPL #{session_name} on #{config.channel}", "#{config.path}/repl/#{@channel_id}/#{session_name}.rb", " REPL #{session_name} on #{config.channel}", 'text/plain', "ruby")

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

@@ -5,15 +5,16 @@ class SlackSmartBot
   # help: `irb`
   # help: `repl SESSION_NAME`
   # help: `private repl SESSION_NAME`
+  # help: `clean repl SESSION_NAME`
   # help: `repl ENV_VAR=VALUE`
   # help: `repl SESSION_NAME ENV_VAR=VALUE ENV_VAR='VALUE'`
   # help: `repl SESSION_NAME: "DESCRIPTION"`
   # help: `repl SESSION_NAME: "DESCRIPTION" ENV_VAR=VALUE ENV_VAR='VALUE'`
-  # help: 
   # help:     Will run all we write as a ruby command and will keep the session values. 
   # help:     SESSION_NAME only admits from a to Z, numbers, - and _
   # help:     If no SESSION_NAME supplied it will be treated as a temporary REPL
   # help:     If 'private' specified the repl will be accessible only by you and it will be displayed only to you when `see repls`
+  # help:     If 'clean' specified the repl won't pre execute the code written on the .smart-bot-repl file
   # help:     To avoid a message to be treated, start the message with '-'.
   # help:     Send _quit_, _bye_ or _exit_ to finish the session.
   # help:     Send puts, print, p or pp if you want to print out something when using `run repl` later.
@@ -78,7 +79,13 @@ class SlackSmartBot
           }
           update_repls()        
         end
-    
+        react :running
+        if Thread.current[:ts].to_s == ''
+          @ts_react = Thread.current[:thread_ts]
+        else
+          @ts_react = Thread.current[:ts]
+        end        
+
         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`. 
@@ -96,6 +103,19 @@ class SlackSmartBot
         File.write("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.output", "", mode: "a+")
         File.write("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.run", "", mode: "a+")
         
+        if type != :private_clean and type != :public_clean
+          pre_execute = '
+            if File.exist?(\"./.smart-bot-repl\")
+              begin
+                eval(File.read(\"./.smart-bot-repl\"), bindme' + serialt + ')
+              rescue Exception => resp_repl
+              end
+            end
+          '
+        else
+          pre_execute = ''
+        end
+
         process_to_run = '
             ruby -e "' + env_vars.join("\n") + '
             require \"amazing_print\"
@@ -105,17 +125,12 @@ class SlackSmartBot
               (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
-                eval(File.read(\"./.smart-bot-repl\"), bindme' + serialt + ')
-              rescue Exception => resp_repl
-              end
-            end
+            file_input_repl = File.open(\"' + File.expand_path(config.path) + '/repl/' + @channel_id + '/' + session_name + '.input\", \"r\")
+            ' + pre_execute + '
             while true do 
               sleep 0.2 
               code_to_run_repl = file_input_repl.read
-              if code_to_run_repl.to_s!=''
+              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 
@@ -134,16 +149,16 @@ class SlackSmartBot
                   end
                   if resp_repl.to_s != \"\"
                     if code_to_run_repl.match?(/^\s*p\s+/i)
-                      open(\"' + Dir.pwd + '/repl/' + @channel_id + '/' + session_name + '.output\", \"a+\") {|f|
+                      open(\"' + File.expand_path(config.path) + '/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|
+                      open(\"' + File.expand_path(config.path) + '/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|
+                      open(\"' + File.expand_path(config.path) + '/repl/' + @channel_id + '/' + session_name + '.run\", \"a+\") {|f|
                         f.puts code_to_run_repl
                       }
                     end
@@ -152,7 +167,6 @@ class SlackSmartBot
               end
             end"
         '
-
         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)
@@ -160,12 +174,12 @@ class SlackSmartBot
         end
         started = Time.now
         process_to_run = ("cd #{project_folder} &&" + process_to_run) if defined?(project_folder)
-        
+
         stdin, stdout, stderr, wait_thr = Open3.popen3(process_to_run)
         timeout = 30 * 60 # 30 minutes
         
         file_output_repl = File.open("#{config.path}/repl/#{@channel_id}/#{session_name}.output", "r")
-
+        @repl_sessions[from][:pid] = wait_thr.pid
         while (wait_thr.status == 'run' or wait_thr.status == 'sleep') and @repl_sessions.key?(from)
           begin
             if (Time.now-@repl_sessions[from][:finished]) > timeout
@@ -173,6 +187,14 @@ class SlackSmartBot
                   f.puts 'quit'
                 }
                 respond "REPL session finished: #{@repl_sessions[from][:name]}", dest
+                unreact :running, @ts_react
+                pids = `pgrep -P #{@repl_sessions[from][:pid]}`.split("\n").map(&:to_i) #todo: it needs to be adapted for Windows
+                pids.each do |pid|
+                  begin
+                    Process.kill("KILL", pid)
+                  rescue
+                  end
+                end
                 @repl_sessions.delete(from)
                 break
             end
@@ -199,10 +221,12 @@ class SlackSmartBot
         code.gsub!("\\r", "\r")
         # 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
+        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
           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/)
+          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/)
           respond "Sorry I cannot run this due security reasons", dest
         else
           @repl_sessions[from][:input]<<code
@@ -212,6 +236,14 @@ class SlackSmartBot
               f.puts code
             }
             respond "REPL session finished: #{@repl_sessions[from][:name]}", dest
+            unreact :running, @ts_react
+            pids = `pgrep -P #{@repl_sessions[from][:pid]}`.split("\n").map(&:to_i) #todo: it needs to be adapted for Windows
+            pids.each do |pid|
+              begin
+                Process.kill("KILL", pid)
+              rescue
+              end
+            end
             @repl_sessions.delete(from)
           when /^\s*-/i
             #ommit

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

@@ -13,39 +13,64 @@ class SlackSmartBot
       (!user.key?(:enterprise_user) or ( user.key?(:enterprise_user) and !config[:allow_access][__method__].include?(user[:enterprise_user].id)))
       respond "You don't have access to use this command, please contact an Admin to be able to use it: <@#{config.admins.join(">, <@")}>"
     else
-      unless code.match?(/System/i) or code.match?(/Kernel/i) or code.include?("File") or
+      unless 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/)
+            code.include?("ENV") or code.match?(/=\s*IO/) or code.include?("Dir.") or code.match?(/=\s*IO/) 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/)
+        react :running
         unless rules_file.empty?
           begin
             eval(File.new(config.path+rules_file).read) if File.exist?(config.path+rules_file)
           end
         end
 
-        respond "Running", dest if code.size > 100
+        respond "Running", dest if code.size > 200
 
         begin
           code.gsub!(/^\W*$/, "") #to remove special chars from slack when copy/pasting
+          code.gsub!('$','\$') #to take $ as literal, fex: puts '$lolo' => puts '\$lolo'
           ruby = "ruby -e \"#{code.gsub('"', '\"')}\""
           if defined?(project_folder) and project_folder.to_s != "" and Dir.exist?(project_folder)
             ruby = ("cd #{project_folder} &&" + ruby)
           else
             def project_folder() "" end
           end
-          stdout, stderr, status = Open3.capture3(ruby)
-          if stderr == ""
-            if stdout == ""
-              respond "Nothing returned. Remember you need to use p or puts to print", dest
+
+          stdin, stdout, stderr, wait_thr = Open3.popen3(ruby)
+          timeout = timeoutt = 20
+          procstart = Time.now
+          while (wait_thr.status == 'run' or wait_thr.status == 'sleep') and timeout > 0
+            timeout -= 0.1
+            sleep 0.1
+          end
+          if timeout > 0
+            stdout = stdout.read
+            stderr = stderr.read
+            if stderr == ""
+              if stdout == ""
+                respond "Nothing returned. Remember you need to use p or puts to print", dest
+              else
+                respond stdout, dest
+              end
             else
-              respond stdout, dest
+              respond "#{stderr}\n#{stdout}", dest
             end
           else
-            respond "#{stderr}\n#{stdout}", dest
+            respond "The process didn't finish in #{timeoutt} secs so it was aborted. Timeout!"
+            pids = `pgrep -P #{wait_thr.pid}`.split("\n").map(&:to_i) #todo: it needs to be adapted for Windows
+            pids.each do |pid|
+              begin
+                Process.kill("KILL", pid)
+              rescue
+              end
+            end
           end
         rescue Exception => exc
           respond exc, dest
         end
+        unreact :running
       else
         respond "Sorry I cannot run this due security reasons", dest
       end

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

@@ -4,7 +4,6 @@ class SlackSmartBot
   # help: `run repl SESSION_NAME ENV_VAR=VALUE ENV_VAR=VALUE`
   # help: `run live SESSION_NAME`
   # help: `run irb SESSION_NAME`
-  # help: 
   # help:     Will run the repl session specified and return the output. 
   # help:     You can supply the Environmental Variables you need for the Session
   # help:     It will return only the values that were print out on the repl with puts, print, p or pp
@@ -22,7 +21,7 @@ class SlackSmartBot
       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}")
       if File.exist?("#{config.path}/repl/#{@channel_id}/#{session_name}.run")
-        if @repls.key?(session_name) and @repls[session_name][:type] == :private and 
+        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 
           !config.admins.include?(user.name)
           respond "The REPL with session name: #{session_name} is private", dest
@@ -44,7 +43,7 @@ class SlackSmartBot
               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")
+          if File.exist?("#{project_folder}/.smart-bot-repl") and @repls[session_name][:type] != :private_clean and @repls[session_name][:type] != :public_clean
             content += File.read("#{project_folder}/.smart-bot-repl")
             content += "\n"
           end

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

@@ -14,7 +14,7 @@ class SlackSmartBot
     else
       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)
+        if (repl.creator_name == user.name or repl.type == :public or repl.type == :public_clean) 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_name} / runs: #{repl.runs_by_creator+repl.runs_by_others} / gets: #{repl.gets} \n"
         end
       end

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

@@ -13,26 +13,44 @@ class SlackSmartBot
     else
       unless typem == :on_extended
         msg = ""
-        if @shortcuts[:all].keys.size > 0
+        if @shortcuts[:all].keys.size > 0 or @shortcuts_global[:all].keys.size > 0
           msg = "*Available shortcuts for all:*\n"
-          @shortcuts[:all].each { |name, value|
-            msg += "    _#{name}: #{value}_\n"
-          }
+          
+          if @shortcuts[:all].keys.size > 0
+            @shortcuts[:all].each { |name, value|
+              msg += "    _#{name}: #{value}_\n"
+            }
+          end
+          if @shortcuts_global[:all].keys.size > 0
+            @shortcuts_global[:all].each { |name, value|
+              msg += "    _#{name} (global): #{value}_\n"
+            }
+          end
           respond msg, dest
         end
-
+        msg2 = ''
         if @shortcuts.keys.include?(from) and @shortcuts[from].keys.size > 0
           new_hash = @shortcuts[from].dup
           @shortcuts[:all].keys.each { |k| new_hash.delete(k) }
           if new_hash.keys.size > 0
-            msg = "*Available shortcuts for #{from}:*\n"
+            msg2 = "*Available shortcuts for #{from}:*\n"
             new_hash.each { |name, value|
-              msg += "    _#{name}: #{value}_\n"
+              msg2 += "    _#{name}: #{value}_\n"
+            }
+          end
+        end
+        if @shortcuts_global.keys.include?(from) and @shortcuts_global[from].keys.size > 0
+          new_hash = @shortcuts_global[from].dup
+          @shortcuts_global[:all].keys.each { |k| new_hash.delete(k) }
+          if new_hash.keys.size > 0
+            msg2 = "*Available shortcuts for #{from}:*\n" if msg2 == ''
+            new_hash.each { |name, value|
+              msg2 += "    _#{name} (global): #{value}_\n"
             }
-            respond msg, dest
           end
         end
-        respond "No shortcuts found", dest if msg == ""
+        respond msg2 unless msg2 == ''
+        respond "No shortcuts found" if (msg + msg2) == ""
       end
     end
   end

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

@@ -7,7 +7,15 @@ class SlackSmartBot
       respond "You don't have access to use this command, please contact an Admin to be able to use it: <@#{config.admins.join(">, <@")}>"
     else
       if typem == :on_extended or typem == :on_call #for the other cases above.
-        help_filtered = get_help(rules_file, dest, from, true)
+
+        if help_command.to_s != ''
+          help_command = '' if help_command.to_s.match?(/^\s*expanded\s*$/i) or help_command.to_s.match?(/^\s*extended\s*$/i)
+          expanded = true
+        else
+          expanded = false
+        end 
+  
+        help_filtered = get_help(rules_file, dest, from, true, expanded)
 
         if help_command.to_s != ""
           help_found = false
@@ -38,6 +46,11 @@ class SlackSmartBot
           def git_project() "" end
           def project_folder() "" end
         end
+        unless expanded
+          message_not_expanded = "*If you want to see the expanded version of `bot rules`, please call `bot rules expanded`*\n"
+          message_not_expanded += "*Also to get specific expanded help for a specific command or rule call `bot rules COMMAND`*\n"
+          respond message_not_expanded
+        end
       end
     end
   end

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

@@ -11,10 +11,10 @@ class SlackSmartBot
     save_stats(__method__)
     if config.on_master_bot
       if config.admins.include?(from) #admin user
-        unless @questions.keys.include?(from)
+        if answer.empty?
           ask("are you sure?", command, from, dest)
         else
-          case @questions[from]
+          case answer
           when /yes/i, /yep/i, /sure/i
             respond "Game over!", dest
             respond "Ciao #{display_name}!", dest
@@ -33,7 +33,7 @@ class SlackSmartBot
               exit!
             end
           when /no/i, /nope/i, /cancel/i
-            @questions.delete(from)
+            answer_delete(from)
             respond "Thanks, I'm happy to be alive", dest
           else
             ask("I don't understand, are you sure do you want me to close? (yes or no)", command, from, dest)

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

@@ -18,7 +18,7 @@ class SlackSmartBot
           end
           respond "Bot channels have been notified", dest
         elsif where == "all" #all
-          myconv = client.web_client.users_conversations(exclude_archived: true, limit: 100, types: "im, public_channel,private_channel").channels
+          myconv = get_channels(bot_is_in: true)
           myconv.each do |c|
             respond message, c.id unless c.name == config.master_channel
           end

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

@@ -0,0 +1,41 @@
+class SlackSmartBot
+  # helpmaster: ----------------------------------------------
+  # helpmaster: `set maintenance on`
+  # helpmaster: `set maintenance on MESSAGE`
+  # helpmaster: `set maintenance off`
+  # helpmaster: `turn maintenance on`
+  # helpmaster: `turn maintenance on MESSAGE`
+  # helpmaster: `turn maintenance off`
+  # helpmaster:    The SmartBot will be on maintenance and responding with a generic message
+  # helpmaster:    Only works if you are on Master channel and you are a master admin user
+  # helpmaster:
+  def set_maintenance(from, status, message)
+    save_stats(__method__)
+    if config.on_master_bot
+      if config.admins.include?(from) #admin user
+        if message == ''
+          config.on_maintenance_message = "Sorry I'm on maintenance so I cannot attend your request."
+        else
+          config.on_maintenance_message = message
+        end
+
+        if status == 'on'
+          config.on_maintenance = true
+          respond "From now on I'll be on maintenance status so I won't be responding accordingly."
+        else
+          config.on_maintenance = false
+          respond "From now on I won't be on maintenance. Everything is back to normal!"
+        end
+        
+        file = File.open("#{config.path}/config_tmp.status", "w")
+        file.write config.inspect
+        file.close
+    
+      else
+        respond 'Only master admins on master channel can use this command.'
+      end
+    else
+      respond 'Only master admins on master channel can use this command.'
+    end
+  end
+end