slack-smart-bot 1.13.0 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11331340784024ea3f35184a8e580ddbc80d54cf2bb30e5f21e643d0adfe471d
-  data.tar.gz: 39fc7e79977f18893e08215d78eda51af8e21dc25a4d5af3d0a8a33687d021f0
+  metadata.gz: 1d49cea86f54f8c7486c39dfbdb0c9e871a5b2d740c06e80242f120e9f3c8b38
+  data.tar.gz: fb3d52d42693d1dba820685d7ef0bada290298de9db2cd00212e1196c2baaae8
 SHA512:
-  metadata.gz: d2536ec8de0e528516baed6b50a8ea6ffa9fae939e9c1a31f3d7e430cdcddc579373c8efa6a3a937e88b15d3a688ce9836a3874b3cd2e04c94eca3fc4b2d03a2
-  data.tar.gz: e7e51fa921bdb4e9542319723c82daae8d7d502fcb655b85fdecb17d4f6c3beaa9cbc29c27cb426ed36cbdf1083e960b69813d0dfd9acbf4803272d8fe5e30e8
+  metadata.gz: 261ac1f20a7bdec84c5e5b24278584656def3ab09dc0bf2f4fc17080a812952a18474bff74f845fcc83e8783b121e00be555086ea7159bd362b955236c4b1dc6
+  data.tar.gz: ea5fe6b71b79f696727a1a54585e6a2b450c381fa7daadc6e351e9513e3a0b878c7869683b2df4db35997071af06d17a1d55d03f465421aa701e9bd727adef88

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

@@ -1,5 +1,6 @@
 class SlackSmartBot
   def event_hello()
+    @first_time_bot_started ||= true
     unless config.simulate
       m = "Successfully connected, welcome '#{client.self.name}' to the '#{client.team.name}' team at https://#{client.team.domain}.slack.com."
       puts m
@@ -18,7 +19,7 @@ class SlackSmartBot
       version_message = ". There is a new available version: #{version_remote}."
     end
     if (!config[:silent] or ENV['BOT_SILENT'].to_s == 'false') and !config.simulate
-      unless ENV['BOT_SILENT']=='true'
+      unless ENV['BOT_SILENT']=='true' or !@first_time_bot_started
         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
       ENV['BOT_SILENT'] = 'true' if config[:silent] and ENV['BOT_SILENT'].to_s != 'true'
@@ -30,5 +31,6 @@ class SlackSmartBot
         end
       end
     end
+    @first_time_bot_started = false
   end
 end

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

@@ -10,7 +10,7 @@ class SlackSmartBot
   # 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:     Will run all we write as a ruby command and will keep the session values. 
+  # 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`
@@ -19,7 +19,7 @@ class SlackSmartBot
   # 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.
   # help:     After 30 minutes of no communication with the Smart Bot the session will be dismissed.
-  # help:     If you declare on your rules file a method called 'project_folder' returning the path for the project folder, the code will be executed from that folder. 
+  # help:     If you declare on your rules file a method called 'project_folder' returning the path for the project folder, the code will be executed from that folder.
   # help:     By default it will be automatically loaded the gems: string_pattern, nice_hash and nice_http
   # help:     To pre-execute some ruby when starting the session add the code to .smart-bot-repl file on the project root folder defined on project_folder
   # help:     If you want to see the methods of a class or module you created use _ls TheModuleOrClass_
@@ -41,9 +41,9 @@ class SlackSmartBot
         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}")
-        
+
         serialt = Time.now.strftime("%Y%m%d%H%M%S%N")
-        if session_name.to_s==''
+        if session_name.to_s == ""
           session_name = "#{from}_#{serialt}"
           temp_repl = true
         else
@@ -51,7 +51,7 @@ class SlackSmartBot
           i = 0
           name = session_name
           while File.exist?("#{config.path}/repl/#{@channel_id}/#{session_name}.input")
-            i+=1
+            i += 1
             session_name = "#{name}#{i}"
           end
         end
@@ -65,32 +65,32 @@ class SlackSmartBot
           thread_ts: Thread.current[:thread_ts],
           collaborators: [],
           user_type: :creator,
-          user_creator: from
+          user_creator: from,
         }
 
         unless temp_repl
           @repls[session_name] = {
-              created: @repl_sessions[from][:started].to_s,
-              accessed: @repl_sessions[from][:started].to_s,
-              creator_name: user.name,
-              creator_id: user.id,
-              description: description,
-              type: type,
-              runs_by_creator: 0,
-              runs_by_others: 0,
-              gets: 0
+            created: @repl_sessions[from][:started].to_s,
+            accessed: @repl_sessions[from][:started].to_s,
+            creator_name: user.name,
+            creator_id: user.id,
+            description: description,
+            type: type,
+            runs_by_creator: 0,
+            runs_by_others: 0,
+            gets: 0,
           }
-          update_repls()        
+          update_repls()
         end
         react :running
         @ts_react ||= {}
-        if Thread.current[:ts].to_s == ''
+        if Thread.current[:ts].to_s == ""
           @ts_react[session_name] = Thread.current[:thread_ts]
         else
           @ts_react[session_name] = Thread.current[:ts]
