[fix dist] Update to "common-style".

Author: indexzero

bin/http-server

@@ -13,54 +13,56 @@ var ifaces = os.networkInterfaces();
 
 if (argv.h || argv.help) {
   console.log([
-    "usage: http-server [path] [options]",
-    "",
-    "options:",
-    "  -p                 Port to use [8080]",
-    "  -a                 Address to use [0.0.0.0]",
-    "  -d                 Show directory listings [true]",
-    "  -i                 Display autoIndex [true]",
-    "  -e --ext           Default file extension if none supplied [none]",
-    "  -s --silent        Suppress log messages from output",
-    "  --cors             Enable CORS via the 'Access-Control-Allow-Origin' header",
-    "  -o [path]          Open browser window after starting the server",
-    "  -c                 Cache time (max-age) in seconds [3600], e.g. -c10 for 10 seconds.",
-    "                     To disable caching, use -c-1.",
-    "",
-    "  -P --proxy         Fallback proxy if the request cannot be resolved. e.g.: http://someurl.com",
-    "",
-    "  -S --ssl           Enable https.",
-    "  -C --cert          Path to ssl cert file (default: cert.pem).",
-    "  -K --key           Path to ssl key file (default: key.pem).",
-    "",
-    "  -r --robots        Respond to /robots.txt [User-agent: *\\nDisallow: /]",
-    "  -h --help          Print this list and exit."
+    'usage: http-server [path] [options]',
+    '',
+    'options:',
+    '  -p                 Port to use [8080]',
+    '  -a                 Address to use [0.0.0.0]',
+    '  -d                 Show directory listings [true]',
+    '  -i                 Display autoIndex [true]',
+    '  -e --ext           Default file extension if none supplied [none]',
+    '  -s --silent        Suppress log messages from output',
+    '  --cors             Enable CORS via the "Access-Control-Allow-Origin" header',
+    '  -o [path]          Open browser window after starting the server',
+    '  -c                 Cache time (max-age) in seconds [3600], e.g. -c10 for 10 seconds.',
+    '                     To disable caching, use -c-1.',
+    '',
+    '  -P --proxy         Fallback proxy if the request cannot be resolved. e.g.: http://someurl.com',
+    '',
+    '  -S --ssl           Enable https.',
+    '  -C --cert          Path to ssl cert file (default: cert.pem).',
+    '  -K --key           Path to ssl key file (default: key.pem).',
+    '',
+    '  -r --robots        Respond to /robots.txt [User-agent: *\\nDisallow: /]',
+    '  -h --help          Print this list and exit.'
   ].join('\n'));
   process.exit();
 }
 
 var port = argv.p || parseInt(process.env.PORT, 10),
     host = argv.a || '0.0.0.0',
-    log = (argv.s || argv.silent) ? (function () {}) : console.log,
     ssl = !!argv.S || !!argv.ssl,
     proxy = argv.P || argv.proxy,
-    requestLogger;
+    logger = colors && {};
 
 if (!argv.s && !argv.silent) {
-  requestLogger = function(req, res, error) {
-    var date = (new Date).toUTCString();
-    if (error) {
-      log('[%s] "%s %s" Error (%s): "%s"', date, req.method.red, req.url.red, error.status.toString().red, error.message.red);
-    } else {
-      log('[%s] "%s %s" "%s"', date, req.method.cyan, req.url.cyan, req.headers['user-agent']);
+  logger = {
+    info: console.log,
+    request: function (req, res, error) {
+      var date = new Date().toUTCString();
+      if (error) {
+        logger.info('[%s] "%s %s" Error (%s): "%s"', date, req.method.red, req.url.red, error.status.toString().red, error.message.red);
+      } else {
+        logger.info('[%s] "%s %s" "%s"', date, req.method.cyan, req.url.cyan, req.headers['user-agent']);
+      }
     }
   };
 }
 
 if (!port) {
   portfinder.basePort = 8080;
   portfinder.getPort(function (err, port) {
-    if (err) throw err;
+    if (err) { throw err; }
     listen(port);
   });
 } else {
@@ -75,7 +77,7 @@ function listen(port) {
     autoIndex: argv.i,
     robots: argv.r || argv.robots,
     ext: argv.e || argv.ext,
-    logFn: requestLogger,
+    logFn: logger.request,
     proxy: proxy
   };
 
@@ -95,9 +97,9 @@ function listen(port) {
     var canonicalHost = host === '0.0.0.0' ? '127.0.0.1' : host,
         protocol      = ssl ? 'https:' : 'http:';
 
-    log('Starting up http-server, serving '.yellow
+    logger.info('Starting up http-server, serving '.yellow
       + server.root.cyan
-      + (ssl ? (' through'.yellow + ' https'.cyan) : '')
+      + ssl ? ' through'.yellow + ' https'.cyan : ''
       + ' on: '.yellow
       + (protocol + '//' + host + ':' + port).cyan);
 
@@ -112,10 +114,10 @@ function listen(port) {
     });
 
     if (typeof proxy === 'string') {
-      log('Unhandled requests will be served from: ' + proxy);
+      logger.info('Unhandled requests will be served from: ' + proxy);
     }
 
-    log('Hit CTRL-C to stop the server');
+    logger.info('Hit CTRL-C to stop the server');
     if (argv.o) {
       opener(
         protocol + '//' + canonicalHost + ':' + port,
@@ -134,8 +136,8 @@ if (process.platform === 'win32') {
   });
 }
 
-process.on('SIGINT', function() {
-  log('http-server stopped.'.red);
+process.on('SIGINT', function () {
+  logger.info('http-server stopped.'.red);
   process.exit();
 });
 

lib/http-server.js

@@ -1,5 +1,4 @@
 var fs = require('fs'),
-    util = require('util'),
     union = require('union'),
     ecstatic = require('ecstatic'),
     httpProxy = require('http-proxy'),
@@ -10,13 +9,11 @@ var HTTPServer = exports.HTTPServer = function (options) {
 
   if (options.root) {
     this.root = options.root;
-  }
-  else {
+  } else {
     try {
       fs.lstatSync('./public');
       this.root = './public';
-    }
-    catch (err) {
+    } catch (err) {
       this.root = './';
     }
   }

package.json

@@ -13,7 +13,7 @@
   ],
   "scripts": {
     "start": "node ./bin/http-server",
-    "pretest": "stylezero bin/ lib/ test",
+    "pretest": "stylezero bin/http-server lib/ test",
     "test": "vows --spec --isolate"
   },
   "contributors": [

test/http-server-test.js

@@ -71,7 +71,7 @@ vows.describe('http-server').addBatch({
       topic: function () {
         request('http://127.0.0.1:8080/', this.callback);
       },
-      'should respond with headers set in options': function (err, res, body) {
+      'should respond with headers set in options': function (err, res) {
         assert.equal(res.headers['access-control-allow-origin'], '*');
         assert.equal(res.headers['access-control-allow-credentials'], 'true');
       }
@@ -146,7 +146,7 @@ vows.describe('http-server').addBatch({
           }
         }, this.callback);
       },
-      'status code should be 204': function (err, res, body) {
+      'status code should be 204': function (err, res) {
         assert.equal(res.statusCode, 204);
       }
     }