Merge pull request #100 from Mogztter/issue-98-template-dir

resolves #98 add --template-dir option

Author: ggrossetie

lib/options.js

@@ -13,6 +13,7 @@ const convertOptions = (args, attrs) => {
   const baseDir = args['base-dir']
   const destinationDir = args['destination-dir']
   const outFile = args['out-file']
+  const templateDir = args['template-dir']
   const templateEngine = args['template-engine']
   const quiet = args.quiet
   const verbose = args.verbose
@@ -38,6 +39,7 @@ const convertOptions = (args, attrs) => {
     console.log('trace ' + trace)
     console.log('base-dir ' + baseDir)
     console.log('destination-dir ' + destinationDir)
+    console.log('template-dir ' + templateDir)
     console.log('template-engine ' + templateEngine)
   }
   const verboseMode = quiet ? 0 : verbose ? 2 : 1
@@ -70,7 +72,12 @@ const convertOptions = (args, attrs) => {
   if (destinationDir != null) {
     options.to_dir = destinationDir
   }
-  options.template_engine = templateEngine
+  if (templateDir) {
+    options.template_dirs = templateDir
+  }
+  if (templateEngine) {
+    options.template_engine = templateEngine
+  }
   if (typeof outFile !== 'undefined') {
     if (outFile === '') {
       options.to_file = '-'
@@ -188,6 +195,12 @@ class Options {
         describe: 'enable timings mode',
         type: 'boolean'
       })
+      .option('template-dir', {
+        alias: 'T',
+        array: true,
+        describe: 'a directory containing custom converter templates that override the built-in converter (may be specified multiple times)',
+        type: 'string'
+      })
       .option('template-engine', {
         alias: 'E',
         describe: 'template engine to use for the custom converter templates',
@@ -217,6 +230,7 @@ show this usage if TOPIC is not specified or recognized
 show an overview of the AsciiDoc syntax if TOPIC is syntax`,
         type: 'string'
       })
+      .nargs('template-dir', 1)
       .nargs('attribute', 1)
       .nargs('require', 1)
       .usage(`$0 [options...] files...

test/test.js

@@ -306,6 +306,31 @@ describe('Require option', () => {
   })
 })
 
+describe('Template directory', () => {
+  it('should parse a command with a single template directory', () => {
+    const result = argsParser.parse('--template-dir /path/to/templates file.adoc')
+    expect(result.files).to.have.length(1)
+    expect(result.files).to.include('file.adoc')
+    expect(result['template-dir']).to.have.length(1)
+    expect(result['template-dir']).to.include('/path/to/templates')
+  })
+
+  it('should parse a command with a multiple template directories', () => {
+    const result = argsParser.parse('--template-dir=/path/to/templates -T /path/to/others file.adoc')
+    expect(result.files).to.have.length(1)
+    expect(result.files).to.include('file.adoc')
+    expect(result['template-dir']).to.have.length(2)
+    expect(result['template-dir']).to.include('/path/to/templates')
+    expect(result['template-dir']).to.include('/path/to/others')
+  })
+  it('should set template_dirs option when --template-dir is defined', () => {
+    const opts = new Options({}).parse('node asciidoctor --template-dir /path/to/templates -b html5 file.adoc')
+    expect(opts.options.backend).to.equal('html5')
+    expect(opts.options.template_dirs).to.have.length(1)
+    expect(opts.options.template_dirs).to.include('/path/to/templates')
+  })
+})
+
 describe('Template engine', () => {
   it('should parse a command with the --template-engine argument', () => {
     const result = argsParser.parse('--template-engine=nunjucks -a foo=bar file.adoc')