slack-smart-bot 1.7.0 → 1.9.2

data/lib/slack/smart-bot/commands/general/bot_status.rb

@@ -14,7 +14,7 @@ class SlackSmartBot
       gems_remote = `gem list slack-smart-bot --remote`
       version_remote = gems_remote.to_s().scan(/slack-smart-bot \((\d+\.\d+\.\d+)/).join
       version_message = ""
-      if version_remote != VERSION
+      if Gem::Version.new(version_remote) > Gem::Version.new(VERSION)
         version_message = " There is a new available version: #{version_remote}."
       end
       require "socket"

data/lib/slack/smart-bot/commands/general/bye_bot.rb

@@ -4,8 +4,8 @@ class SlackSmartBot
   # help: `Bye Bot`
   # help: `Bye Smart`
   # help: `Bye NAME_OF_THE_BOT`
-  # help:    Also apart of Bye you can use _Bæ, Good Bye, Adiós, Ciao, Bless, Bless Bless, Adeu_
   # help:    Bot stops listening to you
+  # help:    Also apart of Bye you can use _Bæ, Good Bye, Adiós, Ciao, Bless, Bless Bless, Adeu_
   # help:
   def bye_bot(dest, from, display_name)
     if @status == :on

data/lib/slack/smart-bot/commands/general/hi_bot.rb

@@ -5,9 +5,9 @@ class SlackSmartBot
   # help: `Hi Smart`
   # help: `Hello Bot` `Hola Bot` `Hallo Bot` `What's up Bot` `Hey Bot` `Hæ Bot`
   # help: `Hello THE_NAME_OF_THE_BOT`
-  # help:    Also apart of Hello you can use _Hallo, Hi, Hola, What's up, Hey, Hæ_
   # help:    Bot starts listening to you
   # help:    After that if you want to avoid a single message to be treated by the smart bot, start the message by -
+  # help:    Also apart of Hello you can use _Hallo, Hi, Hola, What's up, Hey, Hæ_
   # help:
   def hi_bot(user, dest, dchannel, from, display_name)
     if @status == :on

data/lib/slack/smart-bot/commands/general/use_rules.rb

@@ -15,17 +15,14 @@ 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
       #todo: add pagination for case more than 1000 channels on the workspace
-      channels = client.web_client.conversations_list(
-        types: "private_channel,public_channel",
-        limit: "1000",
-        exclude_archived: "true",
-      ).channels
-
+      channels = get_channels()
+      channel.gsub!('#','') # for the case the channel name is in plain text including #
       channel_found = channels.detect { |c| c.name == channel }
-      members = client.web_client.conversations_members(channel: @channels_id[channel]).members unless channel_found.nil?
+      get_channels_name_and_id() unless @channels_id.key?(channel)
+      members = get_channel_members(@channels_id[channel]) unless channel_found.nil? or !@channels_id.key?(channel)
 
-      if channel_found.nil?
-        respond "The channel you are trying to use doesn't exist", dest
+      if channel_found.nil? or !@channels_id.key?(channel)
+        respond "The channel you are trying to use doesn't exist or cannot be found.", dest
       elsif channel_found.name == config.master_channel
         respond "You cannot use the rules from Master Channel on any other channel.", dest
       elsif !@bots_created.key?(@channels_id[channel])

data/lib/slack/smart-bot/commands/general/whats_new.rb

@@ -0,0 +1,19 @@
+class SlackSmartBot
+
+    # help: ----------------------------------------------
+    # help: `What's new`
+    # help:    It will display the last user changes on Slack Smart Bot
+    # help:
+    def whats_new(user, dest, dchannel, from, display_name)
+      if @status == :on
+        save_stats(__method__)
+        whats_new_file = (__FILE__).gsub(/lib\/slack\/smart-bot\/commands\/general\/whats_new\.rb$/, "whats_new.txt")
+        whats_new = File.read(whats_new_file)
+        whats_new.split(/^\-\-\-\-\-\-+$/).each do |msg|
+            respond msg
+            sleep 0.3
+        end
+      end
+    end
+  end
+  

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

@@ -7,8 +7,10 @@ class SlackSmartBot
   # help: `add sc for all NAME: COMMAND`
   # help: `shortcut NAME: COMMAND`
   # help: `shortcut for all NAME: COMMAND`
+  # help: `add global sc for all NAME: COMMAND`
   # help:    It will add a shortcut that will execute the command we supply.
   # help:    In case we supply 'for all' then the shorcut will be available for everybody
+  # help:    If 'global' or 'generic' supplied and in Master channel then the shortcut will be available in all Bot channels.
   # help:    If you want to use a shortcut as a inline shortcut inside a command you can do it by adding a $ fex: _!run tests $cust1_
   # help:    Example:
   # help:        _add shortcut for all Spanish account: code require 'iso/iban'; 10.times {puts ISO::IBAN.random('ES')}_
@@ -17,7 +19,7 @@ class SlackSmartBot
   # help:        _shortcut Spanish Account_
   # help:        _Spanish Account_
   # help:
-  def add_shortcut(dest, user, typem, for_all, shortcut_name, command, command_to_run)
+  def add_shortcut(dest, user, typem, for_all, shortcut_name, command, command_to_run, global)
     save_stats(__method__)
     unless typem == :on_extended
       from = user.name
@@ -25,43 +27,73 @@ 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
-        @shortcuts[from] = Hash.new() unless @shortcuts.keys.include?(from)
 
-        found_other = false
-        if for_all.to_s != ""
-          @shortcuts.each { |sck, scv|
-            if sck != :all and sck != from and scv.key?(shortcut_name)
-              found_other = true
+        if global 
+          if !config.on_master_bot or typem != :on_master
+            respond "It is only possible to add global shortcuts from Master channel"
+          else
+            @shortcuts_global[from] = Hash.new() unless @shortcuts_global.keys.include?(from)
+            found_other = false
+            if for_all.to_s != ""
+              @shortcuts_global.each { |sck, scv|
+                if sck != :all and sck != from and scv.key?(shortcut_name)
+                  found_other = true
+                end
+              }
             end
-          }
-        end
-        if !config.admins.include?(from) and @shortcuts[:all].include?(shortcut_name) and !@shortcuts[from].include?(shortcut_name)
-          respond "Only the creator of the shortcut can modify it", dest
-        elsif found_other
-          respond "You cannot create a shortcut for all with the same name than other user is using", dest
-        elsif !@shortcuts[from].include?(shortcut_name)
-          #new shortcut
-          @shortcuts[from][shortcut_name] = command_to_run
-          @shortcuts[:all][shortcut_name] = command_to_run if for_all.to_s != ""
-          update_shortcuts_file()
-          respond "shortcut added", dest
+            if @shortcuts_global[:all].include?(shortcut_name) or @shortcuts_global[from].include?(shortcut_name)
+              respond "Global shortcut name already in use. Please use another shortcut name."
+            elsif found_other
+              respond "You cannot create a global shortcut for all with the same name than other user is using."
+            elsif !@shortcuts_global[from].include?(shortcut_name)
+              #new shortcut
+              @shortcuts_global[from][shortcut_name] = command_to_run
+              @shortcuts_global[:all][shortcut_name] = command_to_run if for_all.to_s != ""
+              update_shortcuts_file()
+              respond "global shortcut added"
+            else
+              respond "Not possible to add the global shortcut" #todo: check if this is ever gonna be the case
+            end            
+          end
         else
-          #are you sure? to avoid overwriting existing
-          unless @questions.keys.include?(from)
-            ask("The shortcut already exists, are you sure you want to overwrite it?", command, from, dest)
+          @shortcuts[from] = Hash.new() unless @shortcuts.keys.include?(from)
+
+          found_other = false
+          if for_all.to_s != ""
+            @shortcuts.each { |sck, scv|
+              if sck != :all and sck != from and scv.key?(shortcut_name)
+                found_other = true
+              end
+            }
+          end
+          if !config.admins.include?(from) and @shortcuts[:all].include?(shortcut_name) and !@shortcuts[from].include?(shortcut_name)
+            respond "Only the creator of the shortcut can modify it", dest
+          elsif found_other
+            respond "You cannot create a shortcut for all with the same name than other user is using", dest
+          elsif !@shortcuts[from].include?(shortcut_name)
+            #new shortcut
+            @shortcuts[from][shortcut_name] = command_to_run
+            @shortcuts[:all][shortcut_name] = command_to_run if for_all.to_s != ""
+            update_shortcuts_file()
+            respond "shortcut added", dest
           else
-            case @questions[from]
-            when /^(yes|yep)/i
-              @shortcuts[from][shortcut_name] = command_to_run
-              @shortcuts[:all][shortcut_name] = command_to_run if for_all.to_s != ""
-              update_shortcuts_file()
-              respond "shortcut added", dest
-              @questions.delete(from)
-            when /^no/i
-              respond "ok, I won't add it", dest
-              @questions.delete(from)
+            #are you sure? to avoid overwriting existing
+            if answer.empty?
+              ask("The shortcut already exists, are you sure you want to overwrite it?", command, from, dest)
             else
-              ask "I don't understand, yes or no?", command, from, dest
+              case answer
+              when /^(yes|yep)/i
+                @shortcuts[from][shortcut_name] = command_to_run
+                @shortcuts[:all][shortcut_name] = command_to_run if for_all.to_s != ""
+                update_shortcuts_file()
+                respond "shortcut added", dest
+                answer_delete(from)
+              when /^no/i
+                respond "ok, I won't add it", dest
+                answer_delete(from)
+              else
+                ask "I don't understand, yes or no?", command, from, dest
+              end
             end
           end
         end

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

@@ -1,10 +1,14 @@
 class SlackSmartBot
   # helpadmin: ----------------------------------------------
   # helpadmin: `add routine NAME every NUMBER PERIOD COMMAND`
+  # helpadmin: `add routine NAME every NUMBER PERIOD #CHANNEL COMMAND`
   # helpadmin: `add routine NAME every NUMBER PERIOD`
   # 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 at TIME #CHANNEL COMMAND`
+  # helpadmin: `add routine NAME on DAYWEEK at TIME COMMAND`
+  # helpadmin: `add routine NAME on DAYWEEK at TIME #CHANNEL COMMAND`
   # helpadmin: `add routine NAME at TIME`
   # helpadmin: `add silent routine NAME at TIME`
   # helpadmin: `create routine NAME at TIME`
@@ -15,14 +19,18 @@ 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:    #CHANNEL: the destination channel where the results will be published. If not supplied then the bot channel by default or a DM if the command is run from a DM.
   # 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:      _create silent routine Example every 12 hours !Run customer tests_
+  # helpadmin:      _add routine example on Mondays at 05:00 !run customer tests_
+  # helpadmin:      _add routine example on Tuesdays at 09:00 #SREChannel !run db cleanup_
   # helpadmin:
-  def add_routine(dest, from, user, name, type, number_time, period, command_to_run, files, silent)
+  def add_routine(dest, from, user, name, type, number_time, period, command_to_run, files, silent, channel)
     save_stats(__method__)
     if files.nil? or files.size == 0 or (files.size > 0 and config.masters.include?(from))
       if config.admins.include?(from)
@@ -30,13 +38,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 +61,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}")
 
