Merge lp:~stefanor/ibid/ibid-plugin-507489 into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

[Stefano Rivera (stefanor)]

This branch was kicked off by Marco trying to set a configuration value in ibid-plugin. Then I noticed his "ibid-plugin -c" wasn't doing the right thing any more. I believe this fixes everything.

[Jonathan Hitchcock (vhata)]

review: Approve

[marcog (marco-gallotta)]

pyflakes complains (see below), but I think it can be ignored.

scripts/ibid-plugin:21: redefinition of unused 'ibid' from line 20

Looks good though.

review: Approve

[Max Rabkin (max-rabkin)]

Looks OK.

review: Approve

[Michael Gorven (mgorven)]

 review approve
 status approved

review: Approve

=== modified file 'ibid.ini'
--- ibid.ini	2010-01-04 12:23:00 +0000
+++ ibid.ini	2010-01-14 15:07:12 +0000
@@ -12,12 +12,12 @@
         type = irc
         server = za.atrum.org
         modes = B
-# 	     nickserv_password = password
+        # nickserv_password = password
         nickserv_mask = [e-mail]
     [[freenode]]
         type = irc
         server = chat.eu.freenode.net
-# 	     nickserv_password = password
+        # nickserv_password = password
         nickserv_mask = NickServ@services.
         disabled = True
     [[jabber]]

=== modified file 'ibid/core.py'
--- ibid/core.py	2010-01-07 12:41:26 +0000
+++ ibid/core.py	2010-01-14 15:07:12 +0000
@@ -173,8 +173,9 @@
 
         self.load_source(source)
 
-    def load_processors(self):
-        """Configuration:
+    def load_processors(self, load=None, noload=None, autoload=None):
+        """If method parameters are not provided, they'll be looked up from
+        config:
         [plugins]
             load = List of plugins / plugin.Processors to load
             noload = List of plugins / plugin.Processors to skip automatically loading
@@ -183,12 +184,18 @@
         # Sets up twisted.python so that we can iterate modules
         __import__('ibid.plugins')
 
-        load = 'load' in ibid.config.plugins and ibid.config.plugins['load'] or []
-        noload = 'noload' in ibid.config.plugins and ibid.config.plugins['noload'] or []
+        if load is None:
+            load = ibid.config.plugins.get('load', [])
+        if noload is None:
+            noload = ibid.config.plugins.get('noload', [])
 
         all_plugins = set(plugin.split('.')[0] for plugin in load)
-        if 'autoload' not in ibid.config.plugins or ibid.config.plugins['autoload'] == True:
-            all_plugins |= set(plugin.name.replace('ibid.plugins.', '') for plugin in getModule('ibid.plugins').iterModules())
+        if autoload is None:
+            autoload = ibid.config.plugins.get('autoload', 'True').lower() \
+                       in ('true', 'yes')
+        if autoload:
+            all_plugins |= set(plugin.name.replace('ibid.plugins.', '')
+                    for plugin in getModule('ibid.plugins').iterModules())
 
         for plugin in all_plugins:
             load_processors = [p.split('.')[1] for p in load if p.startswith(plugin + '.')]

=== modified file 'scripts/ibid-plugin'
--- scripts/ibid-plugin	2010-01-07 12:41:26 +0000
+++ scripts/ibid-plugin	2010-01-14 15:07:12 +0000
@@ -24,12 +24,16 @@
 from ibid.event import Event
 
 parser = OptionParser(usage="""%prog [options...] [plugins...]
-plugins is the list of plugins to load. A plugin name followed by a - will be disabled rather than loaded.""")
-parser.add_option("-o", "--only", dest="load_base", action="store_false", default=True,
+plugins is the list of plugins to load.
+A plugin name followed by a - will be disabled rather than loaded.""")
+parser.add_option("-o", "--only", dest="load_base", action="store_false",
+        default=True,
         help="Only load the specified plugins, not the common base plugins")
-parser.add_option("-c", "--configured", dest="load_configured", action="store_true",
-        help="Load all all configured plugins")
-parser.add_option("-p", "--public", dest="public", action="store_true", default=False,
+parser.add_option("-c", "--configured", dest="load_configured",
+        action="store_true",
+        default=False, help="Load all all configured plugins")
+parser.add_option("-p", "--public", dest="public", action="store_true",
+        default=False,
         help="Make testchan public, it's private by default")
 
 (options, args) = parser.parse_args()
@@ -58,7 +62,7 @@
 ibid.reloader.reload_databases()
 ibid.reloader.reload_dispatcher()
 
-class TestSource(dict):
+class TestSource(object):
     type = 'test'
     permissions = []
     supports = ('action', 'multiline', 'notice')
@@ -69,6 +73,12 @@
     def truncation_point(self, response, event=None):
         return None
 
+    def setup(self):
+        pass
+
+    def url(self):
+        return None
+
 ibid.sources[u'test_source'] = TestSource()
 
 load = [plugin for plugin in args if not plugin.endswith("-")]
@@ -77,21 +87,11 @@
 if options.load_base:
     load.extend(("admin", "config", "core", "help", "test"))
 
-if load:
-    if 'load' in ibid.config.plugins:
-        load.extend(ibid.config.plugins['load'])
-    ibid.config.plugins['load'] = load
-
-if noload:
-    if 'noload' in ibid.config.plugins:
-        ibid.config.plugins['noload'].extend(noload)
-    else:
-        ibid.config.plugins['noload'] = noload
-
-if not options.load_configured:
-    ibid.config.plugins['autoload'] = False
-
-ibid.reloader.load_processors()
+load.extend(ibid.config.plugins.get('load', []))
+noload.extend(ibid.config.plugins.get('noload', []))
+autoload = options.load_configured
+
+ibid.reloader.load_processors(load, noload, autoload)
 
 username = unicode(getenv('USER'))
 if not username: