From d94a0ffc25f5e6205dd2fa770819c2095160800a Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 8 Feb 2017 13:11:10 +0100 Subject: [PATCH] feat context: Add YAML loading support Closes #5 --- context/context.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/context/context.go b/context/context.go index 612faa39a..140f11fce 100644 --- a/context/context.go +++ b/context/context.go @@ -2,9 +2,12 @@ package context import ( "encoding/json" + "fmt" "io/ioutil" "path" + "strings" + "github.com/ghodss/yaml" "github.com/polydawn/meep" ) @@ -38,7 +41,17 @@ func LoadContextFromFile(filename string) (*Context, error) { var c Context - err = json.Unmarshal(file, &c) + if strings.HasSuffix(filename, "json") { + err = json.Unmarshal(file, &c) + } else if strings.HasSuffix(filename, "yaml") || strings.HasSuffix(filename, "yml") { + err = yaml.Unmarshal(file, &c) + } else { + return nil, meep.New( + &ContextLoadingError{Filename: filename}, + meep.Cause(fmt.Errorf("File format not supported. Must be JSON or YAML.")), + ) + } + if err != nil { return nil, meep.New( &ContextLoadingError{Filename: filename},