Fixing cfg value source printing

Fixes #5

Author: tsiq-karold

webtau-groovy/src/main/groovy/com/twosigma/webtau/cli/WebTauTestCliConfig.groovy

@@ -16,34 +16,38 @@
 
 package com.twosigma.webtau.cli
 
+import com.twosigma.webtau.cfg.ConfigValue
 import com.twosigma.webtau.console.ConsoleOutputs
 import com.twosigma.webtau.console.ansi.Color
 import com.twosigma.webtau.cfg.WebTauConfig
 import org.apache.commons.cli.*
 
 import java.nio.file.Files
 import java.nio.file.Path
-import java.nio.file.Paths
 
 class WebTauTestCliConfig {
     private static final String CLI_SOURCE = "command line argument"
     private static final String CFG_SOURCE = "config file"
 
-    private WebTauConfig cfg = WebTauConfig.INSTANCE
+    private final WebTauConfig cfg
 
     private final ExitHandler exitHandler
 
     private List<String> testFiles
-    private String env
     private Path configPath
     private CommandLine commandLine
     private ConfigObject configObject
 
     WebTauTestCliConfig(String... args) {
-        this({ System.exit(it) }, args)
+        this(WebTauConfig.INSTANCE, { System.exit(it) }, args)
     }
 
-    WebTauTestCliConfig(ExitHandler exitHandler, String... args) {
+    WebTauTestCliConfig(WebTauConfig cfg, String... args) {
+        this(cfg, { System.exit(it) }, args)
+    }
+
+    WebTauTestCliConfig(WebTauConfig cfg, ExitHandler exitHandler, String... args) {
+        this.cfg = cfg
         this.exitHandler = exitHandler
         parseArgs(args)
     }
@@ -90,12 +94,14 @@ class WebTauTestCliConfig {
         }
 
         testFiles = new ArrayList<>(commandLine.argList)
-        Path workingDir = Paths.get(cliValue(cfg.getWorkingDirConfigName(), ""))
-        configPath = workingDir.resolve(cliValue("config", "test.cfg"))
 
-        def envCliValue = cliValue(cfg.envConfigValue.key, "local")
-        cfg.acceptConfigValues(CLI_SOURCE, [(cfg.envConfigValue.key): envCliValue,
-                                            (cfg.workingDirConfigValue.key): workingDir])
+        setValueFromCliIfPresent(cfg.workingDirConfigValue)
+        Path workingDir = cfg.workingDir
+
+        setValueFromCliIfPresent(cfg.configFileName)
+        configPath = workingDir.resolve(cfg.configFileName.asString)
+
+        setValueFromCliIfPresent(cfg.envConfigValue)
     }
 
     private static CommandLine createCommandLine(String[] args, Options options) {
@@ -107,9 +113,10 @@ class WebTauTestCliConfig {
         }
     }
 
-    private def cliValue(String name, defaultValue) {
-        return commandLine.hasOption(name) ? commandLine.getOptionValue(name) :
-                defaultValue
+    private def setValueFromCliIfPresent(ConfigValue configValue) {
+        if (commandLine.hasOption(configValue.key)) {
+            configValue.set(CLI_SOURCE, commandLine.getOptionValue(configValue.key))
+        }
     }
 
     private Options createOptions() {

webtau-groovy/src/test/groovy/com/twosigma/webtau/cli/WebTauTestCliConfigTest.groovy

@@ -24,19 +24,19 @@ import java.nio.file.Paths
 
 class WebTauTestCliConfigTest {
     private static def groovy = GroovyStandaloneEngine.createWithoutDelegating(Paths.get(""), [])
-    private static final cfg = WebTauConfig.INSTANCE
+    private final cfg = new WebTauConfig()
 
     @Test
-    void "should use default environment values when evn is not specified"() {
-        def cliConfig = new WebTauTestCliConfig("--config=src/test/resources/test.cfg", "testFile")
+    void "should use default environment values when env is not specified"() {
+        def cliConfig = new WebTauTestCliConfig(cfg, "--config=src/test/resources/test.cfg", "testFile")
         cliConfig.parseConfig(groovy)
 
         cfg.baseUrl.should == "http://localhost:8180"
     }
 
     @Test
-    void "should use environment specific values when evn is specified"() {
-        def cliConfig = new WebTauTestCliConfig("--config=src/test/resources/test.cfg", "--env=dev", "testFile")
+    void "should use environment specific values when env is specified"() {
+        def cliConfig = new WebTauTestCliConfig(cfg, "--config=src/test/resources/test.cfg", "--env=dev", "testFile")
         cliConfig.parseConfig(groovy)
 
         cfg.baseUrl.should == "http://dev.host:8080"
@@ -45,8 +45,33 @@ class WebTauTestCliConfigTest {
     @Test
     void "should exit if only config file provided"() {
         Integer retCode
-        new WebTauTestCliConfig({ retCode = it }, "--config=src/test/resources/test.cfg", "--env=dev")
+        new WebTauTestCliConfig(cfg, { retCode = it }, "--config=src/test/resources/test.cfg", "--env=dev")
 
         retCode.should == 1
     }
+
+    @Test
+    void "should set command line args source when env is specified"() {
+        def cliConfig = new WebTauTestCliConfig(cfg, "--config=src/test/resources/test.cfg", "--env=dev", "testFile")
+        cliConfig.parseConfig(groovy)
+
+        cfg.envConfigValue.source.should == "command line argument"
+    }
+
+    @Test
+    void "should set default source when env is not specified"() {
+        def cliConfig = new WebTauTestCliConfig(cfg, "--config=src/test/resources/test.cfg", "testFile")
+        cliConfig.parseConfig(groovy)
+
+        cfg.envConfigValue.source.should == "default"
+    }
+
+    @Test
+    void "should set default source and value when cfg is not specified"() {
+        def cliConfig = new WebTauTestCliConfig(cfg, "testFile")
+        cliConfig.parseConfig(groovy)
+
+        cfg.configFileName.asString.should == "test.cfg"
+        cfg.configFileName.source.should == "default"
+    }
 }

webtau/src/main/java/com/twosigma/webtau/cfg/WebTauConfig.java

@@ -103,6 +103,10 @@ public ConfigValue getEnvConfigValue() {
         return env;
     }
 
+    public ConfigValue getConfigFileName() {
+        return config;
+    }
+
     public ConfigValue getWorkingDirConfigValue() {
         return workingDir;
     }