allow config file to export a function

sokra · sokra · commit ff4585b1081d · 2015-03-05T22:22:22.000+01:00
pass --env to config function
diff --git a/bin/config-optimist.js b/bin/config-optimist.js
@@ -5,6 +5,8 @@ module.exports = function(optimist) {
 
 	.string("config").describe("config")
 
+	.string("env").describe("env", "Enviroment passed to the config, when it is a function")
+
 	.string("context").describe("context")
 
 	.string("entry").describe("entry")
diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -36,6 +36,11 @@ module.exports = function(optimist, argv, convertOptions) {
 			configFileLoaded = true;
 		}
 	}
+
+	if(typeof options === "function") {
+		options = options(argv.env, argv);
+	}
+
 	if(typeof options !== "object" || options === null) {
 		console.log("Config did not export a object.");
 		process.exit(-1);

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,11 @@ module.exports = function(optimist, argv, convertOptions) {`
`36`	`36`	`configFileLoaded = true;`
`37`	`37`	`}`
`38`	`38`	`}`
	`39`	`+`
	`40`	`+ if(typeof options === "function") {`
	`41`	`+ options = options(argv.env, argv);`
	`42`	`+ }`
	`43`	`+`
`39`	`44`	`if(typeof options !== "object" \|\| options === null) {`
`40`	`45`	`console.log("Config did not export a object.");`
`41`	`46`	`process.exit(-1);`