# HG changeset patch # User smith@nwoca.org # Date 1338849390 -3600 # Node ID 167745cd8af9d8dfc6252b66465f4c46d8019d0d # Parent 34bb1f5b90279eec23f50988af41c3cfc2f2d28f add support for private environment files in slurper format diff -r 34bb1f5b9027 -r 167745cd8af9 init.gradle --- a/init.gradle Wed May 16 18:24:23 2012 +0100 +++ b/init.gradle Mon Jun 04 23:36:30 2012 +0100 @@ -142,16 +142,24 @@ file('.').eachFileMatch(~/^environment.*\.groovy$/) { envFile -> def envName = envFile.name - '.groovy' + def privateFile = file("private" + envName - "environment" + ".groovy") logger.info("loading environment $envFile.name") + def envCfg = slurper.parse(envFile.toURL()) envCfg.merge(slurper.parse(developerPrivate)) + if (privateFile.exists()) { + logger.info("loading private environment $privateFile") + envCfg.merge(slurper.parse(privateFile.toURL())) + } + gradle.rootProject.getProperties().find { it.key.startsWith('environment') }.each { it.value.split(',').each { p -> def (k,v) = p.split('=') - logger.info("$envName: overriding " + k + "=" + v) + logger.info("$envName: overriding " + k + "=" + v + " in $it") envCfg.put(k,v) } } + envOverrides.each { k,v -> logger.info("$envName: overriding " + k + "=" + v) envCfg.put(k,v)