refactor(config): do not just interpret database.json

also check for either a passed config object OR a config file exists

Author: wzrdtales

api.js

@@ -566,9 +566,7 @@ function loadConfig( config, internals ) {
   var out,
       currentEnv = internals.currentEnv || internals.argv.env;
 
-  if (process.env.DATABASE_URL) {
-    out = config.loadUrl(process.env.DATABASE_URL, currentEnv);
-  } else if (internals.configObject) {
+  if (internals.configObject) {
     out = config.loadObject(internals.configObject, currentEnv);
   } else {
     out = config.loadFile(internals.argv.config, currentEnv, internals.plugins);

lib/commands/helper/assert.js

@@ -1,3 +1,4 @@
+var assert = require('assert');
 
 module.exports = function(err, callback) {
   if (err) {

lib/config.js

@@ -43,7 +43,12 @@ exports.loadFile = function(fileName, currentEnv, plugins) {
   try {
     fs.statSync(fileName);
   } catch(e) {
-    throw new Error('Could not find database config file \'' + fileName + '\'');
+    if(!process.env.DATABASE_URL) {
+      throw new Error('Could not find database config file \'' + fileName + '\'');
+    }
+    else {
+      return exports.loadUrl(process.env.DATABASE_URL, currentEnv);
+    }
   }
 
   try {
@@ -77,7 +82,18 @@ exports.loadFile = function(fileName, currentEnv, plugins) {
       throw e;
     }
 
-    config = require(path.join(process.cwd(), fileName));
+    try {
+      config = require(path.join(process.cwd(), fileName));
+    }
+    catch(e) {
+
+      if(!process.env.DATABASE_URL) {
+        throw e;
+      }
+      else {
+        return exports.loadUrl(process.env.DATABASE_URL, currentEnv);
+      }
+    }
   }
 
   return exports.loadObject(config, currentEnv);
@@ -106,13 +122,13 @@ function walkConfig(level) {
 }
 
 exports.loadObject = function(_config, currentEnv) {
+
   var out = new Config();
   // do not overwrite the users config
   var config = JSON.parse(JSON.stringify(_config));
 
   for (var env in config) {
 
-
     if (config[env].ENV) {
       if(!process.env[config[env].ENV])
         log.verbose('Environment variable ' + config[env].ENV + ' is empty!');
@@ -127,12 +143,20 @@ exports.loadObject = function(_config, currentEnv) {
       out[env] = config[env];
     }
 
-    if(typeof(config[env].url) === 'string') {
+    if(typeof(config[env].url) === 'string' || process.env.DATABASE_URL) {
 
-      config[env] = Object.assign(
-        config[env],
-        exports.loadUrl(config[env].url, env)[env]
-      );
+      if(typeof(config[env].url) !== 'string') {
+        config[env] = Object.assign(
+          config[env],
+          parseDatabaseUrl(process.env.DATABASE_URL)
+        );
+      }
+      else {
+        config[env] = Object.assign(
+          config[env],
+          parseDatabaseUrl(config[env].url)
+        );
+      }
       delete config[env].url;
     }
     else if(config[env].url && config[env].url.value) {