Merge lp:~eridanus-developers/eridanus/grant-install-avatar into lp:eridanus

[Tristan Seligmann]

[Jonathan Jacobs (jjacobs)]

Looks good to merge. One thing, if you don't grant a user any plugins they still won't be able to auth, I guess the solution here is to add an axiomatic command to create users to Eridanus (instead of using the userbase one.) At the moment, there is no real point in having a user without any plugins granted, so I wouldn't say this is important to fix, but I've filed bug #578222 anyway.

review: Approve

=== modified file 'axiom/plugins/eridanuscmd.py'
--- axiom/plugins/eridanuscmd.py	2010-01-02 07:50:32 +0000
+++ axiom/plugins/eridanuscmd.py	2010-05-09 21:50:42 +0000
@@ -5,7 +5,9 @@
 from axiom.attributes import AND
 
 from eridanus import plugin
+from eridanus.ieridanus import IIRCAvatar
 from eridanus.bot import IRCBotService, IRCBotFactoryFactory, IRCBotConfig
+from eridanus.avatar import AuthenticatedAvatar
 
 
 
@@ -170,6 +172,9 @@
         loginAccount = loginSystem.accountByAddress(self['username'], self['domain'])
         assert loginAccount is not None, 'No such user'
         userStore = loginAccount.avatars.open()
+        avatar = IIRCAvatar(userStore, None)
+        if avatar is None:
+            userStore.powerUp(AuthenticatedAvatar(store=userStore))
         plugin.installPlugin(userStore, self['pluginName'])
 
 

=== modified file 'bin/fixinitialcomment.py'
--- bin/fixinitialcomment.py	2008-03-24 00:30:21 +0000
+++ bin/fixinitialcomment.py	2010-05-09 21:50:42 +0000
@@ -2,7 +2,7 @@
 
 from axiom.store import Store
 
-from eridanus.entry import Entry, Comment
+from eridanus.entry import Entry
 
 
 db = Store(sys.argv[1])

=== modified file 'bin/killbrokenmanagers.py'
--- bin/killbrokenmanagers.py	2008-03-24 00:30:21 +0000
+++ bin/killbrokenmanagers.py	2010-05-09 21:50:42 +0000
@@ -1,7 +1,6 @@
 import sys
 
 from axiom.store import Store
-from axiom.dependency import uninstallFrom
 
 from eridanus.bot import IRCBotService
 

=== modified file 'bin/setconfigname.py'
--- bin/setconfigname.py	2008-03-24 00:30:21 +0000
+++ bin/setconfigname.py	2010-05-09 21:50:42 +0000
@@ -1,7 +1,6 @@
 import sys
 
 from axiom.store import Store
-from axiom.dependency import uninstallFrom
 
 from eridanus.bot import IRCBotService
 

=== modified file 'eridanus/avatar.py'
--- eridanus/avatar.py	2008-10-17 21:06:10 +0000
+++ eridanus/avatar.py	2010-05-09 21:50:42 +0000
@@ -51,6 +51,7 @@
     """
     typeName = 'eridanus_avatar_authenticatedavatar'
     schemaVersion = 1
+    powerupInterfaces = [IIRCAvatar]
 
     dummy = integer()
 

=== modified file 'eridanus/bot.py'
--- eridanus/bot.py	2010-01-02 07:59:40 +0000
+++ eridanus/bot.py	2010-05-09 21:50:42 +0000
@@ -285,7 +285,7 @@
 
 
     def directedPublicMessage(self, source, message):
-        d = maybeDeferred(self.command, source, message
+        maybeDeferred(self.command, source, message
             ).addErrback(self.mentionFailure, source)
 
     privateMessage = directedPublicMessage
@@ -293,7 +293,7 @@
 
     def publicMessage(self, source, message):
         for obs in plugin.getAmbientEventObservers(self.appStore):
-            d = maybeDeferred(obs.publicMessageReceived, source, message
+            maybeDeferred(obs.publicMessageReceived, source, message
                 ).addErrback(self.mentionFailure, source)
 
 

=== modified file 'eridanus/iriparse.py'
--- eridanus/iriparse.py	2009-04-12 09:02:01 +0000
+++ eridanus/iriparse.py	2010-05-09 21:50:42 +0000
@@ -1,4 +1,6 @@
 import string
+# suppress pyflakes warning, as this is used by the PyMeta grammar
+string
 
 from pymeta.grammar import OMeta
 from pymeta.runtime import ParseError

=== modified file 'eridanus/plugin.py'
--- eridanus/plugin.py	2010-01-02 09:40:10 +0000
+++ eridanus/plugin.py	2010-05-09 21:50:42 +0000
@@ -261,7 +261,7 @@
                   will accept
         @rtype: C{(min, max)}
         """
-        minargs, maxargs = arglimits = getattr(self.method, 'arglimits', (None, None))
+        minargs, maxargs = getattr(self.method, 'arglimits', (None, None))
         return getCommandArgLimits(self.method, minargs, maxargs)
 
 

=== modified file 'eridanus/reparse.py'
--- eridanus/reparse.py	2009-01-23 15:12:36 +0000
+++ eridanus/reparse.py	2010-05-09 21:50:42 +0000
@@ -2,6 +2,8 @@
 Parse a regular expression into it's parts.
 """
 import re, string
+# suppress pyflakes warning, as this is used by the PyMeta grammar
+string
 
 from pymeta.grammar import OMeta
 from pymeta.runtime import ParseError

=== modified file 'eridanus/test/plugin_broken.py'
--- eridanus/test/plugin_broken.py	2010-01-02 09:40:10 +0000
+++ eridanus/test/plugin_broken.py	2010-05-09 21:50:42 +0000
@@ -17,3 +17,4 @@
 
 # Here we import a mythical module to generate an ImportError.
 import gyre_and_gimble_in_the_wabe
+gyre_and_gimble_in_the_wabe

=== modified file 'eridanus/test/test_plugin.py'
--- eridanus/test/test_plugin.py	2010-01-02 09:40:10 +0000
+++ eridanus/test/test_plugin.py	2010-05-09 21:50:42 +0000
@@ -5,6 +5,11 @@
 from eridanus.ieridanus import IEridanusPlugin, IEridanusBrokenPlugin
 
 
+# Make pyflakes happy
+UselessPlugin = None
+SadPlugin = None
+
+
 class TestSafePluginImport(unittest.TestCase):
     """
     Tests for the broken plugin system.

=== modified file 'eridanus/test/test_reparse.py'
--- eridanus/test/test_reparse.py	2008-11-28 15:16:35 +0000
+++ eridanus/test/test_reparse.py	2010-05-09 21:50:42 +0000
@@ -1,5 +1,3 @@
-from datetime import timedelta
-
 from twisted.trial import unittest
 
 from eridanus import errors, reparse