@@ -75,12 +99,21 @@ class SlackSmartBot
               http.get(files[0].url_private_download, save_data: file_path)
               system("chmod +x #{file_path}")
             end
-
+            get_channels_name_and_id() unless @channels_name.keys.include?(channel) or @channels_id.keys.include?(channel)
+            channel_id = nil
+            if @channels_name.key?(channel) #it is an id
+              channel_id = channel
+              channel = @channels_name[channel_id]
+            elsif @channels_id.key?(channel) #it is a channel name
+              channel_id = @channels_id[channel]
+            end
+    
+            channel_id = dest if channel_id.to_s == ''
             @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: "", 
+                                             next_run: next_run.to_s, dest: channel_id, last_run: "", last_elapsed: "", 
                                              running: false }
             update_routines
             respond "Added routine *`#{name}`* to the channel", dest

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

@@ -14,15 +14,11 @@ class SlackSmartBot
         respond "Only admins can extend the rules. Admins on this channel: #{config.admins}", dest
       else
         #todo: add pagination for case more than 1000 channels on the workspace
-        channels = client.web_client.conversations_list(
-          types: "private_channel,public_channel",
-          limit: "1000",
-          exclude_archived: "true",
-        ).channels
+        channels = get_channels()
 
         channel_found = channels.detect { |c| c.name == channel }
         get_channels_name_and_id()
