Little refactoring and. Ignorecase on "karma" args.

Author: sentenza

README.md

@@ -1,15 +1,32 @@
 pyircbot
 ========
 
-A simple python-twisted IRC bot with greetings and karma functionalities. Presently pyircbot has **NOT** chat logging features.
+A simple python-twisted IRC. Presently pyircbot has **NOT** chat logging features.
 
-### Usage
+# Usage
 
-`$ python pyircbot.py --help`
+```
+Usage: pyircbot.py [options]
+    * Basic configuration file 'bot.conf' could be used instead
+    ** Information will be stored in a directory called<CHANNEL>-data
 
-### TODO
+Options:
+  -h, --help            show this help message and exit
+  -s SERVER_ADDRESS, --server=SERVER_ADDRESS
+                        IRC server address, default irc.freenode.net
+  -p PORT, --port=PORT  Server port, default 6667
+  -c CHANNEL, --channel=CHANNEL
+                        Channel name, default zencoders
+  -n NICK, --nick=NICK  Bot nickname zenbot
+  -g GREETING_PROBABILITY, --greeting=GREETING_PROBABILITY
+                        Greeting probability [1 - 100]
+  -v, --verbose         Print a lot of stuff...
+```
 
-* Anti-Flooding
-* Last tweets
-* Last news
-* Random BOT responses
+## Plugins
+
+* karma
+* reddit
+* greetings
+* diceroller
+* random number

bot_core/irc_bot.py

@@ -8,9 +8,9 @@
 from message_logger import MessageLogger
 from karma.karma_manager import KarmaManager
 from karma.karma_rate import KarmaRateLimiter
-from functions.welcome_machine import WelcomeMachine
-from functions.dice_roller import DiceRoller
-from functions.reddit import RedditManager
+from plugins.welcome_machine import WelcomeMachine
+from plugins.dice_roller import DiceRoller
+from plugins.reddit import RedditManager
 
 class IRCBot(irc.IRCClient):
     """Python Twisted IRC BOT. irc.IRCClient specialization."""
@@ -88,7 +88,7 @@ def privmsg(self, user, channel, msg):
         elif nickname_pattern.match(msg):
             deferred_reddit = threads.deferToThread(self.reddit.retrieve_hot, rand=True, nick=user)
             deferred_reddit.addCallback(self.threadSafeMsg)
-        elif re.match(re.compile('\w+\+\+$|\w+--$'), msg):
+        elif re.match(re.compile('\w+\+\+$|\w+--$', re.I), msg):
             self.karma_update(user, channel, msg)
         elif hello_pattern.match(msg):
             polite_msg = self.welcome_machine.ciao(user)
@@ -118,7 +118,7 @@ def evaluate_command(self, user, channel, msg):
             if len(msg_splits) == 1:
                 fetch_user = user
             elif len(msg_splits) == 2:
-                fetch_user = msg_splits[1]
+                fetch_user = msg_splits[1].lower()
             else: # !karma first two etc
                 return
             # Deferred call 

config.py

@@ -1,6 +1,6 @@
 import os
 from ConfigParser import SafeConfigParser
-from utility.singleton import Singleton
+from interfaces.singleton import Singleton
 
 class ConfigManager(object):
     """ Configuration Manager Singleton class."""

functions/__init__.py renamed to interfaces/__init__.py

@@ -39,7 +39,6 @@ def retrieve_hot(self, subject="programming", num_entries=3, rand=False, nick=No
         except requests.exceptions.HTTPError, e:
             sys.stderr.write("HTTPError: %s\n" % e)
             retrieved_list.append("[REDDIT] %s is not a valid subject" % subject)
-            return retrieved_list
         finally:            
             if len(retrieved_list) == 0:
                 retrieved_list.append("[Reddit] Nothing found for \"%s\" :(" % subject)

utility/singleton.py renamed to interfaces/singleton.py

@@ -1,4 +1,4 @@
-from utility.singleton import Singleton
+from interfaces.singleton import Singleton
 import random
 
 class WelcomeMachine: