slack-smart-bot 1.10.0 → 1.12.0

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

@@ -0,0 +1,84 @@
+class SlackSmartBot
+  def get_command_ids
+    commands = {
+      general: [],
+      on_bot_general: [],
+      on_bot_on_demand: [],
+      on_bot_admin: [],
+      on_bot_master_admin: [],
+      on_extended: [],
+      on_master: [],
+      on_master_admin: [],
+      on_master_master_admin: [],
+      general_commands: [],
+      general_rules: [],
+      rules: []
+    }
+    typem = Thread.current[:typem]
+    user = Thread.current[:user]
+    # :on_call, :on_bot, :on_extended, :on_dm, :on_master, :on_pg, :on_pub
+    admin = is_admin?(user.name)
+
+    commands[:general] = (Dir.entries("#{__dir__}/../commands/general/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    general = File.read("#{__dir__}/../commands/general_bot_commands.rb")
+    commands[:general] += general.scan(/^\s*#\s*help\w*:\s+command_id:\s+:(\w+)\s*$/i).flatten
+    commands[:general].uniq!
+    
+    if typem == :on_bot or typem == :on_master
+      commands[:on_bot_general] = (Dir.entries("#{__dir__}/../commands/on_bot/general/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    end
+
+    if typem == :on_bot or typem == :on_master
+      commands[:on_bot_on_demand] = (Dir.entries("#{__dir__}/../commands/on_bot/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    end
+
+    if (typem == :on_bot or typem == :on_master) and admin
+      commands[:on_bot_admin] = (Dir.entries("#{__dir__}/../commands/on_bot/admin/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    end
+
+    if (typem == :on_bot or typem == :on_master) and config.masters.include?(user.name)
+      commands[:on_bot_master_admin] = (Dir.entries("#{__dir__}/../commands/on_bot/admin_master/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    end
+
+    if typem == :on_extended
+      commands[:on_extended] = (Dir.entries("#{__dir__}/../commands/on_extended/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+      commands[:on_extended]+= ['repl', 'see_repls', 'get_repl', 'run_repl', 'delete_repl', 'kill_repl', 'ruby_code']
+    end
+
+    if typem == :on_master
+      commands[:on_master] = (Dir.entries("#{__dir__}/../commands/on_master/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    end
+
+    if typem == :on_master and admin
+      commands[:on_master_admin] = (Dir.entries("#{__dir__}/../commands/on_master/admin/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    end
+
+    if typem == :on_master and config.masters.include?(user.name)
+      commands[:on_master_master_admin] = (Dir.entries("#{__dir__}/../commands/on_master/admin_master/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    end
+
+    if File.exist?("#{config.path}/rules/general_commands.rb")
+      general_commands = File.read("#{config.path}/rules/general_commands.rb")
+      commands[:general_commands] = general_commands.scan(/^\s*#\s*help\w*:\s+command_id:\s+:(\w+)\s*$/i).flatten
+      commands[:general_commands]+= general_commands.scan(/^\s*save_stats\(?\s*:(\w+)\s*,?/i).flatten
+      commands[:general_commands].uniq!
+    end
+
+    if typem == :on_extended or typem ==:on_call or typem == :on_bot or typem == :on_master or (typem == :on_dm and Thread.current[:using_channel].to_s != '')
+      if Thread.current.key?(:rules_file) and File.exist?(config.path + Thread.current[:rules_file])
+        rules = File.read(config.path + Thread.current[:rules_file])
+        commands[:rules] = rules.scan(/^\s*#\s*help\w*:\s+command_id:\s+:(\w+)\s*$/i).flatten
+        commands[:rules]+= rules.scan(/^\s*save_stats\(?\s*:(\w+)\s*,?/i).flatten
+        commands[:rules].uniq!
+
+        if File.exist?("#{config.path}/rules/general_rules.rb")
+          general_rules = File.read("#{config.path}/rules/general_rules.rb")
+          commands[:general_rules] = general_rules.scan(/^\s*#\s*help\w*:\s+command_id:\s+:(\w+)\s*$/i).flatten
+          commands[:general_rules]+= general_rules.scan(/^\s*save_stats\(?\s*:(\w+)\s*,?/i).flatten
+          commands[:general_rules].uniq!  
+        end
+      end
+    end
+    return commands
+  end
+end

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

@@ -1,14 +1,18 @@
 class SlackSmartBot
   def get_help(rules_file, dest, from, only_rules, expanded, descriptions: true, only_normal_user: false)
     order = {
-      general: [:whats_new, :hi_bot, :bye_bot, :bot_help, :suggest_command, :bot_status, :use_rules, :stop_using_rules, :bot_stats, :leaderboard],
-      on_bot: [:ruby_code, :repl, :get_repl, :run_repl, :delete_repl, :see_repls, :add_shortcut, :delete_shortcut, :see_shortcuts],
+      general: [:bot_help, :hi_bot, :bye_bot, :add_admin, :remove_admin, :see_admins, :poster, :add_announcement, :delete_announcement, 
+                :see_announcements, :see_command_ids, :share_messages, :see_shares, :delete_share, :see_favorite_commands, :see_statuses, 
+                :allow_access, :see_access, :deny_access, :add_team, :add_memo_team, :delete_memo_team, :set_memo_status, :see_teams, :update_team, :ping_team, :delete_team,
+              :add_vacation, :remove_vacation, :see_vacations, :see_vacations_team],
+      on_bot_general: [:whats_new, :suggest_command, :bot_status, :use_rules, :stop_using_rules, :bot_stats, :leaderboard],
+      on_bot: [:ruby_code, :repl, :get_repl, :run_repl, :delete_repl, :see_repls, :kill_repl, :add_shortcut, :delete_shortcut, :see_shortcuts],
       on_bot_admin: [:extend_rules, :stop_using_rules_on, :start_bot, :pause_bot, :add_routine,
         :see_routines, :start_routine, :pause_routine, :remove_routine, :see_result_routine, :run_routine]
     }
     if config.masters.include?(from)
       user_type = :master # master admin
-    elsif config.admins.include?(from)
+    elsif is_admin?(from)
       user_type = :admin
     else
       user_type = :normal #normal user
@@ -66,9 +70,15 @@ class SlackSmartBot
     end
 
     help[:general_commands_file] = build_help("#{__dir__}/../commands/general_bot_commands.rb", expanded)[user_type].values.join("\n") + "\n" unless only_rules
-    if File.exists?(config.path + '/rules/general_commands.rb') and !only_rules
+    if File.exist?(config.path + '/rules/general_commands.rb') and !only_rules
       help[:general_commands_file] += build_help(config.path+'/rules/general_commands.rb', expanded)[user_type].values.join("\n") + "\n"
     end
+    if help.key?(:on_bot)
+      commands_on_extended_from_on_bot = [:repl, :see_repls, :get_repl, :run_repl, :delete_repl, :kill_repl, :ruby_code]
+      commands_on_extended_from_on_bot.each do |cm|
+        help[:on_extended][cm] = help[:on_bot][cm] if help[:on_bot].key?(cm)
+      end      
+    end
     help = remove_hash_keys(help, :admin_master) unless user_type == :master
     help = remove_hash_keys(help, :admin) unless user_type == :admin or user_type == :master
     help = remove_hash_keys(help, :on_master) unless channel_type == :master_bot
@@ -101,36 +111,33 @@ class SlackSmartBot
         You need to join the specified channel to be able to use those rules.
         Also you can use this command to call another bot from a channel with a running bot.
       \n"
-      txt +="
-      The commands you will be able to use from a channel without a bot: 
-      *bot rules*, *ruby CODE*, *add shortcut NAME: COMMAND*, *delete shortcut NAME*, *see shortcuts*, *shortcut NAME*
-      *And all the specific rules of the Channel*\n"
     end
 
-    if help.key?(:general) and channel_type != :external and channel_type != :extended
+    if help.key?(:general_commands_file)
+      txt += "===================================
+        *General commands on any channel where the Smart Bot is a member:*\n" if descriptions
+      txt += help.general_commands_file
+    end
+
+    if help.key?(:on_bot) and help.on_bot.key?(:general) and channel_type != :external and channel_type != :extended
       if descriptions
         if channel_type == :direct
           txt += "===================================
           *General commands:*\n"
         else
           txt += "===================================
-          *General commands even when the Smart Bot is not listening to you:*\n"
+          *General commands on Bot channel even when the Smart Bot is not listening to you:*\n"
         end
       end
-      order.general.each do |o|
-        txt += help.general[o]
+      order.on_bot_general.each do |o|
+        txt += help.on_bot.general[o]
       end
       if channel_type == :master_bot
         txt += help.on_master.create_bot
+        txt += help.on_master.where_smartbot
       end
     end
 
-    if help.key?(:general_commands_file)
-      txt += "===================================
-        *General commands on any channel where the Smart Bot is a member:*\n" if descriptions
-      txt += help.general_commands_file
-    end
-
     if help.key?(:on_bot) and channel_type != :external and channel_type != :extended
       if descriptions
         if channel_type == :direct
@@ -138,13 +145,23 @@ class SlackSmartBot
           *General commands on bot, DM or on external call on demand:*\n"
         else
           txt += "===================================
-          *General commands only when the Smart Bot is listening to you or on demand:*\n"
+          *General commands on Bot channel only when the Smart Bot is listening to you or on demand:*\n"
         end
       end
       order.on_bot.each do |o|
         txt += help.on_bot[o]
       end
     end
+    if help.key?(:on_extended) and channel_type == :extended and help[:on_extended].keys.size > 0
+      if descriptions
+        txt += "===================================
+        *General commands on Extended channel only on demand:*\n"
+      end
+      commands_on_extended_from_on_bot.each do |o|
+        txt += help.on_extended[o]
+      end
+    end
+
     if help.key?(:on_bot) and help.on_bot.key?(:admin) and channel_type != :external and channel_type != :extended
       txt += "===================================
         *Admin commands:*\n\n" if descriptions

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

@@ -1,11 +1,31 @@
 class SlackSmartBot
 
   def get_repls(channel = @channel_id)
-    if File.exist?("#{config.path}/repl/repls_#{channel}.rb")
+    require 'yaml'
+    repl_file = "#{config.path}/repl/repls_#{channel}.yaml"
+
+    if File.exist?("#{config.path}/repl/repls_#{channel}.rb") #backwards compatible
       file_conf = IO.readlines("#{config.path}/repl/repls_#{channel}.rb").join
-      unless file_conf.to_s() == ""
+      if file_conf.to_s() == ""
+        @repls = {}
+      else
         @repls = eval(file_conf)
       end
+      File.open(repl_file, 'w') {|file| file.write(@repls.to_yaml) }
+      File.delete("#{config.path}/repl/repls_#{channel}.rb")
+    end
+
+    if File.exist?(repl_file)      
+      repls = @repls
+      10.times do
+        repls = YAML.load(File.read(repl_file))
+        if repls.is_a?(Hash)
+          break
+        else
+          sleep (0.1*(rand(2)+1))
+        end
+      end
+      @repls = repls unless repls.is_a?(FalseClass)
     end
   end
 end

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

@@ -1,11 +1,31 @@
 class SlackSmartBot
 
   def get_routines(channel = @channel_id)
-    if File.exist?("#{config.path}/routines/routines_#{channel}.rb")
+    require 'yaml'
+    routines_file = "#{config.path}/routines/routines_#{channel}.yaml"
+
+    if File.exist?("#{config.path}/routines/routines_#{channel}.rb") #backwards compatible
       file_conf = IO.readlines("#{config.path}/routines/routines_#{channel}.rb").join
-      unless file_conf.to_s() == ""
+      if file_conf.to_s() == ""
+        @routines = {}
+      else
         @routines = eval(file_conf)
       end
+      File.open(routines_file, 'w') {|file| file.write(@routines.to_yaml) }
+      File.delete("#{config.path}/routines/routines_#{channel}.rb")
+    end
+
+    if File.exist?(routines_file)      
+      routines = @routines
+      10.times do
+        routines = YAML.load(File.read(routines_file))
+        if routines.is_a?(Hash)
+          break
+        else
+          sleep (0.1*(rand(2)+1))
+        end
+      end
+      @routines = routines unless routines.is_a?(FalseClass)
     end
   end
 end

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

@@ -0,0 +1,22 @@
+class SlackSmartBot
+  def get_teams
+    @teams ||= {}
+    teams_file = config.file_path.gsub(".rb", "_teams.yaml")
+    if File.exist?(teams_file)
+      if !defined?(@datetime_teams_file) or @datetime_teams_file != File.mtime(teams_file)
+        require 'yaml'
+        teams = @teams
+        10.times do
+          teams = YAML.load(File.read(teams_file))
+          if teams.is_a?(Hash)
+            break
+          else
+            sleep (0.1*(rand(2)+1))
+          end
+        end
+        @teams = teams unless teams.is_a?(FalseClass)
+        @datetime_teams_file = File.mtime(teams_file)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+class SlackSmartBot
+  def get_vacations
+    @vacations ||= {}
+    vacations_file = config.file_path.gsub(".rb", "_vacations.yaml")
+    if File.exist?(vacations_file)
+      if !defined?(@datetime_vacations_file) or @datetime_vacations_file != File.mtime(vacations_file)
+        require 'yaml'
+        vacations = @vacations
+        10.times do
+          vacations = YAML.load(File.read(vacations_file))
+          if vacations.is_a?(Hash)
+            break
+          else
+            sleep (0.1*(rand(2)+1))
+          end
+        end
+        @vacations = vacations unless vacations.is_a?(FalseClass)
+        @datetime_vacations_file = File.mtime(vacations_file)
+      end
+    end
+  end
+end

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

@@ -1,12 +1,28 @@
 class SlackSmartBot
-    def has_access?(method, user=nil)
-        user = Thread.current[:user] if user.nil?
-        if config[:allow_access].key?(method) and !config[:allow_access][method].include?(user.name) and !config[:allow_access][method].include?(user.id) and 
-            (!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(">, <@")}>"
-            return false
+  def has_access?(method, user = nil)
+    user = Thread.current[:user] if user.nil?
+    if config[:allow_access].key?(method) and !config[:allow_access][method].include?(user.name) and !config[:allow_access][method].include?(user.id) and
+       (!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(">, <@")}>"
+      return false
+    else
+      if Thread.current[:typem] == :on_call
+        channel = Thread.current[:dchannel]
+      elsif Thread.current[:using_channel].to_s == ""
+        channel = Thread.current[:dest]
+      else
+        channel = Thread.current[:using_channel]
+      end
+      if !@access_channels.key?(channel) or !@access_channels[channel].key?(method.to_s) or @access_channels[channel][method.to_s].include?(user.name)
+        return true
+      else
+        if @admins_channels.key?(channel) and !@admins_channels[channel].empty?
+            respond "You don't have access to use this command, please contact an Admin to be able to use it: <@#{@admins_channels[channel].join(">, <@")}>"
         else
-            return true
-        end      
+            respond "You don't have access to use this command, please contact an Admin to be able to use it."
+        end        
+        return false
+      end
     end
-end
+  end
+end

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

@@ -0,0 +1,27 @@
+class SlackSmartBot
+    def is_admin?(from=nil)
+        if from.nil?
+            user = Thread.current[:user]
+            from = user.name
+        end
+        
+        if (Thread.current[:dchannel].to_s!='' and !@channels_creator.key?(Thread.current[:dchannel])) or 
+            (Thread.current[:dest].to_s!='' and Thread.current[:dest][0]!='D' and !@channels_creator.key?(Thread.current[:dest])) or 
+            (Thread.current[:using_channel].to_s!='' and !@channels_creator.key?(:using_channel))
+            get_channels_name_and_id() 
+        end
+
+        if config.masters.include?(from) or 
+           config.admins.include?(from) or 
+           (Thread.current[:typem] == :on_call and @admins_channels.key?(Thread.current[:dchannel]) and @admins_channels[Thread.current[:dchannel]].include?(from)) or
+           (Thread.current[:using_channel].to_s == '' and @admins_channels.key?(Thread.current[:dest]) and @admins_channels[Thread.current[:dest]].include?(from)) or
+           (@admins_channels.key?(Thread.current[:using_channel]) and @admins_channels[Thread.current[:using_channel]].include?(from)) or 
+           (Thread.current[:using_channel].to_s=='' and @channels_creator.key?(Thread.current[:dest]) and from == @channels_creator[Thread.current[:dest]]) or 
+           (Thread.current[:typem] == :on_call  and @channels_creator.key?(Thread.current[:dchannel]) and from == @channels_creator[Thread.current[:dchannel]]) or 
+           (@channels_creator.key?(Thread.current[:using_channel]) and from == @channels_creator[Thread.current[:using_channel]])
+            return true
+        else
+            return false
+        end
+    end
+end

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

@@ -1,47 +1,57 @@
 class SlackSmartBot
+  def save_stats(method, data: {})
+    if has_access?(method, Thread.current[:user])
+      if config.stats
+        begin
+          require "csv"
+          if !File.exist?("#{config.stats_path}.#{Time.now.strftime("%Y-%m")}.log")
+            CSV.open("#{config.stats_path}.#{Time.now.strftime("%Y-%m")}.log", "wb") do |csv|
+              csv << ["date", "bot_channel", "bot_channel_id", "dest_channel", "dest_channel_id", "type_message", "user_name", "user_id", "text", "command", "files", "time_zone"]
+            end
+          end
+          if data.empty?
+            data = {
+              dest: Thread.current[:dest],
+              typem: Thread.current[:typem],
+              user: Thread.current[:user],
+              files: Thread.current[:files?],
+              command: Thread.current[:command],
+              routine: Thread.current[:routine],
+            }
+          end
+          if method.to_s == "ruby_code" and data.files
+            command_txt = "ruby"
+          else
+            command_txt = data.command
+          end
+          command_txt.gsub!(/```.+```/m, "```CODE```")
+          command_txt = "#{command_txt[0..99]}..." if command_txt.size > 100
 
-    def save_stats(method, data: {})
-        if config.stats
-            begin
-              require 'csv'
-              if !File.exist?("#{config.stats_path}.#{Time.now.strftime("%Y-%m")}.log")
-                CSV.open("#{config.stats_path}.#{Time.now.strftime("%Y-%m")}.log", 'wb') do |csv|
-                    csv << ['date','bot_channel', 'bot_channel_id', 'dest_channel', 'dest_channel_id', 'type_message', 'user_name', 'user_id', 'text', 'command', 'files']
-                end
-              end
-              if data.empty?
-                data = {
-                  dest: Thread.current[:dest],
-                  typem: Thread.current[:typem],
-                  user: Thread.current[:user],
-                  files: Thread.current[:files?],
-                  command: Thread.current[:command],
-                  routine: Thread.current[:routine]
-                }
-              end
-              if method.to_s == 'ruby_code' and data.files
-                command_txt = 'ruby'
-              else
-                command_txt = data.command
-              end
-              command_txt.gsub!(/```.+```/m,'```CODE```')
-              command_txt = "#{command_txt[0..99]}..." if command_txt.size > 100
+          if data.routine
+            user_name = "routine/#{data.user.name}"
+            user_id = "routine/#{data.user.id}"
+          else
+            user_name = data.user.name
+            user_id = data.user.id
+          end
+          user_info = @users.select { |u| u.id == user_id or (u.key?(:enterprise_user) and u.enterprise_user.id == user_id) }[-1]
+          if user_info.nil? or user_info.is_app_user or user_info.is_bot
+            time_zone = ''
+          else
+            time_zone = user_info.tz_label
+          end
 
-              if data.routine
-                user_name = "routine/#{data.user.name}"
-                user_id = "routine/#{data.user.id}"
-              else
-                user_name = data.user.name
-                user_id = data.user.id
-              end
-              CSV.open("#{config.stats_path}.#{Time.now.strftime("%Y-%m")}.log", "a+") do |csv|
-                csv << [Time.now, config.channel, @channel_id, @channels_name[data.dest], data.dest, data.typem, user_name, user_id, command_txt, method, data.files]
-              end
-            rescue Exception => exception
-              @logger.fatal "There was a problem on the stats"
-              @logger.fatal exception
-            end
+          CSV.open("#{config.stats_path}.#{Time.now.strftime("%Y-%m")}.log", "a+") do |csv|
+            csv << [Time.now, config.channel, @channel_id, @channels_name[data.dest], data.dest, data.typem, user_name, user_id, command_txt, method, data.files, time_zone]
+          end
+        rescue Exception => exception
+          @logger.fatal "There was a problem on the stats"
+          @logger.fatal exception
         end
+      end
+    else
+      sleep 0.2
+      Thread.exit
     end
-
-end  
+  end
+end

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

@@ -7,12 +7,23 @@ class SlackSmartBot
       CSV.open("#{config.path}/status/#{config.channel}_status.csv", "a+") do |csv|
         csv << [Time.now.strftime("%Y/%m/%d"), Time.now.strftime("%H:%M:%S"), status, status_id, message]
       end
+      if defined?(@channels_list) #wait until the 'client' started
+        channel_info = @channels_list.select { |c| c.id == @channel_id}[-1]
+        if channel_info.nil? or channel_info.is_private
+          channel_link = "##{config.channel}"
+        else
+          channel_link = "<##{@channel_id}|#{config.channel}>"
+        end
+      else
+        channel_link = "##{config.channel}"
+      end
+
       if status_id == :disconnected
         Thread.new do
           sleep 50
           @logger.info "check disconnection 50 scs later #{@last_notified_status_id}"
           unless @last_notified_status_id == :connected
-            respond ":red_circle: The *SmartBot* on *<##{@channel_id}|#{config.channel}>* is down. An admin will take a look. <@#{config.admins.join(">, <@")}>", config.status_channel
+            respond ":red_circle: The *SmartBot* on *#{channel_link}* is down. An admin will take a look. <@#{config.admins.join(">, <@")}>", config.status_channel
           end
         end
       end
@@ -22,27 +33,31 @@ class SlackSmartBot
         if (Time.now-@last_status_change) > 20 or !defined?(@last_notified_status_id)
           if status_id == :connected
             if defined?(@last_notified_status_id)
-              m = ":exclamation: :large_green_circle: The *SmartBot* on *<##{@channel_id}|#{config.channel}>* was not available for #{(Time.now-@last_status_change).round(0)} secs. *Now it is up and running again.*" 
+              m = ":exclamation: :large_green_circle: The *SmartBot* on *#{channel_link}* was not available for #{(Time.now-@last_status_change).round(0)} secs. *Now it is up and running again.*" 
             else
-              m = ":large_green_circle: The *SmartBot* on *<##{@channel_id}|#{config.channel}>* is up and running again." 
+              m = ":large_green_circle: The *SmartBot* on *#{channel_link}* is up and running again." 
             end
           end
         end
         if status_id == :paused
-          m = ":red_circle: #{message} *<##{@channel_id}|#{config.channel}>*"
+          m = ":red_circle: #{message} *#{channel_link}*"
         elsif status_id == :started
-          m = ":large_green_circle: #{message} *<##{@channel_id}|#{config.channel}>*"            
+          m = ":large_green_circle: #{message} *#{channel_link}*"            
         elsif status_id == :killed or status_id == :exited
           m = ":red_circle: #{message}"
         elsif config.on_master_bot and status_id == :maintenance_on
-          m = ":red_circle: The *SmartBot* is on maintenance so not possible to attend any request."
+          if message.to_s == "Sorry I'm on maintenance so I cannot attend your request."
+            m = ":red_circle: The *SmartBot* is on maintenance so not possible to attend any request."
+          else
+            m = ":red_circle: #{message}"
+          end
         elsif config.on_master_bot and status_id == :maintenance_off
           m = ":large_green_circle: The *SmartBot* is up and running again."
         end
         @last_status_change = Time.now
         @last_notified_status_id = status_id
         unless m == ''
-          respond m, config.status_channel
+          respond eval("\"" + m + "\""), config.status_channel
         end
       end
 

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

@@ -0,0 +1,8 @@
+class SlackSmartBot
+
+  def update_access_channels()
+    file = File.open("#{config.path}/rules/#{@channel_id}/access_channels.rb", "w")
+    file.write (@access_channels.inspect)
+    file.close
+  end
+end

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

@@ -0,0 +1,25 @@
+class SlackSmartBot
+
+  def update_admins_channels()
+
+    require 'yaml'
+    admins_file = "#{config.path}/rules/#{@channel_id}/admins_channels.yaml"
+
+    if File.exist?(admins_file.gsub(".yaml", ".rb")) #backwards compatible
+      file_conf = IO.readlines(admins_file.gsub(".yaml", ".rb")).join
+      if file_conf.to_s() == ""
+        @admins_channels = {}
+      else
+        @admins_channels = eval(file_conf)
+      end
+      File.open(admins_file, 'w') {|file| file.write(@admins_channels.to_yaml) }
+      File.delete(admins_file.gsub(".yaml", ".rb"))
+    end
+
+    File.open(admins_file, 'w') {|file|
+      file.flock(File::LOCK_EX)
+      file.write(@admins_channels.to_yaml) 
+      file.flock(File::LOCK_UN)
+    }
+  end
+end

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

@@ -1,11 +1,32 @@
 class SlackSmartBot
   def update_bots_file
-    file = File.open(config.file_path.gsub(".rb", "_bots.rb"), "w")
-    bots_created = @bots_created.dup
-    bots_created.each { |k, v| 
-      v[:thread] = "" 
-    }
-    file.write bots_created.inspect
-    file.close
+    bots_file = config.file_path.gsub(".rb", "_bots.yaml")
+
+    if File.exist?(config.file_path.gsub(".rb", "_bots.rb")) #backwards compatible
+      file_conf = IO.readlines(config.file_path.gsub(".rb", "_bots.rb")).join
+      if file_conf.to_s() == ""
+        @bots_created = {}
+      else
+        @bots_created = eval(file_conf)
+      end      
+      File.open(bots_file, 'w') {|file| 
+        file.flock(File::LOCK_EX)
+        file.write(@bots_created.to_yaml) 
+        file.flock(File::LOCK_UN)
+      }
+      File.delete(config.file_path.gsub(".rb", "_bots.rb"))
+    else
+      #not possible to use @bots_created.deep_copy since one of the fields contains a thread
+      bots_created = {}
+      @bots_created.each do |k,v|
+        bots_created[k] = v.dup
+        bots_created[k][:thread] = ''
+      end
+      File.open(bots_file, 'w') {|file|
+        file.flock(File::LOCK_EX)
+        file.write(bots_created.to_yaml) 
+        file.flock(File::LOCK_UN)
+      }
+    end
   end
 end

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

@@ -1,8 +1,11 @@
 class SlackSmartBot
-
   def update_repls(channel = @channel_id)
-    file = File.open("#{config.path}/repl/repls_#{channel}.rb", "w")
-    file.write (@repls.inspect)
-    file.close
+    require 'yaml'
+    repl_file = "#{config.path}/repl/repls_#{channel}.yaml"
+    File.open(repl_file, 'w') {|file|
+      file.flock(File::LOCK_EX)
+      file.write(@repls.to_yaml) 
+      file.flock(File::LOCK_UN)
+    }
   end
 end