changed Vendor function's comment and parameters names

This commit is contained in:
Manuel Carmona 2017-04-10 10:25:52 +02:00
parent eaf473743b
commit f175c2d20b

View File

@ -8,27 +8,27 @@ import (
yaml "gopkg.in/yaml.v2" yaml "gopkg.in/yaml.v2"
) )
// Vendor reads from buf and builds utils.go file from utilsTmplPath. // Vendor reads from buf and builds vendor_matchers.go file from VendorTmplPath.
func Vendor(data []byte, uitlsTmplPath, utilsTmplName, commit string) ([]byte, error) { func Vendor(data []byte, vendorTmplPath, vendorTmplName, commit string) ([]byte, error) {
var regexpList []string var regexpList []string
if err := yaml.Unmarshal(data, &regexpList); err != nil { if err := yaml.Unmarshal(data, &regexpList); err != nil {
return nil, err return nil, err
} }
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
if err := executeVendorTemplate(buf, regexpList, uitlsTmplPath, utilsTmplName, commit); err != nil { if err := executeVendorTemplate(buf, regexpList, vendorTmplPath, vendorTmplName, commit); err != nil {
return nil, err return nil, err
} }
return buf.Bytes(), nil return buf.Bytes(), nil
} }
func executeVendorTemplate(out io.Writer, regexpList []string, languagesTmplPath, languagesTmpl, commit string) error { func executeVendorTemplate(out io.Writer, regexpList []string, vendorTmplPath, languagesTmpl, commit string) error {
fmap := template.FuncMap{ fmap := template.FuncMap{
"getCommit": func() string { return commit }, "getCommit": func() string { return commit },
} }
t := template.Must(template.New(languagesTmpl).Funcs(fmap).ParseFiles(languagesTmplPath)) t := template.Must(template.New(languagesTmpl).Funcs(fmap).ParseFiles(vendorTmplPath))
if err := t.Execute(out, regexpList); err != nil { if err := t.Execute(out, regexpList); err != nil {
return err return err
} }