v6.34.0. Bugfix. Improvement.

- v6.34.0 May 8, 2013
	- Now uses [envfile](https://github.com/bevry/envfile) for `.env` file
parsing
	- Fixed `TypeError: Cannot call method 'get' of undefined ->
/lib/docpad.js:972` error when using [minicms
plugin](https://github.com/jeremyfa/docpad-plugin-minicms)
		- Closes [issue docpad#501](docpad#501)
reported by [rleite](https://github.com/rleite)

History.md

@@ -1,5 +1,10 @@
 ## History
 
+- v6.34.0 May 8, 2013
+	- Now uses [envfile](https://github.com/bevry/envfile) for `.env` file parsing
+	- Fixed `TypeError: Cannot call method 'get' of undefined -> /lib/docpad.js:972` error when using [minicms plugin](https://github.com/jeremyfa/docpad-plugin-minicms)
+		- Closes [issue #501](https://github.com/bevry/docpad/issues/501) reported by [rleite](https://github.com/rleite)
+
 - v6.33.0 May 6, 2013
 	- We now load the exchange file based on which DocPad version we are running
 	- Updated dependencies

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "docpad",
-	"version": "6.33.0",
+	"version": "6.34.0",
 	"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",
 	"installUrl": "http://docpad.org/install",
@@ -89,7 +89,8 @@
 		"yamljs": "~0.1.4",
 		"getmac": "~1.0.4",
 		"canihaz": "~1.0.0",
-		"progressbar": "~1.0.1"
+		"progressbar": "~1.0.1",
+		"envfile": "~1.0.0"
 	},
 	"optionalDependencies": {
 		"airbrake": "~0.2.9",

src/lib/docpad.coffee

@@ -1065,12 +1065,16 @@ class DocPad extends EventEmitterEnhanced
 				# Update the cache entry and fetch the latest if it was already set
 				existingModelId = @filesByOutPath[outPath] ?= model.id
 				if existingModelId isnt model.id
-					# We have a conflict, let the user know
-					modelPath = model.get('fullPath')
 					existingModel = @database.get(existingModelId)
-					existingModelPath = existingModel.get('fullPath')
-					message =  util.format(docpad.getLocale().outPathConflict, outPath, modelPath, existingModelPath)
-					docpad.warn(message)
+					if existingModel
+						# We have a conflict, let the user know
+						modelPath = model.get('fullPath')
+						existingModelPath = existingModel.get('fullPath')
+						message =  util.format(docpad.getLocale().outPathConflict, outPath, modelPath, existingModelPath)
+						docpad.warn(message)
+					else
+						# There reference was old, update it with our new one
+						@filesByOutPath[outPath] = model.id
 			)
 		@locales = extendr.dereference(@locales)
 		@userConfig = extendr.dereference(@userConfig)
@@ -1439,16 +1443,10 @@ class DocPad extends EventEmitterEnhanced
 			envPath = pathUtil.join(rootPath, '.env')
 			safefs.exists envPath, (exists) ->
 				return complete()  unless exists
-				safefs.readFile envPath, (err,data) ->
+				require('envfile').parseFile envPath, (err,data) ->
 					return complete(err)  if err
-					result = data.toString()
-					lines = result.split('\n')
-					for line in lines
-						match = line.match(/^([^=]+?)=(.*)/)
-						if match
-							key = match[1]
-							value = match[2]
-							process.env[key] = value
+					for own key,value of data
+						process.env[key] = value
 					return complete()
 
 		# Load Website's Configuration