-        members = client.web_client.conversations_members(channel: @channels_id[channel]).members unless channel_found.nil?
+        members = get_channel_members(@channels_id[channel]) unless channel_found.nil?
         get_bots_created()
         channels_in_use = []
         @bots_created.each do |k, v|
@@ -39,7 +35,7 @@ class SlackSmartBot
         elsif !members.include?(user.id)
           respond "You need to join that channel first", dest
         elsif !members.include?(config[:nick_id])
-          respond "You need to add first to the channel the smart bot user: #{config[:nick]}", dest
+          respond "You need to add first to the channel the smart bot user: <@#{config[:nick_id]}>", dest
         else
           channels_in_use.each do |channel_in_use|
             respond "The rules from channel <##{@channels_id[channel_in_use]}> are already in use on that channel", dest

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

@@ -13,6 +13,7 @@ class SlackSmartBot
       respond "zZzzzzZzzzzZZZZZZzzzzzzzz", dest
       @status = :paused
       @bots_created[@channel_id][:status] = :paused
+      update_bots_file()
       unless config.on_master_bot
         send_msg_channel config.master_channel, "Changed status on #{config.channel} to :paused"
       end

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

@@ -38,12 +38,19 @@ class SlackSmartBot
           respond "Routines on channel *#{rout_ch.get_values(:channel_name).values.flatten.uniq[0]}*", dest
           rout_ch.each do |k, v|
             msg = []
