Merge lp:~nueces/lalita/support-private-channels into lp:lalita

[nueces]

This branch provide support to joining private channels that are protected by password.

[Facundo Batista (facundo)]

This looks nice! However, some details:

- point at the end of the docstring

- remove blank in the ".get (...)"

And what it mandates a need fixing here: You need to provide test cases for this new feature.

Thank you very much!!

review: Needs Fixing

Unmerged revisions

138. By nueces on 2010-03-07

merge to sync with trunk

137. By nueces on 2010-03-07

Added support to joining private channels that are protected by password

=== modified file 'lalita.cfg.sample'
--- lalita.cfg.sample	2010-02-21 23:17:33 +0000
+++ lalita.cfg.sample	2010-03-07 15:49:17 +0000
@@ -181,5 +181,32 @@
                     'encoding': 'utf8',
                     },
                 },
-        }
+        },
+       'private-channel': dict(
+            encoding='utf8',
+            host='irc.freenode.net',
+            port=6667,
+            nickname='rosita',
+            channels= {
+                '#rosita-public': dict(
+                    plugins={
+                        'url.Url': dict (database= 'url_public',),
+                        'seen.Seen': {'base_dir':'./rosita/irc/logs/seen/public'},
+                    },
+                ),
+                '#rosita-private': dict(
+                    password='permiso',
+                    plugins={
+                        'url.Url': dict (database= 'url_private',),
+                        'seen.Seen': {'base_dir':'./rosita/irc/logs/seen/private'},
+                    },
+                ),
+            },
+            plugins= {
+                'freenode.Register': { 'password': '' },
+                'url.Url': dict ( database= 'url_public',),
+                'seen.Seen': {'base_dir':'./rosita/irc/logs/seen/default'},
+                'misc.Ping': { },
+            },
+        ),
         }

=== modified file 'lalita/ircbot.py'
--- lalita/ircbot.py	2010-02-20 15:02:51 +0000
+++ lalita/ircbot.py	2010-03-07 15:49:17 +0000
@@ -115,13 +115,18 @@
         self.dispatcher.push(events.CONNECTION_LOST)
 
     def signedOn(self):
+        """This is called to join a channel"""
         logger.debug("signed on %s:%d",
                      self.config['host'], self.config['port'])
         self.dispatcher.push(events.SIGNED_ON)
-        for channel in self.config.get ('channels', []):
+        for channel, options in self.config.get ('channels', {}).iteritems():
+            password = options.get('password', '').strip()
+            if password:
+                channel = '%s %s' % (channel, password)
+
             logger.debug("joining %s on %s:%d",
                          channel, self.config['host'], self.config['port'])
-            self.join (channel)
+            self.join(channel)
 
     def receivedMOTD(self, motd):
         logger.debug("motd from %s:%d",