Merge pull request #7 from andreimerlescu/hotfix/listmap-append

Implemented PolicyMapAppend and added tests for PolicyFlagAppend

Author: andreimerlescu

VERSION

@@ -1 +1 @@
-v2.0.7
+v2.0.8

assure_test.go

@@ -1,9 +1,10 @@
 package figtree
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSomeAssurances(t *testing.T) {

callback_test.go

@@ -1,9 +1,10 @@
 package figtree
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTree_WithCallback(t *testing.T) {

list_flag.go

@@ -45,6 +45,8 @@ func (l *ListFlag) Set(value string) error {
 	items := strings.Split(value, ",")
 	if PolicyListAppend {
 		*l.values = append(*l.values, items...)
+	} else {
+		*l.values = items
 	}
 	return nil
 }

list_flag_test.go

@@ -1,8 +1,10 @@
 package figtree
 
 import (
-	"github.com/stretchr/testify/assert"
+	"os"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTree_ListValues(t *testing.T) {
@@ -11,3 +13,28 @@ func TestTree_ListValues(t *testing.T) {
 	assert.NoError(t, figs.Parse())
 	assert.Contains(t, *figs.List(t.Name()), "yahuah")
 }
+
+func TestListFlag_Set(t *testing.T) {
+	t.Run("PolicyListAppend_TRUE", func(t *testing.T) {
+		PolicyListAppend = true
+		os.Args = []string{os.Args[0], "-x", "yahuah"}
+		figs := With(Options{Germinate: true})
+		figs.NewList("x", []string{"bum"}, "Name List")
+		assert.NoError(t, figs.Parse())
+		assert.Equal(t, "", figs.Fig("x").ToString())
+		assert.Contains(t, *figs.List("x"), "yahuah")
+		assert.Contains(t, *figs.List("x"), "bum") // Contains because of PolicyListAppend
+		os.Args = []string{os.Args[0]}
+	})
+	t.Run("PolicyListAppend_DEFAULT", func(t *testing.T) {
+		PolicyListAppend = false
+		os.Args = []string{os.Args[0], "-x", "yahuah"}
+		figs := With(Options{Germinate: true})
+		figs.NewList("x", []string{"bum"}, "Name List")
+		assert.NoError(t, figs.Parse())
+		assert.Equal(t, "", figs.Fig("x").ToString())
+		assert.Contains(t, *figs.List("x"), "yahuah")
+		assert.NotContains(t, *figs.List("x"), "bum") // NotContains because of PolicyListAppend
+		os.Args = []string{os.Args[0]}
+	})
+}

map_flag.go

@@ -66,11 +66,16 @@ func (m *MapFlag) String() string {
 	return strings.Join(entries, ",")
 }
 
+var PolicyMapAppend = false
+
 // Set accepts a value like KEY=VALUE,KEY=VALUE,KEY=VALUE to override map values
 func (m *MapFlag) Set(value string) error {
 	if m.values == nil {
 		m.values = &map[string]string{}
 	}
+	if !PolicyMapAppend {
+		m.values = &map[string]string{}
+	}
 	pairs := strings.Split(value, ",")
 	for _, pair := range pairs {
 		kv := strings.SplitN(pair, "=", 2)

map_flag_test.go

@@ -1,8 +1,10 @@
 package figtree
 
 import (
-	"github.com/stretchr/testify/assert"
+	"os"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTree_MapKeys(t *testing.T) {
@@ -11,3 +13,29 @@ func TestTree_MapKeys(t *testing.T) {
 	assert.NoError(t, figs.Parse())
 	assert.Contains(t, figs.MapKeys(t.Name()), "name")
 }
+
+func TestMapFlag_Set(t *testing.T) {
+	t.Run("PolicyMapAppend_TRUE", func(t *testing.T) {
+		PolicyMapAppend = true
+		os.Args = []string{os.Args[0], "-x", "name=yahuah"}
+		figs := With(Options{Germinate: true})
+		figs.NewMap("x", map[string]string{"job": "bum"}, "Name Map")
+		assert.NoError(t, figs.Parse())
+		assert.Equal(t, "", figs.Fig("x").ToString())
+		assert.Contains(t, figs.MapKeys("x"), "name")
+		assert.Contains(t, figs.MapKeys("x"), "job") // Contains because of PolicyMapAppend
+		os.Args = []string{os.Args[0]}
+	})
+	t.Run("PolicyMapAppend_DEFAULT", func(t *testing.T) {
+		PolicyMapAppend = false
+		os.Args = []string{os.Args[0], "-x", "name=yahuah"}
+		figs := With(Options{Germinate: true})
+		figs.NewMap("x", map[string]string{"job": "bum"}, "Name Map")
+		assert.NoError(t, figs.Parse())
+		assert.Equal(t, "", figs.Fig("x").ToString())
+		assert.Contains(t, figs.MapKeys("x"), "name")
+		assert.NotContains(t, figs.MapKeys("x"), "job") // NotContains because no PolicyMapAppend
+		os.Args = []string{os.Args[0]}
+	})
+
+}

parsing_test.go

@@ -1,9 +1,10 @@
 package figtree
 
 import (
-	"github.com/stretchr/testify/assert"
 	"path/filepath"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTree_Parse(t *testing.T) {

rules_test.go

@@ -1,11 +1,12 @@
 package figtree
 
 import (
-	"github.com/stretchr/testify/assert"
 	"os"
 	"sync"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestRules(t *testing.T) {

savior.go

@@ -4,10 +4,11 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/go-ini/ini"
-	"gopkg.in/yaml.v3"
 	"os"
 	"path/filepath"
+
+	"github.com/go-ini/ini"
+	"gopkg.in/yaml.v3"
 )
 
 func (tree *figTree) ReadFrom(path string) error {