From 26d210e2cd929a8d5f57a08cd0391eae58c4c687 Mon Sep 17 00:00:00 2001 From: jharshman Date: Tue, 29 Jan 2019 01:07:11 -0800 Subject: [PATCH] vgo - fixing up the root template --- cobra/cmd/init.go | 28 +++++++++++--- cobra/tpl/main.go | 96 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 118 insertions(+), 6 deletions(-) diff --git a/cobra/cmd/init.go b/cobra/cmd/init.go index f59be065..306a45a9 100644 --- a/cobra/cmd/init.go +++ b/cobra/cmd/init.go @@ -56,20 +56,38 @@ Init will not use an existing directory with contents.`, PkgName: pkgName, Legal: getLicense(), Copyright: copyrightLine(), + // viper + // appname } - // open file for writing - f, err := os.Create(fmt.Sprintf("%s/main.go", project.AbsolutePath)) + // create main.go + mainFile, err := os.Create(fmt.Sprintf("%s/main.go", project.AbsolutePath)) if err != nil { er(err) } - defer f.Close() + defer mainFile.Close() - t := template.Must(template.New("init").Parse(string(tpl.MainTemplate()))) - err = t.Execute(f, project) + mainTemplate := template.Must(template.New("main").Parse(string(tpl.MainTemplate()))) + err = mainTemplate.Execute(mainFile, project) if err != nil { er(err) } + + // create cmd/root.go + rootFile, err := os.Create(fmt.Sprintf("%s/cmd/root.go", project.AbsolutePath)) + if err != nil { + er(err) + } + defer rootFile.Close() + + rootTemplate := template.Must(template.New("root").Parse(string(tpl.RootTemplate()))) + err = rootTemplate.Execute(rootFile, project) + if err != nil { + er(err) + } + + createLicenseFile(project.Legal, project.AbsolutePath) + /* wd, err := os.Getwd() if err != nil { diff --git a/cobra/tpl/main.go b/cobra/tpl/main.go index af19ac80..ee2d528b 100644 --- a/cobra/tpl/main.go +++ b/cobra/tpl/main.go @@ -4,7 +4,7 @@ func MainTemplate() []byte { return []byte(` /* {{ .Copyright }} -{{if .Legal.Header}}{{ .Legal.Header }}{{end}} +{{ if .Legal.Header }}{{ .Legal.Header }}{{ end }} */ package main @@ -15,3 +15,97 @@ func main() { } `) } + +func RootTemplate() []byte { + return []byte(` +/* +{{ .Copyright }} +{{ if .Legal.Header }}{{ .Legal.Header }}{{ end }} +*/ +package cmd + +import ( + "fmt" + "os" + "github.com/spf13/cobra" +{{ if .Viper }} + homedir "github.com/mitchellh/go-homedir" + "github.com/spf13/viper" +{{ end }} +) + +{{ if .Viper }} +var cfgFile string +{{ end }} + +// rootCmd represents the base command when called without any subcommands +var rootCmd = &cobra.Command{ + Use: "{{ .AppName }}", + Short: "A brief description of your application", + Long: ` + "`" + `A longer description that spans multiple lines and likely contains +examples and usage of using your application. For example: + +Cobra is a CLI library for Go that empowers applications. +This application is a tool to generate the needed files +to quickly create a Cobra application.` + "`" + `, + // Uncomment the following line if your bare application + // has an action associated with it: + // Run: func(cmd *cobra.Command, args []string) { }, +} + +// Execute adds all child commands to the root command and sets flags appropriately. +// This is called by main.main(). It only needs to happen once to the rootCmd. +func Execute() { + if err := rootCmd.Execute(); err != nil { + fmt.Println(err) + os.Exit(1) + } +} + +func init() { +{{- if .Viper }} + cobra.OnInitialize(initConfig) +{{ end }} + // Here you will define your flags and configuration settings. + // Cobra supports persistent flags, which, if defined here, + // will be global for your application. +{{ if .Viper }} + rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.{{ .AppName }}.yaml)") +{{ else }} + // rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.{{ .AppName }}.yaml)") +{{ end }} + + // Cobra also supports local flags, which will only run + // when this action is called directly. + rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") +} + +{{ if .Viper }} +// initConfig reads in config file and ENV variables if set. +func initConfig() { + if cfgFile != "" { + // Use config file from the flag. + viper.SetConfigFile(cfgFile) + } else { + // Find home directory. + home, err := homedir.Dir() + if err != nil { + fmt.Println(err) + os.Exit(1) + } + + // Search config in home directory with name ".{{ .appName }}" (without extension). + viper.AddConfigPath(home) + viper.SetConfigName(".{{ .appName }}") + } + + viper.AutomaticEnv() // read in environment variables that match + + // If a config file is found, read it in. + if err := viper.ReadInConfig(); err == nil { + fmt.Println("Using config file:", viper.ConfigFileUsed()) + } +} +{{ end }} +`) +}