Merge pull request #16 from BrunoBernardino/master

Allow boot/local.js file

@@ -87,6 +87,41 @@ exports['@singleton'] = true
 
 
 ```
 ```
 
 
+You can have a `boot/local.js` with local settings if you need something unversioned (and load it by doing `$ export NODE_ENV=local`).
+
+```js
+// boot/local.js
+
+var path = require('path')
+var uploadsDir = path.join(__dirname, '..', 'uploads')
+var maxAge = 30 * 24 * 60 * 60 * 1000
+
+exports = module.exports = function() {
+
+  return {
+    local: {
+      uploadsDir: uploadsDir,
+      server: {
+        host: '0.0.0.0',
+        env: 'local',
+        port: 3003,
+      },
+      mongo: {
+        dbname: 'igloo-local',
+      },
+      redis: {
+        prefix: 'igloo-local',
+        maxAge: maxAge
+      }
+    }
+
+  }
+
+}
+
+exports['@singleton'] = true
+```
+
 
 
 ```js
 ```js
 // app.js
 // app.js

@@ -11,17 +11,28 @@ exports = module.exports = function(config, local) {
 
 
   var env = process.env.NODE_ENV || 'development'
   var env = process.env.NODE_ENV || 'development'
 
 
-  if (!_.isObject(config[env]))
-    throw new Error(util.format('Unknown environment %s', env))
-
   if (!_.isObject(local))
   if (!_.isObject(local))
     local = {}
     local = {}
 
 
-  mergeDefaults(settings, local, config[env], config.defaults)
+  mergeDefaults(config, local)
+
+  if (!_.isObject(config[env]))
+    throw new Error(util.format('Unknown environment %s', env))
+
+  mergeDefaults(settings, config[env], config.defaults)
 
 
   return settings
   return settings
 
 
 }
 }
 
 
 exports['@singleton'] = true
 exports['@singleton'] = true
-exports['@require'] = [ 'config' ]
+exports['@require'] = ['config']
+
+var fs = require('fs')
+var path = require('path')
+var localPath = path.join(__dirname, '..', '..', '..', '..' ,'boot', 'local.js')
+
+// Include local.js if it exists at boot/local.js
+if (fs.existsSync(localPath)) {
+  exports['@require'].push('local')
+}