-            ch != v[:dest] ? directm = " (*DM to #{v[:creator]}*)" : directm = ""
-            msg << "*`#{k}`*#{directm}"
+            if v[:dest][0] == 'D'
+              extram = " (*DM to #{v[:creator]}*)"
+            elsif v[:dest] != ch
+              extram = " (*publish on <##{v[:dest]}>*)"
+            else
+              extram = ''
+            end
+            msg << "*`#{k}`*#{extram}"
             msg << "\tCreator: #{v[:creator]}"
             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/start_bot.rb

@@ -12,6 +12,7 @@ class SlackSmartBot
       respond "This bot is running and listening from now on. You can pause again: pause this bot", dest
       @status = :on
       @bots_created[@channel_id][:status] = :on
+      update_bots_file()
       unless config.on_master_bot
         send_msg_channel config.master_channel, "Changed status on #{config.channel} to :on"
       end

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

@@ -3,7 +3,6 @@ class SlackSmartBot
   # help: `delete repl SESSION_NAME`
   # help: `delete irb SESSION_NAME`
   # help: `remove repl SESSION_NAME`
-  # help: 
   # help:     Will delete the specified REPL
   # help:     Only the creator of the REPL or an admin can delete REPLs
   # help:
@@ -20,6 +19,7 @@ class SlackSmartBot
           @repls.delete(session_name)
           update_repls()
           File.rename("#{config.path}/repl/#{@channel_id}/#{session_name}.input", "#{config.path}/repl/#{@channel_id}/#{session_name}_#{Time.now.strftime("%Y%m%d%H%M%S%N")}.deleted")
+          File.delete("#{config.path}/repl/#{@channel_id}/#{session_name}.output") if File.exist?("#{config.path}/repl/#{@channel_id}/#{session_name}.output")
           File.delete("#{config.path}/repl/#{@channel_id}/#{session_name}.run") if File.exist?("#{config.path}/repl/#{@channel_id}/#{session_name}.run")
           respond "REPL #{session_name} deleted"
         else

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

@@ -2,10 +2,12 @@ class SlackSmartBot
   # help: ----------------------------------------------
   # help: `delete shortcut NAME`
   # help: `delete sc NAME`
+  # help: `delete global sc NAME`
   # help:    It will delete the shortcut with the supplied name
+  # help:    'global' or 'generic' can only be used on Master channel.
   # help:
 
-  def delete_shortcut(dest, user, shortcut, typem, command)
+  def delete_shortcut(dest, user, shortcut, typem, command, global)
     save_stats(__method__)
     unless typem == :on_extended
       from = user.name
@@ -15,32 +17,61 @@ class SlackSmartBot
       else
         deleted = false
 
-        if !config.admins.include?(from) and @shortcuts[:all].include?(shortcut) and !@shortcuts[from].include?(shortcut)
-          respond "Only the creator of the shortcut or an admin user can delete it", dest
-        elsif (@shortcuts.keys.include?(from) and @shortcuts[from].keys.include?(shortcut)) or
-              (config.admins.include?(from) and @shortcuts[:all].include?(shortcut))
-          #are you sure? to avoid deleting by mistake
-          unless @questions.keys.include?(from)
-            ask("are you sure you want to delete it?", command, from, dest)
+        if global
+          if !config.on_master_bot or typem != :on_master
+            respond "It is only possible to delete global shortcuts from Master channel"
           else
