diff --git a/cmd/gignore/create.go b/cmd/gignore/create.go index f4fe006..1028694 100644 --- a/cmd/gignore/create.go +++ b/cmd/gignore/create.go @@ -38,5 +38,6 @@ func init() { func createTemplate(template string) { err := client.Create(template) cobra.CheckErr(err) + fmt.Printf("√ created %s .gitignore file\n", template) } diff --git a/cmd/gignore/list.go b/cmd/gignore/list.go index 79a4f0a..7ceca8e 100644 --- a/cmd/gignore/list.go +++ b/cmd/gignore/list.go @@ -19,9 +19,8 @@ You can use this command to quickly find all available .gitignore templates. Example: gignore --root= list`, Run: func(_ *cobra.Command, _ []string) { - if err := listTemplates(); err != nil { - cobra.CheckErr(err) - } + err := listTemplates() + cobra.CheckErr(err) }, } @@ -37,10 +36,12 @@ func listTemplates() error { if err != nil { return err } + var output strings.Builder for _, template := range templates { output.WriteString(template + "\n") } fmt.Print(output.String()) + return nil } diff --git a/cmd/gignore/main.go b/cmd/gignore/main.go index c02ad82..a867be3 100644 --- a/cmd/gignore/main.go +++ b/cmd/gignore/main.go @@ -3,6 +3,8 @@ package main import ( + "os" + "github.com/onyx-and-iris/gignore" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -43,6 +45,14 @@ func init() { StringP("loglevel", "l", getEnv("GIGNORE_LOGLEVEL", "warn"), "Log level (trace, debug, info, warn, error, fatal, panic)") } +func getEnv(key, defaultValue string) string { + value := os.Getenv(key) + if value == "" { + return defaultValue + } + return value +} + func main() { if err := rootCmd.Execute(); err != nil { panic(err) diff --git a/cmd/gignore/util.go b/cmd/gignore/util.go deleted file mode 100644 index cce19b4..0000000 --- a/cmd/gignore/util.go +++ /dev/null @@ -1,11 +0,0 @@ -package main - -import "os" - -func getEnv(key, defaultValue string) string { - value := os.Getenv(key) - if value == "" { - return defaultValue - } - return value -}