Merge lp:~stefanor/ibid/ibid-plugin-333213 into lp:~ibid-core/ibid/old-trunk-pack-0.92

[Stefano Rivera]

[Stefano Rivera (stefanor)]

Some mistakes in early commits fixed later, bleh.

[Jonathan Hitchcock (vhata)]

review: Approve

[Michael Gorven (mgorven)]

 review approve
 status approve

review: Approve

=== modified file 'ibid/core.py'
--- ibid/core.py	2009-02-13 21:35:13 +0000
+++ ibid/core.py	2009-03-01 14:29:51 +0000
@@ -18,7 +18,7 @@
     def _process(self, event):
         for processor in ibid.processors:
             try:
-                event = processor.process(event) or event
+                processor.process(event)
             except Exception:
                 self.log.exception(u"Exception occured in %s processor of %s plugin", processor.__class__.__name__, processor.name)
 

=== modified file 'ibid/plugins/admin.py'
--- ibid/plugins/admin.py	2009-02-13 21:19:45 +0000
+++ ibid/plugins/admin.py	2009-03-01 14:29:51 +0000
@@ -18,7 +18,6 @@
                 plugins.append(processor.name)
 
         event.addresponse(', '.join(plugins))
-        return event
 
 help['core'] = 'Reloads core modules.'
 class ReloadCoreModules(Processor):

=== modified file 'ibid/plugins/basic.py'
--- ibid/plugins/basic.py	2009-02-13 21:19:45 +0000
+++ ibid/plugins/basic.py	2009-03-01 14:29:51 +0000
@@ -21,7 +21,6 @@
             reply['action'] = True
 
         event.addresponse(reply)
-        return event
 
 help['redirect'] = u'Redirects the response to a command to a different channel.'
 class RedirectCommand(Processor):

=== modified file 'ibid/plugins/bzr.py'
--- ibid/plugins/bzr.py	2009-02-18 10:41:14 +0000
+++ ibid/plugins/bzr.py	2009-03-01 14:36:38 +0000
@@ -111,7 +111,9 @@
 
     @handler
     def launchpad(self, event):
-        if ibid.sources[event.source.lower()].type != 'smtp' or 'X-Launchpad-Branch' not in event.headers:
+        if event.source.lower() not in ibid.sources \
+                or ibid.sources[event.source.lower()].type != 'smtp' \
+                or 'X-Launchpad-Branch' not in event.headers:
             return
 
         event.processed = True

=== modified file 'ibid/plugins/config.py'
--- ibid/plugins/config.py	2009-02-13 21:55:56 +0000
+++ ibid/plugins/config.py	2009-03-01 15:12:17 +0000
@@ -47,7 +47,7 @@
         for part in key.split('.'):
             if part not in config:
                 event.addresponse(u'No such option')
-                return event
+                return
             config = config[part]
         event.addresponse(unicode(config))
         

=== modified file 'ibid/plugins/core.py'
--- ibid/plugins/core.py	2009-02-23 20:29:44 +0000
+++ ibid/plugins/core.py	2009-03-01 15:01:42 +0000
@@ -34,7 +34,6 @@
 
                 event.addressed = matches.group(1)
                 event.message = new_message
-                return event
 
 class Strip(Processor):
 
@@ -59,8 +58,6 @@
             if event.sender['nick'] == who:
                 event.processed = True
 
-        return event
-
 class Responses(Processor):
 
     priority = 1600
@@ -78,13 +75,12 @@
                 response['target'] = event.channel
             if 'source' not in response:
                 response['source'] = event.source
-            if 'action' in response and ibid.sources[response['source'].lower()].type not in ('irc', 'silc'):
+            if 'action' in response and (response['source'].lower() not in ibid.sources \
+                    or ibid.sources[response['source'].lower()].type not in ('irc', 'silc')):
                 response['reply'] = '* %s %s' % (ibid.config['botname'], response['reply'])
             converted.append(response)
 
         event.responses = converted
-        return event
-
 
 class Address(Processor):
 
@@ -125,7 +121,6 @@
             event.addresponse(choice(self.notauthed))
         else:
             event.addresponse(choice(self.complaints))
-        return event
 
 class RateLimit(Processor):
 