-            case @questions[from]
-            when /^(yes|yep)/i
-              @questions.delete(from)
-              respond "shortcut deleted!", dest
-              respond("#{shortcut}: #{@shortcuts[from][shortcut]}", dest) if @shortcuts.key?(from) and @shortcuts[from].key?(shortcut)
-              respond("#{shortcut}: #{@shortcuts[:all][shortcut]}", dest) if @shortcuts.key?(:all) and @shortcuts[:all].key?(shortcut)
-              @shortcuts[from].delete(shortcut) if @shortcuts.key?(from) and @shortcuts[from].key?(shortcut)
-              @shortcuts[:all].delete(shortcut) if @shortcuts.key?(:all) and @shortcuts[:all].key?(shortcut)
+            if !config.admins.include?(from) and @shortcuts_global[:all].include?(shortcut) and 
+              (!@shortcuts_global.key?(from) or !@shortcuts_global[from].include?(shortcut))
+              respond "Only the creator of the shortcut or an admin user can delete it"
+            elsif (@shortcuts_global.key?(from) and @shortcuts_global[from].keys.include?(shortcut)) or
+              (config.admins.include?(from) and @shortcuts_global[:all].include?(shortcut))
+              
+              respond "global shortcut deleted!", dest
+              if @shortcuts_global.key?(from) and @shortcuts_global[from].key?(shortcut)
+                respond("#{shortcut}: #{@shortcuts_global[from][shortcut]}", dest) 
+              elsif @shortcuts_global.key?(:all) and @shortcuts_global[:all].key?(shortcut)
+                respond("#{shortcut}: #{@shortcuts_global[:all][shortcut]}", dest)
+              end
+              @shortcuts_global[from].delete(shortcut) if @shortcuts_global.key?(from) and @shortcuts_global[from].key?(shortcut)
+              @shortcuts_global[:all].delete(shortcut) if @shortcuts_global.key?(:all) and @shortcuts_global[:all].key?(shortcut)
               update_shortcuts_file()
-            when /^no/i
-              @questions.delete(from)
-              respond "ok, I won't delete it", dest
             else
-              ask("I don't understand, are you sure you want to delete it? (yes or no)", command, from, dest)
+              respond 'shortcut not found'
             end
           end
         else
-          respond "shortcut not found", dest
+          if !config.admins.include?(from) and @shortcuts[:all].include?(shortcut) and 
+            (!@shortcuts.key?(from) or !@shortcuts[from].include?(shortcut))
+            respond "Only the creator of the shortcut or an admin user can delete it", dest
+          elsif (@shortcuts.keys.include?(from) and @shortcuts[from].keys.include?(shortcut)) or
+                (config.admins.include?(from) and @shortcuts[:all].include?(shortcut))
+            #are you sure? to avoid deleting by mistake
+            if answer.empty?
+              ask("are you sure you want to delete it?", command, from, dest)
+            else
+              case answer
+              when /^(yes|yep)/i
+                answer_delete(from)
+                respond "shortcut deleted!", dest
+                if @shortcuts.key?(from) and @shortcuts[from].key?(shortcut)
+                  respond("#{shortcut}: #{@shortcuts[from][shortcut]}", dest) 
+                elsif @shortcuts.key?(:all) and @shortcuts[:all].key?(shortcut)
+                  respond("#{shortcut}: #{@shortcuts[:all][shortcut]}", dest)
+                end
+                @shortcuts[from].delete(shortcut) if @shortcuts.key?(from) and @shortcuts[from].key?(shortcut)
+                @shortcuts[:all].delete(shortcut) if @shortcuts.key?(:all) and @shortcuts[:all].key?(shortcut)
+                update_shortcuts_file()
+              when /^no/i
+                answer_delete(from)
+                respond "ok, I won't delete it", dest
+              else
+                ask("I don't understand, are you sure you want to delete it? (yes or no)", command, from, dest)
+              end
+            end
+          else
+            respond "shortcut not found", dest
+          end
         end
       end
     end