-        end        
+        end
         @ts_repl ||= {}
-        @ts_repl[session_name] = ''
+        @ts_repl[session_name] = ""
 
         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`. 
@@ -105,26 +105,26 @@ class SlackSmartBot
           _repl CreateCustomer LOCATION=spain HOST='https://10.30.40.50:8887'_
         "
         respond message, dest
-        
+
         File.write("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.input", "", mode: "a+")
         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 + ')
+                eval(File.read(\"./.smart-bot-repl\"), bindme' + serialt + ")
               rescue Exception => resp_repl
               end
             end
-          '
+          "
         else
-          pre_execute = ''
+          pre_execute = ""
         end
 
-        process_to_run = '
-            ' + env_vars.join("\n") + '
+        process_to_run = "
+            " + env_vars.join("\n") + '
             require \"amazing_print\"
             require \"stringio\"
             bindme' + serialt + ' = binding
@@ -132,8 +132,8 @@ class SlackSmartBot
             def ls(obj)
               (obj.methods - Object.methods)
             end
-            file_run_path = \"' +  + File.expand_path(config.path) + '/repl/' + @channel_id + '/' + session_name + '.rb\"
-            file_input_repl = File.open(\"' + File.expand_path(config.path) + '/repl/' + @channel_id + '/' + session_name + '.input\", \"r\")
+            file_run_path = \"' + +File.expand_path(config.path) + "/repl/" + @channel_id + "/" + session_name + '.rb\"
+            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 
@@ -163,7 +163,7 @@ class SlackSmartBot
                     error = true
                   end
                   if error
-                    open(\"' + File.expand_path(config.path) + '/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.to_s.gsub(/^.+' + session_name + '\.rb:\d+:/,\"\")}\`\`\`\"
                     }
                   else
@@ -174,7 +174,7 @@ class SlackSmartBot
                       else
                         resp_repl = stdout_repl 
                       end
-                      open(\"' + File.expand_path(config.path) + '/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}\`\`\`\"
                       }
                     else
@@ -183,12 +183,12 @@ class SlackSmartBot
                       else
                         resp_repl = stdout_repl 
                       end
-                      open(\"' + File.expand_path(config.path) + '/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}\`\`\`\"
                       }
                     end
                     unless !add_to_run_repl
-                      open(\"' + File.expand_path(config.path) + '/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
@@ -199,16 +199,16 @@ class SlackSmartBot
         '
         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
-        process_to_run.gsub!('\"','"')
+        process_to_run.gsub!('\"', '"')
         file_run_path = "./tmp/repl/#{@channel_id}/#{session_name}.rb"
         if defined?(project_folder)
           Dir.mkdir("#{project_folder}/tmp/") unless Dir.exist?("#{project_folder}/tmp/")
           Dir.mkdir("#{project_folder}/tmp/repl") unless Dir.exist?("#{project_folder}/tmp/repl")
           Dir.mkdir("#{project_folder}/tmp/repl/#{@channel_id}/") unless Dir.exist?("#{project_folder}/tmp/repl/#{@channel_id}/")
-          file_run = File.open(file_run_path.gsub('./',"#{project_folder}/"), "w")
+          file_run = File.open(file_run_path.gsub("./", "#{project_folder}/"), "w")
           file_run.write process_to_run
           file_run.close
         else
@@ -226,87 +226,88 @@ class SlackSmartBot
         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)
+        while (wait_thr.status == "run" or wait_thr.status == "sleep") and @repl_sessions.key?(from)
           begin
-            if (Time.now-@repl_sessions[from][:finished]) > timeout
-                open("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.input", 'a+') {|f|
-                  f.puts 'quit'
-                }
-                respond "REPL session finished: #{@repl_sessions[from][:name]}", dest
-                unreact :running, @ts_react[@repl_sessions[from].name]
-                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
+            if (Time.now - @repl_sessions[from][:finished]) > timeout
+              open("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.input", "a+") { |f|
+                f.puts "quit"
+              }
+              respond "REPL session finished: #{@repl_sessions[from][:name]}", dest
+              unreact :running, @ts_react[@repl_sessions[from].name]
+              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
-                @repl_sessions[from][:collaborators].each do |collaborator|
-                  @repl_sessions.delete(collaborator)
-                end  
-                @repl_sessions.delete(from)
-                break
+              end
+              @repl_sessions[from][:collaborators].each do |collaborator|
+                @repl_sessions.delete(collaborator)
+              end
+              @repl_sessions.delete(from)
+              break
             end
             sleep 0.2
             resp_repl = file_output_repl.read
-            if resp_repl.to_s!=''
-              if @ts_repl[@repl_sessions[from].name].to_s != ''
-                unreact(:running, @ts_repl[@repl_sessions[from].name]) 
-                @ts_repl[@repl_sessions[from].name] = ''
+            if resp_repl.to_s != ""
+              if @ts_repl[@repl_sessions[from].name].to_s != ""
+                unreact(:running, @ts_repl[@repl_sessions[from].name])
+                @ts_repl[@repl_sessions[from].name] = ""
               end
               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)
+                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
           end
         end
-      elsif @repl_sessions.key?(from) and @repl_sessions[from][:command].to_s == ''
-        respond 'You are already in a repl on this SmartBot. You need to quit that one before starting a new one.'
+      elsif @repl_sessions.key?(from) and @repl_sessions[from][:command].to_s == ""
+        respond "You are already in a repl on this SmartBot. You need to quit that one before starting a new one."
       else
         @repl_sessions[from][:finished] = Time.now
         code = @repl_sessions[from][:command]
-        @repl_sessions[from][:command] = ''
+        @repl_sessions[from][:command] = ""
         code.gsub!("\\n", "\n")
         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
-          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)
-
+      if code.match?(/\A\s*-/i)
+        # don't treat
+      elsif 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
         elsif code.match(/\A\s*add\s+collaborator\s+<@(\w+)>\s*\z/i)
-            collaborator = $1
-            user_info = @users.select{|u| u.id == collaborator or (u.key?(:enterprise_user) and u.enterprise_user.id == collaborator)}[-1]
-            collaborator_name = user_info.name
-            if @repl_sessions.key?(collaborator_name)
-              respond "Sorry, <@#{collaborator}> is already in a repl. Please ask her/him to quit it first.", dest
-            else
-              respond "Collaborator added. Now <@#{collaborator}> can interact with this repl.", dest
-              creator = @repl_sessions[from][:user_creator]
-              @repl_sessions[creator][:collaborators] << collaborator_name
-              @repl_sessions[collaborator_name] = {
-                name: @repl_sessions[from][:name],
-                dest: dest,
-                on_thread: Thread.current[:on_thread],
-                thread_ts: Thread.current[:thread_ts],
-                user_type: :collaborator,
-                user_creator: creator
-              }    
-            end
+          collaborator = $1
+          user_info = @users.select { |u| u.id == collaborator or (u.key?(:enterprise_user) and u.enterprise_user.id == collaborator) }[-1]
+          collaborator_name = user_info.name
+          if @repl_sessions.key?(collaborator_name)
+            respond "Sorry, <@#{collaborator}> is already in a repl. Please ask her/him to quit it first.", dest
+          else
+            respond "Collaborator added. Now <@#{collaborator}> can interact with this repl.", dest
+            creator = @repl_sessions[from][:user_creator]
+            @repl_sessions[creator][:collaborators] << collaborator_name
+            @repl_sessions[collaborator_name] = {
+              name: @repl_sessions[from][:name],
+              dest: dest,
+              on_thread: Thread.current[:on_thread],
+              thread_ts: Thread.current[:thread_ts],
+              user_type: :collaborator,
+              user_creator: creator,
+            }
+          end
         else
           if @repl_sessions[from][:user_type] == :collaborator
             @repl_sessions[@repl_sessions[from][:user_creator]][:input] << code
@@ -320,7 +321,7 @@ class SlackSmartBot
               @repl_sessions[@repl_sessions[from][:user_creator]][:collaborators].delete(from)
               @repl_sessions.delete(from)
             else
-              open("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.input", 'a+') {|f|
+              open("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.input", "a+") { |f|
                 f.puts code
               }
               respond "REPL session finished: #{@repl_sessions[from][:name]}", dest
@@ -337,14 +338,12 @@ class SlackSmartBot
               end
               @repl_sessions.delete(from)
             end
-          when /\A\s*-/i
-            #ommit
           else
-            if @ts_repl[@repl_sessions[from].name].to_s == ''
+            if @ts_repl[@repl_sessions[from].name].to_s == ""
               @ts_repl[@repl_sessions[from].name] = Thread.current[:ts]
-              react :running 
+              react :running
             end
-            open("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.input", 'a+') {|f|
+            open("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.input", "a+") { |f|
               f.puts code
             }
           end

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

@@ -10,7 +10,7 @@ class SlackSmartBot
             user_info = @users.select{|u| u.name == @routines[@channel_id][name][:creator]}[-1]
             @routines[@channel_id][name][:creator_id] = user_info.id unless user_info.nil? or user_info.empty?
           end
-          @logger.info "Routine: #{@routines[@channel_id][name].inspect}"
+          @logger.info "Routine #{name}: #{@routines[@channel_id][name].inspect}"
           if @routines[@channel_id][name][:file_path].match?(/\.rb$/i)
             ruby = "ruby "
           else
@@ -188,6 +188,10 @@ class SlackSmartBot
           update_routines()
           sleep(@routines[@channel_id][name][:sleeping]) unless elapsed > every_in_seconds
         else
+          if !@routines[@channel_id][name][:running]
+            @routines[@channel_id][name][:running] = true
+            update_routines()
+          end
           sleep 30
         end
       end

data/whats_new.txt

@@ -1,4 +1,4 @@
-*Version 1.13.0* Released 2023-Mar-01
+*Version 1.13.2* Released 2023-Mar-15
 
 *For General users*
 - It is possible to run any command on a loop: `for 3 times every 5 minutes !ruby puts Time.now` (<https://github.com/MarioRuiz/slack-smart-bot/issues/83|#83>).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-smart-bot
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.2
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client