=== modified file 'ibid/plugins/dbus.py'
--- ibid/plugins/dbus.py	2009-02-18 21:24:45 +0000
+++ ibid/plugins/dbus.py	2009-03-01 14:29:51 +0000
@@ -55,6 +55,5 @@
         if response:
             event['responses'].append(response)
             event['processed'] = True
-            return event
 
 # vi: set et sta sw=4 ts=4:

=== modified file 'ibid/plugins/http.py'
--- ibid/plugins/http.py	2009-02-03 18:03:49 +0000
+++ ibid/plugins/http.py	2009-03-01 14:29:51 +0000
@@ -30,4 +30,3 @@
 				reply = u'%s "%s"' % (reply, match.groups()[0].strip())
 
 		event.addresponse(reply)
-		return event

=== modified file 'ibid/plugins/log.py'
--- ibid/plugins/log.py	2009-02-23 20:43:40 +0000
+++ ibid/plugins/log.py	2009-03-01 14:36:38 +0000
@@ -20,7 +20,7 @@
 
     def get_logfile(self, source, channel, when):
         when = localtime(when)
-        if ibid.sources[source.lower()].type == 'jabber':
+        if source.lower() in ibid.sources and ibid.sources[source.lower()].type == 'jabber':
             channel = channel.split('/')[0]
         filename = self.log %   {   'source': source,
                                     'channel': channel,

=== modified file 'ibid/plugins/lookup.py'
--- ibid/plugins/lookup.py	2009-02-22 10:37:32 +0000
+++ ibid/plugins/lookup.py	2009-03-01 14:29:51 +0000
@@ -58,7 +58,8 @@
         try:
             f = urlopen(self.za_url)
         except Exception, e:
-            return event.addresponse(self.errors['open'])
+            event.addresponse(self.errors['open'])
+            return
         
         s = "".join(f)
         f.close()
@@ -68,8 +69,9 @@
         balls = self.za_re.findall(s)
         
         if len(balls) != 14:
-            return event.addresponse(self.errors['balls'] % \
-                     (14, len(balls), ", ".join(balls)))
+            event.addresponse(self.errors['balls'] % \
+                (14, len(balls), ", ".join(balls)))
+            return
         
         r += " ".join(balls[:6])
         r += " (Bonus: %s), Lotto Plus: " % (balls[6], )

=== modified file 'ibid/plugins/misc.py'
--- ibid/plugins/misc.py	2009-02-23 20:29:44 +0000
+++ ibid/plugins/misc.py	2009-03-01 15:12:17 +0000
@@ -22,13 +22,12 @@
         # Hi ... race condition.
         if self.pot:
             event.addresponse(u"There's already a pot on")
-            return event
+            return
         
         self.pot = [event.sender['nick']]
         sleep(self.time)
         event.addresponse(u"Coffee's ready for %s!" % u', '.join(self.pot))
         self.pot = None
-        return event
     
     @match('^coffee\s+(?:please|pls)$')
     def coffee_accept(self, event):
@@ -42,8 +41,6 @@
             self.pot.append(event.sender['nick'])
             event.addresponse(True)
 
-        return event
-
 version = resource_exists(__name__, '../.version') and resource_string(__name__, '../.version') or None
 
 help['version'] = u"Show the Ibid version currently running"

=== modified file 'ibid/plugins/morse.py'
--- ibid/plugins/morse.py	2009-01-24 12:39:04 +0000
+++ ibid/plugins/morse.py	2009-03-01 14:29:51 +0000
@@ -73,8 +73,5 @@
 
         if message.replace('-', '').replace('.', '').isspace():
             event.addresponse(morse2text(message))
-	    return event
-
         else:
             event.addresponse(text2morse(message))
-	    return event

=== modified file 'ibid/plugins/roshambo.py'
--- ibid/plugins/roshambo.py	2009-01-24 12:39:04 +0000
+++ ibid/plugins/roshambo.py	2009-03-01 14:29:51 +0000
@@ -24,6 +24,5 @@
             reply = 'I win! I chose %s' % choices[bchoice]
  
         event.addresponse(reply)
-        return event
 
 # vi: set et sta sw=4 ts=4:

=== modified file 'ibid/plugins/seen.py'
--- ibid/plugins/seen.py	2009-02-18 19:05:10 +0000
+++ ibid/plugins/seen.py	2009-03-01 14:29:51 +0000
@@ -125,6 +125,5 @@
 
         event.addresponse(reply)
         session.close()
-        return event
 
 # vi: set et sta sw=4 ts=4:

=== modified file 'ibid/plugins/test.py'
--- ibid/plugins/test.py	2009-01-12 17:35:59 +0000
+++ ibid/plugins/test.py	2009-03-01 14:29:51 +0000
@@ -9,7 +9,6 @@
     def handler(self, event, delay):
         sleep(float(delay))
         event.addresponse('Done')
-        return event
 
 class Authorise(Processor):
 
@@ -27,4 +26,11 @@
         event.addresponse({'reply': 'Test message', 'source': 'email', 'target': unicode(address)})
         event.addresponse(u"I've emailed %s" % address)
 
+class Except(Processor):
+
+    @match(r'^raise\s+exception$')
+    def handler(self, event):
+        event.addresponse("I'll except in a moment")
+        raise Exception("Ow, that hurt.")
+
 # vi: set et sta sw=4 ts=4:

=== modified file 'scripts/ibid-plugin'
--- scripts/ibid-plugin	2009-02-23 20:43:40 +0000
+++ scripts/ibid-plugin	2009-03-01 14:37:55 +0000
@@ -1,14 +1,19 @@
 #!/usr/bin/env python
 
+import logging
+import os
+import sqlalchemy
 from sys import argv, exit
-from traceback import print_exc
-import logging
-
-if len(argv) != 2:
-    print 'Usage: %s plugin' % (argv[0], )
+
+try:
+    import readline
+except ImportError:
+    pass
+
+if len(argv) < 2:
+    print 'Usage: %s plugin[s]' % (argv[0], )
     exit(1)
 
-import os
 import ibid
 import ibid.plugins
 from ibid.config import FileConfig
@@ -28,37 +33,60 @@
 ibid.reload_reloader()
 ibid.reloader.reload_databases()
 ibid.reloader.reload_dispatcher()
-ibid.reloader.load_processor(argv[1])
+
+plugins = argv[1:]
+if len(argv[1:]) == 1 and argv[1] == "--all":
+    plugins = ibid.config.get("load")
+for plugin in plugins:
+    ibid.reloader.load_processor(plugin)
 
 username = unicode(os.getenv('USER'))
 if not username:
-    username = u'test_plugin'
+    username = u'tester'
 session = ibid.databases.ibid()
-identity = session.query(Identity).filter_by(identity=username).first()
+try:
+    identity = session.query(Identity).filter_by(identity=username).first()
+except sqlalchemy.exc.ArgumentError:
+    identity = None
 if not identity:
-    identity = Identity(u'test_plugin',username)
+    identity = Identity(u'test_source',username)
     session.add(identity)
     session.flush()
     identity = session.query(Identity).filter_by(identity=username).first()
 identity_id = identity.id
 
+try:
+    encoding = os.getenv("LANG").split(".")[1]
+except:
+    encoding = "ascii"
+
+log = logging.getLogger('scripts.ibid-plugin')
+
 while True:
+    event = Event(u'test_source', u'message')
+    event.sender['id'] = event.sender['connection'] = event.sender['nick'] = username
+    event.identity = identity_id
+    event.account =  None
+    event.addressed = True
+    event.public = False
+    event.channel = u"testchan"
+
     try:
-        event = Event('test_plugin', 'message')
-        event.sender['id'] = event.sender['connection'] = event.sender['nick'] = username
-        event.identity = identity_id
-        event.account =  None
-        event.addressed = True
-        event.public = False
-        event.message = unicode(raw_input('Query: '))
-        for processor in ibid.processors:
+        event.message = unicode(raw_input('Query: '), encoding)
+    except KeyboardInterrupt:
+        break
+
+    for processor in ibid.processors:
+        try:
             processor.process(event)
-        for response in event.responses:
-            if isinstance(response, dict):
-                response = response['reply']
-            print 'Response: %s' % response
-        #print event
-    except Exception, e:
-        print_exc()
+        except Exception:
+            log.exception(u"Exception occured in %s processor of %s plugin", processor.__class__.__name__, processor.name)
+
+    for response in event.responses:
+        if isinstance(response, dict):
+            response = response['reply']
+        print 'Response: %s' % response
+
+print "\nExiting"
 
 # vi: set et sta sw=4 ts=4: