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

replaced nature with command-line-args

Browse Source
This commit is contained in:
Lloyd Brookes
2014-05-29 23:01:39 +01:00
parent 2af9509f26
commit 913f6573c5
2 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
bin/ws.js
View File

@ -3,7 +3,7 @@
var dope = require("console-dope"), var dope = require("console-dope"),
connect = require("connect"), connect = require("connect"),
http = require("http"), http = require("http"),
Model = require("nature").Model, parseArgv = require("command-line-args"),
w = require("wodge"), w = require("wodge"),
path = require("path"), path = require("path"),
loadConfig = require("config-master"), loadConfig = require("config-master"),
@ -14,7 +14,7 @@ var dope = require("console-dope"),
var usage = var usage =
"usage: \n\ "usage: \n\
$ ws [--directory|-d <directory>] [--port|-p <port>] [--log-format|-f dev|default|short|tiny] [--compress|-c]\n\ $ ws [--directory|-d <dir>] [--port|-p <port>] [--log-format|-f dev|default|short|tiny] [--compress|-c]\n\
$ ws --config\n\ $ ws --config\n\
$ ws --help|-h"; $ ws --help|-h";
@ -24,38 +24,31 @@ function halt(message){
process.exit(1); process.exit(1);
} }
/* parse command-line args */ /* Merge together options from
var argv = new Model() - ~/.local-web-server.json
.define({ name: "port", alias: "p", type: "number", defaultOption: true, value: 8000 }) - {cwd}/.local-web-server.json
.define({ name: "log-format", alias: "f", type: "string" }) - {cwd}/package.json
.define({ name: "help", alias: "h", type: "boolean" }) */
.define({ name: "directory", alias: "d", type: "string", value: process.cwd() })
.define({ name: "config", type: "boolean" })
.define({ name: "compress", alias: "c", type: "boolean" });
/* Merge together options from "~/.local-web-server.json", "{cwd}/.local-web-server.json" and "{cwd}/package.json", in that order. */
var storedConfig = loadConfig( var storedConfig = loadConfig(
path.join(w.getHomeDir(), ".local-web-server.json"), path.join(w.getHomeDir(), ".local-web-server.json"),
path.join(process.cwd(), ".local-web-server.json"), path.join(process.cwd(), ".local-web-server.json"),
path.join(process.cwd(), "package.json:local-web-server") path.join(process.cwd(), "package.json:local-web-server")
); );
/* override stored config with values parsed from command line */
try { try {
argv.set(storedConfig); var argv = parseArgv([
} catch (err){ { name: "port", alias: "p", type: Number, defaultOption: true, value: 8000 },
dope.red.log("Failed to set stored config, please check your config files"); { name: "log-format", alias: "f", type: String },
{ name: "help", alias: "h", type: Boolean },
{ name: "directory", alias: "d", type: String, value: process.cwd() },
{ name: "config", type: Boolean },
{ name: "compress", alias: "c", type: Boolean }
]);
} catch(err){
halt(err.message); halt(err.message);
} }
argv = w.extend(storedConfig, argv);
/* Finally, set the options from the command-line, overriding all defaults. */
try {
argv.set(process.argv);
} catch (err){
dope.red.log("Failed to set command line options");
halt(err.message);
}
/* Die here if invalid args received */
if (!argv.valid) halt(argv.validationMessages);
if (argv.config){ if (argv.config){
dope.log("Stored config: "); dope.log("Stored config: ");

12
package.json
View File

@ -14,14 +14,14 @@
"repository": "https://github.com/75lb/local-web-server", "repository": "https://github.com/75lb/local-web-server",
"author": "Lloyd Brookes", "author": "Lloyd Brookes",
"dependencies": { "dependencies": {
"connect": "^3.0.0", "command-line-args": "~0.0.2",
"nature": "~0.4.0", "compression": "^1.0.2",
"console-dope": "~0.3.0",
"wodge": "~0.5.0",
"config-master": "~0.1.0", "config-master": "~0.1.0",
"connect": "^3.0.0",
"console-dope": "~0.3.0",
"morgan": "^1.0.0", "morgan": "^1.0.0",
"serve-static": "^1.1.0",
"serve-index": "^1.0.2", "serve-index": "^1.0.2",
"compression": "^1.0.2" "serve-static": "^1.1.0",
"wodge": "~0.6.0"
} }
} }