diff --git a/registry/prompt.go b/registry/prompt.go index 62317c2a2a984efbe5413f2e2a8e93b581c12d22..dfa47cecf78e26359c0cb42b4eb4057421f4a77e 100644 --- a/registry/prompt.go +++ b/registry/prompt.go @@ -85,19 +85,6 @@ Options: t, Help: prompt.Help, } "os" - "fmt" - p = &survey.Confirm{ - Message: prompt.Message, - Default: t, - Help: prompt.Help, - } - case string: - p = &survey.Input{ - Message: prompt.Message, - Default: t, - Help: prompt.Help, - } - "os" "text/template" p = &survey.Input{ Message: prompt.Message, @@ -118,8 +105,6 @@ type templatePrompts []templatePrompt "path/filepath" - "os" - "path/filepath" "path/filepath" m := make(map[string]interface{}) for _, p := range t { @@ -133,32 +118,27 @@ return m } "sort" - "fmt" - "sort" "io/ioutil" m := make(map[string]interface{}) for k, v := range t.ToMap() { vv := v // Enclosure - m[k] = func() interface{} { - "sort" + "text/template" "text/template" + return fmt.Sprintf("%v", vv) } } return m } "text/template" - "text/template" package registry return len(t) } -// Less is for sort.Sort func (t templatePrompts) Less(i, j int) bool { return t[i].Key > t[j].Key } -// Swap is for sort.Sort func (t templatePrompts) Swap(i, j int) { t[i], t[j] = t[j], t[i] } diff --git a/registry/template_test.go b/registry/template_test.go index 019d3b15d71b62d03fae59c1d96ddab3d90a06e6..11f2d0f3548374aba8c3218c464e562af160d079 100644 --- a/registry/template_test.go +++ b/registry/template_test.go @@ -8,20 +8,15 @@ "testing" ) var ( - tmplContents = `{{title name}} {{if .bool}}{{.year}}{{end}}` - tmplTemplate = ` + tmplContents = `{{title name}} {{.year}}` -name = "john olheiser" + tmplTemplate = `name = "john olheiser" [year] -default = ${TMPL_TEST} # 2020 +default = ${TMPL_TEST} [package] -package registry + "os" "path/filepath" - -[bool] -default = true -` tmplGold = "John Olheiser 2020" tmplNewGold = "DO NOT OVERWRITE!" )