Plugins: rename Plugins::pluginmanager to Plugins::manager

diff --git a/lib/rbot/ircbot.rb b/lib/rbot/ircbot.rb
index fed377311b61872d3f78bfa4297d47b0b816ddf2..f4ddc8fa6f1b933f449ff462379f3997aaee880b 100644 (file)
--- a/lib/rbot/ircbot.rb
+++ b/lib/rbot/ircbot.rb
@@ -437,7 +437,7 @@ class Bot
     @auth.botowner.password= @config['auth.password']
 
     Dir.mkdir("#{botclass}/plugins") unless File.exist?("#{botclass}/plugins")
-    @plugins = Plugins::pluginmanager
+    @plugins = Plugins::manager
     @plugins.bot_associate(self)
     setup_plugins_path()
 

diff --git a/lib/rbot/plugins.rb b/lib/rbot/plugins.rb
index d29d21c16cbf63a399afb59a8b23ac8999b3671b..cc4b5372d0cf67a1cbb8c143da8d7b15943a40ef 100644 (file)
--- a/lib/rbot/plugins.rb
+++ b/lib/rbot/plugins.rb
@@ -109,7 +109,7 @@ module Plugins
     # initialise your bot module. Always call super if you override this method,
     # as important variables are set up for you
     def initialize
-      @manager = Plugins::pluginmanager
+      @manager = Plugins::manager
       @bot = @manager.bot
 
       @botmodule_triggers = Array.new
@@ -627,7 +627,7 @@ module Plugins
   end
 
   # Returns the only PluginManagerClass instance
-  def Plugins.pluginmanager
+  def Plugins.manager
     return PluginManagerClass.instance
   end