Merge pull request #14 from pugjs/pug

Rename project to pug

Author: TimothyGu

HISTORY.md

@@ -15,12 +15,12 @@ As with most npm modules, this project adheres to
 
 ## [0.1.0] - 2015-07-24
 ### Added
-- Silent mode (`-s`, `--silent`) which disables printing unimportant messages (#3, jadejs/jade#1905).
+- Silent mode (`-s`, `--silent`) which disables printing unimportant messages (#3, pugjs/jade#1905).
 
 ### Changed
 - Hierarchy mode (`-H`, `--hierarchy`) is made the default.
 - Both versions of Jade and the CLI are printed with `-V` or `--version`.
-- Unescaped Unicode line and paragraph separators (`U+2028` and `U+2029`) is now allowed in the `-O` option only when the input is considered to be JSON (#5, jadejs/jade#1949).
+- Unescaped Unicode line and paragraph separators (`U+2028` and `U+2029`) is now allowed in the `-O` option only when the input is considered to be JSON (#5, pugjs/jade#1949).
 - Non-JSON object files are allowed for the `-O` option as long as it can be parsed with the `eval()` function.
 
 ### Deprecated
@@ -30,12 +30,12 @@ As with most npm modules, this project adheres to
 ### Fixed
 - Capitalization in help message is kept consistent.
 - Fix grammar error in the help message (by @didoarellano).
-- Fix watch mode in more than one level of dependency hierarchy (jadejs/jade#1888).
+- Fix watch mode in more than one level of dependency hierarchy (pugjs/jade#1888).
 
 ## 0.0.1 - 2015-06-02
 ### Added
 - Initial release.
 
-[unreleased]: https://github.com/jadejs/jade-cli/compare/0.1.1...master
-[0.1.1]: https://github.com/jadejs/jade-cli/compare/0.1.0...0.1.1
-[0.1.0]: https://github.com/jadejs/jade-cli/compare/0.0.1...0.1.0
+[unreleased]: https://github.com/pugjs/pug-cli/compare/0.1.1...master
+[0.1.1]: https://github.com/pugjs/pug-cli/compare/0.1.0...0.1.1
+[0.1.0]: https://github.com/pugjs/pug-cli/compare/0.0.1...0.1.0

README.md

@@ -1,15 +1,15 @@
-# jade-cli
+# pug-cli
 
-Jade's CLI interface
+Pug's CLI interface
 
-[![Build Status](https://img.shields.io/travis/jadejs/jade-cli/master.svg)](https://travis-ci.org/jadejs/jade-cli)
-[![Dependency Status](https://img.shields.io/gemnasium/jadejs/jade-cli.svg)](https://gemnasium.com/jadejs/jade-cli)
-[![NPM version](https://img.shields.io/npm/v/jade-cli.svg)](https://www.npmjs.org/package/jade-cli)
+[![Build Status](https://img.shields.io/travis/pugjs/pug-cli/master.svg)](https://travis-ci.org/pugjs/pug-cli)
+[![Dependency Status](https://img.shields.io/david/pugjs/pug-cli.svg)](https://david-dm.org/pugjs/pug-cli)
+[![NPM version](https://img.shields.io/npm/v/pug-cli.svg)](https://www.npmjs.org/package/pug-cli)
 
 ## Usage
 
 ```
-$ jade [options] [dir|file ...]
+$ pug [options] [dir|file ...]
 ```
 
 Render `<file>`s and all files in `<dir>`s. If no files are specified,
@@ -42,31 +42,31 @@ input is taken from standard input and output to standard output.
 Render all files in the `templates` directory:
 
 ```
-$ jade templates
+$ pug templates
 ```
 
 Create `{foo,bar}.html`:
 
 ```
-$ jade {foo,bar}.jade
+$ pug {foo,bar}.pug
 ```
 
-Using `jade` over standard input and output streams:
+Using `pug` over standard input and output streams:
 
 ```
-$ jade < my.jade > my.html
-$ echo "h1 Jade!" | jade
+$ pug < my.pug > my.html
+$ echo "h1 Pug!" | pug
 ```
 
 Render all files in `foo` and `bar` directories to `/tmp`:
 
 ```
-$ jade foo bar --out /tmp
+$ pug foo bar --out /tmp
 ```
 
 ## Installation
 
-    npm install jade-cli -g
+    npm install pug-cli -g
 
 ## License
 

index.js

@@ -7,7 +7,7 @@ var path = require('path');
 var program = require('commander');
 var mkdirp = require('mkdirp');
 var chalk = require('chalk');
-var jade = require('jade');
+var pug = require('jade');
 var escapeRegex = require('escape-string-regexp');
 
 var basename = path.basename;
@@ -17,16 +17,16 @@ var normalize = path.normalize;
 var join = path.join;
 var relative = path.relative;
 
-// jade options
+// Pug options
 
 var options = {};
 
 // options
 
 program
   .version(
-    'jade version: '     + require('jade/package.json').version + '\n' +
-    'jade-cli version: ' + require(   './package.json').version
+    'pug version: '     + require('jade/package.json').version + '\n' +
+    'pug-cli version: ' + require(  './package.json').version
   )
   .usage('[options] [dir|file ...]')
   .option('-O, --obj <str|path>', 'JSON/JavaScript options object or file')
@@ -47,17 +47,17 @@ program.on('--help', function(){
   console.log('  Examples:');
   console.log('');
   console.log('    # Render all files in the `templates` directory:');
-  console.log('    $ jade templates');
+  console.log('    $ pug templates');
   console.log('');
   console.log('    # Create {foo,bar}.html:');
-  console.log('    $ jade {foo,bar}.jade');
+  console.log('    $ pug {foo,bar}.pug');
   console.log('');
-  console.log('    # Using `jade` over standard input and output streams');
-  console.log('    $ jade < my.jade > my.html');
-  console.log('    $ echo \'h1 Jade!\' | jade');
+  console.log('    # Using `pug` over standard input and output streams');
+  console.log('    $ pug < my.pug > my.html');
+  console.log('    $ echo \'h1 Pug!\' | pug');
   console.log('');
   console.log('    # Render all files in `foo` and `bar` directories to `/tmp`:');
-  console.log('    $ jade foo bar --out /tmp');
+  console.log('    $ pug foo bar --out /tmp');
   console.log('');
 });
 
@@ -221,36 +221,36 @@ function stdin() {
   process.stdin.on('end', function(){
     var output;
     if (options.client) {
-      output = jade.compileClient(buf, options);
+      output = pug.compileClient(buf, options);
     } else {
-      var fn = jade.compile(buf, options);
+      var fn = pug.compile(buf, options);
       var output = fn(options);
     }
     process.stdout.write(output);
   }).resume();
 }
 
 /**
- * Process the given path, compiling the jade files found.
+ * Process the given path, compiling the pug files found.
  * Always walk the subdirectories.
  *
  * @param path      path of the file, might be relative
  * @param rootPath  path relative to the directory specified in the command
  */
 
 function renderFile(path, rootPath) {
-  var re = /\.jade$/;
+  var re = /\.pug$/;
   var stat = fs.lstatSync(path);
-  // Found jade file/\.jade$/
+  // Found pug file/\.pug$/
   if (stat.isFile() && re.test(path)) {
     // Try to watch the file if needed. watchFile takes care of duplicates.
     if (options.watch) watchFile(path, null, rootPath);
     if (program.nameAfterFile) {
       options.name = getNameFromFileName(path);
     }
     var fn = options.client
-           ? jade.compileFileClient(path, options)
-           : jade.compileFile(path, options);
+           ? pug.compileFileClient(path, options)
+           : pug.compileFile(path, options);
     if (options.watch && fn.dependencies) {
       // watch dependencies, and recompile the base
       fn.dependencies.forEach(function (dep) {
@@ -264,7 +264,7 @@ function renderFile(path, rootPath) {
     else if (options.client) extname = '.js';
     else                     extname = '.html';
 
-    // path: foo.jade -> foo.<ext>
+    // path: foo.pug -> foo.<ext>
     path = path.replace(re, extname);
     if (program.out) {
       // prepend output directory
@@ -300,7 +300,7 @@ function renderFile(path, rootPath) {
  * @returns {String}
  */
 function getNameFromFileName(filename) {
-  var file = basename(filename, '.jade');
+  var file = basename(filename, '.pug');
   return file.toLowerCase().replace(/[^a-z0-9]+([a-z])/g, function (_, character) {
     return character.toUpperCase();
   }) + 'Template';

package.json

@@ -1,9 +1,9 @@
 {
-  "name": "jade-cli",
+  "name": "pug-cli",
   "version": "0.1.1",
-  "description": "Jade's CLI interface",
+  "description": "Pug's CLI interface",
   "bin": {
-    "jade": "./index.js"
+    "pug": "./index.js"
   },
   "preferGlobal": true,
   "keywords": [],
@@ -27,7 +27,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/jadejs/jade-cli.git"
+    "url": "https://github.com/pugjs/pug-cli.git"
   },
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "maintainers": [

test/dependencies/dependency2.jade

@@ -0,0 +1 @@
+include dependency3.pug

test/dependencies/dependency2.pug

@@ -0,0 +1 @@
+include dependency2.pug