Updates shell.js to v0.1.2

external/shelljs/ChangeLog

@@ -1,22 +0,0 @@
-2012.03.22, Version 0.0.4
-
-* ls() and find() return arrays instead of hashes (Artur Adib)
-* exec({silent:...}) overrides global silent() state (Artur Adib)
-
-
-2012.03.21, Version 0.0.3
-
-* Wildcard bug fix (Artur Adib)
-* execSync() now uses dummy file I/O op to reduce CPU usage (Artur Adib)
-* Minor fixes
-
-
-2012.03.15, Version 0.0.2
-
-* New methods: find(), test() (Artur Adib)
-* Deprecated non-Unix methods: exists(), verbose()
-
-
-2012.03.03, Version 0.0.2pre1
-
-* First public release

external/shelljs/README.md

@@ -1,18 +1,47 @@
 # ShellJS - Unix shell commands for Node.js [![Build Status](https://secure.travis-ci.org/arturadib/shelljs.png)](http://travis-ci.org/arturadib/shelljs)
 
-+ _This project is young and experimental. Use at your own risk._
+ShellJS is a portable **(Windows/Linux/OS X)** implementation of Unix shell commands on top of the Node.js API. You can use it to eliminate your shell script's dependency on Unix while still keeping its familiar and powerful commands. You can also install it globally so you can run it from outside Node projects - say goodbye to those gnarly Bash scripts!
-+ _Major API change as of v0.0.4: `ls()` and `find()` now return arrays._
 
