move code to lib/

Author: simonh1000

README.md

@@ -101,10 +101,11 @@ The `--https` or `--ssl` flags are intended for development and/or testing purpo
 
 ## Changelog
 
-1.7.0 - add option to include own ssl certificate (thanks dpraul)
-1.6.0 - add --config option (thanks dpraul)
-1.5.0 - add --open option (thanks tluanga34)
-1.4.0 - add --path option (thanks nick-bogdanov)
+ - 1.8.0 - rewrite of path resolution (thanks dpraul)
+ - 1.7.0 - add option to include own ssl certificate (thanks dpraul)
+ - 1.6.0 - add --config option (thanks dpraul)
+ - 1.5.0 - add --open option (thanks tluanga34)
+ - 1.4.0 - add --path option (thanks nick-bogdanov)
 
 ## Contributing
 

angular-http-server.js renamed to lib/angular-http-server.js

@@ -1,22 +1,20 @@
 #!/usr/bin/env node
 
 var fs = require("fs");
-var argv = require("minimist")(process.argv.slice(2));
-var mime = require("mime");
 var path = require("path");
+var mime = require("mime");
 var pem = require("pem");
 var https = require("https");
 var http = require("http");
 var opn = require("opn");
 
-const getFilePathFromUrl = require('./lib/get-file-path-from-url');
-
+var argv = require("minimist")(process.argv.slice(2));
+const getFilePathFromUrl = require('./get-file-path-from-url');
 
 const NO_PATH_FILE_ERROR_MESSAGE =
     "Error: index.html could not be found in the specified path ";
-const NO_ROOT_FILE_ERROR_MESSAGE =
-    "Error: Could not find index.html within the working directory.";
 
+// if using config file, load that first
 if (argv.config) {
     let configPath;
     if (path.isAbsolute(argv.config)) {
@@ -32,11 +30,13 @@ if (argv.config) {
         config = getConfig;
     }
     // supplement argv with config, but CLI args take precedence
-    argv = Object.assign({}, config, argv);
+    argv = Object.assign(config, argv);
 }
 
+// Pre-process arguments
 const useHttps = argv.ssl || argv.https;
 const basePath = argv.path ? path.resolve(argv.path) : process.cwd();
+const port = getPort(argv.p);
 
 // As a part of the startup - check to make sure we can access index.html
 returnDistFile(true);
@@ -71,11 +71,11 @@ if (useHttps) {
 }
 
 function start() {
-    server.listen(getPort(), function() {
+    server.listen(port, function() {
         if (argv.open == true || argv.o) {
-            opn((useHttps ? "https" : "http") + "://localhost:" + getPort());
+            opn((useHttps ? "https" : "http") + "://localhost:" + port);
         }
-        return console.log("Listening on " + getPort());
+        return console.log("Listening on " + port);
     });
 }
 
@@ -119,9 +119,9 @@ function requestListener(req, res) {
     });
 }
 
-function getPort() {
-    if (argv.p) {
-        var portNum = parseInt(argv.p);
+function getPort(portNo) {
+    if (portNo) {
+        var portNum = parseInt(portNo);
         if (!isNaN(portNum)) {
             return portNum;
         } else {

package.json

@@ -18,6 +18,8 @@
     },
     "contributors": [
         {
+            "name": "dpraul"
+        },{
             "name": "Dale Myszewski",
             "email": "dale@daleslab.com"
         },
@@ -33,7 +35,7 @@
     },
     "preferGlobal": true,
     "bin": {
-        "angular-http-server": "./angular-http-server.js"
+        "angular-http-server": "./lib/angular-http-server.js"
     },
     "dependencies": {
         "mime": "^1.3.6",