From b7289201e1ca4bbd73470798a58f0d8ebbab1b48 Mon Sep 17 00:00:00 2001
From: Lloyd Brookes <lloyd.brookes@gmail.com>
Date: Sat, 10 Jun 2017 21:16:08 +0100
Subject: [PATCH] refactor bin run

---
 bin/cli.js              | 14 +-------------
 lib/local-web-server.js | 41 ++++++++++++++++++++---------------------
 2 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/bin/cli.js b/bin/cli.js
index fce734c..b3eed89 100755
--- a/bin/cli.js
+++ b/bin/cli.js
@@ -1,14 +1,2 @@
 #!/usr/bin/env node
-'use strict'
-const LocalWebServer = require('../')
-const localWebServer = new LocalWebServer()
-try {
-  localWebServer.start()
-} catch (err) {
-  if (err.code === 'MODULE_NOT_FOUND') {
-    console.error(err.message)
-    console.error(require('util').inspect(err.attempted, { depth: 6, colors: true }))
-  } else {
-    console.error(err.stack)
-  }
-}
+require('../').run()
diff --git a/lib/local-web-server.js b/lib/local-web-server.js
index 1d5ad99..dc80d4e 100644
--- a/lib/local-web-server.js
+++ b/lib/local-web-server.js
@@ -1,6 +1,7 @@
 'use strict'
 const Lws = require('lws')
-const Serve = require('lws/lib/command/serve/serve')
+const Serve = require('lws/lib/command/serve')
+const path = require('path')
 
 /**
  * @module local-web-server
@@ -8,26 +9,23 @@ const Serve = require('lws/lib/command/serve/serve')
 
 class WsServe extends Serve {
   execute (options, argv) {
-    const path = require('path')
-    let stack = [
-      'lws-log',
-      'lws-cors',
-      'lws-json',
-      'lws-rewrite',
-      'lws-body-parser',
-      'lws-blacklist',
-      'lws-conditional-get',
-      'lws-mime',
-      'lws-compress',
-      'lws-mock-response',
-      'lws-spa',
-      'lws-static',
-      'lws-index'
-    ]
-    const moduleDir = path.resolve(__dirname, `../node_modules`)
     options = {
-      stack,
-      moduleDir,
+      stack: [
+        'lws-log',
+        'lws-cors',
+        'lws-json',
+        'lws-rewrite',
+        'lws-body-parser',
+        'lws-blacklist',
+        'lws-conditional-get',
+        'lws-mime',
+        'lws-compress',
+        'lws-mock-response',
+        'lws-spa',
+        'lws-static',
+        'lws-index'
+      ],
+      moduleDir: path.resolve(__dirname, `../node_modules`),
       modulePrefix: 'lws-'
     }
     super.execute(options, argv)
@@ -64,12 +62,13 @@ class WsServe extends Serve {
 class LocalWebServer extends Lws {
   constructor (options) {
     super (options)
+    /* override default serve command */
     this.commands.add(null, WsServe)
+    /* add feature-list command */
     this.commands.add('feature-list', require('./feature-list'))
   }
 
   getVersion () {
-    const path = require('path')
     const pkg = require(path.resolve(__dirname, '..', 'package.json'))
     return pkg.version
   }