Add -b/--basedir option

TimothyGu · TimothyGu · commit 19568b4cd23e · 2016-06-01T16:26:40.000-07:00
Based on a patch by Breeze.kay <wangwenpei@nextoa.com> in #18. Closes #16. Closes #18. Addresses pugjs/pug#2164.
diff --git a/HISTORY.md b/HISTORY.md
@@ -2,6 +2,12 @@
 As with most npm modules, this project adheres to
 [Semantic Versioning](http://semver.org/).
 
+## [1.0.0] - 2016-06-01
+
+### Added
+- `--basedir` option is added for easier specification of that Pug option.
+- Mark as stable.
+
 ## [1.0.0-alpha5] - 2016-05-18
 
 ### Changed
diff --git a/index.js b/index.js
@@ -31,8 +31,9 @@ program
   .option('-O, --obj <str|path>', 'JSON/JavaScript options object or file')
   .option('-o, --out <dir>', 'output the rendered HTML or compiled JavaScript to <dir>')
   .option('-p, --path <path>', 'filename used to resolve includes')
-  .option('-P, --pretty', 'compile pretty html output')
-  .option('-c, --client', 'compile function for client-side runtime.js')
+  .option('-b, --basedir <path>', 'path used as root directory to resolve absolute includes')
+  .option('-P, --pretty', 'compile pretty HTML output')
+  .option('-c, --client', 'compile function for client-side')
   .option('-n, --name <str>', 'the name of the compiled template (requires --client)')
   .option('-D, --no-debug', 'compile without debugging (smaller functions)')
   .option('-w, --watch', 'watch files for changes and automatically re-render')
@@ -107,6 +108,7 @@ function parseObj (input) {
   ['debug', 'compileDebug'], // --no-debug
   ['client', 'client'],      // --client
   ['pretty', 'pretty'],      // --pretty
+  ['basedir', 'basedir'],    // --basedir
   ['doctype', 'doctype'],    // --doctype
 ].forEach(function (o) {
   options[o[1]] = program[o[0]] !== undefined ? program[o[0]] : options[o[1]];
diff --git a/test/dependencies/dependency1.pug b/test/dependencies/dependency1.pug
@@ -0,0 +1,3 @@
+html
+  body
+    block container
diff --git a/test/index.js b/test/index.js
@@ -161,6 +161,16 @@ describe('HTML output', function () {
       done();
     });
   });
+  it('--basedir', function (done) {
+    w('input.pug', 'extends /dependency1.pug');
+    w('input.html', '<p>output not written</p>');
+    run(['--no-debug', '-b', j([__dirname, 'dependencies']), 'input.pug'], function (err, stdout) {
+      if (err) return done(err);
+      var html = r('input.html');
+      assert.equal(html, '<html><body></body></html>');
+      done();
+    });
+  });
   context('--obj', function () {
     it('JavaScript syntax works', function (done) {
       w('input.pug', '.foo= loc');

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+html`
	`2`	`+ body`
	`3`	`+ block container`