AnalogJ
diff --git a/‎Gopkg.toml‎
Lines changed: 0 additions & 78 deletions b/‎Gopkg.toml‎
Lines changed: 0 additions & 78 deletions
diff --git a/‎cmd/drawbridge/drawbridge.go‎
Lines changed: 35 additions & 15 deletions b/‎cmd/drawbridge/drawbridge.go‎
Lines changed: 35 additions & 15 deletions
diff --git a/‎go.mod‎
Lines changed: 18 additions & 0 deletions b/‎go.mod‎
Lines changed: 18 additions & 0 deletions
@@ -12,7 +12,7 @@ import (
 	"github.com/analogj/drawbridge/pkg/utils"
 	"github.com/analogj/drawbridge/pkg/version"
 	"github.com/fatih/color"
-	"gopkg.in/urfave/cli.v2"
+	"github.com/urfave/cli/v2"
 	"log"
 	"strings"
 )
@@ -390,14 +390,14 @@ OPTIONS:
 func createFlags(appConfig config.Interface) ([]cli.Flag, error) {
 	flags := []cli.Flag{
 		&cli.StringFlag{
-			Name:  "active_config_template",
-			Usage: "Active config_template",
-			Value: appConfig.GetString("options.active_config_template"),
+			Name:        "active_config_template",
+			Usage:       "Active config_template",
+			DefaultText: appConfig.GetString("options.active_config_template"),
 		},
 		&cli.StringSliceFlag{
-			Name:  "active_custom_templates",
-			Usage: "Activated custom_templates",
-			Value: cli.NewStringSlice(appConfig.GetStringSlice("options.active_custom_templates")...),
+			Name:        "active_custom_templates",
+			Usage:       "Activated custom_templates",
+			DefaultText: strings.Join(appConfig.GetStringSlice("options.active_custom_templates"), ", "),
 		},
 		&cli.BoolFlag{
 			Name:  "dryrun",
@@ -451,16 +451,36 @@ func createFlags(appConfig config.Interface) ([]cli.Flag, error) {
 	return flags, nil
 }
 
-func createFlagHandler(appConfig config.Interface, defaultValues map[string]interface{}, cliFlags []string, c *cli.Context) (map[string]interface{}, error) {
-
-	cliAnswers := defaultValues
+func createFlagHandler(appConfig config.Interface, answerValues map[string]interface{}, cliFlags []string, c *cli.Context) (map[string]interface{}, error) {
+	//there's 4 special cases we need to handle for "defaultOptions":
+	//case 1: no flag override and no answer option
+	//case 2: flag override and no answer option
+	//case 3: no flag override and answer option
+	//case 4: flag override and answer option
+
+	// the override order is:
+	// default value from config
+	// answer value from config
+	// flag override
+
+	//get default defaultOptions from the config
+	defaultOptions := map[string]interface{}{}
+	appConfig.UnmarshalKey("options", &defaultOptions)
+
+	cliAnswers := answerValues
+	//find answer defaultOptions (and set them)
+	for optionName, _ := range defaultOptions {
+		//check if the key is set as an answer/default
+		if answerOptionValue, ok := answerValues[optionName]; ok {
+			//this answer is actuall for an option. lets set it.
+			appConfig.Set(fmt.Sprintf("options.%v", optionName), answerOptionValue)
+		}
+	}
 
 	for _, flagName := range cliFlags {
-		//handle options
-		options := map[string]interface{}{}
-		appConfig.UnmarshalKey("options", &options)
-		if _, ok := options[flagName]; ok {
-			//this flag is actually an option. Lets set it.
+
+		if _, ok := defaultOptions[flagName]; ok {
+			//this flag is actually an "option". Lets set it.
 			appConfig.Set(fmt.Sprintf("options.%v", flagName), c.String(flagName))
 			continue
 		}
 
@@ -0,0 +1,18 @@
+module github.com/analogj/drawbridge
+
+go 1.13
+
+require (
+	github.com/Jeffail/gabs v1.4.0
+	github.com/fatih/color v1.9.0
+	github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf
+	github.com/kvz/logstreamer v0.0.0-20150507115422-a635b98146f0
+	github.com/mitchellh/go-homedir v1.1.0
+	github.com/spf13/viper v1.6.2
+	github.com/stretchr/testify v1.5.1
+	github.com/urfave/cli/v2 v2.2.0
+	github.com/xeipuuv/gojsonschema v1.2.0
+	github.com/xlab/treeprint v1.0.0
+	golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59
+	gopkg.in/yaml.v2 v2.2.8
+)