Permalink
Browse files

v6.6.1. Fix.

Fixes newsletter crash when a config value isn't defined.
  • Loading branch information...
1 parent a2664a4 commit cee090d02618c42035af45dad50935abd60b29d8 @balupton balupton committed Aug 28, 2012
Showing with 12 additions and 12 deletions.
  1. +5 −5 History.md
  2. +2 −2 package.json
  3. +5 −5 src/lib/interfaces/console.coffee
View
@@ -1,6 +1,6 @@
## History
-- v6.6.0 August 28, 2012
+- v6.6.0-6.6.1 August 28, 2012
- Added `docpad-debug` executable for easier debugging
- Will now ask if you would like to subscribe to our newsletter when running on the development environment
- Beginnings of localisation
@@ -12,7 +12,7 @@
- v6.5.6 August 19, 2012
- Added `regenerateEvery` configuration option
-- v6.5.0-v6.5.5 August 10, 2012
+- v6.5.0-6.5.5 August 10, 2012
- IMPORTANT: Renamed `extensionRendered` to `outExtension`, `filenameRendered` to `outFilename`, and `contentTypeRendered` to `outContentType` and moved them from the Document model to the File model
- The `serverExtend` event will now also emit the `express` dependency if used
- No longer attempts to install plugins dependencies every time, this is outside the scope of DocPad and in the standard use cases already handled via npm
@@ -292,7 +292,7 @@
- Fixed some UTF8 encoded files from being detected as binary
- Fixed documents with no extension being outputted with an undefined extension
-- v5.1.0-v5.1.1 April 25, 2012
+- v5.1.0-5.1.1 April 25, 2012
- Fixed EventEmitter warning
- Binary files can now be placed within the `src/documents` directory
- Removed eyes devDependency
@@ -337,7 +337,7 @@
- Exchange data now moved to the [docpad-extras](https://github.com/bevry/docpad-extras) repository
- Fixed broken `balupton.docpad` skeleton repo url
-- v4.0.0-v4.0.3 April 6, 2012
+- v4.0.0-4.0.3 April 6, 2012
- Added support for partials, with the new [Partials Plugin](https://github.com/bevry/docpad/tree/master/lib/exchange/plugins/partials)
- Added support for caching remote assets, with the new [Cachr Plugin](https://github.com/bevry/docpad/tree/master/lib/exchange/plugins/cachr)
- Added support for caching and parsing remote feeds, with the new [Feedr Plugin](https://github.com/bevry/docpad/tree/master/lib/exchange/plugins/feedr)
@@ -410,7 +410,7 @@
- Closes
- [#143](https://github.com/bevry/docpad/issues/143) - No errors on wrong layout
-- v3.2.0-v3.2.7 February 15, 2012
+- v3.2.0-3.2.7 February 15, 2012
- Cleaned architecture
- Added unit tests (uses mocha)
- Better source code documentation
View
@@ -1,6 +1,6 @@
{
"name": "docpad",
- "version": "6.6.0",
+ "version": "6.6.1",
"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": [
@@ -50,7 +50,7 @@
"npm": ">=1.1.0"
},
"dependencies": {
- "bal-util": ">=1.13.3 <1.14",
+ "bal-util": ">=1.13.4 <1.14",
"express": "2.5.x",
"mime": "1.2.x",
"query-engine": ">=1.2.3 <1.3",
@@ -310,13 +310,13 @@ class ConsoleInterface
['config','--get','github.user']
]
balUtil.gitCommands commands, (err,results) ->
- # Check
- return next(err) if err
+ # Ignore error as it just means a config value wasn't defined
+ # return next(err) if err
# Fetch
- userConfig.name or= String(results[0][1]).trim() or null
- userConfig.email or= String(results[1][1]).trim() or null
- userConfig.username or= String(results[2][1]).trim() or null
+ userConfig.name or= String(results[0]?[1]).trim() or null
+ userConfig.email or= String(results[1]?[1]).trim() or null
+ userConfig.username or= String(results[2]?[1]).trim() or null
# Let the user know we scanned their configuration if we got anything useful
if userConfig.name or userConfig.email or userConfig.username

0 comments on commit cee090d

Please sign in to comment.