Introducing nemubot v4 directories architecture

.gitignore

@@ -3,4 +3,6 @@
 TAGS
 *.py[cod]
 __pycache__
+build/
 datas/
+dist/

README.md

@@ -1,7 +1,21 @@
-# *nemubot*
+# nemubot
 
-An extremely modulable IRC bot, built around XML configuration files!
+A smart and modulable IM bot!
+
+## Usage
+
+TODO
 
 ## Documentation
 
 Have a look to the wiki at https://github.com/nemunaire/nemubot/wiki
+
+## Building
+
+TODO
+
+## License
+
+This software is copyright (c) 2014 by nemunaire.
+
+This is free software; you can redistribute it and/or modify it under the same terms as GNU Affero General Public Licence v3.

bin/nemubot

@@ -22,14 +22,14 @@ import os
 import imp
 import traceback
 
-import bot
+from nemubot import Bot
-import prompt
+from nemubot import prompt
-from prompt.builtins import load_file
+from nemubot.prompt.builtins import load_file
-import importer
+from nemubot import importer
 
 if __name__ == "__main__":
     # Create bot context
-    context = bot.Bot(0, "FIXME")
+    context = Bot(0, "FIXME")
 
     # Load the prompt
     prmpt = prompt.Prompt()

lib/DCC.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -25,8 +25,8 @@ import time
 import threading
 import traceback
 
-import message
+import nemubot.message
-import server
+from nemubot import server
 
 #Store all used ports
 PORTS = list()

lib/IRCServer.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -23,12 +23,12 @@ import socket
 import threading
 import traceback
 
-from channel import Channel
+from nemubot.channel import Channel
-from DCC import DCC
+from nemubot.DCC import DCC
-from hooks import Hook
+from nemubot.hooks import Hook
-import message
+import nemubot.message
-import server
+from nemubot import server
-import xmlparser
+import nemubot.xmlparser
 
 class IRCServer(server.Server):
     """Class to interact with an IRC server"""

lib/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -23,21 +23,21 @@ import threading
 import time
 import re
 
-import consumer
+from nemubot import consumer
-import event
+from nemubot import event
-import hooks
+from nemubot import hooks
-from networkbot import NetworkBot
+from nemubot.networkbot import NetworkBot
-from IRCServer import IRCServer
+from nemubot.IRCServer import IRCServer
-from DCC import DCC
+from nemubot.DCC import DCC
-import response
+from nemubot import response
 
 ID_letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 
 class Bot:
     def __init__(self, ip, realname, mp=list()):
         # Bot general informations
-        self.version     = 3.3
+        self.version     = 4.0
-        self.version_txt = "3.3"
+        self.version_txt = '4.0.dev0'
 
         # Save various informations
         self.ip = ip

lib/channel.py

@@ -1,7 +1,7 @@
 # coding=utf-8
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

lib/consumer.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -22,11 +22,10 @@ import threading
 import traceback
 import sys
 
-import bot
+from nemubot.DCC import DCC
-from DCC import DCC
+from nemubot.message import Message
-from message import Message
+from nemubot import response
-import response
+from nemubot import server
-import server
 
 class MessageConsumer:
     """Store a message before treating"""

lib/event.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

lib/exception.py

@@ -1,7 +1,7 @@
 # coding=utf-8
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from response import Response
+from nemubot.response import Response
 
 class IRCException(Exception):
 

lib/hooks.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -18,8 +18,8 @@
 
 import re
 
-from response import Response
+from nemubot.response import Response
-from exception import IRCException
+from nemubot.exception import IRCException
 
 class MessagesHook:
     def __init__(self, context, bot):

lib/importer.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -22,11 +22,11 @@ import imp
 import os
 import sys
 
-import event
+from nemubot import event
-import exception
+from nemubot import exception
-from hooks import Hook
+from nemubot.hooks import Hook
-import response
+from nemubot import response
-import xmlparser
+from nemubot import xmlparser
 
 class ModuleFinder(Finder):
     def __init__(self, context, prompt):

lib/message.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -21,10 +21,10 @@ import re
 import shlex
 import time
 
-import credits
+import nemubot.credits
-from credits import Credits
+from nemubot.credits import Credits
-from response import Response
+from nemubot.response import Response
-import xmlparser
+import nemubot.xmlparser
 
 CREDITS = {}
 filename = ""

lib/networkbot.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -22,9 +22,9 @@ import shlex
 import urllib.parse
 import zlib
 
-from DCC import DCC
+from nemubot.DCC import DCC
-import hooks
+import nemubot.hooks
-from response import Response
+from nemubot.response import Response
 
 class NetworkBot:
     def __init__(self, context, srv, dest, dcc=None):

lib/prompt/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

lib/prompt/builtins.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -17,7 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import xmlparser
+
+from nemubot import xmlparser
 
 def end(toks, context, prompt):
     """Quit the prompt for reload or exit"""

lib/response.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -165,7 +165,7 @@ class Response:
                 self.elt = 0
                 return msg
 
-import hooks
+import nemubot.hooks
 class Hook:
     def __init__(self, TYPE, call, name=None, data=None, regexp=None,
                  channels=list(), server=None, end=None, call_end=None,

lib/server.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

lib/tools/web.py

@@ -1,7 +1,7 @@
 # coding=utf-8
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

lib/tools/wrapper.py

@@ -1,7 +1,7 @@
 # coding=utf-8
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

lib/xmlparser/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

modules/cmd_server.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012  Mercier Pierre-Olivier
+# Copyright (C) 2012-2014  nemunaire
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -19,9 +19,9 @@
 import traceback
 import sys
 
-from networkbot import NetworkBot
+from nemubot.networkbot import NetworkBot
 
-nemubotversion = 3.3
+nemubotversion = 4.0
 NODATA = True
 
 def getserver(toks, context, prompt):