Merge branch 'master' into master

Author: jinzhu

README.md

@@ -1,6 +1,6 @@
 # Configor
 
-Golang Configuration tool that support YAML, JSON, TOML, Shell Environment
+Golang Configuration tool that support YAML, JSON, TOML, Shell Environment (Supports Go 1.10+)
 
 [![wercker status](https://app.wercker.com/status/9ebd3684ff8998501af5aac38a79a380/s/master "wercker status")](https://app.wercker.com/project/byKey/9ebd3684ff8998501af5aac38a79a380)
 

configor.go

@@ -15,6 +15,7 @@ type Config struct {
 	ENVPrefix   string
 	Debug       bool
 	Verbose     bool
+	Silent      bool
 
 	// In case of json files, this field will be used only when compiled with
 	// go 1.10 or later.
@@ -36,6 +37,10 @@ func New(config *Config) *Configor {
 		config.Verbose = true
 	}
 
+	if os.Getenv("CONFIGOR_SILENT_MODE") != "" {
+		config.Silent = true
+	}
+
 	return &Configor{Config: config}
 }
 

go.mod

@@ -0,0 +1,8 @@
+module github.com/jinzhu/configor
+
+go 1.12
+
+require (
+	github.com/BurntSushi/toml v0.3.1
+	gopkg.in/yaml.v2 v2.2.2
+)

go.sum

@@ -0,0 +1,6 @@
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

unmarshal_json_1_10.go

@@ -1,5 +1,3 @@
-// +build go1.10
-
 package configor_test
 
 import (

unmarshal_json_1_9.go

@@ -1,16 +1,18 @@
 package configor
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"os"
 	"path"
 	"reflect"
 	"strings"
 
 	"github.com/BurntSushi/toml"
-	yaml "gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v2"
 )
 
 // UnmatchedTomlKeysError errors are returned by the Load function when
@@ -79,9 +81,11 @@ func (configor *Configor) getConfigurationFiles(files ...string) []string {
 		// check example configuration
 		if !foundFile {
 			if example, err := getConfigurationFileWithENVPrefix(file, "example"); err == nil {
-				fmt.Printf("Failed to find configuration %v, using example file %v\n", file, example)
+				if !configor.Silent {
+					fmt.Printf("Failed to find configuration %v, using example file %v\n", file, example)
+				}
 				results = append(results, example)
-			} else {
+			} else if !configor.Silent {
 				fmt.Printf("Failed to find configuration %v\n", file)
 			}
 		}
@@ -154,6 +158,24 @@ func unmarshalToml(data []byte, config interface{}, errorOnUnmatchedKeys bool) e
 	return err
 }
 
+// unmarshalJSON unmarshals the given data into the config interface.
+// If the errorOnUnmatchedKeys boolean is true, an error will be returned if there
+// are keys in the data that do not match fields in the config interface.
+func unmarshalJSON(data []byte, config interface{}, errorOnUnmatchedKeys bool) error {
+	reader := strings.NewReader(string(data))
+	decoder := json.NewDecoder(reader)
+
+	if errorOnUnmatchedKeys {
+		decoder.DisallowUnknownFields()
+	}
+
+	err := decoder.Decode(config)
+	if err != nil && err != io.EOF {
+		return err
+	}
+	return nil
+}
+
 func getPrefixForStruct(prefixes []string, fieldStruct *reflect.StructField) []string {
 	if fieldStruct.Anonymous && fieldStruct.Tag.Get("anonymous") == "true" {
 		return prefixes