9 files changed, 883 insertions, 0 deletions
diff --git a/node_modules/optimist/test/_.js b/node_modules/optimist/test/_.js
new file mode 100644
index 000000000..d9c58b368
--- /dev/null
+++ b/node_modules/optimist/test/_.js
@@ -0,0 +1,71 @@
+var spawn = require('child_process').spawn;
+var test = require('tap').test;
+
+test('dotSlashEmpty', testCmd('./bin.js', []));
+
+test('dotSlashArgs', testCmd('./bin.js', [ 'a', 'b', 'c' ]));
+
+test('nodeEmpty', testCmd('node bin.js', []));
+
+test('nodeArgs', testCmd('node bin.js', [ 'x', 'y', 'z' ]));
+
+test('whichNodeEmpty', function (t) {
+    var which = spawn('which', ['node']);
+    
+    which.stdout.on('data', function (buf) {
+        t.test(
+            testCmd(buf.toString().trim() + ' bin.js', [])
+        );
+        t.end();
+    });
+    
+    which.stderr.on('data', function (err) {
+        assert.error(err);
+        t.end();
+    });
+});
+
+test('whichNodeArgs', function (t) {
+    var which = spawn('which', ['node']);
+
+    which.stdout.on('data', function (buf) {
+        t.test(
+            testCmd(buf.toString().trim() + ' bin.js', [ 'q', 'r' ])
+        );
+        t.end();
+    });
+    
+    which.stderr.on('data', function (err) {
+        t.error(err);
+        t.end();
+    });
+});
+
+function testCmd (cmd, args) {
+
+    return function (t) {
+        var to = setTimeout(function () {
+            assert.fail('Never got stdout data.')
+        }, 5000);
+        
+        var oldDir = process.cwd();
+        process.chdir(__dirname + '/_');
+        
+        var cmds = cmd.split(' ');
+        
+        var bin = spawn(cmds[0], cmds.slice(1).concat(args.map(String)));
+        process.chdir(oldDir);
+        
+        bin.stderr.on('data', function (err) {
+            t.error(err);
+            t.end();
+        });
+        
+        bin.stdout.on('data', function (buf) {
+            clearTimeout(to);
+            var _ = JSON.parse(buf.toString());
+            t.same(_.map(String), args.map(String));
+            t.end();
+        });
+    };
+}
diff --git a/node_modules/optimist/test/_/argv.js b/node_modules/optimist/test/_/argv.js
new file mode 100644
index 000000000..3d096062c
--- /dev/null
+++ b/node_modules/optimist/test/_/argv.js
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+console.log(JSON.stringify(process.argv));
diff --git a/node_modules/optimist/test/_/bin.js b/node_modules/optimist/test/_/bin.js
new file mode 100755
index 000000000..4a18d85f3
--- /dev/null
+++ b/node_modules/optimist/test/_/bin.js
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+var argv = require('../../index').argv
+console.log(JSON.stringify(argv._));
diff --git a/node_modules/optimist/test/dash.js b/node_modules/optimist/test/dash.js
new file mode 100644
index 000000000..af8ed6fc6
--- /dev/null
+++ b/node_modules/optimist/test/dash.js
@@ -0,0 +1,31 @@
+var optimist = require('../index');
+var test = require('tap').test;
+
+test('-', function (t) {
+    t.plan(5);
+    t.deepEqual(
+        fix(optimist.parse([ '-n', '-' ])),
+        { n: '-', _: [] }
+    );
+    t.deepEqual(
+        fix(optimist.parse([ '-' ])),
+        { _: [ '-' ] }
+    );
+    t.deepEqual(
+        fix(optimist.parse([ '-f-' ])),
+        { f: '-', _: [] }
+    );
+    t.deepEqual(
+        fix(optimist([ '-b', '-' ]).boolean('b').argv),
+        { b: true, _: [ '-' ] }
+    );
+    t.deepEqual(
+        fix(optimist([ '-s', '-' ]).string('s').argv),
+        { s: '-', _: [] }
+    );
+});
+
+function fix (obj) {
+    delete obj.$0;
+    return obj;
+}
diff --git a/node_modules/optimist/test/parse.js b/node_modules/optimist/test/parse.js
new file mode 100644
index 000000000..d320f4336
--- /dev/null
+++ b/node_modules/optimist/test/parse.js
@@ -0,0 +1,446 @@
+var optimist = require('../index');
+var path = require('path');
+var test = require('tap').test;
+
+var $0 = 'node ./' + path.relative(process.cwd(), __filename);
+
+test('short boolean', function (t) {
+    var parse = optimist.parse([ '-b' ]);
+    t.same(parse, { b : true, _ : [], $0 : $0 });
+    t.same(typeof parse.b, 'boolean');
+    t.end();
+});
+
+test('long boolean', function (t) {
+    t.same(
+        optimist.parse([ '--bool' ]),
+        { bool : true, _ : [], $0 : $0 }
+    );
+    t.end();
+});
+    
+test('bare', function (t) {
+    t.same(
+        optimist.parse([ 'foo', 'bar', 'baz' ]),
+        { _ : [ 'foo', 'bar', 'baz' ], $0 : $0 }
+    );
+    t.end();
+});
+
+test('short group', function (t) {
+    t.same(
+        optimist.parse([ '-cats' ]),
+        { c : true, a : true, t : true, s : true, _ : [], $0 : $0 }
+    );
+    t.end();
+});
+
+test('short group next', function (t) {
+    t.same(
+        optimist.parse([ '-cats', 'meow' ]),
+        { c : true, a : true, t : true, s : 'meow', _ : [], $0 : $0 }
+    );
+    t.end();
+});
+ 
+test('short capture', function (t) {
+    t.same(
+        optimist.parse([ '-h', 'localhost' ]),
+        { h : 'localhost', _ : [], $0 : $0 }
+    );
+    t.end();
+});
+
+test('short captures', function (t) {
+    t.same(
+        optimist.parse([ '-h', 'localhost', '-p', '555' ]),
+        { h : 'localhost', p : 555, _ : [], $0 : $0 }
+    );
+    t.end();
+});
+
+test('long capture sp', function (t) {
+    t.same(
+        optimist.parse([ '--pow', 'xixxle' ]),
+        { pow : 'xixxle', _ : [], $0 : $0 }
+    );
+    t.end();
+});
+
+test('long capture eq', function (t) {
+    t.same(
+        optimist.parse([ '--pow=xixxle' ]),
+        { pow : 'xixxle', _ : [], $0 : $0 }
+    );
+    t.end()
+});
+
+test('long captures sp', function (t) {
+    t.same(
+        optimist.parse([ '--host', 'localhost', '--port', '555' ]),
+        { host : 'localhost', port : 555, _ : [], $0 : $0 }
+    );
+    t.end();
+});
+
+test('long captures eq', function (t) {
+    t.same(
+        optimist.parse([ '--host=localhost', '--port=555' ]),
+        { host : 'localhost', port : 555, _ : [], $0 : $0 }
+    );
+    t.end();
+});
+
+test('mixed short bool and capture', function (t) {
+    t.same(
+        optimist.parse([ '-h', 'localhost', '-fp', '555', 'script.js' ]),
+        {
+            f : true, p : 555, h : 'localhost',
+            _ : [ 'script.js' ], $0 : $0,
+        }
+    );
+    t.end();
+});
+ 
+test('short and long', function (t) {
+    t.same(
+        optimist.parse([ '-h', 'localhost', '-fp', '555', 'script.js' ]),
+        {
+            f : true, p : 555, h : 'localhost',
+            _ : [ 'script.js' ], $0 : $0,
+        }
+    );
+    t.end();
+});
+
+test('no', function (t) {
+    t.same(
+        optimist.parse([ '--no-moo' ]),
+        { moo : false, _ : [], $0 : $0 }
+    );
+    t.end();
+});
+ 
+test('multi', function (t) {
+    t.same(
+        optimist.parse([ '-v', 'a', '-v', 'b', '-v', 'c' ]),
+        { v : ['a','b','c'], _ : [], $0 : $0 }
+    );
+    t.end();
+});
+ 
+test('comprehensive', function (t) {
+    t.same(
+        optimist.parse([
+            '--name=meowmers', 'bare', '-cats', 'woo',
+            '-h', 'awesome', '--multi=quux',
+            '--key', 'value',
+            '-b', '--bool', '--no-meep', '--multi=baz',
+            '--', '--not-a-flag', 'eek'
+        ]),
+        {
+            c : true,
+            a : true,
+            t : true,
+            s : 'woo',
+            h : 'awesome',
+            b : true,
+            bool : true,
+            key : 'value',
+            multi : [ 'quux', 'baz' ],
+            meep : false,
+            name : 'meowmers',
+            _ : [ 'bare', '--not-a-flag', 'eek' ],
+            $0 : $0
+        }
+    );
+    t.end();
+});
+
+test('nums', function (t) {
+    var argv = optimist.parse([
+        '-x', '1234',
+        '-y', '5.67',
+        '-z', '1e7',
+        '-w', '10f',
+        '--hex', '0xdeadbeef',
+        '789',
+    ]);
+    t.same(argv, {
+        x : 1234,
+        y : 5.67,
+        z : 1e7,
+        w : '10f',
+        hex : 0xdeadbeef,
+        _ : [ 789 ],
+        $0 : $0
+    });
+    t.same(typeof argv.x, 'number');
+    t.same(typeof argv.y, 'number');
+    t.same(typeof argv.z, 'number');
+    t.same(typeof argv.w, 'string');
+    t.same(typeof argv.hex, 'number');
+    t.same(typeof argv._[0], 'number');
+    t.end();
+});
+
+test('flag boolean', function (t) {
+    var parse = optimist([ '-t', 'moo' ]).boolean(['t']).argv;
+    t.same(parse, { t : true, _ : [ 'moo' ], $0 : $0 });
+    t.same(typeof parse.t, 'boolean');
+    t.end();
+});
+
+test('flag boolean value', function (t) {
+    var parse = optimist(['--verbose', 'false', 'moo', '-t', 'true'])
+        .boolean(['t', 'verbose']).default('verbose', true).argv;
+    
+    t.same(parse, {
+        verbose: false,
+        t: true,
+        _: ['moo'],
+        $0 : $0
+    });
+    
+    t.same(typeof parse.verbose, 'boolean');
+    t.same(typeof parse.t, 'boolean');
+    t.end();
+});
+
+test('flag boolean default false', function (t) {
+    var parse = optimist(['moo'])
+        .boolean(['t', 'verbose'])
+        .default('verbose', false)
+        .default('t', false).argv;
+    
+    t.same(parse, {
+        verbose: false,
+        t: false,
+        _: ['moo'],
+        $0 : $0
+    });
+    
+    t.same(typeof parse.verbose, 'boolean');
+    t.same(typeof parse.t, 'boolean');
+    t.end();
+
+});
+
+test('boolean groups', function (t) {
+    var parse = optimist([ '-x', '-z', 'one', 'two', 'three' ])
+        .boolean(['x','y','z']).argv;
+    
+    t.same(parse, {
+        x : true,
+        y : false,
+        z : true,
+        _ : [ 'one', 'two', 'three' ],
+        $0 : $0
+    });
+    
+    t.same(typeof parse.x, 'boolean');
+    t.same(typeof parse.y, 'boolean');
+    t.same(typeof parse.z, 'boolean');
+    t.end();
+});
+
+test('newlines in params' , function (t) {
+    var args = optimist.parse([ '-s', "X\nX" ])
+    t.same(args, { _ : [], s : "X\nX", $0 : $0 });
+
+    // reproduce in bash:
+    // VALUE="new
+    // line"
+    // node program.js --s="$VALUE"
+    args = optimist.parse([ "--s=X\nX" ])
+    t.same(args, { _ : [], s : "X\nX", $0 : $0 });
+    t.end();
+});
+
+test('strings' , function (t) {
+    var s = optimist([ '-s', '0001234' ]).string('s').argv.s;
+    t.same(s, '0001234');
+    t.same(typeof s, 'string');
+    
+    var x = optimist([ '-x', '56' ]).string('x').argv.x;
+    t.same(x, '56');
+    t.same(typeof x, 'string');
+    t.end();
+});
+
+test('stringArgs', function (t) {
+    var s = optimist([ '  ', '  ' ]).string('_').argv._;
+    t.same(s.length, 2);
+    t.same(typeof s[0], 'string');
+    t.same(s[0], '  ');
+    t.same(typeof s[1], 'string');
+    t.same(s[1], '  ');
+    t.end();
+});
+
+test('slashBreak', function (t) {
+    t.same(
+        optimist.parse([ '-I/foo/bar/baz' ]),
+        { I : '/foo/bar/baz', _ : [], $0 : $0 }
+    );
+    t.same(
+        optimist.parse([ '-xyz/foo/bar/baz' ]),
+        { x : true, y : true, z : '/foo/bar/baz', _ : [], $0 : $0 }
+    );
+    t.end();
+});
+
+test('alias', function (t) {
+    var argv = optimist([ '-f', '11', '--zoom', '55' ])
+        .alias('z', 'zoom')
+        .argv
+    ;
+    t.equal(argv.zoom, 55);
+    t.equal(argv.z, argv.zoom);
+    t.equal(argv.f, 11);
+    t.end();
+});
+
+test('multiAlias', function (t) {
+    var argv = optimist([ '-f', '11', '--zoom', '55' ])
+        .alias('z', [ 'zm', 'zoom' ])
+        .argv
+    ;
+    t.equal(argv.zoom, 55);
+    t.equal(argv.z, argv.zoom);
+    t.equal(argv.z, argv.zm);
+    t.equal(argv.f, 11);
+    t.end();
+});
+
+test('boolean default true', function (t) {
+    var argv = optimist.options({
+        sometrue: {
+            boolean: true,
+            default: true
+        }
+    }).argv;
+  
+    t.equal(argv.sometrue, true);
+    t.end();
+});
+
+test('boolean default false', function (t) {
+    var argv = optimist.options({
+        somefalse: {
+            boolean: true,
+            default: false
+        }
+    }).argv;
+
+    t.equal(argv.somefalse, false);
+    t.end();
+});
+
+test('nested dotted objects', function (t) {
+    var argv = optimist([
+        '--foo.bar', '3', '--foo.baz', '4',
+        '--foo.quux.quibble', '5', '--foo.quux.o_O',
+        '--beep.boop'
+    ]).argv;
+    
+    t.same(argv.foo, {
+        bar : 3,
+        baz : 4,
+        quux : {
+            quibble : 5,
+            o_O : true
+        },
+    });
+    t.same(argv.beep, { boop : true });
+    t.end();
+});
+
+test('boolean and alias with chainable api', function (t) {
+    var aliased = [ '-h', 'derp' ];
+    var regular = [ '--herp',  'derp' ];
+    var opts = {
+        herp: { alias: 'h', boolean: true }
+    };
+    var aliasedArgv = optimist(aliased)
+        .boolean('herp')
+        .alias('h', 'herp')
+        .argv;
+    var propertyArgv = optimist(regular)
+        .boolean('herp')
+        .alias('h', 'herp')
+        .argv;
+    var expected = {
+        herp: true,
+        h: true,
+        '_': [ 'derp' ],
+        '$0': $0,
+    };
+
+    t.same(aliasedArgv, expected);
+    t.same(propertyArgv, expected); 
+    t.end();
+});
+
+test('boolean and alias with options hash', function (t) {
+    var aliased = [ '-h', 'derp' ];
+    var regular = [ '--herp', 'derp' ];
+    var opts = {
+        herp: { alias: 'h', boolean: true }
+    };
+    var aliasedArgv = optimist(aliased)
+      .options(opts)
+      .argv;
+    var propertyArgv = optimist(regular).options(opts).argv;
+    var expected = {
+        herp: true,
+        h: true,
+        '_': [ 'derp' ],
+        '$0': $0,
+    };
+
+    t.same(aliasedArgv, expected);
+    t.same(propertyArgv, expected);
+
+    t.end();
+});
+
+test('boolean and alias using explicit true', function (t) {
+    var aliased = [ '-h', 'true' ];
+    var regular = [ '--herp',  'true' ];
+    var opts = {
+        herp: { alias: 'h', boolean: true }
+    };
+    var aliasedArgv = optimist(aliased)
+        .boolean('h')
+        .alias('h', 'herp')
+        .argv;
+    var propertyArgv = optimist(regular)
+        .boolean('h')
+        .alias('h', 'herp')
+        .argv;
+    var expected = {
+        herp: true,
+        h: true,
+        '_': [ ],
+        '$0': $0,
+    };
+
+    t.same(aliasedArgv, expected);
+    t.same(propertyArgv, expected); 
+    t.end();
+});
+
+// regression, see https://github.com/substack/node-optimist/issues/71
+test('boolean and --x=true', function(t) {
+    var parsed = optimist(['--boool', '--other=true']).boolean('boool').argv;
+
+    t.same(parsed.boool, true);
+    t.same(parsed.other, 'true');
+
+    parsed = optimist(['--boool', '--other=false']).boolean('boool').argv;
+
+    t.same(parsed.boool, true);
+    t.same(parsed.other, 'false');
+    t.end();
+});
diff --git a/node_modules/optimist/test/parse_modified.js b/node_modules/optimist/test/parse_modified.js
new file mode 100644
index 000000000..a57dc84e9
--- /dev/null
+++ b/node_modules/optimist/test/parse_modified.js
@@ -0,0 +1,14 @@
+var optimist = require('../');
+var test = require('tap').test;
+
+test('parse with modifier functions' , function (t) {
+    t.plan(1);
+    
+    var argv = optimist().boolean('b').parse([ '-b', '123' ]);
+    t.deepEqual(fix(argv), { b: true, _: ['123'] });
+});
+
+function fix (obj) {
+    delete obj.$0;
+    return obj;
+}
diff --git a/node_modules/optimist/test/short.js b/node_modules/optimist/test/short.js
new file mode 100644
index 000000000..b2c38ad84
--- /dev/null
+++ b/node_modules/optimist/test/short.js
@@ -0,0 +1,16 @@
+var optimist = require('../index');
+var test = require('tap').test;
+
+test('-n123', function (t) {
+    t.plan(1);
+    var parse = optimist.parse([ '-n123' ]);
+    t.equal(parse.n, 123);
+});
+
+test('-123', function (t) {
+    t.plan(3);
+    var parse = optimist.parse([ '-123', '456' ]);
+    t.equal(parse['1'], true);
+    t.equal(parse['2'], true);
+    t.equal(parse['3'], 456);
+});
diff --git a/node_modules/optimist/test/usage.js b/node_modules/optimist/test/usage.js
new file mode 100644
index 000000000..300454c1e
--- /dev/null
+++ b/node_modules/optimist/test/usage.js
@@ -0,0 +1,292 @@
+var Hash = require('hashish');
+var optimist = require('../index');
+var test = require('tap').test;
+
+test('usageFail', function (t) {
+    var r = checkUsage(function () {
+        return optimist('-x 10 -z 20'.split(' '))
+            .usage('Usage: $0 -x NUM -y NUM')
+            .demand(['x','y'])
+            .argv;
+    });
+    t.same(
+        r.result,
+        { x : 10, z : 20, _ : [], $0 : './usage' }
+    );
+
+    t.same(
+        r.errors.join('\n').split(/\n+/),
+        [
+            'Usage: ./usage -x NUM -y NUM',
+            'Options:',
+            '  -x  [required]',
+            '  -y  [required]',
+            'Missing required arguments: y',
+        ]
+    );
+    t.same(r.logs, []);
+    t.ok(r.exit);
+    t.end();
+});
+
+
+test('usagePass', function (t) {
+    var r = checkUsage(function () {
+        return optimist('-x 10 -y 20'.split(' '))
+            .usage('Usage: $0 -x NUM -y NUM')
+            .demand(['x','y'])
+            .argv;
+    });
+    t.same(r, {
+        result : { x : 10, y : 20, _ : [], $0 : './usage' },
+        errors : [],
+        logs : [],
+        exit : false,
+    });
+    t.end();
+});
+
+test('checkPass', function (t) {
+    var r = checkUsage(function () {
+        return optimist('-x 10 -y 20'.split(' '))
+            .usage('Usage: $0 -x NUM -y NUM')
+            .check(function (argv) {
+                if (!('x' in argv)) throw 'You forgot about -x';
+                if (!('y' in argv)) throw 'You forgot about -y';
+            })
+            .argv;
+    });
+    t.same(r, {
+        result : { x : 10, y : 20, _ : [], $0 : './usage' },
+        errors : [],
+        logs : [],
+        exit : false,
+    });
+    t.end();
+});
+
+test('checkFail', function (t) {
+    var r = checkUsage(function () {
+        return optimist('-x 10 -z 20'.split(' '))
+            .usage('Usage: $0 -x NUM -y NUM')
+            .check(function (argv) {
+                if (!('x' in argv)) throw 'You forgot about -x';
+                if (!('y' in argv)) throw 'You forgot about -y';
+            })
+            .argv;
+    });
+
+    t.same(
+        r.result,
+        { x : 10, z : 20, _ : [], $0 : './usage' }
+    );
+
+    t.same(
+        r.errors.join('\n').split(/\n+/),
+        [
+            'Usage: ./usage -x NUM -y NUM',
+            'You forgot about -y'
+        ]
+    );
+
+    t.same(r.logs, []);
+    t.ok(r.exit);
+    t.end();
+});
+
+test('checkCondPass', function (t) {
+    function checker (argv) {
+        return 'x' in argv && 'y' in argv;
+    }
+
+    var r = checkUsage(function () {
+        return optimist('-x 10 -y 20'.split(' '))
+            .usage('Usage: $0 -x NUM -y NUM')
+            .check(checker)
+            .argv;
+    });
+    t.same(r, {
+        result : { x : 10, y : 20, _ : [], $0 : './usage' },
+        errors : [],
+        logs : [],
+        exit : false,
+    });
+    t.end();
+});
+
+test('checkCondFail', function (t) {
+    function checker (argv) {
+        return 'x' in argv && 'y' in argv;
+    }
+
+    var r = checkUsage(function () {
+        return optimist('-x 10 -z 20'.split(' '))
+            .usage('Usage: $0 -x NUM -y NUM')
+            .check(checker)
+            .argv;
+    });
+
+    t.same(
+        r.result,
+        { x : 10, z : 20, _ : [], $0 : './usage' }
+    );
+
+    t.same(
+        r.errors.join('\n').split(/\n+/).join('\n'),
+        'Usage: ./usage -x NUM -y NUM\n'
+        + 'Argument check failed: ' + checker.toString()
+    );
+
+    t.same(r.logs, []);
+    t.ok(r.exit);
+    t.end();
+});
+
+test('countPass', function (t) {
+    var r = checkUsage(function () {
+        return optimist('1 2 3 --moo'.split(' '))
+            .usage('Usage: $0 [x] [y] [z] {OPTIONS}')
+            .demand(3)
+            .argv;
+    });
+    t.same(r, {
+        result : { _ : [ '1', '2', '3' ], moo : true, $0 : './usage' },
+        errors : [],
+        logs : [],
+        exit : false,
+    });
+    t.end();
+});
+
+test('countFail', function (t) {
+    var r = checkUsage(function () {
+        return optimist('1 2 --moo'.split(' '))
+            .usage('Usage: $0 [x] [y] [z] {OPTIONS}')
+            .demand(3)
+            .argv;
+    });
+    t.same(
+        r.result,
+        { _ : [ '1', '2' ], moo : true, $0 : './usage' }
+    );
+
+    t.same(
+        r.errors.join('\n').split(/\n+/),
+        [
+            'Usage: ./usage [x] [y] [z] {OPTIONS}',
+            'Not enough non-option arguments: got 2, need at least 3',
+        ]
+    );
+
+    t.same(r.logs, []);
+    t.ok(r.exit);
+    t.end();
+});
+
+test('defaultSingles', function (t) {
+    var r = checkUsage(function () {
+        return optimist('--foo 50 --baz 70 --powsy'.split(' '))
+            .default('foo', 5)
+            .default('bar', 6)
+            .default('baz', 7)
+            .argv
+        ;
+    });
+    t.same(r.result, {
+        foo : '50',
+        bar : 6,
+        baz : '70',
+        powsy : true,
+        _ : [],
+        $0 : './usage',
+    });
+    t.end();
+});
+
+test('defaultAliases', function (t) {
+    var r = checkUsage(function () {
+        return optimist('')
+            .alias('f', 'foo')
+            .default('f', 5)
+            .argv
+        ;
+    });
+    t.same(r.result, {
+        f : '5',
+        foo : '5',
+        _ : [],
+        $0 : './usage',
+    });
+    t.end();
+});
+
+test('defaultHash', function (t) {
+    var r = checkUsage(function () {
+        return optimist('--foo 50 --baz 70'.split(' '))
+            .default({ foo : 10, bar : 20, quux : 30 })
+            .argv
+        ;
+    });
+    t.same(r.result, {
+        _ : [],
+        $0 : './usage',
+        foo : 50,
+        baz : 70,
+        bar : 20,
+        quux : 30,
+    });
+    t.end();
+});
+
+test('rebase', function (t) {
+    t.equal(
+        optimist.rebase('/home/substack', '/home/substack/foo/bar/baz'),
+        './foo/bar/baz'
+    );
+    t.equal(
+        optimist.rebase('/home/substack/foo/bar/baz', '/home/substack'),
+        '../../..'
+    );
+    t.equal(
+        optimist.rebase('/home/substack/foo', '/home/substack/pow/zoom.txt'),
+        '../pow/zoom.txt'
+    );
+    t.end();
+});
+
+function checkUsage (f) {
+
+    var exit = false;
+
+    process._exit = process.exit;
+    process._env = process.env;
+    process._argv = process.argv;
+
+    process.exit = function (t) { exit = true };
+    process.env = Hash.merge(process.env, { _ : 'node' });
+    process.argv = [ './usage' ];
+
+    var errors = [];
+    var logs = [];
+
+    console._error = console.error;
+    console.error = function (msg) { errors.push(msg) };
+    console._log = console.log;
+    console.log = function (msg) { logs.push(msg) };
+
+    var result = f();
+
+    process.exit = process._exit;
+    process.env = process._env;
+    process.argv = process._argv;
+
+    console.error = console._error;
+    console.log = console._log;
+
+    return {
+        errors : errors,
+        logs : logs,
+        exit : exit,
+        result : result,
+    };
+};
diff --git a/node_modules/optimist/test/whitespace.js b/node_modules/optimist/test/whitespace.js
new file mode 100644
index 000000000..90b90752c
--- /dev/null
+++ b/node_modules/optimist/test/whitespace.js
@@ -0,0 +1,8 @@
+var optimist = require('../');
+var test = require('tap').test;
+
+test('whitespace should be whitespace' , function (t) {
+    t.plan(1);
+    var x = optimist.parse([ '-x', '\t' ]).x;
+    t.equal(x, '\t');
+});