slack-smart-bot 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd95efb0ac282a17d1b463fe28293643c0b38b91b3261e0d3899e879950e4655
-  data.tar.gz: 1d332d2651286f4bef95c1172d95bc6ce422166b50bf788773563747ebbf1c30
+  metadata.gz: b15c46b5b101a0a31487508457982e8f5d6b81ad41f54338407ecdb2aa9974f3
+  data.tar.gz: d32bfceda9068f5f11d1002f255b77a280f3a7b7068f40a632c03b7cb6378127
 SHA512:
-  metadata.gz: f48dc2999a22da392d297cb789dfcc7552ce1ef7aad607283f705d39af5eac58ce2ca002b844178184e6bacdc13fe641ddbe762f8a999b17da7532a5cad234b8
-  data.tar.gz: f4ac49668234f24295e79afd842218e40a1a918c1107392af84d3b31c6d8908fadb8319f2e4596ef896c44e7c36665714523fc554f4c8b70a3a5a1f02cc2c872
+  metadata.gz: 61c6e4060d928a1562176a0596ac968c7d007998c268816af489a0d36624a768ba1eadd3b6d27be7d19d37984b335d70215f718189165c1a9ac0a3a18130c5a0
+  data.tar.gz: 48995f9d416dd8906353508ac9bf86219cd92b2ede2f0043c3752dcc4db95564161ad64f41d86fd9f821fa1dc6d9d5bba3ef5519be037214e0003c3423b595c9

data/README.md

@@ -124,6 +124,7 @@ def rules(user, command, processed, dest)
             respond "zZzzzzzZZZZZZzzzzzzz!"
             react :sleeping
             sleep 10
+            unreact :sleeping
             react :sunny
           when /no/i, /nope/i, /cancel/i
             @questions.delete(from)
@@ -152,6 +153,8 @@ def rules(user, command, processed, dest)
       else
         respond "#{user.name}: #{stdout} #{stderr}"
       end
+      
+      unreact :runner
 
     else
       unless processed
@@ -391,6 +394,7 @@ Examples:
 >**_`add routine run_tests every 3h !run tests on customers`_**  
 >**_`add routine clean_db at 17:05 !clean customers temp db`_**  
 >**_`add silent routine clean_db at 17:05 !clean customers temp db`_**  
+>**_`add routine clean_custdb on Mondays at 05:00 !clean customers db`_**  
 
 Also instead of adding a Command to be executed, you can attach a file, then the routine will be created and the attached file will be executed on the criteria specified. Only Master Admins are allowed to use it this way.
 

data/lib/slack-smart-bot_general_rules.rb

@@ -8,12 +8,15 @@ def general_rules(user, command, processed, dest, files = [], rules_file = "")
 
         # help: ----------------------------------------------
         # help: `echo SOMETHING`
-        # help:     repeats SOMETHING
+        # help: `INTEGER echo SOMETHING`
+        # help:     repeats SOMETHING. If INTEGER supplied then that number of times.
         # help:  Examples:
         # help:     _echo I am the Smart Bot_
-        when /^echo\s(.+)/i
-            save_stats :echo
-            respond $1
+        # help:     _100 echo :heart:_
+      when /^(\d*)\s*echo\s(.+)/i
+        save_stats :echo
+        $1.to_s == '' ? times = 1 : times = $1.to_i
+        respond ($2*times).to_s
 
       else
         return false

data/lib/slack-smart-bot_rules.rb

@@ -60,6 +60,7 @@ def rules(user, command, processed, dest, files = [], rules_file = "")
             respond "zZzzzzzZZZZZZzzzzzzz!"
             react :sleeping
             sleep 5
+            unreact :sleeping
             react :sunny
           when /no/i, /nope/i, /cancel/i
             @questions.delete(from)
@@ -81,6 +82,7 @@ def rules(user, command, processed, dest, files = [], rules_file = "")
         process_to_run = "ruby -v"
         process_to_run = ("cd #{project_folder} &&" + process_to_run) if defined?(project_folder)
         stdout, stderr, status = Open3.capture3(process_to_run)
+        unreact :runner
         if stderr == ""
           if stdout == ""
             respond "#{display_name}: Nothing returned."

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

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

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

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

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

@@ -8,7 +8,7 @@ class SlackSmartBot
   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
+      if to[0] == "U" or to[0] == "W" #user
         im = client.web_client.im_open(user: to)
         channel = im["channel"]["id"]
       else

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

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

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

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

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

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

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

@@ -22,7 +22,7 @@ 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:      _bot stats #sales from 2020-01-01 monthly_
     # helpadmin:
     def bot_stats(dest, from_user, typem, channel_id, from, to, user, exclude_masters, exclude_command, monthly)
         require 'csv'
@@ -36,6 +36,10 @@ class SlackSmartBot
             if !File.exist?("#{config.stats_path}.#{Time.now.strftime("%Y-%m")}.log")
                 message<<'No stats'
             else
+                if user!=''
+                    user_info = client.web_client.users_info(user: user)
+                    user_name = user_info.user.name
+                end
                 from = "#{Time.now.strftime("%Y-%m")}-01" if from == ''
                 to = "#{Time.now.strftime("%Y-%m-%d")}" if to == ''
                 from_short = from
@@ -46,20 +50,26 @@ class SlackSmartBot
                 to+= " 23:59:59 +0000"
                 rows = []
                 rows_month = {}
