diff --git a/node_modules/connect/node_modules/crc/tests/nodeunit/README.md b/node_modules/connect/node_modules/crc/tests/nodeunit/README.md index 67026a2..f11456f 100644 --- a/node_modules/connect/node_modules/crc/tests/nodeunit/README.md +++ b/node_modules/connect/node_modules/crc/tests/nodeunit/README.md @@ -324,13 +324,13 @@ if its missing: var reporter = require('nodeunit').reporters.default; } catch(e) { - var sys = require('sys'); - sys.puts("Cannot find nodeunit module."); - sys.puts("You can download submodules for this project by doing:"); - sys.puts(""); - sys.puts(" git submodule init"); - sys.puts(" git submodule update"); - sys.puts(""); + var util = require('util'); + util.puts("Cannot find nodeunit module."); + util.puts("You can download submodules for this project by doing:"); + util.puts(""); + util.puts(" git submodule init"); + util.puts(" git submodule update"); + util.puts(""); process.exit(); } diff --git a/node_modules/connect/node_modules/crc/tests/nodeunit/bin/nodeunit b/node_modules/connect/node_modules/crc/tests/nodeunit/bin/nodeunit index 4162a2d..ac910ee 100755 --- a/node_modules/connect/node_modules/crc/tests/nodeunit/bin/nodeunit +++ b/node_modules/connect/node_modules/crc/tests/nodeunit/bin/nodeunit @@ -2,7 +2,7 @@ var fs = require('fs'), - sys = require('sys'), + util = require('util'), path = require('path'); require.paths.push(process.cwd()); @@ -62,19 +62,19 @@ args.forEach(function (arg) { }).filter(function (reporter_file) { return reporter_file !== 'index'; }); - sys.puts('Build-in reporters: '); + util.puts('Build-in reporters: '); reporters.forEach(function (reporter_file) { var reporter = require('../lib/reporters/' + reporter_file); - sys.puts(' * ' + reporter_file + (reporter.info ? ': ' + reporter.info : '')); + util.puts(' * ' + reporter_file + (reporter.info ? ': ' + reporter.info : '')); }); process.exit(0); } else if ((arg === '-v') || (arg === '--version')) { var content = fs.readFileSync(__dirname + '/../package.json', 'utf8'); var pkg = JSON.parse(content); - sys.puts(pkg.version); + util.puts(pkg.version); process.exit(0); } else if ((arg === '-h') || (arg === '--help')) { - sys.puts(usage); + util.puts(usage); process.exit(0); } else { files.push(arg); @@ -82,8 +82,8 @@ args.forEach(function (arg) { }); if (files.length === 0) { - sys.puts('Files required.'); - sys.puts(usage); + util.puts('Files required.'); + util.puts(usage); process.exit(1); } diff --git a/node_modules/connect/node_modules/crc/tests/nodeunit/deps/ejs.js b/node_modules/connect/node_modules/crc/tests/nodeunit/deps/ejs.js index f6abf29..1341d2a 100644 --- a/node_modules/connect/node_modules/crc/tests/nodeunit/deps/ejs.js +++ b/node_modules/connect/node_modules/crc/tests/nodeunit/deps/ejs.js @@ -9,7 +9,7 @@ * Module dependencies. */ -var sys = require('sys'); +var util = require('util'); /** * Library version. @@ -85,7 +85,7 @@ var parse = exports.parse = function(str){ */ var compile = exports.compile = function(str, options){ - if (options.debug) sys.puts(parse(str)); + if (options.debug) util.puts(parse(str)); return new Function('locals, escape', parse(str)); }; diff --git a/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/default.js b/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/default.js index c3d725d..11cf988 100644 --- a/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/default.js +++ b/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/default.js @@ -11,7 +11,7 @@ var nodeunit = require('../nodeunit'), utils = require('../utils'), fs = require('fs'), - sys = require('sys'), + util = require('util'), path = require('path'); AssertionError = require('../assert').AssertionError; @@ -59,24 +59,24 @@ exports.run = function (files, options) { nodeunit.runFiles(paths, { moduleStart: function (name) { - sys.puts('\n' + bold(name)); + util.puts('\n' + bold(name)); }, testDone: function (name, assertions) { if (!assertions.failures()) { - sys.puts('✔ ' + name); + util.puts('✔ ' + name); } else { - sys.puts(error('✖ ' + name) + '\n'); + util.puts(error('✖ ' + name) + '\n'); assertions.forEach(function (a) { if (a.failed()) { a = utils.betterErrors(a); if (a.error instanceof AssertionError && a.message) { - sys.puts( + util.puts( 'Assertion Message: ' + assertion_message(a.message) ); } - sys.puts(a.error.stack + '\n'); + util.puts(a.error.stack + '\n'); } }); } @@ -85,14 +85,14 @@ exports.run = function (files, options) { var end = new Date().getTime(); var duration = end - start; if (assertions.failures()) { - sys.puts( + util.puts( '\n' + bold(error('FAILURES: ')) + assertions.failures() + '/' + assertions.length + ' assertions failed (' + assertions.duration + 'ms)' ); } else { - sys.puts( + util.puts( '\n' + bold(ok('OK: ')) + assertions.length + ' assertions (' + assertions.duration + 'ms)' ); diff --git a/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/html.js b/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/html.js index a693c2d..10ce245 100644 --- a/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/html.js +++ b/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/html.js @@ -11,7 +11,7 @@ var nodeunit = require('../nodeunit'), utils = require('../utils'), fs = require('fs'), - sys = require('sys'), + util = require('util'), path = require('path'), AssertionError = require('assert').AssertionError; @@ -35,72 +35,72 @@ exports.run = function (files, options) { return path.join(process.cwd(), p); }); - sys.puts(''); - sys.puts(''); - sys.puts(''); - sys.puts(''); - sys.puts(''); - sys.puts(''); + util.puts(' ol li.pass:before { content: "\\2714 \\0020"; }'); + util.puts(' ol li.fail:before { content: "\\2716 \\0020"; }'); + util.puts(''); + util.puts(''); + util.puts(''); nodeunit.runFiles(paths, { moduleStart: function (name) { - sys.puts('

' + name + '

'); - sys.puts('
    '); + util.puts('

    ' + name + '

    '); + util.puts('
      '); }, testDone: function (name, assertions) { if (!assertions.failures()) { - sys.puts('
    1. ' + name + '
    2. '); + util.puts('
    3. ' + name + '
    4. '); } else { - sys.puts('
    5. ' + name); + util.puts('
    6. ' + name); assertions.forEach(function (a) { if (a.failed()) { a = utils.betterErrors(a); if (a.error instanceof AssertionError && a.message) { - sys.puts('
      ' + + util.puts('
      ' + 'Assertion Message: ' + a.message + '
      '); } - sys.puts('
      ');
      -                        sys.puts(a.error.stack);
      -                        sys.puts('
      '); + util.puts('
      ');
      +                        util.puts(a.error.stack);
      +                        util.puts('
      '); } }); - sys.puts('
    7. '); + util.puts(''); } }, moduleDone: function () { - sys.puts('
    '); + util.puts('
'); }, done: function (assertions) { var end = new Date().getTime(); var duration = end - start; if (assertions.failures()) { - sys.puts( + util.puts( '

FAILURES: ' + assertions.failures() + '/' + assertions.length + ' assertions failed (' + assertions.duration + 'ms)

' ); } else { - sys.puts( + util.puts( '

OK: ' + assertions.length + ' assertions (' + assertions.duration + 'ms)

' ); } - sys.puts(''); + util.puts(''); // should be able to flush stdout here, but doesn't seem to work, // instead delay the exit to give enough to time flush. setTimeout(function () { diff --git a/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/junit.js b/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/junit.js index bc1e1ec..18990e6 100644 --- a/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/junit.js +++ b/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/junit.js @@ -11,7 +11,7 @@ var nodeunit = require('../nodeunit'), utils = require('../utils'), fs = require('fs'), - sys = require('sys'), + util = require('util'), path = require('path'), async = require('../../deps/async'), AssertionError = require('assert').AssertionError, @@ -154,13 +154,13 @@ exports.run = function (files, opts, callback) { opts.output, module.name + '.xml' ); - sys.puts('Writing ' + filename); + util.puts('Writing ' + filename); fs.writeFile(filename, rendered, cb); }, function (err) { if (err) throw err; else if (assertions.failures()) { - sys.puts( + util.puts( '\n' + bold(error('FAILURES: ')) + assertions.failures() + '/' + assertions.length + ' assertions failed (' + @@ -168,7 +168,7 @@ exports.run = function (files, opts, callback) { ); } else { - sys.puts( + util.puts( '\n' + bold(ok('OK: ')) + assertions.length + ' assertions (' + assertions.duration + 'ms)' ); diff --git a/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/minimal.js b/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/minimal.js index 951e39d..0caa406 100644 --- a/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/minimal.js +++ b/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/minimal.js @@ -11,7 +11,7 @@ var nodeunit = require('../nodeunit'), utils = require('../utils'), fs = require('fs'), - sys = require('sys'), + util = require('util'), path = require('path'), AssertionError = require('assert').AssertionError; @@ -58,21 +58,21 @@ exports.run = function (files, options) { nodeunit.runFiles(paths, { moduleStart: function (name) { - sys.print(bold(name) + ': '); + util.print(bold(name) + ': '); }, moduleDone: function (name, assertions) { - sys.puts(''); + util.puts(''); if (assertions.failures()) { assertions.forEach(function (a) { if (a.failed()) { a = utils.betterErrors(a); if (a.error instanceof AssertionError && a.message) { - sys.puts( + util.puts( 'Assertion in test ' + bold(a.testname) + ': ' + magenta(a.message) ); } - sys.puts(a.error.stack + '\n'); + util.puts(a.error.stack + '\n'); } }); } @@ -82,10 +82,10 @@ exports.run = function (files, options) { }, testDone: function (name, assertions) { if (!assertions.failures()) { - sys.print('.'); + util.print('.'); } else { - sys.print(red('F')); + util.print(red('F')); assertions.forEach(function (assertion) { assertion.testname = name; }); @@ -95,14 +95,14 @@ exports.run = function (files, options) { var end = new Date().getTime(); var duration = end - start; if (assertions.failures()) { - sys.puts( + util.puts( '\n' + bold(red('FAILURES: ')) + assertions.failures() + '/' + assertions.length + ' assertions failed (' + assertions.duration + 'ms)' ); } else { - sys.puts( + util.puts( '\n' + bold(green('OK: ')) + assertions.length + ' assertions (' + assertions.duration + 'ms)' ); diff --git a/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/skip_passed.js b/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/skip_passed.js index e2abf38..41f68d3 100644 --- a/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/skip_passed.js +++ b/node_modules/connect/node_modules/crc/tests/nodeunit/lib/reporters/skip_passed.js @@ -11,7 +11,7 @@ var nodeunit = require('../nodeunit'), utils = require('../utils'), fs = require('fs'), - sys = require('sys'), + util = require('util'), path = require('path'), AssertionError = require('assert').AssertionError; @@ -58,44 +58,44 @@ exports.run = function (files, options) { nodeunit.runFiles(paths, { moduleStart: function (name) { - sys.puts('\n' + bold(name)); + util.puts('\n' + bold(name)); }, testDone: function (name, assertions) { if (assertions.failures()) { - sys.puts(error('✖ ' + name) + '\n'); + util.puts(error('✖ ' + name) + '\n'); assertions.forEach(function (a) { if (a.failed()) { a = utils.betterErrors(a); if (a.error instanceof AssertionError && a.message) { - sys.puts( + util.puts( 'Assertion Message: ' + assertion_message(a.message) ); } - sys.puts(a.error.stack + '\n'); + util.puts(a.error.stack + '\n'); } }); } }, moduleDone: function (name, assertions) { if (!assertions.failures()) { - sys.puts('✔ all tests passed'); + util.puts('✔ all tests passed'); } else { - sys.puts(error('✖ some tests failed')); + util.puts(error('✖ some tests failed')); } }, done: function (assertions) { var end = new Date().getTime(); var duration = end - start; if (assertions.failures()) { - sys.puts( + util.puts( '\n' + bold(error('FAILURES: ')) + assertions.failures() + '/' + assertions.length + ' assertions failed (' + assertions.duration + 'ms)' ); } else { - sys.puts( + util.puts( '\n' + bold(ok('OK: ')) + assertions.length + ' assertions (' + assertions.duration + 'ms)' ); diff --git a/node_modules/connect/node_modules/crc/tests/nodeunit/lib/utils.js b/node_modules/connect/node_modules/crc/tests/nodeunit/lib/utils.js index dd4605e..8797b43 100644 --- a/node_modules/connect/node_modules/crc/tests/nodeunit/lib/utils.js +++ b/node_modules/connect/node_modules/crc/tests/nodeunit/lib/utils.js @@ -10,7 +10,7 @@ var async = require('../deps/async'), fs = require('fs'), - sys = require('sys'), + util = require('util'), Script = process.binding('evals').Script, http = require('http'); @@ -190,8 +190,8 @@ exports.betterErrors = function (assertion) { Object.getOwnPropertyDescriptor(e, 'expected')) { // alexgorbatchev 2010-10-22 :: Added a bit of depth to inspection - var actual = sys.inspect(e.actual, false, 10).replace(/\n$/, ''); - var expected = sys.inspect(e.expected, false, 10).replace(/\n$/, ''); + var actual = util.inspect(e.actual, false, 10).replace(/\n$/, ''); + var expected = util.inspect(e.expected, false, 10).replace(/\n$/, ''); var multiline = ( actual.indexOf('\n') !== -1 || expected.indexOf('\n') !== -1 diff --git a/node_modules/connect/node_modules/formidable/lib/util.js b/node_modules/connect/node_modules/formidable/lib/util.js index e9493e9..d096f70 100755 --- a/node_modules/connect/node_modules/formidable/lib/util.js +++ b/node_modules/connect/node_modules/formidable/lib/util.js @@ -2,5 +2,5 @@ try { module.exports = require('util'); } catch (e) { - module.exports = require('sys'); + module.exports = require('util'); }