x/urfave-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix yaml file loader

Browse Source 
* fix typo (yamlSourceLoader -> yamlSourceContext)
* fix function return type (NewYamlSourceFromFlagFunc)

Also fixed build tags to properly build on >=go1.2

Signed-off-by: Jesse Szwedko <jesse.szwedko@gmail.com>
This commit is contained in:
Yasuhiro KANDA 2016-03-20 03:06:53 +09:00 committed by Jesse Szwedko
parent aca5b047ed
commit ad7ed77a7e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
altsrc/yaml_command_test.go
View File

@ -1,7 +1,7 @@
// Disabling building of yaml support in cases where golang is 1.0 or 1.1 // Disabling building of yaml support in cases where golang is 1.0 or 1.1
// as the encoding library is not implemented or supported. // as the encoding library is not implemented or supported.
// +build !go1,!go1.1 // +build go1.2
package altsrc package altsrc

12
altsrc/yaml_file_loader.go
View File

@ -1,7 +1,7 @@
// Disabling building of yaml support in cases where golang is 1.0 or 1.1 // Disabling building of yaml support in cases where golang is 1.0 or 1.1
// as the encoding library is not implemented or supported. // as the encoding library is not implemented or supported.
// +build !go1,!go1.1 // +build go1.2
package altsrc package altsrc
@ -23,19 +23,19 @@ type yamlSourceContext struct {
// NewYamlSourceFromFile creates a new Yaml InputSourceContext from a filepath. // NewYamlSourceFromFile creates a new Yaml InputSourceContext from a filepath.
func NewYamlSourceFromFile(file string) (InputSourceContext, error) { func NewYamlSourceFromFile(file string) (InputSourceContext, error) {
ymlLoader := &yamlSourceLoader{FilePath: file} ysc := &yamlSourceContext{FilePath: file}
var results map[string]interface{} var results map[string]interface{}
err := readCommandYaml(ysl.FilePath, &results) err := readCommandYaml(ysc.FilePath, &results)
if err != nil { if err != nil {
return fmt.Errorf("Unable to load Yaml file '%s': inner error: \n'%v'", filePath, err.Error()) return nil, fmt.Errorf("Unable to load Yaml file '%s': inner error: \n'%v'", ysc.FilePath, err.Error())
} }
return &MapInputSource{valueMap: results}, nil return &MapInputSource{valueMap: results}, nil
} }
// NewYamlSourceFromFlagFunc creates a new Yaml InputSourceContext from a provided flag name and source context. // NewYamlSourceFromFlagFunc creates a new Yaml InputSourceContext from a provided flag name and source context.
func NewYamlSourceFromFlagFunc(flagFileName string) func(InputSourceContext, error) { func NewYamlSourceFromFlagFunc(flagFileName string) func(context *cli.Context) (InputSourceContext, error) {
return func(context cli.Context) { return func(context *cli.Context) (InputSourceContext, error) {
filePath := context.String(flagFileName) filePath := context.String(flagFileName)
return NewYamlSourceFromFile(filePath) return NewYamlSourceFromFile(filePath)
} }