namespaces: simplify Irc::Bot::Auth manager singleton name and accessor

diff --git a/lib/rbot/botuser.rb b/lib/rbot/botuser.rb
index 146912b43587093325e4625fe6ae02c0df73fb4e..7a00f27737e8f77596f597ec5746869454fb062a 100644 (file)
--- a/lib/rbot/botuser.rb
+++ b/lib/rbot/botuser.rb
@@ -19,7 +19,7 @@ require 'set'
 #     class_eval {\r
 #       define_method(m) { |*a|\r
 #         r = super(*a)\r
-#         Irc::Bot::Auth.authmanager.set_changed\r
+#         Irc::Bot::Auth.manager.set_changed\r
 #         r\r
 #       }\r
 #     }\r
@@ -236,7 +236,7 @@ class Bot
       attr_reader :password\r
       attr_reader :netmasks\r
       attr_reader :perm\r
-      # Please remember to #set_changed() the authmanager\r
+      # Please remember to #set_changed() the Auth.manager\r
       # when modifying data\r
       attr_reader :data\r
       attr_writer :login_by_mask\r
@@ -344,13 +344,13 @@ class Bot
       # Reset the login-by-mask option\r
       #\r
       def reset_login_by_mask\r
-        @login_by_mask = Auth.authmanager.bot.config['auth.login_by_mask'] unless defined?(@login_by_mask)\r
+        @login_by_mask = Auth.manager.bot.config['auth.login_by_mask'] unless defined?(@login_by_mask)\r
       end\r
 \r
       # Reset the autologin option\r
       #\r
       def reset_autologin\r
-        @autologin = Auth.authmanager.bot.config['auth.autologin'] unless defined?(@autologin)\r
+        @autologin = Auth.manager.bot.config['auth.autologin'] unless defined?(@autologin)\r
       end\r
 \r
       # Do we allow automatic logging in?\r
@@ -601,10 +601,10 @@ class Bot
     end\r
 \r
 \r
-    # This is the AuthManagerClass singleton, used to manage User/BotUser connections and\r
-    # everything\r
+    # This is the ManagerClass singleton, used to manage\r
+    # Irc::User/Irc::Bot::Auth::BotUser connections and everything\r
     #\r
-    class AuthManagerClass\r
+    class ManagerClass\r
 \r
       include Singleton\r
 \r
@@ -826,10 +826,10 @@ class Bot
 \r
     end\r
 \r
-    # Returns the only instance of AuthManagerClass\r
+    # Returns the only instance of ManagerClass\r
     #\r
-    def Auth.authmanager\r
-      return AuthManagerClass.instance\r
+    def Auth.manager\r
+      return ManagerClass.instance\r
     end\r
 \r
   end\r
@@ -841,7 +841,7 @@ end
     # associated with the receiver\r
     #\r
     def botuser\r
-      Irc::Bot::Auth.authmanager.irc_to_botuser(self)\r
+      Irc::Bot::Auth.manager.irc_to_botuser(self)\r
     end\r
 \r
     # Bot-specific data can be stored with Irc::Users. This is\r
@@ -867,7 +867,7 @@ end
     def set_bot_data(key,value=nil,&block)\r
       if not block_given?\r
         self.botuser.data[key]=value\r
-        Irc::Bot::Auth.authmanager.set_changed\r
+        Irc::Bot::Auth.manager.set_changed\r
         return value\r
       end\r
       if value and not bot_data.has_key?(key)\r
@@ -877,7 +877,7 @@ end
       begin\r
         r = yield bot_data(key)\r
       ensure\r
-        Irc::Bot::Auth.authmanager.set_changed\r
+        Irc::Bot::Auth.manager.set_changed\r
       end\r
       return r\r
     end\r

diff --git a/lib/rbot/core/remote.rb b/lib/rbot/core/remote.rb
index 52cfed4e836119e49e84810f172ccd9c8e36e99d..7ffb62e1bb6e5a2e7613e67b22456c486e5ff85e 100644 (file)
--- a/lib/rbot/core/remote.rb
+++ b/lib/rbot/core/remote.rb
@@ -36,9 +36,9 @@ class Bot
       end
     end
 
-    # We extend the AuthManagerClass to handle remote logins
+    # We extend the ManagerClass to handle remote logins
     #
-    class AuthManagerClass
+    class ManagerClass
 
       MAX_SESSION_ID = 2**128 - 1
 

diff --git a/lib/rbot/ircbot.rb b/lib/rbot/ircbot.rb
index cab24ddd1945c92a99b22aaf799ae08f2d641621..ca40e0d63f87a92f89515726f2464d0000d8f358 100644 (file)
--- a/lib/rbot/ircbot.rb
+++ b/lib/rbot/ircbot.rb
@@ -461,7 +461,7 @@ class Bot
     @lang = Language.new(self, @config['core.language'])
 
     begin
-      @auth = Auth::authmanager
+      @auth = Auth::manager
       @auth.bot_associate(self)
       # @auth.load("#{botclass}/botusers.yaml")
     rescue Exception => e