Override default options from ini

ini.go

@@ -58,6 +58,8 @@ const (
 // IniParser is a utility to read and write flags options from and to ini
 // formatted strings.
 type IniParser struct {
+	ParseAsDefaults bool // override default flags
+
 	parser *Parser
 }
 
@@ -539,9 +541,9 @@ func (i *IniParser) parse(ini *ini) error {
 				continue
 			}
 
-			// ini value is ignored if override is not set or
+			// ini value is ignored if override is set and
 			// value was previously set from non default
-			if len(opt.tag.Get("ini-override")) > 0 && !opt.isSetDefault {
+			if i.ParseAsDefaults && !opt.isSetDefault {
 				continue
 			}
 

ini_test.go

@@ -988,8 +988,8 @@ func TestIniOverwriteOptions(t *testing.T) {
 	for _, test := range tests {
 		var opts struct {
 			Config string `long:"config" no-ini:"true"`
-			Value  string `long:"value" default:"from default" ini-override:"true"`
-			Toggle bool   `long:"toggle" ini-override:"true"`
+			Value  string `long:"value" default:"from default"`
+			Toggle bool   `long:"toggle"`
 		}
 
 		p := NewParser(&opts, Default)
@@ -1000,7 +1000,10 @@ func TestIniOverwriteOptions(t *testing.T) {
 		}
 
 		if opts.Config != "" {
-			err = NewIniParser(p).Parse(bytes.NewBufferString("value = from INI\ntoggle = true"))
+			inip := NewIniParser(p)
+			inip.ParseAsDefaults = true
+
+			err = inip.Parse(bytes.NewBufferString("value = from INI\ntoggle = true"))
 			if err != nil {
 				t.Fatalf("Unexpected error %s with args %+v", err, test.args)
 			}