Remove core config

.gitignore

@@ -5,4 +5,5 @@ docs/_build
 botenv
 dist
 build
-pyircbot.egg-info
+pyircbot.egg-info
+dev

bin/pyircbot

@@ -14,27 +14,21 @@ if __name__ == "__main__":
 	
 	" parse command line args "
 	parser = OptionParser()
-	parser.add_option("-c", "--config", action="store", type="string", dest="config", help="Path to core config file")
+	parser.add_option("-c", "--config", action="store", type="string", dest="config", help="Path to config file")
-	parser.add_option("-b", "--bot", action="store", type="string", dest="bot", help="Path to bot config file")
 	
 	(options, args) = parser.parse_args()
 	
 	log.debug(options)
 	
 	if not options.config:
-		log.critical("No core config file specified (-c). Exiting.")
+		log.critical("No bot config file specified (-c). Exiting.")
-		sys.exit(0)
-	if not options.bot:
-		log.critical("No bot config file specified (-b). Exiting.")
 		sys.exit(0)
 	
-	coreconfig = yaml.load(open(options.config, 'r'))
+	botconfig = yaml.load(open(options.config, 'r'))
-	botconfig = yaml.load(open(options.bot, 'r'))
 	
-	log.debug(coreconfig)
 	log.debug(botconfig)
 	
-	bot = PyIRCBot(coreconfig, botconfig)
+	bot = PyIRCBot(botconfig)
 	try:
 		bot.loop()
 	except KeyboardInterrupt:

examples/config.main.yml

@@ -1,2 +0,0 @@
-botdir: /home/example/bot/pyircbot/
-moduledir: /home/example/bot/pyircbot/modules/

examples/data/config/Services.yml

@@ -1,9 +1,8 @@
 user:
   nick:
-    - dave
+    - pyircbot3
-    - dave_
+    - pyircbot3_
-    - dave__
+    - pyircbot3__
-    - dave___
   password: nickservpassword
   username: pyircbot3
   hostname: pyircbot3.domain.com
@@ -16,9 +15,9 @@ ident:
   ghost_to: nickserv
   ghost_cmd: ghost %(nick)s %(password)s
 channels:
-  - "#dave2"
+  - "#xmopx"
 privatechannels:
   to: chanserv
   command: invite %(channel)s
   list:
-    - "#aprivatechannel"
+    - "#aprivatechannel"

examples/run-example.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-../bin/pyircbot -c config.main.yml -b config.instance.yml
+../bin/pyircbot --config config.instance.yml

pyircbot/pyircbot.py

@@ -15,22 +15,14 @@ from pyircbot import modulebase
 import os.path
 
 class PyIRCBot:
-	""":param coreconfig: The core configuration of the bot. Passed by main.py.
+	""":param botconfig: The configuration of this instance of the bot. Passed by main.py.
-	:type coreconfig: dict
-	:param botconfig: The configuration of this instance of the bot. Passed by main.py.
 	:type botconfig: dict
 	"""
 	
-	version = "1.0a1-git"
+	def __init__(self, botconfig):
-	""" PyIRCBot version """
-	
-	def __init__(self, coreconfig, botconfig):
 		self.log = logging.getLogger('PyIRCBot')
 		"""Reference to logger object"""
 		
-		self.coreconfig = coreconfig
-		"""saved copy of the core config"""
-		
 		self.botconfig = botconfig
 		"""saved copy of the instance config"""
 		
@@ -96,10 +88,7 @@ class PyIRCBot:
 		" instances of modules "
 		self.moduleInstances = {}
 		" append module location to path "
-		sys.path.append(self.coreconfig["moduledir"])
+		sys.path.append(os.path.dirname(__file__)+"/modules/")
-		" append bot directory to path "
-		sys.path.append(self.coreconfig["botdir"]+"core/")
-		
 		for modulename in self.botconfig["modules"]:
 			self.loadmodule(modulename)