Use env mapping to extend configs

Author: SamyPesse

lib/configs/default.js

@@ -6,10 +6,10 @@ var path = require('path');
 module.exports = function(options) {
     options = _.merge(options, {
         // Debug
-        'debug': !!process.env.DEBUG,
+        'debug': false,
 
         // Port for running the webserver
-        'port': process.env.PORT || 3000,
+        'port': 3000,
 
         // Root folder
         'root': process.cwd(),
@@ -49,6 +49,9 @@ module.exports = function(options) {
                     'email': data.email
                 };
             },
+            'events': undefined,
+            'settings.get': undefined,
+            'settings.set': undefined
         },
 
         // Packages

lib/configs/env.js

@@ -0,0 +1,50 @@
+var _ = require('lodash');
+
+var alias = {
+    'PORT': 'CODEBOX_PORT'
+}
+
+var parseEnv = function (env, parent, prefix) {
+    var k, v, envVar, parsedEnv;
+
+    if (!parent) {
+        parent = {};
+    }
+
+    for(k in parent) {
+        v = parent[k];
+
+        envVar = prefix? prefix + '_': '';
+        envVar += k.toUpperCase();
+
+        if (_.isObject(v) && !_.isArray(v) && !_.isFunction(v)) {
+            parseEnv(env, v, envVar);
+        }
+        else {
+            if (envVar in env) {
+                if (_.isArray(v) && (v.length == 0 || _.isString(v[0]))) {
+                    parent[k] = _.compact(env[envVar].split(","));
+                } else if (_.isNumber(v)) {
+            		parent[k] = parseInt(env[envVar]);
+            	} else if (_.isBoolean(v)) {
+            		parent[k] = (env[envVar] == "false"? false : true);
+            	} else {
+            		parent[k] = env[envVar]
+            	}
+            }
+        }
+    }
+
+    return parent;
+};
+
+
+// Extend configuration with environment variables
+module.exports = function(options) {
+    var env = _.clone(process.env);
+    _.each(alias, function(to, from) {
+        env[to] = env[from] || env[to];
+    })
+
+    return parseEnv(env, options, 'CODEBOX');
+};

lib/configs/index.js

@@ -3,12 +3,13 @@ var Q = require('q');
 
 var TEMPLATES = {
     'default': require('./default'),
-    'local': require('./local')
+    'local': require('./local'),
+    'env': require('./env')
 };
 
 // Generate a complete config from templates
 module.exports = function(options) {
-    var templates = _.unique(["default"].concat((options.templates || "local").split(",")));
+    var templates = _.unique(["default"].concat((options.templates || "local,env").split(",")));
 
     return _.reduce(templates, function(prev, template) {
         return prev.then(function(_options) {

lib/configs/local.js

@@ -6,51 +6,44 @@ var wrench = require('wrench');
 
 var logger = require("../utils/logger")("local");
 
-var LOCAL_SETTINGS_DIR = process.env.WORKSPACE_CODEBOX_DIR || path.join(
-    process.env.HOME,
-    '.codebox'
-);
-
+var LOCAL_SETTINGS_DIR = process.env.CODEBOX_LOCAL_FOLDER || path.join(process.env.HOME,'.codebox')
 var SETTINGS_FILE = path.join(LOCAL_SETTINGS_DIR, 'settings.json');
 
 // Base structure for a local workspace
 // Store the workspace configuration in a file, ...
 module.exports = function(options) {
-    options = _.defaults(options, {
-
-    });
-
-    options.hooks = _.defaults(options.hooks, {
-        'settings.get': function(args) {
-            return Q.nfcall(fs.readFile, SETTINGS_FILE, "utf-8")
-            .then(JSON.parse)
-            .fail(_.constant({}))
-            .then(function(config) {
-                if (!config[options.id]) config[options.id] = {};
-                return config[options.id][args.user] || {};
-            });
+    options = _.merge(options, {
+        'hooks': {
+            'settings.get': function(args) {
+                return Q.nfcall(fs.readFile, SETTINGS_FILE, "utf-8")
+                .then(JSON.parse)
+                .fail(_.constant({}))
+                .then(function(config) {
+                    if (!config[options.id]) config[options.id] = {};
+                    return config[options.id][args.user] || {};
+                });
+            },
+
+            'settings.set': function(args) {
+                return Q.nfcall(fs.readFile, SETTINGS_FILE, "utf-8")
+                .then(JSON.parse)
+                .fail(_.constant({}))
+                .then(function(config) {
+                    if (!config[options.id]) config[options.id] = {};
+                    config[options.id][args.user] = args.settings;
+
+                    return Q.nfcall(fs.writeFile, SETTINGS_FILE, JSON.stringify(config))
+                    .thenResolve(config);
+                })
+                .then(function(config) {
+                    return config[options.id][args.user] || {};
+                });
+            }
         },
-
-        'settings.set': function(args) {
-            return Q.nfcall(fs.readFile, SETTINGS_FILE, "utf-8")
-            .then(JSON.parse)
-            .fail(_.constant({}))
-            .then(function(config) {
-                if (!config[options.id]) config[options.id] = {};
-                config[options.id][args.user] = args.settings;
-
-                return Q.nfcall(fs.writeFile, SETTINGS_FILE, JSON.stringify(config))
-                .thenResolve(config);
-            })
-            .then(function(config) {
-                return config[options.id][args.user] || {};
-            });
+        packages:{
+            'root': path.resolve(LOCAL_SETTINGS_DIR, 'packages')
         }
-    });
-
-    options.packages = _.defaults(options.packages, {
-        'root': process.env.WORKSPACE_ADDONS_DIR || path.resolve(LOCAL_SETTINGS_DIR, 'packages')
-    });
+    }, _.defaults);
 
     // Create .codebox folder
     logger.log("Creating", LOCAL_SETTINGS_DIR);