From 3ef523579baea23d723758652cca0c729279d06c Mon Sep 17 00:00:00 2001
From: Benjamin Lupton <b@lupton.cc>
Date: Fri, 25 Jan 2013 23:05:19 +1100
Subject: [PATCH] v6.21.6. Improvement.

- v6.21.6 January 25, 2013
	- Better debugging around server starting
---
 History.md                   | 3 +++
 locale/en.cson               | 1 +
 package.json                 | 2 +-
 src/lib/docpad.coffee        | 5 ++---
 src/test/actions.test.coffee | 8 ++++----
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/History.md b/History.md
index 6a7b3f47..4aba1ce1 100755
--- a/History.md
+++ b/History.md
@@ -1,5 +1,8 @@
 ## History
 
+- v6.21.6 January 25, 2013
+	- Better debugging around server starting
+
 - v6.21.5 January 24, 2013
 	- Supports Node v0.9
 	- Added `renderSingleExtensions` option
diff --git a/locale/en.cson b/locale/en.cson
index 76b35530..0c463377 100644
--- a/locale/en.cson
+++ b/locale/en.cson
@@ -42,6 +42,7 @@
 
 	# Server
 	serverInUse: "Could not start the web server, chances are the desired port %s is already in use"
+	serverStart: "Starting server on port %s and directory %s"
 	serverStarted: "DocPad listening to %s on directory %s"
 
 	# Watching
diff --git a/package.json b/package.json
index 86961e46..41d0e8c5 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "docpad",
-	"version": "6.21.5",
+	"version": "6.21.6",
 	"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",
diff --git a/src/lib/docpad.coffee b/src/lib/docpad.coffee
index 7d4ed91b..c1a44108 100755
--- a/src/lib/docpad.coffee
+++ b/src/lib/docpad.coffee
@@ -3289,7 +3289,6 @@ class DocPad extends EventEmitterEnhanced
 				return next(err)  if err
 
 				# Done
-				docpad.log 'debug', 'Server setup'
 				return next()
 
 		# Start Server
@@ -3304,14 +3303,14 @@ class DocPad extends EventEmitterEnhanced
 				return next(err)
 
 			# Listen
+			docpad.log 'debug', util.format(locale.serverStart, port, config.outPath)
 			serverHttp.listen port,  ->
 				# Log
 				address = serverHttp.address()
 				serverHostname = if address.address is '0.0.0.0' then 'localhost' else address.address
 				serverPort = address.port
 				serverLocation = "http://#{serverHostname}:#{serverPort}/"
-				serverDir = config.outPath
-				docpad.log 'info', util.format(locale.serverStarted, serverLocation, serverDir)
+				docpad.log 'info', util.format(locale.serverStarted, serverLocation, config.outPath)
 
 				# Done
 				return next()
diff --git a/src/test/actions.test.coffee b/src/test/actions.test.coffee
index 4601a411..0da4b6dc 100755
--- a/src/test/actions.test.coffee
+++ b/src/test/actions.test.coffee
@@ -132,7 +132,7 @@ joe.suite 'docpad-actions', (suite,test) ->
 				return done(err)  if err
 				balUtil.readFile "#{outExpectedPath}/html.html", (err,expected) ->
 					return done(err)  if err
-					expect(actual.toString()).to.be.equal(expected.toString())
+					expect(actual.toString().trim()).to.be.equal(expected.toString().trim())
 					done()
 
 		test 'served custom urls', (done) ->
@@ -140,21 +140,21 @@ joe.suite 'docpad-actions', (suite,test) ->
 				return done(err)  if err
 				balUtil.readFile "#{outExpectedPath}/custom-url.html", (err,expected) ->
 					return done(err)  if err
-					expect(actual.toString()).to.be.equal(expected.toString())
+					expect(actual.toString().trim()).to.be.equal(expected.toString().trim())
 					done()
 
 		test 'served dynamic documents - part 1/2', (done) ->
 			request "#{baseUrl}/dynamic.html?name=ben", (err,response,actual) ->
 				return done(err)  if err
 				expected = 'hi ben'
-				expect(actual.toString()).to.be.equal(expected)
+				expect(actual.toString().trim()).to.be.equal(expected)
 				done()
 
 		test 'served dynamic documents - part 2/2', (done) ->
 			request "#{baseUrl}/dynamic.html?name=joe", (err,response,actual) ->
 				return done(err)  if err
 				expected = 'hi joe'
-				expect(actual.toString()).to.be.equal(expected)
+				expect(actual.toString().trim()).to.be.equal(expected)
 				done()
 
 	test 'completed', (done) ->