Permalink
Browse files

v6.63.1. Bugfix. Improvement.

- v6.63.1 January 30, 2014
	- Fixed gobbling of error messages during `contextualizeFiles`, `renderFiles` or `writeFiles` (regression since v6.59.2)
		- Thanks to [Rob Loach](https://github.com/RobLoach), [Nathan Rijksen](https://github.com/Naatan) for [issue #784](#784)
	- All task groups and tasks we define are now named (makes for easier debugging)
	- Updated dependencies
  • Loading branch information...
1 parent 09a20a6 commit b627cd417fe1c3460cbc57b899761512c0347c8d @balupton balupton committed Jan 30, 2014
Showing with 183 additions and 177 deletions.
  1. +12 −4 Cakefile
  2. +6 −0 HISTORY.md
  3. +2 −0 README.md
  4. +9 −8 package.json
  5. +144 −158 src/lib/docpad.coffee
  6. +2 −2 src/lib/models/document.coffee
  7. +4 −3 src/lib/models/file.coffee
  8. +3 −1 src/lib/plugin.coffee
  9. +1 −1 test/docpad.coffee
View
@@ -1,4 +1,4 @@
-# v1.3.11 December 11, 2013
+# v1.3.13 December 19, 2013
# https://github.com/bevry/base
@@ -51,7 +51,9 @@ for own key,value of config
# Generic
{spawn, exec} = require('child_process')
+
safe = (next,fn) ->
+ next ?= (err) -> console.log(err.stack ? err)
fn ?= next # support only one argument
return (err) ->
# success status code
@@ -80,7 +82,11 @@ actions =
clean: (opts,next) ->
# Prepare
(next = opts; opts = {}) unless next?
- args = ['-Rf', config.COFFEE_COFFEE_OUT_PATH]
+
+ # Add compilation paths
+ args = ['-Rf', config.COFFEE_OUT_PATH, config.DOCPAD_OUT_PATH, config.DOCCO_OUT_PATH]
+
+ # Add common ignore paths
for path in [APP_PATH, config.TEST_PATH]
args.push(
pathUtil.join(path, 'build')
@@ -148,11 +154,13 @@ actions =
step2 = ->
return step3() if !config.COFFEE_SRC_PATH or !fsUtil.existsSync(COFFEE)
console.log('coffee watch')
- spawn(COFFEE, ['-wco', config.COFFEE_OUT_PATH, config.COFFEE_SRC_PATH], {stdio:'inherit', cwd:APP_PATH}).on('close', safe next, step3)
+ spawn(COFFEE, ['-wco', config.COFFEE_OUT_PATH, config.COFFEE_SRC_PATH], {stdio:'inherit', cwd:APP_PATH}).on('close', safe) # background
+ step3() # continue while coffee runs in background
step3 = ->
return step4() if !config.DOCPAD_SRC_PATH or !fsUtil.existsSync(DOCPAD)
console.log('docpad run')
- spawn(DOCPAD, ['run'], {stdio:'inherit', cwd:APP_PATH}).on('close', safe next, step4)
+ spawn(DOCPAD, ['run'], {stdio:'inherit', cwd:APP_PATH}).on('close', safe) # background
+ step4() # continue while docpad runs in background
step4 = next
# Start
View
@@ -1,5 +1,11 @@
# History
+- v6.63.1 January 30, 2014
+ - Fixed gobbling of error messages during `contextualizeFiles`, `renderFiles` or `writeFiles` (regression since v6.59.2)
+ - Thanks to [Rob Loach](https://github.com/RobLoach), [Nathan Rijksen](https://github.com/Naatan) for [issue #784](https://github.com/bevry/docpad/issues/784)
+ - All task groups and tasks we define are now named (makes for easier debugging)
+ - Updated dependencies
+
- v6.63.0 January 28, 2014
- Disabled database writing by default (set `databaseCache` to `false` instead of `'write"` by default)
- We never used it, still many naunces with reading to figure out, so it doesn't make sense incurring the performance penalty of the write while there is no use for it
View
@@ -16,6 +16,7 @@
[![Gittip donate button](http://img.shields.io/gittip/docpad.png)](https://www.gittip.com/docpad/ "Donate weekly to this project using Gittip")
[![Flattr donate button](http://img.shields.io/flattr/donate.png?color=yellow)](http://flattr.com/thing/344188/balupton-on-Flattr "Donate monthly to this project using Flattr")
[![PayPayl donate button](http://img.shields.io/paypal/donate.png?color=yellow)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QB8GQPZAH84N6 "Donate once-off to this project using Paypal")
+[![BitCoin donate button](http://img.shields.io/bitcoin/donate.png?color=yellow)](https://coinbase.com/checkouts/9ef59f5479eec1d97d63382c9ebcb93a "Donate once-off to this project using BitCoin")
<!-- /BADGES -->
@@ -139,6 +140,7 @@ Become a sponsor!
[![Gittip donate button](http://img.shields.io/gittip/docpad.png)](https://www.gittip.com/docpad/ "Donate weekly to this project using Gittip")
[![Flattr donate button](http://img.shields.io/flattr/donate.png?color=yellow)](http://flattr.com/thing/344188/balupton-on-Flattr "Donate monthly to this project using Flattr")
[![PayPayl donate button](http://img.shields.io/paypal/donate.png?color=yellow)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QB8GQPZAH84N6 "Donate once-off to this project using Paypal")
+[![BitCoin donate button](http://img.shields.io/bitcoin/donate.png?color=yellow)](https://coinbase.com/checkouts/9ef59f5479eec1d97d63382c9ebcb93a "Donate once-off to this project using BitCoin")
### Contributors
View
@@ -1,7 +1,7 @@
{
"title": "DocPad. Streamlined web development.",
"name": "docpad",
- "version": "6.63.0",
+ "version": "6.63.1",
"description": "DocPad is a next generation web architecture that lets you create fast static websites with dynamic abilities and powerful abstractions. Write your website as files on your computer, entries in a database, or even RSS feeds and DocPad will import it, generate & render it, then output a static website for deployment anywhere or a dynamic node website for advanced server-side functionality. Use it as a module or standalone. It's purely awesome. Check it out.",
"homepage": "http://docpad.org",
"installUrl": "http://docpad.org/install",
@@ -17,7 +17,8 @@
"daviddev": true,
"gittip": "docpad",
"flattr": "344188/balupton-on-Flattr",
- "paypal": "QB8GQPZAH84N6"
+ "paypal": "QB8GQPZAH84N6",
+ "bitcoin": "https://coinbase.com/checkouts/9ef59f5479eec1d97d63382c9ebcb93a"
},
"keywords": [
"document management system",
@@ -118,7 +119,7 @@
"cson": "~1.4.5",
"eachr": "~2.0.2",
"envfile": "~1.0.0",
- "event-emitter-grouped": "~2.3.1",
+ "event-emitter-grouped": "~2.3.3",
"express": "~3.4.4",
"extendr": "~2.1.0",
"extract-opts": "~2.2.0",
@@ -135,20 +136,20 @@
"safeps": "~2.2.10",
"semver": "~2.2.1",
"superagent": "~0.16.0",
- "taskgroup": "~3.3.6",
+ "taskgroup": "~3.3.7n",
"typechecker": "~2.0.8",
- "watchr": "~2.4.7",
+ "watchr": "~2.4.9",
"yamljs": "~0.1.4",
"promptly": "~0.2.0",
"istextorbinary": "~1.0.0",
"extendonclass": "~1.0.0"
},
"devDependencies": {
- "coffee-script": "~1.6.2",
- "chai": "~1.8.1",
+ "coffee-script": "~1.6.3",
+ "chai": "~1.9.0",
"joe": "~1.3.2",
"joe-reporter-console": "~1.2.1",
- "projectz": "~0.3.0"
+ "projectz": "~0.3.9"
},
"directories": {
"lib": "./out/lib"
Oops, something went wrong.

0 comments on commit b627cd4

Please sign in to comment.