imporve error handling

expand.go

@@ -3,7 +3,6 @@ package goenv
 import (
 	"os"
 	"regexp"
-	"strings"
 )
 
 func expand(env map[string]string) {
@@ -19,10 +18,7 @@ func evaluate(env map[string]string, key string, value string) string {
 		return value
 	}
 
-	// we trim the quotes in case of : "...${key}..."
-	value = strings.Trim(value, "\"")
-
-	// we expand each variable at once
+	// we replace variables with their values
 	return os.Expand(value, func(s string) string {
 		// in case of key1="somthing ${key1} something"
 		// we return to avoid infinit loop
@@ -49,7 +45,7 @@ func evaluate(env map[string]string, key string, value string) string {
 }
 
 func expectExpanding(value string) bool {
-	rx := regexp.MustCompile("^(\")?[^\"]*[$]{[^}]+}[^\"]*(\")?$")
+	rx := regexp.MustCompile("[$]({)?[A-z_0-9]+}?")
 
 	return rx.MatchString(value)
 }

goenv.go

@@ -75,10 +75,14 @@ func Read(files ...string) (map[string]string, error) {
 }
 
 // read envirement variables from s and return them as map
-func Unmarshal(s string) map[string]string {
-	envs := buildKeyValuePairs(s)
+func Unmarshal(s string) (map[string]string, error) {
+	envs, err := buildKeyValuePairs(s)
+
+	if err != nil {
+		return nil, err
+	}
 
 	expand(envs)
 
-	return envs
+	return envs, nil
 }

parser.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 )
 
-// parse one or more files , if files is empty we default to .env
+// parse one or more files , if files not provided is empty we default to .env
 func parseOrDefault(files ...string) (map[string]string, error) {
 
 	// if no files provided we default to .env
@@ -69,7 +69,7 @@ func parseFile(file string) (map[string]string, error) {
 		return nil, err
 	}
 
-	return buildKeyValuePairs(content), nil
+	return buildKeyValuePairs(content)
 
 }
 
@@ -92,8 +92,7 @@ func getFileContent(file string) (string, error) {
 	return string(content), nil
 }
 
-// build the map[key]value structure based on the given string
-func buildKeyValuePairs(s string) map[string]string {
+func buildKeyValuePairs(s string) (map[string]string, error) {
 	lines := strings.Split(s, "\n")
 	pairs := make(map[string]string)
 
@@ -102,28 +101,28 @@ func buildKeyValuePairs(s string) map[string]string {
 		line = strings.TrimSpace(line)
 
 		if !isValidPair(line) {
-			continue
+			return nil, errors.New("invalid key value pairs : [" + line + "]")
 		}
 
 		key, value := splitKeyValue(line)
 		pairs[key] = strings.TrimSpace(strings.Trim(value, "\""))
 	}
 
-	return pairs
+	return pairs, nil
 }
 
-// split l into a key value pairs, excluding any comments or invalid pairs
 func splitKeyValue(l string) (key string, value string) {
 
 	pair := strings.SplitN(l, "=", 2)
 
 	key = strings.TrimSpace(pair[0])
+
+	// exclude comments
 	value = strings.TrimSpace(strings.Split(pair[1], "#")[0])
 
 	return key, value
 }
 
-// check if it looks like key=value
 func isValidPair(l string) bool {
 	rx := regexp.MustCompile(`^(\s)*[A-z_0-9]+(\s)*=(\s)*[^\n]+(\s*)(#[^\n]*)*$`)
 

throttle.go

@@ -4,7 +4,7 @@ import (
 	"log"
 )
 
-const MAX_ALLOWED_CALLS = 1000
+const max_allowed_reads = 1000
 
 var stack = make(map[string]int)
 
@@ -15,7 +15,7 @@ func throttle(key1 string, key2 string) {
 
 	calls := stack[key1+key2]
 
-	if calls > MAX_ALLOWED_CALLS {
+	if calls > max_allowed_reads {
 		log.Panic("recursion detected : trying to read " + key2 + " by " + key1)
 	}