From 210a2e4163accab2f39c454f301a8255f4cf9ee2 Mon Sep 17 00:00:00 2001 From: Benjamin Lupton Date: Mon, 6 May 2013 21:33:18 +1000 Subject: [PATCH] v6.33.0. Improvement. - v6.33.0 May 6, 2013 - We now load the exchange file based on which DocPad version we are running - Updated dependencies - [Caterpillar Human](https://github.com/bevry/caterpillar-human) v3.1 from v3.0 --- History.md | 5 +++++ package.json | 4 ++-- src/lib/docpad.coffee | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/History.md b/History.md index 63fb6229..ce5d9c25 100755 --- a/History.md +++ b/History.md @@ -1,5 +1,10 @@ ## History +- v6.33.0 May 6, 2013 + - We now load the exchange file based on which DocPad version we are running + - Updated dependencies + - [Caterpillar Human](https://github.com/bevry/caterpillar-human) v3.1 from v3.0 + - v6.32.0 May 2, 2013 - Now uses [Caterpillar](https://github.com/bevry/caterpillar) v2 - We now write a `docpad-debug.log` file when running with the `-d` flag, submit this when you file a bug report :) diff --git a/package.json b/package.json index 18a3ed62..daac34fb 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "docpad", - "version": "6.32.0", + "version": "6.33.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", @@ -75,7 +75,7 @@ "taskgroup": "~3.1.2", "caterpillar": "~2.0.1", "caterpillar-filter": "~2.0.1", - "caterpillar-human": "~2.0.2", + "caterpillar-human": "~2.1.0", "commander": "~1.1.1", "cson": "~1.4.1", "express": "~3.2.0", diff --git a/src/lib/docpad.coffee b/src/lib/docpad.coffee index 26db082e..4d11349d 100755 --- a/src/lib/docpad.coffee +++ b/src/lib/docpad.coffee @@ -2358,7 +2358,8 @@ class DocPad extends EventEmitterEnhanced return next(null,@exchange) unless typeChecker.isEmptyObject(@exchange) # Otherwise fetch it from the exchangeUrl - @loadConfigUrl @config.exchangeUrl, (err,parsedData) -> + exchangeUrl = @config.exchangeUrl+'?version='+@version + @loadConfigUrl exchangeUrl, (err,parsedData) -> return next(err) if err @exchange = parsedData return next(null,parsedData)