format codes, and upgrade ini to v2

.travis.yml

@@ -8,5 +8,5 @@ before_install:
   - go get golang.org/x/tools/cmd/cover
 
 script:
-#  - go test -v -cover
+  #  - go test -v -cover
   - $HOME/gopath/bin/goveralls -service=travis-ci

_examples/ini.go

@@ -3,6 +3,7 @@ package main
 
 import (
 	"fmt"
+
 	"github.com/gookit/config/v2"
 	"github.com/gookit/config/v2/ini"
 )

_examples/json.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+
 	"github.com/gookit/config/v2"
 	"github.com/gookit/config/v2/json"
 )

_examples/toml.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+
 	"github.com/gookit/config/v2"
 	"github.com/gookit/config/v2/toml"
 )

_examples/yaml.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+
 	"github.com/gookit/config/v2"
 	"github.com/gookit/config/v2/yaml"
 )

config_test.go

@@ -3,9 +3,10 @@ package config
 import (
 	"bytes"
 	"fmt"
+	"testing"
+
 	"github.com/gookit/config/v2/dotnev"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 var jsonStr = `{

dotnev/dotenv.go

@@ -3,10 +3,11 @@ package dotnev
 
 import (
 	"bufio"
-	"github.com/gookit/ini/parser"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/gookit/ini/v2/parser"
 )
 
 // DefaultName default file name

dotnev/dotenv_test.go

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

go.mod

@@ -4,14 +4,13 @@ go 1.12
 
 require (
 	github.com/BurntSushi/toml v0.3.1
-	github.com/gookit/ini v1.1.1
+	github.com/gookit/ini/v2 v2.0.2
 	github.com/hashicorp/hcl v1.0.0
 	github.com/imdario/mergo v0.3.7
 	github.com/json-iterator/go v1.1.6
+	github.com/kr/pretty v0.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
-	github.com/pkg/errors v0.8.1 // indirect
-	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/stretchr/testify v1.3.0
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 	gopkg.in/yaml.v2 v2.2.2

hcl/hcl.go

@@ -7,6 +7,7 @@ package hcl
 
 import (
 	"errors"
+
 	"github.com/gookit/config/v2"
 	"github.com/hashicorp/hcl"
 )

hcl/hcl_test.go

@@ -1,9 +1,10 @@
 package hcl
 
 import (
+	"testing"
+
 	"github.com/gookit/config/v2"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestDriver(t *testing.T) {

ini/ini.go

@@ -7,7 +7,7 @@ package ini
 
 import (
 	"github.com/gookit/config/v2"
-	"github.com/gookit/ini/parser"
+	"github.com/gookit/ini/v2/parser"
 )
 
 // Decoder the ini content decoder

ini/ini_test.go

@@ -2,9 +2,10 @@ package ini
 
 import (
 	"fmt"
+	"testing"
+
 	"github.com/gookit/config/v2"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Example() {

json/json_test.go

@@ -2,9 +2,10 @@ package json
 
 import (
 	"fmt"
+	"testing"
+
 	"github.com/gookit/config/v2"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Example() {

json_test.go

@@ -1,8 +1,9 @@
 package config
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestStripJSONComments(t *testing.T) {

load.go

@@ -4,13 +4,14 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"github.com/imdario/mergo"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
+
+	"github.com/imdario/mergo"
 )
 
 // LoadFiles load one or multi files
@@ -95,7 +96,7 @@ func LoadFlags(keys []string) error { return dc.LoadFlags(keys) }
 
 // LoadFlags parse command line arguments, based on provide keys.
 // Usage:
-//	// debug flag is bool type
+// 	// debug flag is bool type
 // 	c.LoadFlags([]string{"env", "debug:bool"})
 func (c *Config) LoadFlags(keys []string) (err error) {
 	hash := map[string]interface{}{}

load_test.go

@@ -1,10 +1,11 @@
 package config
 
 import (
-	"github.com/gookit/config/v2/dotnev"
-	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
+
+	"github.com/gookit/config/v2/dotnev"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestDefaultLoad(t *testing.T) {

read.go

@@ -331,7 +331,7 @@ func (c *Config) Float(key string, defVal ...float64) (value float64) {
 	str, ok := c.getString(key)
 	if !ok {
 		if len(defVal) > 0 {
-			value =  defVal[0]
+			value = defVal[0]
 		}
 		return
 	}

read_test.go

@@ -2,8 +2,9 @@ package config
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestConfig_GetValue(t *testing.T) {

testdata/json_base.json

@@ -1,26 +1,26 @@
 {
-    "name": "app",
-    "debug": false,
-    "baseKey": "value",
-    "age": 123,
-    "envKey": "${SHELL}",
-    "envKey1": "${NotExist|defValue}",
-    "map1": {
-        "key": "val",
-        "key1": "val1",
-        "key2": "val2"
-    },
-    "arr1": [
-        "val",
-        "val1",
-        "val2"
-    ],
-    "lang": {
-        "dir": "res/lang",
-        "defLang": "en",
-        "allowed": {
-            "en": "val",
-            "zh-CN": "val2"
-        }
+  "name": "app",
+  "debug": false,
+  "baseKey": "value",
+  "age": 123,
+  "envKey": "${SHELL}",
+  "envKey1": "${NotExist|defValue}",
+  "map1": {
+    "key": "val",
+    "key1": "val1",
+    "key2": "val2"
+  },
+  "arr1": [
+    "val",
+    "val1",
+    "val2"
+  ],
+  "lang": {
+    "dir": "res/lang",
+    "defLang": "en",
+    "allowed": {
+      "en": "val",
+      "zh-CN": "val2"
     }
+  }
 }

testdata/json_other.json

@@ -1,14 +1,14 @@
 {
-    "name": "app2",
-    "debug": false,
-    "age": 12,
-    "baseKey": "value2",
-    "map1": {
-        "key": "val2",
-        "key2": "val20"
-    },
-    "arr1": [
-        "val1",
-        "val21"
-    ]
+  "name": "app2",
+  "debug": false,
+  "age": 12,
+  "baseKey": "value2",
+  "map1": {
+    "key": "val2",
+    "key2": "val20"
+  },
+  "arr1": [
+    "val1",
+    "val21"
+  ]
 }

testdata/yml_base.yml

@@ -6,18 +6,18 @@ envKey: ${SHELL}
 envKey1: ${NotExist|defValue}
 
 map1:
-    key: val
-    key1: val1
-    key2: val2
+  key: val
+  key1: val1
+  key2: val2
 
 arr1:
-    - val
-    - val1
-    - val2
+  - val
+  - val1
+  - val2
 
 lang:
-    dir: res/lang
-    defLang: en
-    allowed:
-        en: val
-        zh-CN: val2
+  dir: res/lang
+  defLang: en
+  allowed:
+    en: val
+    zh-CN: val2

testdata/yml_other.yml

@@ -4,9 +4,9 @@ age: 12
 baseKey: value2
 
 map1:
-    key: val2
-    key2: val20
+  key: val2
+  key2: val20
 
 arr1:
-    - val1
-    - val21
+  - val1
+  - val21

toml/toml.go

@@ -9,6 +9,7 @@ package toml
 // see https://godoc.org/github.com/BurntSushi/toml
 import (
 	"bytes"
+
 	"github.com/BurntSushi/toml"
 	"github.com/gookit/config/v2"
 )

toml/toml_test.go

@@ -2,9 +2,10 @@ package toml
 
 import (
 	"fmt"
+	"testing"
+
 	"github.com/gookit/config/v2"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 var tomlStr = `

write.go

@@ -3,9 +3,10 @@ package config
 import (
 	"errors"
 	"fmt"
-	"github.com/imdario/mergo"
 	"strconv"
 	"strings"
+
+	"github.com/imdario/mergo"
 )
 
 // Set val by key

write_test.go

@@ -2,8 +2,9 @@ package config
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSet(t *testing.T) {

yaml/yaml_test.go

@@ -3,9 +3,10 @@ package yaml
 import (
 	"bytes"
 	"fmt"
+	"testing"
+
 	"github.com/gookit/config/v2"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 var yamlStr = `