v6.0.10. Fixed CLI on certain setups

- v6.0.10 June 22, 2012
	- Fixed CLI on certain setups

History.md

@@ -1,5 +1,8 @@
 ## History
 
+- v6.0.10 June 22, 2012
+	- Fixed CLI on certain setups
+
 - v6.0.9 June 22, 2012
 	- Many minor fixes and improvements
 	- Available DocPad events are now exposed through `docpadInstance.getEvents()`

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "docpad",
-	"version": "6.0.9",
+	"version": "6.0.10",
 	"description": "DocPad is a language agnostic document management system. This means you write your website as documents, in whatever language you wish, and DocPad will handle the compiling, templates and layouts for you. For static documents it will generate static files, for dynamic documents it'll re-render them on each request. You can utilise DocPad by itself, or use it as a module your own custom system. It's pretty cool, and well worth checking out. We love it.",
 	"homepage": "https://github.com/bevry/docpad",
 	"keywords": [

src/lib/docpad.coffee

@@ -375,7 +375,7 @@ class DocPad extends EventEmitterEnhanced
 		_.each @getEvents(), (eventName) ->
 			# Bind to the event
 			docpad.on eventName, (opts,next) ->
-				eventHandler = docpad.getConfig().events[eventName]
+				eventHandler = docpad.getConfig().events?[eventName]
 				# Fire the config event handler for this event, if it exists
 				if typeof eventHandler is 'function'
 					args = [opts,next]
@@ -515,9 +515,9 @@ class DocPad extends EventEmitterEnhanced
 
 
 			# Ready
-			@emitSync 'docpadReady', {docpad:@}, (err) ->
+			@emitSync 'docpadReady', {docpad}, (err) ->
 				# Error?
-				return @error(err)  if err
+				return docpad.error(err)  if err
 
 				# All done, forward our DocPad instance onto our creator
 				return next?(null,docpad)