feat(config): Allow browser-sync property in package.json

feat(config): Allow flags to override config file/package.json when given on cli

Author: shakyShane

lib/cli/command.start.js

@@ -1,6 +1,9 @@
 "use strict";
 
-var info = require("./cli-info");
+var path  = require("path");
+var fs    = require("fs");
+var _     = require("lodash");
+var utils = require("../utils");
 
 /**
  * $ browser-sync start <options>
@@ -13,11 +16,31 @@ var info = require("./cli-info");
  */
 module.exports = function (opts) {
 
-    var flags = stripUndefined(opts.cli.flags);
+    var flags    = stripUndefined(opts.cli.flags);
+    var maybepkg = path.resolve(process.cwd(), "package.json");
+    var input    = flags;
+
+    if (flags.config) {
+        var maybeconf = path.resolve(process.cwd(), flags.config);
+        if (fs.existsSync(maybeconf)) {
+            var conf = require(maybeconf);
+            input = _.merge({}, conf, flags);
+        } else {
+            utils.fail(true, new Error("Configuration file '" + flags.config + "' not found"), opts.cb);
+        }
+    } else {
+        if (fs.existsSync(maybepkg)) {
+            var pkg = require(maybepkg);
+            if (pkg["browser-sync"]) {
+                console.log("> Configuration obtained from package.json");
+                input = _.merge({}, pkg["browser-sync"], flags);
+            }
+        }
+    }
 
     return require("../../")
         .create("cli")
-        .init(flags, opts.cb);
+        .init(input, opts.cb);
 };
 
 /**

lib/cli/opts.start.json

@@ -68,6 +68,7 @@
   },
   "config": {
     "type": "string",
+    "alias": "c",
     "desc": "Specify a path to a configuration file"
   },
   "host": {

test/fixtures/config/si-config.js

@@ -2,6 +2,7 @@ module.exports = {
     files: ["test/fixtures/**/*.css", "test/fixtures/**/*.html"],
     testConfig: true,
     logLevel: "debug",
+    open: false,    
     server: {
         baseDir: "test/fixtures"
     }

test/specs/e2e/cli/e2e.cli.conf.js

@@ -0,0 +1,29 @@
+"use strict";
+
+var path        = require("path");
+var browserSync = require(path.resolve("./"));
+var pkg         = require(path.resolve("package.json"));
+var assert      = require("chai").assert;
+var sinon       = require("sinon");
+var fs          = require("fs");
+var cli         = require(path.resolve(pkg.bin));
+
+// describe("CLI: merging package.json property with cli args", function () {
+//     it("accepts key `browser-sync` from package.json", function (done) {
+//         browserSync.reset();
+//         cli({
+//             cli: {
+//                 input: ["start"],
+//                 flags: {
+//                     logLevel: "silent",
+//                     open: false
+//                 }
+//             },
+//             cb: function (err, bs) {
+//                 assert.equal(bs.options.getIn(["server", "baseDir"]), "test/fixtures");
+//                 bs.cleanup();
+//                 done();
+//             }
+//         });
+//     });
+// });