fixed config directory setting from env var

firstandthird · Nov 28, 2011 · ebdf62c · ebdf62c
1 parent 7347652
commit ebdf62c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/lib/confi.js b/lib/confi.js
@@ -4,7 +4,7 @@ var aug = require('aug');
 var cwd = process.cwd();
 
 var defaults = {
-  configDirectory: process.env.CONFI_PATH || 'conf',
+  configDirectory: process.env.CONFI_PATH || path.join(cwd, 'conf'),
   env: process.env.NODE_ENV || 'dev'
 };
 
@@ -19,10 +19,9 @@ var readConfig = function(configPath, env) {
 
 var load = function(options) {
   var opts = aug({}, defaults, options);
-  var configPath = path.join(cwd, opts.configDirectory); 
 
-  var defaultConf = readConfig(configPath, "default");
+  var defaultConf = readConfig(opts.configDirectory, "default");
-  var envConf = readConfig(configPath, opts.env);
+  var envConf = readConfig(opts.configDirectory, opts.env);
 
   return aug(defaultConf, envConf);
 };

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "confi",
   "description": "a simple configuration library",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "homepage": "https://github.com/jgallen23/confi",
   "author": "Greg Allen <@jgaui> (http://jga.me)",
   "repository": {