+                users_month = {}
+                commands_month = {}
 
                 Dir["#{config.stats_path}.*.log"].sort.each do |file|
                     if file >= "#{config.stats_path}.#{from_file}.log" or file <= "#{config.stats_path}.#{to_file}.log"
                         CSV.foreach(file, headers: true, header_converters: :symbol, converters: :numeric) do |row|
                             row[:date] = row[:date].to_s
                             if !exclude_masters or (exclude_masters and !config.masters.include?(row[:user_name]))
-                                if user=='' or (user!='' and row[:user_id] == user)
+                                if user=='' or (user!='' and row[:user_name] == user_name)
                                     if exclude_command == '' or (exclude_command!='' and row[:command]!=exclude_command)
                                         if row[:bot_channel_id] == channel_id or channel_id == ''
                                             if row[:date] >= from and row[:date] <= to
                                                 rows << row.to_h
                                                 if monthly
                                                     rows_month[row[:date][0..6]] = 0 unless rows_month.key?(row[:date][0..6])
+                                                    users_month[row[:date][0..6]] = [] unless users_month.key?(row[:date][0..6])
+                                                    commands_month[row[:date][0..6]] = [] unless commands_month.key?(row[:date][0..6])
                                                     rows_month[row[:date][0..6]] += 1
+                                                    users_month[row[:date][0..6]] << row[:user_name]
+                                                    commands_month[row[:date][0..6]] << row[:command]
                                                 end
                                             end
                                         end
@@ -87,9 +97,18 @@ class SlackSmartBot
                 end
                 if total > 0
                     if monthly 
-                        message << '*Totals by month*'
+                        message << '*Totals by month / commands / users (%new)*'
+                        all_users = []
+                        new_users = []
                         rows_month.each do |k,v|
-                            message << "\t#{k}: #{v} (#{(v.to_f*100/total).round(2)}%)"
+                            if all_users.empty?
+                                message_new_users = ''
+                            else
+                                new_users = (users_month[k]-all_users).uniq
+                                message_new_users = "(#{new_users.size*100/users_month[k].uniq.size}%)"
+                            end
+                            all_users += users_month[k]
+                            message << "\t#{k}: #{v} (#{(v.to_f*100/total).round(2)}%) / #{commands_month[k].uniq.size} / #{users_month[k].uniq.size} #{message_new_users}"
                         end
                     end
 
@@ -102,16 +121,16 @@ class SlackSmartBot
                         end
                     end
                     if user==''
-                        message << "*Users*"
                         users = rows.user_name.uniq.sort
+                        message << "*Users* - #{users.size}"
                         users.each do |user|
                             count = rows.count {|h| h.user_name==user}
                             message << "\t#{user}: #{count} (#{(count.to_f*100/total).round(2)}%)"
                         end
                     end
 
-                    message << "*Commands*"
                     commands = rows.command.uniq.sort
+                    message << "*Commands* - #{commands.size}"
                     commands.each do |command|
                         count = rows.count {|h| h.command==command}
                         message << "\t#{command}: #{count} (#{(count.to_f*100/total).round(2)}%)"

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

@@ -70,7 +70,8 @@ class SlackSmartBot
         channel = $1
         kill_bot_on_channel(dest, from, channel)
       when /^\s*(add|create)\s+(silent\s+)?routine\s+(\w+)\s+(every)\s+(\d+)\s*(days|hours|minutes|seconds|mins|min|secs|sec|d|h|m|s)\s*(\s.+)?\s*$/i,
-           /^\s*(add|create)\s+(silent\s+)?routine\s+(\w+)\s+(at)\s+(\d+:\d+:?\d+?)\s*()(\s.+)?\s*$/i
+        /^\s*(add|create)\s+(silent\s+)?routine\s+(\w+)\s+on\s+(monday|tuesday|wednesday|thursday|friday|saturday|sunday)s?\s+at\s+(\d+:\d+:?\d+?)\s*()(\s.+)?\s*$/i,
+        /^\s*(add|create)\s+(silent\s+)?routine\s+(\w+)\s+(at)\s+(\d+:\d+:?\d+?)\s*()(\s.+)?\s*$/i
         silent = $2.to_s!=''
         name = $3.downcase
         type = $4

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

@@ -117,6 +117,7 @@ class SlackSmartBot
       begin
         #todo: when changed @questions user_id then move user_info inside the ifs to avoid calling it when not necessary
         user_info = client.web_client.users_info(user: data.user)
+        user_info.user.id = data.user #todo: remove this line when slack issue with Wxxxx Uxxxx fixed
         if @questions.key?(user_info.user.name)
           if data.text.match?(/^\s*(Bye|Bæ|Good\sBye|Adiós|Ciao|Bless|Bless\sBless|Adeu)\s(#{@salutations.join("|")})\s*$/i)
             @questions.delete(user_info.user.name)

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

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

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: slack-smart-bot
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: 0.15.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: 0.15.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: nice_http
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,7 @@ files:
 - lib/slack/smart-bot/comm/send_file.rb
 - lib/slack/smart-bot/comm/send_msg_channel.rb
 - lib/slack/smart-bot/comm/send_msg_user.rb
+- lib/slack/smart-bot/comm/unreact.rb
 - lib/slack/smart-bot/commands.rb
 - lib/slack/smart-bot/commands/general/bot_help.rb
 - lib/slack/smart-bot/commands/general/bot_status.rb