-ShellJS is a **portable** (Windows included) implementation of Unix shell commands on top of the Node.js API. You can use it to eliminate your shell script's dependency on Unix while still keeping its familiar and powerful commands.
+The project is [unit-tested](http://travis-ci.org/arturadib/shelljs) and battled-tested in projects like:
 
-The project is [unit-tested](http://travis-ci.org/arturadib/shelljs) and is being used at Mozilla's [pdf.js](http://github.com/mozilla/pdf.js).
++ [PDF.js](http://github.com/mozilla/pdf.js) - Firefox's next-gen PDF reader
++ [Firebug](http://getfirebug.com/) - Firefox's infamous debugger
++ [JSHint](http://jshint.com) - Most popular JavaScript linter
++ [Yeoman](http://yeoman.io/) - Web application stack and development tool
++ [Deployd.com](http://deployd.com) - Open source PaaS for quick API backend generation
+
+and [many more](https://npmjs.org/browse/depended/shelljs).
+
+## Installing
+
+Via npm:
+
+```bash
+$ npm install [-g] shelljs
+```
+
+If the global option `-g` is specified, the binary `shjs` will be installed. This makes it possible to
+run ShellJS scripts much like any shell script from the command line, i.e. without requiring a `node_modules` folder:
+
+```bash
+$ shjs my_script
+```
+
+You can also just copy `shell.js` into your project's directory, and `require()` accordingly.
 
 
-### Example
+## Examples
+
+### JavaScript
 
 ```javascript
 require('shelljs/global');
 
+if (!which('git')) {
+  echo('Sorry, this script requires git');
+  exit(1);
+}
+
 // Copy files to release dir
 mkdir('-p', 'out/Release');
 cp('-R', 'stuff/*', 'out/Release');
@@ -33,7 +62,34 @@ if (exec('git commit -am "Auto-commit"').code !== 0) {
 }
 ```
 
-### Global vs. Local
+### CoffeeScript
+
+```coffeescript
+require 'shelljs/global'
+
+if not which 'git'
+  echo 'Sorry, this script requires git'
+  exit 1
+
+# Copy files to release dir
+mkdir '-p', 'out/Release'
+cp '-R', 'stuff/*', 'out/Release'
+
+# Replace macros in each .js file
+cd 'lib'
+for file in ls '*.js'
+  sed '-i', 'BUILD_VERSION', 'v0.1.2', file
+  sed '-i', /.*REMOVE_THIS_LINE.*\n/, '', file
+  sed '-i', /.*REPLACE_LINE_WITH_MACRO.*\n/, cat 'macro.js', file
+cd '..'
+
+# Run external tool synchronously
+if (exec 'git commit -am "Auto-commit"').code != 0
+  echo 'Error: Git commit failed'
+  exit 1
+```
+
+## Global vs. Local
 
 The example above uses the convenience script `shelljs/global` to reduce verbosity. If polluting your global namespace is not desirable, simply require `shelljs`.
 
@@ -44,55 +100,37 @@ var shell = require('shelljs');
 shell.echo('hello world');
 ```
 
-### Make tool
+## Make tool
 
 A convenience script `shelljs/make` is also provided to mimic the behavior of a Unix Makefile. In this case all shell objects are global, and command line arguments will cause the script to execute only the corresponding function in the global `target` object. To avoid redundant calls, target functions are executed only once per script.
 
-Example:
+Example (CoffeeScript):
 
-```javascript
+```coffeescript
-//
+require 'shelljs/make'
-// Example file: make.js
-//
-require('shelljs/make');
 
-target.all = function() {
+target.all = ->
-  target.bundle();
+  target.bundle()
-  target.docs();
+  target.docs()
-}
 
-// Bundle JS files
+target.bundle = ->
-target.bundle = function() {
+  cd __dirname
-  cd(__dirname);
+  mkdir 'build'
-  mkdir('build');
+  cd 'lib'
-  cd('lib');
+  (cat '*.js').to '../build/output.js'
-  cat('*.js').to('../build/output.js');
-}
 
-// Generate docs
+target.docs = ->
-target.docs = function() {
+  cd __dirname
-  cd(__dirname);
+  mkdir 'docs'
-  mkdir('docs');
+  cd 'lib'
-  cd('lib');
+  for file in ls '*.js'
-  ls('*.js').forEach(function(file){
+    text = grep '//@', file     # extract special comments
-    var text = grep('//@', file); // extract special comments
+    text.replace '//@', ''      # remove comment tags
-    text.replace('//@', ''); // remove comment tags
+    text.to 'docs/my_docs.md'
-    text.to('docs/my_docs.md');
-  });
-}
 ```
 
 To run the target `all`, call the above script without arguments: `$ node make`. To run the target `docs`: `$ node make docs`, and so on.
 
-### Installing
-
-Via npm:
-
-```bash
-$ npm install shelljs
-```
-
-Or simply copy `shell.js` into your project's directory, and `require()` accordingly.
 
 
 <!-- 
@@ -102,24 +140,24 @@ Or simply copy `shell.js` into your project's directory, and `require()` accordi
 -->
 
 
-# Command reference
+## Command reference
 
 
 All commands run synchronously, unless otherwise stated.
 
 
-#### cd('dir')
+### cd('dir')
 Changes to directory `dir` for the duration of the script
 
-#### pwd()
+### pwd()
 Returns the current directory.
 
-#### ls([options ,] path [,path ...])
+### ls([options ,] path [,path ...])
-#### ls([options ,] path_array)
+### ls([options ,] path_array)
 Available options:
 
 + `-R`: recursive
-+ `-a`: all files (include files beginning with `.`)
++ `-A`: all files (include files beginning with `.`, except for `.` and `..`)
 
 Examples:
 
@@ -131,8 +169,8 @@ ls('-R', ['/users/me', '/tmp']); // same as above
 
 Returns array of files in the given path, or in current directory if no path provided.
 
-#### find(path [,path ...])
+### find(path [,path ...])
-#### find(path_array)
+### find(path_array)
 Examples:
 
 ```javascript
@@ -146,8 +184,8 @@ Returns array of all files (however deep) in the given paths.
 The main difference from `ls('-R', path)` is that the resulting file names
 include the base directories, e.g. `lib/resources/file1` instead of just `file1`.
 
-#### cp('[options ,] source [,source ...], dest')
+### cp([options ,] source [,source ...], dest)
-#### cp('[options ,] source_array, dest')
+### cp([options ,] source_array, dest)
 Available options:
 
 + `-f`: force
@@ -163,8 +201,8 @@ cp('-Rf', ['/tmp/*', '/usr/local/*'], '/home/tmp'); // same as above
 
 Copies files. The wildcard `*` is accepted.
 
-#### rm([options ,] file [, file ...])
+### rm([options ,] file [, file ...])
-#### rm([options ,] file_array)
+### rm([options ,] file_array)
 Available options:
 
 + `-f`: force
@@ -180,8 +218,8 @@ rm(['some_file.txt', 'another_file.txt']); // same as above
 
 Removes files. The wildcard `*` is accepted.
 
-#### mv(source [, source ...], dest')
+### mv(source [, source ...], dest')
-#### mv(source_array, dest')
+### mv(source_array, dest')
 Available options:
 
 + `f`: force
@@ -196,8 +234,8 @@ mv(['file1', 'file2'], 'dir/'); // same as above
 
 Moves files. The wildcard `*` is accepted.
 
-#### mkdir([options ,] dir [, dir ...])
+### mkdir([options ,] dir [, dir ...])
-#### mkdir([options ,] dir_array)
+### mkdir([options ,] dir_array)
 Available options:
 
 + `p`: full path (will create intermediate dirs if necessary)
@@ -211,11 +249,17 @@ mkdir('-p', ['/tmp/a/b/c/d', '/tmp/e/f/g']); // same as above
 
 Creates directories.
 
-#### test(expression)
+### test(expression)
 Available expression primaries:
 
++ `'-b', 'path'`: true if path is a block device
++ `'-c', 'path'`: true if path is a character device
 + `'-d', 'path'`: true if path is a directory
++ `'-e', 'path'`: true if path exists
 + `'-f', 'path'`: true if path is a regular file
++ `'-L', 'path'`: true if path is a symboilc link
++ `'-p', 'path'`: true if path is a pipe (FIFO)
++ `'-S', 'path'`: true if path is a socket
 
 Examples:
 
@@ -226,8 +270,8 @@ if (!test('-f', path)) continue; // skip if it's a regular file
 
 Evaluates expression using the available primaries and returns corresponding value.
 
-#### cat(file [, file ...])
+### cat(file [, file ...])
-#### cat(file_array)
+### cat(file_array)
 
 Examples:
 
@@ -241,7 +285,7 @@ Returns a string containing the given file, or a concatenated string
 containing the files if more than one file is given (a new line character is
 introduced between each file). Wildcard `*` accepted.
 
-#### 'string'.to(file)
+### 'string'.to(file)
 
 Examples:
 
@@ -252,7 +296,7 @@ cat('input.txt').to('output.txt');
 Analogous to the redirection operator `>` in Unix, but works with JavaScript strings (such as
 those returned by `cat`, `grep`, etc). _Like Unix redirections, `to()` will overwrite any existing file!_
 
-#### sed([options ,] search_regex, replace_str, file)
+### sed([options ,] search_regex, replace_str, file)
 Available options:
 
 + `-i`: Replace contents of 'file' in-place. _Note that no backups will be created!_
@@ -267,19 +311,23 @@ sed(/.*DELETE_THIS_LINE.*\n/, '', 'source.js');
 Reads an input string from `file` and performs a JavaScript `replace()` on the input
 using the given search regex and replacement string. Returns the new string after replacement.
 
-#### grep(regex_filter, file [, file ...])
+### grep([options ,] regex_filter, file [, file ...])
-#### grep(regex_filter, file_array)
+### grep([options ,] regex_filter, file_array)
+Available options:
+
++ `-v`: Inverse the sense of the regex and print the lines not matching the criteria.
 
 Examples:
 
 ```javascript
+grep('-v', 'GLOBAL_VARIABLE', '*.js');
 grep('GLOBAL_VARIABLE', '*.js');
 ```
 
 Reads input string from given files and returns a string containing all lines of the
 file that match the given `regex_filter`. Wildcard `*` accepted.
 
-#### which(command)
+### which(command)
 
 Examples:
 
@@ -290,7 +338,7 @@ var nodeExec = which('node');
 Searches for `command` in the system's PATH. On Windows looks for `.exe`, `.cmd`, and `.bat` extensions.
 Returns string containing the absolute path to the command.
 
-#### echo(string [,string ...])
+### echo(string [,string ...])
 
 Examples:
 
@@ -302,69 +350,163 @@ var str = echo('hello world');
 Prints string to stdout, and returns string with additional utility methods
 like `.to()`.
 
-#### exit(code)
+### dirs([options | '+N' | '-N'])
+
+Available options:
+
++ `-c`: Clears the directory stack by deleting all of the elements.
+
+Arguments:
+
++ `+N`: Displays the Nth directory (counting from the left of the list printed by dirs when invoked without options), starting with zero.
++ `-N`: Displays the Nth directory (counting from the right of the list printed by dirs when invoked without options), starting with zero.
+
+Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
+
+See also: pushd, popd
+
+### pushd([options,] [dir | '-N' | '+N'])
+
+Available options:
+
++ `-n`: Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated.
+
+Arguments:
+
++ `dir`: Makes the current working directory be the top of the stack, and then executes the equivalent of `cd dir`.
++ `+N`: Brings the Nth directory (counting from the left of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
++ `-N`: Brings the Nth directory (counting from the right of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
+
+Examples:
+
+```javascript
+// process.cwd() === '/usr'
+pushd('/etc'); // Returns /etc /usr
+pushd('+1');   // Returns /usr /etc
+```
+
+Save the current directory on the top of the directory stack and then cd to `dir`. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
+
+### popd([options,] ['-N' | '+N'])
+
+Available options:
+
++ `-n`: Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated.
+
+Arguments:
+
++ `+N`: Removes the Nth directory (counting from the left of the list printed by dirs), starting with zero.
++ `-N`: Removes the Nth directory (counting from the right of the list printed by dirs), starting with zero.
+
+Examples:
+
+```javascript
+echo(process.cwd()); // '/usr'
+pushd('/etc');       // '/etc /usr'
+echo(process.cwd()); // '/etc'
+popd();              // '/usr'
+echo(process.cwd()); // '/usr'
+```
+
+When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
+
+### exit(code)
 Exits the current process with the given exit code.
 
-#### env['VAR_NAME']
+### env['VAR_NAME']
 Object containing environment variables (both getter and setter). Shortcut to process.env.
 
-#### exec(command [, options] [, callback])
+### exec(command [, options] [, callback])
 Available options (all `false` by default):
 
-+ `async`: Asynchronous execution. Needs callback.
++ `async`: Asynchronous execution. Defaults to true if a callback is provided.
 + `silent`: Do not echo program output to console.
 
 Examples:
 
 ```javascript
 var version = exec('node --version', {silent:true}).output;
+
+var child = exec('some_long_running_process', {async:true});
+child.stdout.on('data', function(data) {
+  /* ... do something with data ... */
+});
+
+exec('some_long_running_process', function(code, output) {
+  console.log('Exit code:', code);
+  console.log('Program output:', output);
+});
 ```
 
 Executes the given `command` _synchronously_, unless otherwise specified.
 When in synchronous mode returns the object `{ code:..., output:... }`, containing the program's
-`output` (stdout + stderr)  and its exit `code`. Otherwise the `callback` gets the 
+`output` (stdout + stderr)  and its exit `code`. Otherwise returns the child process object, and
-arguments `(code, output)`.
+the `callback` gets the arguments `(code, output)`.
 
 **Note:** For long-lived processes, it's best to run `exec()` asynchronously as
 the current synchronous implementation uses a lot of CPU. This should be getting
 fixed soon.
 
-## Non-Unix commands
+### chmod(octal_mode || octal_string, file)
+### chmod(symbolic_mode, file)
+
+Available options:
+
++ `-v`: output a diagnostic for every file processed
++ `-c`: like verbose but report only when a change is made
++ `-R`: change files and directories recursively
+
+Examples:
+
+```javascript
+chmod(755, '/Users/brandon');
+chmod('755', '/Users/brandon'); // same as above 
+chmod('u+x', '/Users/brandon');
+```
+
+Alters the permissions of a file or directory by either specifying the
+absolute permissions in octal form or expressing the changes in symbols.
+This command tries to mimic the POSIX behavior as much as possible.
+Notable exceptions:
+
++ In symbolic modes, 'a-r' and '-r' are identical.  No consideration is
+  given to the umask.
++ There is no "quiet" option since default behavior is to run silent.
+
+## Configuration
 
 
-#### tempdir()
+### config.silent
-Searches and returns string containing a writeable, platform-dependent temporary directory.
-Follows Python's [tempfile algorithm](http://docs.python.org/library/tempfile.html#tempfile.tempdir).
-
-#### error()
-Tests if error occurred in the last command. Returns `null` if no error occurred,
-otherwise returns string explaining the error
-
-#### silent([state])
 Example:
 
 ```javascript
-var silentState = silent();
+var silentState = config.silent; // save old silent state
-silent(true);
+config.silent = true;
 /* ... */
-silent(silentState); // restore old silent state
+config.silent = silentState; // restore old silent state
 ```
 
-Suppresses all command output if `state = true`, except for `echo()` calls. 
+Suppresses all command output if `true`, except for `echo()` calls.
-Returns state if no arguments given.
+Default is `false`.
 
-## Deprecated
+### config.fatal
+Example:
+
+```javascript
+config.fatal = true;
+cp('this_file_does_not_exist', '/dev/null'); // dies here
+/* more commands... */
+```
+
+If `true` the script will die on errors. Default is `false`.
+
+## Non-Unix commands
 
 
-#### exists(path [, path ...])
+### tempdir()
-#### exists(path_array)
+Searches and returns string containing a writeable, platform-dependent temporary directory.
+Follows Python's [tempfile algorithm](http://docs.python.org/library/tempfile.html#tempfile.tempdir).
 
-_This function is being deprecated. Use `test()` instead._
+### error()
-
+Tests if error occurred in the last command. Returns `null` if no error occurred,
-Returns true if all the given paths exist.
+otherwise returns string explaining the error
-
-#### verbose()
-
-_This function is being deprecated. Use `silent(false) instead.`_
-
-Enables all output (default)

external/shelljs/global.js

@@ -1,3 +1,3 @@
 var shell = require('./shell.js');
-for (cmd in shell)
+for (var cmd in shell)
   global[cmd] = shell[cmd];

external/shelljs/make.js

@@ -1,4 +1,5 @@
 require('./global');
+config.fatal = true;
 
 global.target = {};
 
@@ -6,6 +7,7 @@ global.target = {};
 // been evaluated
 var args = process.argv.slice(2);
 setTimeout(function() {
+  var t;
 
   if (args.length === 1 && args[0] === '--help') {
     console.log('Available targets:');
@@ -24,7 +26,7 @@ setTimeout(function() {
           return;
         oldTarget.done = true;
         return oldTarget.apply(oldTarget, arguments);
-      }
+      };
 
     })(t, target[t]);
   }

external/shelljs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shelljs",
-  "version": "0.0.5pre4",
+  "version": "0.1.2",
   "author": "Artur Adib <aadib@mozilla.com>",
   "description": "Portable Unix shell commands for Node.js",
   "keywords": [
@@ -20,6 +20,9 @@
   "scripts": {
     "test": "node scripts/run-tests"
   },
+  "bin": {
+    "shjs": "./bin/shjs"
+  },
   "dependencies": {},
   "devDependencies": {},
   "optionalDependencies": {},