Merge branch 'edge'

Author: neogeek

CHANGELOG.md

@@ -1,5 +1,10 @@
 #Changelog
 
+##0.0.6 (August 17, 2014)
+
+- Added support for custom Handlebars templates.
+- Improved built-in template selection (now case insensitive).
+
 ##0.0.5 (August 17, 2014)
 
 - Added support for crawling directories.

README.md

@@ -14,7 +14,7 @@ $ npm install doxdox -g
 
 ##Usage
 
-```bash
+```
  Usage: doxdox <path> [options]
 
  Options:
@@ -24,7 +24,7 @@ $ npm install doxdox -g
   -t, --title       Sets title.
   -d, --description Sets description.
   -l, --layout      Template to render the documentation with.
-  -p, --package Sets location of package.json file.
+  -p, --package     Sets location of package.json file.
   -o, --output      File to save documentation to. Defaults to stdout.
 
  Available Layouts:

bin/doxdox

@@ -67,7 +67,7 @@ while (args.length) {
         process.stdout.write(chalk.yellow('  -t, --title') + '\t\tSets title.' + '\n');
         process.stdout.write(chalk.yellow('  -d, --description') + '\tSets description.' + '\n');
         process.stdout.write(chalk.yellow('  -l, --layout') + '\t\tTemplate to render the documentation with.' + '\n');
-        process.stdout.write(chalk.yellow('  -p, --package') + '\tSets location of package.json file.' + '\n');
+        process.stdout.write(chalk.yellow('  -p, --package') + '\t\tSets location of package.json file.' + '\n');
         process.stdout.write(chalk.yellow('  -o, --output') + '\t\tFile to save documentation to. Defaults to stdout.' + '\n');
         process.stdout.write('\n');
         process.stdout.write(' Available Layouts:' + '\n\n');

lib/doxdox.js

@@ -53,7 +53,8 @@ exports.parseInput = function (input, output, config) {
 exports.parseScripts = function (scripts, output, config) {
 
     var files = [],
-        content;
+        content,
+        template;
 
     scripts.forEach(function (script) {
 
@@ -70,9 +71,19 @@ exports.parseScripts = function (scripts, output, config) {
 
     });
 
-    if (templates[config.layout]) {
+    if (fs.existsSync(path.resolve(config.layout))) {
 
-        content = templates[config.layout]({
+        template = require(path.resolve(config.layout));
+
+    } else if (templates[config.layout.toLowerCase()]) {
+
+        template = templates[config.layout.toLowerCase()];
+
+    }
+
+    if (template) {
+
+        content = template({
             title: config.title,
             description: config.description,
             files: files

package.json

@@ -1,7 +1,7 @@
 {
     "name": "doxdox",
     "description": "HTML and Markdown documentation generator.",
-    "version": "0.0.5",
+    "version": "0.0.6",
     "bin": "./bin/doxdox",
     "license": "MIT",
     "dependencies": {

templates/bootstrap.hbs

@@ -16,10 +16,10 @@
 
 .back-to-top a {
     display: block;
-    padding: .5em .5em .5em 1.3em;
+    padding: .5em .5em .5em 1.5em;
     line-height: 1em;
     border-radius: .25em;
-    background: #fff url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxM3B4IiBoZWlnaHQ9IjE0cHgiIHZpZXdCb3g9IjAgMCAxMyAxNCI+CiAgICA8cGF0aCBkPSJNNy4xODc2MTE1NiwxMyBMNy4xODc2MTE1Niw1LjQ5MjQ5NzAzIEwxMC40NTg3ODUzLDUuNDkyNDk3MDMgTDUuMDk5MzE3NjMsMC4xMTM1NTgxMjkgTC0wLjI2MDE1LDUuNDkyNDk3MDMgTDMuMDExMDIzNzEsNS40OTI0OTcwMyBMMy4wMTEwMjM3MSwxMyBMNy4xODc2MTE1NiwxMyBaIiBmaWxsPSIjNDI4YmNhIj48L3BhdGg+Cjwvc3ZnPgo=) no-repeat .25em center;
+    background: #fff url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxM3B4IiBoZWlnaHQ9IjE0cHgiIHZpZXdCb3g9IjAgMCAxMyAxNCI+CiAgICA8cGF0aCBkPSJNNy4xODc2MTE1NiwxMyBMNy4xODc2MTE1Niw1LjQ5MjQ5NzAzIEwxMC40NTg3ODUzLDUuNDkyNDk3MDMgTDUuMDk5MzE3NjMsMC4xMTM1NTgxMjkgTC0wLjI2MDE1LDUuNDkyNDk3MDMgTDMuMDExMDIzNzEsNS40OTI0OTcwMyBMMy4wMTEwMjM3MSwxMyBMNy4xODc2MTE1NiwxMyBaIiBmaWxsPSIjNDI4YmNhIj48L3BhdGg+Cjwvc3ZnPgo=) no-repeat .5em center;
 }
 
 .menu {