wpstudio/hiring-test-one
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

deps

Browse Source
This commit is contained in:
Lloyd Brookes
2014-03-12 14:34:52 +01:00
parent d909cdf802
commit d51f42295e
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -10,7 +10,7 @@
"dependencies": { "dependencies": {
"connect": "~2.14.0", "connect": "~2.14.0",
"nature": "~0.3.0", "nature": "~0.3.0",
"console-dope": "~0.2.0", "console-dope": "~0.3.0",
"wodge": "~0.3.0" "wodge": "~0.3.0"
} }
} }

30
ws.js
View File

@ -1,7 +1,7 @@
#!/usr/bin/env node #!/usr/bin/env node
"use strict"; "use strict";
require("console-dope"); var dope = require("console-dope"),
var connect = require("connect"), connect = require("connect"),
http = require("http"), http = require("http"),
fs = require("fs"), fs = require("fs"),
Thing = require("nature").Thing, Thing = require("nature").Thing,
@ -11,8 +11,8 @@ var connect = require("connect"),
var usage = "usage: ws [--directory|-d <directory>] [--port|-p <port>] [--log-format|-f dev|default|short|tiny]"; var usage = "usage: ws [--directory|-d <directory>] [--port|-p <port>] [--log-format|-f dev|default|short|tiny]";
function halt(message){ function halt(message){
console.red.log("Error: %s", message); dope.red.log("Error: %s", message);
console.log(usage); dope.log(usage);
process.exit(1); process.exit(1);
} }
@ -59,7 +59,7 @@ if (!argv.valid) halt(argv.validationMessages);
$ ws --help $ ws --help
*/ */
if (argv.help){ if (argv.help){
console.log(usage); dope.log(usage);
} else { } else {
var total = { var total = {
@ -69,8 +69,8 @@ if (argv.help){
}; };
process.on("SIGINT", function(){ process.on("SIGINT", function(){
console.showCursor(); dope.showCursor();
console.log(); dope.log();
process.exit(0); process.exit(0);
}); });
@ -92,7 +92,7 @@ if (argv.help){
app.use(connect.logger(argv["log-format"])); app.use(connect.logger(argv["log-format"]));
} else { } else {
app.use(function(req, res, next){ app.use(function(req, res, next){
console.column(1).write(++total.req); dope.column(1).write(++total.req);
next(); next();
}); });
} }
@ -125,17 +125,17 @@ if (argv.help){
write status to stderr so stdout can be piped to disk ($ ws > log.txt) write status to stderr so stdout can be piped to disk ($ ws > log.txt)
*/ */
if (path.resolve(argv.directory) === process.cwd()){ if (path.resolve(argv.directory) === process.cwd()){
console.error("serving at %underline{%s}", "http://localhost:" + argv.port); dope.error("serving at %underline{%s}", "http://localhost:" + argv.port);
} else { } else {
console.error("serving %underline{%s} at %underline{%s}", argv.directory, "http://localhost:" + argv.port); dope.error("serving %underline{%s} at %underline{%s}", argv.directory, "http://localhost:" + argv.port);
} }
/** /**
in stats mode, monitor connections and bytes transferred in stats mode, monitor connections and bytes transferred
*/ */
if (!argv["log-format"]){ if (!argv["log-format"]){
console.hideCursor(); dope.hideCursor();
console.log("%underline{Requests} %underline{Data} %underline{Connections}"); dope.log("%underline{Requests} %underline{Data} %underline{Connections}");
server.on("connection", function(socket){ server.on("connection", function(socket){
var oldWrite = socket.write; var oldWrite = socket.write;
socket.write = function(data) { socket.write = function(data) {
@ -144,11 +144,11 @@ if (argv.help){
} }
oldWrite.call(this, data); oldWrite.call(this, data);
total.bytes += data.length; total.bytes += data.length;
console.column(12).write(w.padRight(w.bytesToSize(total.bytes, 2), 12)); dope.column(12).write(w.padRight(w.bytesToSize(total.bytes, 2), 12));
}; };
console.column(24).write(++total.connections); dope.column(24).write(++total.connections);
socket.on("close", function(){ socket.on("close", function(){
console.column(24).write(w.padRight(--total.connections)); dope.column(24).write(w.padRight(--total.connections));
}); });
}); });
} }