From 758ba05bd114e010198af8ae2e5f4876ba57236b Mon Sep 17 00:00:00 2001 From: Andrew Sidesinger Date: Sat, 8 Feb 2014 21:09:54 -0500 Subject: [PATCH 1/2] add non-current-working-directory support --- README.md | 5 +++++ ws.js | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 572eaa1..57274c9 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,11 @@ $ ws serving at http://localhost:8000 ``` +If you wish to serve a different directory, run: +```sh +$ ws -d ~/mysite/ +``` + If you wish to override the default port (8000), use `--port` or `-p`: ```sh $ ws --port 9000 diff --git a/ws.js b/ws.js index 07599e8..06ee567 100755 --- a/ws.js +++ b/ws.js @@ -4,7 +4,7 @@ var connect = require("connect"), Thing = require("nature").Thing, wodge = require("wodge"); -var usage = "usage: ws [--port|-p ] [--log-format|-f dev|default|short|tiny]"; +var usage = "usage: ws [--directory|-d ] [--port|-p ] [--log-format|-f dev|default|short|tiny]"; function halt(message){ console.log(wodge.red("Error ") + message); @@ -16,6 +16,7 @@ var options = new Thing() .define({ name: "port", alias: "p", type: "number", defaultOption: true, value: 8000 }) .define({ name: "log-format", alias: "f", type: "string", value: "dev" }) .define({ name: "help", alias: "h", type: "boolean" }) + .define({ name: "directory", alias: "d", type: "string", defaultOption: true, value: process.cwd()}) .on("error", function(err){ halt(err.message); }) @@ -40,8 +41,8 @@ if (!options.valid){ var app = connect() .use(connect.logger(options["log-format"])) .use(connect.compress()) - .use(connect.static(process.cwd())) - .use(connect.directory(process.cwd(), { icons: true })); + .use(connect.static(options.directory)) + .use(connect.directory(options.directory, { icons: true })); http.createServer(app) .on("error", function(err){ From 3fe6bb1d8c3fe1bd375fe8a4d08706cadfb55e42 Mon Sep 17 00:00:00 2001 From: Lloyd Brookes Date: Sun, 9 Feb 2014 08:30:11 +0100 Subject: [PATCH 2/2] only one defaultOption should be defined --- ws.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ws.js b/ws.js index 06ee567..fbbac3c 100755 --- a/ws.js +++ b/ws.js @@ -16,7 +16,7 @@ var options = new Thing() .define({ name: "port", alias: "p", type: "number", defaultOption: true, value: 8000 }) .define({ name: "log-format", alias: "f", type: "string", value: "dev" }) .define({ name: "help", alias: "h", type: "boolean" }) - .define({ name: "directory", alias: "d", type: "string", defaultOption: true, value: process.cwd()}) + .define({ name: "directory", alias: "d", type: "string", value: process.cwd() }) .on("error", function(err){ halt(err.message); })