fix: NameError about unknown exception

TimeoutError used to come from timeout.rb, has been renamed to
Timeout::Error, though.
In most instances it’s not quite right to use it because timeout.rb is
not even loaded in core, only in plugins.
So we implement our own errors and exceptions now.

Author: Hendrik Jäger

data/rbot/plugins/wserver.rb

@@ -44,7 +44,7 @@ def wserver(m, params)
           end
         end
       end
-    rescue TimeoutError => e
+    rescue Timeout::Error => e
       m.reply "timed out connecting to #{uri.host}:#{uri.port} :("
     rescue RuntimeError => e
       redirect_count += 1

lib/rbot/ircbot.rb

@@ -44,6 +44,9 @@ class ServerError < RuntimeError
 require 'rbot/httputil'
 
 module Irc
+Irc::Error = Class.new(RuntimeError)
+Irc::PingError = Class.new(Irc::Error)
+
 # Main bot class, which manages the various components, receives messages,
 # handles them or passes them to plugins, and contains core functionality.
 class Bot
@@ -931,7 +934,7 @@ def mainloop
 
           # Wait for messages and process them as they arrive. If nothing is
           # received, we call the ping_server() method that will PING the
-          # server if appropriate, or raise a TimeoutError if no PONG has been
+          # server if appropriate, or raise a Irc::PingError if no PONG has been
           # received in the user-chosen timeout since the last PING sent.
           if @socket.select(1)
             break unless reply = @socket.gets
@@ -950,7 +953,7 @@ def mainloop
       rescue SystemExit
         @keep_looping = false
         break
-      rescue Errno::ETIMEDOUT, Errno::ECONNABORTED, TimeoutError, SocketError => e
+      rescue Errno::ETIMEDOUT, Errno::ECONNABORTED, Irc::PingError, SocketError => e
         error "network exception: #{e.pretty_inspect}"
         quit_msg = e.to_s
         too_fast += 10 if valid_recv
@@ -1380,7 +1383,7 @@ def ping_server
         if diff > act_timeout
           debug "no PONG from server in #{diff} seconds, reconnecting"
           # the actual reconnect is handled in the main loop:
-          raise TimeoutError, "no PONG from server in #{diff} seconds"
+          raise Irc::PingError, "no PONG from server in #{diff} seconds"
         end
       end
     end

lib/rbot/plugins.rb

@@ -625,7 +625,7 @@ def load_botmodule_file(fname, desc=nil)
 
         return :loaded
       rescue Exception => err
-        # rescue TimeoutError, StandardError, NameError, LoadError, SyntaxError => err
+        # rescue Irc::PingError, StandardError, NameError, LoadError, SyntaxError => err
         error report_error("#{desc}#{fname} load failed", err)
         bt = err.backtrace.select { |line|
           line.match(/^(\(eval\)|#{fname}):\d+/)
@@ -956,7 +956,7 @@ def help(topic = '')
           begin
             return p.help(key, params)
           rescue Exception => err
-            #rescue TimeoutError, StandardError, NameError, SyntaxError => err
+            #rescue Irc::PingError, StandardError, NameError, SyntaxError => err
             error report_error("#{p.botmodule_class} #{p.name} help() failed:", err)
           end
         }
@@ -968,7 +968,7 @@ def help(topic = '')
           begin
             return p.help(key, params)
           rescue Exception => err
-            #rescue TimeoutError, StandardError, NameError, SyntaxError => err
+            #rescue Irc::PingError, StandardError, NameError, SyntaxError => err
             error report_error("#{p.botmodule_class} #{p.name} help() failed:", err)
           end
         end