fixes #397, allow for multiple profiles

dbashford · Jun 23, 2014 · 85ed05f · 85ed05f
1 parent 660011b
commit 85ed05f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 31 deletions.
diff --git a/lib/util/configurer.js b/lib/util/configurer.js
@@ -323,7 +323,7 @@ _applyAndValidateDefaults = function(config, callback) {
 };
 
 processConfig = function(opts, callback) {
-  var config, err, mainConfigPath, profileConfig, profileConfigPath;
+  var config, err, mainConfigPath;
   config = {};
   mainConfigPath = _findConfigPath("mimosa-config");
   if (mainConfigPath != null) {
@@ -341,24 +341,27 @@ processConfig = function(opts, callback) {
     if (!config.profileLocation) {
       config.profileLocation = "profiles";
     }
-    profileConfigPath = _findConfigPath(path.join(config.profileLocation, opts.profile));
-    if (profileConfigPath != null) {
-      try {
-        profileConfig = _requireConfig(profileConfigPath).config;
-      } catch (_error) {
-        err = _error;
-        return logger.fatal("Improperly formatted configuration file [[ " + profileConfigPath + " ]]: " + err);
-      }
-      if (logger.isDebug()) {
-        logger.debug("Profile config:\n" + (JSON.stringify(profileConfig, null, 2)));
-      }
-      config = _extend(config, profileConfig);
-      if (logger.isDebug()) {
-        logger.debug("mimosa config after profile applied:\n" + (JSON.stringify(config, null, 2)));
+    opts.profile.split("#").forEach(function(profileName) {
+      var profileConfig, profileConfigPath;
+      profileConfigPath = _findConfigPath(path.join(config.profileLocation, profileName));
+      if (profileConfigPath != null) {
+        try {
+          profileConfig = _requireConfig(profileConfigPath).config;
+        } catch (_error) {
+          err = _error;
+          return logger.fatal("Improperly formatted configuration file [[ " + profileConfigPath + " ]]: " + err);
+        }
+        if (logger.isDebug()) {
+          logger.debug("Profile config:\n" + (JSON.stringify(profileConfig, null, 2)));
+        }
+        config = _extend(config, profileConfig);
+        if (logger.isDebug()) {
+          return logger.debug("mimosa config after profile applied:\n" + (JSON.stringify(config, null, 2)));
+        }
+      } else {
+        return logger.fatal("Profile provided but not found at [[ " + (path.join('profiles', profileName)) + " ]]");
       }
-    } else {
-      return logger.fatal("Profile provided but not found at [[ " + (path.join('profiles', opts.profile)) + " ]]");
-    }
+    });
   }
   config.isServer = opts != null ? opts.server : void 0;
   config.isOptimize = opts != null ? opts.optimize : void 0;

diff --git a/src/util/configurer.coffee b/src/util/configurer.coffee
@@ -299,22 +299,25 @@ processConfig = (opts, callback) ->
     unless config.profileLocation
       config.profileLocation = "profiles"
 
-    profileConfigPath = _findConfigPath path.join(config.profileLocation, opts.profile)
-    if profileConfigPath?
-      try
-        profileConfig = _requireConfig(profileConfigPath).config
-      catch err
-        return logger.fatal "Improperly formatted configuration file [[ #{profileConfigPath} ]]: #{err}"
+    opts.profile.split("#").forEach (profileName) ->
 
-      if logger.isDebug()
-        logger.debug "Profile config:\n#{JSON.stringify(profileConfig, null, 2)}"
+      profileConfigPath = _findConfigPath path.join(config.profileLocation, profileName)
+      if profileConfigPath?
+        try
+          profileConfig = _requireConfig(profileConfigPath).config
+        catch err
+          return logger.fatal "Improperly formatted configuration file [[ #{profileConfigPath} ]]: #{err}"
 
-      config = _extend config, profileConfig
+        if logger.isDebug()
+          logger.debug "Profile config:\n#{JSON.stringify(profileConfig, null, 2)}"
+
+        config = _extend config, profileConfig
+
+        if logger.isDebug()
+          logger.debug "mimosa config after profile applied:\n#{JSON.stringify(config, null, 2)}"
+      else
+        return logger.fatal "Profile provided but not found at [[ #{path.join('profiles', profileName)} ]]"
 
-      if logger.isDebug()
-        logger.debug "mimosa config after profile applied:\n#{JSON.stringify(config, null, 2)}"
-    else
-      return logger.fatal "Profile provided but not found at [[ #{path.join('profiles', opts.profile)} ]]"
 
   config.isServer =    opts?.server
   config.isOptimize =  opts?.optimize