Use config-load module to load config

overlookmotel · Jul 18, 2015 · fd60b61 · fd60b61
1 parent 93a37de
commit fd60b61
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/lib/overlook.js b/lib/overlook.js
@@ -11,6 +11,7 @@ var pathModule = require('path'),
     fs = require('fs-extra-promise'),
     promisifyAny = require('promisify-any'),
     requireFolderTree = require('require-folder-tree'),
+    configLoad = require('config-load'),
     walkFolderTree = require('walk-folder-tree');
 
 // imports
@@ -69,14 +70,7 @@ module.exports = promisifyAny.generators({
         this.log('Loading config from ' + configPath);
 
         if (configPath && fs.existsSync(configPath)) {
-            var config = requireFolderTree(configPath);
-
-            if (config.env && config.env[this.env]) {
-                _.merge(config, config.env[this.env]);
-                config = _.clone(config);
-                delete config.env;
-            }
-
+            var config = configLoad(configPath, {env: this.env});
             _.merge(options, config);
         }
 

diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "bluebird": "^2.9.31",
     "co-bluebird": "^0.1.0",
     "co-series": "^0.1.0",
+    "config-load": "^0.1.0",
     "ejs": "^2.3.2",
     "express": "^4.13.0",
     "expressor": "^2.1.1",