format tpl/main.go templates (#980)
This commit is contained in:
		
							
								
								
									
										2
									
								
								cobra/cmd/testdata/main.go.golden
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								cobra/cmd/testdata/main.go.golden
									
									
									
									
										vendored
									
									
								
							@ -18,5 +18,5 @@ package main
 | 
			
		||||
import "github.com/spf13/testproject/cmd"
 | 
			
		||||
 | 
			
		||||
func main() {
 | 
			
		||||
  cmd.Execute()
 | 
			
		||||
	cmd.Execute()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										90
									
								
								cobra/cmd/testdata/root.go.golden
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										90
									
								
								cobra/cmd/testdata/root.go.golden
									
									
									
									
										vendored
									
									
								
							@ -16,82 +16,76 @@ limitations under the License.
 | 
			
		||||
package cmd
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
  "fmt"
 | 
			
		||||
  "os"
 | 
			
		||||
  "github.com/spf13/cobra"
 | 
			
		||||
 | 
			
		||||
  homedir "github.com/mitchellh/go-homedir"
 | 
			
		||||
  "github.com/spf13/viper"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"github.com/spf13/cobra"
 | 
			
		||||
	"os"
 | 
			
		||||
 | 
			
		||||
	homedir "github.com/mitchellh/go-homedir"
 | 
			
		||||
	"github.com/spf13/viper"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
var cfgFile string
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
// rootCmd represents the base command when called without any subcommands
 | 
			
		||||
var rootCmd = &cobra.Command{
 | 
			
		||||
  Use:   "testproject",
 | 
			
		||||
  Short: "A brief description of your application",
 | 
			
		||||
  Long: `A longer description that spans multiple lines and likely contains
 | 
			
		||||
	Use:   "testproject",
 | 
			
		||||
	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) { },
 | 
			
		||||
	// 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)
 | 
			
		||||
  }
 | 
			
		||||
	if err := rootCmd.Execute(); err != nil {
 | 
			
		||||
		fmt.Println(err)
 | 
			
		||||
		os.Exit(1)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func init() {
 | 
			
		||||
  cobra.OnInitialize(initConfig)
 | 
			
		||||
	cobra.OnInitialize(initConfig)
 | 
			
		||||
 | 
			
		||||
  // Here you will define your flags and configuration settings.
 | 
			
		||||
  // Cobra supports persistent flags, which, if defined here,
 | 
			
		||||
  // will be global for your application.
 | 
			
		||||
	// Here you will define your flags and configuration settings.
 | 
			
		||||
	// Cobra supports persistent flags, which, if defined here,
 | 
			
		||||
	// will be global for your application.
 | 
			
		||||
 | 
			
		||||
  rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.testproject.yaml)")
 | 
			
		||||
	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.testproject.yaml)")
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
  // 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")
 | 
			
		||||
	// 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")
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
// 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)
 | 
			
		||||
    }
 | 
			
		||||
	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 ".testproject" (without extension).
 | 
			
		||||
    viper.AddConfigPath(home)
 | 
			
		||||
    viper.SetConfigName(".testproject")
 | 
			
		||||
  }
 | 
			
		||||
		// Search config in home directory with name ".testproject" (without extension).
 | 
			
		||||
		viper.AddConfigPath(home)
 | 
			
		||||
		viper.SetConfigName(".testproject")
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
  viper.AutomaticEnv() // read in environment variables that match
 | 
			
		||||
	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())
 | 
			
		||||
  }
 | 
			
		||||
	// If a config file is found, read it in.
 | 
			
		||||
	if err := viper.ReadInConfig(); err == nil {
 | 
			
		||||
		fmt.Println("Using config file:", viper.ConfigFileUsed())
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -10,7 +10,7 @@ package main
 | 
			
		||||
import "{{ .PkgName }}/cmd"
 | 
			
		||||
 | 
			
		||||
func main() {
 | 
			
		||||
  cmd.Execute()
 | 
			
		||||
	cmd.Execute()
 | 
			
		||||
}
 | 
			
		||||
`)
 | 
			
		||||
}
 | 
			
		||||
@ -23,88 +23,87 @@ func RootTemplate() []byte {
 | 
			
		||||
package cmd
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
  "fmt"
 | 
			
		||||
  "os"
 | 
			
		||||
  "github.com/spf13/cobra"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"github.com/spf13/cobra"
 | 
			
		||||
	"os"
 | 
			
		||||
{{ if .Viper }}
 | 
			
		||||
  homedir "github.com/mitchellh/go-homedir"
 | 
			
		||||
  "github.com/spf13/viper"
 | 
			
		||||
{{ end }}
 | 
			
		||||
	homedir "github.com/mitchellh/go-homedir"
 | 
			
		||||
	"github.com/spf13/viper"
 | 
			
		||||
{{ end -}}
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
{{ if .Viper }}
 | 
			
		||||
{{ if .Viper -}}
 | 
			
		||||
var cfgFile string
 | 
			
		||||
{{ end }}
 | 
			
		||||
{{- 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
 | 
			
		||||
	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) { },
 | 
			
		||||
	// 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)
 | 
			
		||||
  }
 | 
			
		||||
	if err := rootCmd.Execute(); err != nil {
 | 
			
		||||
		fmt.Println(err)
 | 
			
		||||
		os.Exit(1)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func init() {
 | 
			
		||||
{{- if .Viper }}
 | 
			
		||||
  cobra.OnInitialize(initConfig)
 | 
			
		||||
	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.
 | 
			
		||||
	// 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)")
 | 
			
		||||
	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)")
 | 
			
		||||
	// 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")
 | 
			
		||||
	// 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 }}
 | 
			
		||||
{{ 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)
 | 
			
		||||
    }
 | 
			
		||||
	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 }}")
 | 
			
		||||
  }
 | 
			
		||||
		// Search config in home directory with name ".{{ .AppName }}" (without extension).
 | 
			
		||||
		viper.AddConfigPath(home)
 | 
			
		||||
		viper.SetConfigName(".{{ .AppName }}")
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
  viper.AutomaticEnv() // read in environment variables that match
 | 
			
		||||
	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())
 | 
			
		||||
  }
 | 
			
		||||
	// If a config file is found, read it in.
 | 
			
		||||
	if err := viper.ReadInConfig(); err == nil {
 | 
			
		||||
		fmt.Println("Using config file:", viper.ConfigFileUsed())
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
{{ end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
`)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user