diff options
Diffstat (limited to 'vendor/github.com/spf13/cobra/cobra')
4 files changed, 29 insertions, 27 deletions
diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/add.go b/vendor/github.com/spf13/cobra/cobra/cmd/add.go index 8897f8ff0..45f00bb54 100644 --- a/vendor/github.com/spf13/cobra/cobra/cmd/add.go +++ b/vendor/github.com/spf13/cobra/cobra/cmd/add.go @@ -23,10 +23,11 @@ import ( ) func init() { + addCmd.Flags().StringVarP(&packageName, "package", "t", "", "target package name (e.g. github.com/spf13/hugo)") addCmd.Flags().StringVarP(&parentName, "parent", "p", "RootCmd", "name of parent command for this command") } -var parentName string +var packageName, parentName string var addCmd = &cobra.Command{ Use: "add [command name]", @@ -45,11 +46,17 @@ Example: cobra add server -> resulting in a new cmd/server.go`, if len(args) < 1 { er("add needs a name for the command") } - wd, err := os.Getwd() - if err != nil { - er(err) + + var project *Project + if packageName != "" { + project = NewProject(packageName) + } else { + wd, err := os.Getwd() + if err != nil { + er(err) + } + project = NewProjectFromPath(wd) } - project := NewProjectFromPath(wd) cmdName := validateCmdName(args[0]) cmdPath := filepath.Join(project.CmdPath(), cmdName+".go") diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/init.go b/vendor/github.com/spf13/cobra/cobra/cmd/init.go index 0e2b22aa0..4e7ebdb34 100644 --- a/vendor/github.com/spf13/cobra/cobra/cmd/init.go +++ b/vendor/github.com/spf13/cobra/cobra/cmd/init.go @@ -59,7 +59,7 @@ Init will not use an existing directory with contents.`, project = NewProject(arg) } } else { - er("please enter the name") + er("please provide only one argument") } initializeProject(project) @@ -142,13 +142,13 @@ package cmd import ( "fmt" "os" +{{if .viper}} + homedir "github.com/mitchellh/go-homedir"{{end}} + "github.com/spf13/cobra"{{if .viper}} + "github.com/spf13/viper"{{end}} +){{if .viper}} - homedir "github.com/mitchellh/go-homedir" - "github.com/spf13/cobra" -{{if .viper}} "github.com/spf13/viper"{{end}} -) - -{{if .viper}}var cfgFile string{{end}} +var cfgFile string{{end}} // RootCmd represents the base command when called without any subcommands var RootCmd = &cobra.Command{ @@ -174,9 +174,9 @@ func Execute() { } } -func init() { -{{if .viper}} cobra.OnInitialize(initConfig){{end}} - +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 }} diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/root.go b/vendor/github.com/spf13/cobra/cobra/cmd/root.go index cfc785221..1c5e69078 100644 --- a/vendor/github.com/spf13/cobra/cobra/cmd/root.go +++ b/vendor/github.com/spf13/cobra/cobra/cmd/root.go @@ -23,7 +23,7 @@ import ( var ( // Used for flags. - cfgFile, projectBase, userLicense string + cfgFile, userLicense string rootCmd = &cobra.Command{ Use: "cobra", @@ -36,28 +36,23 @@ to quickly create a Cobra application.`, // Execute executes the root command. func Execute() { - if err := rootCmd.Execute(); err != nil { - er(err) - } + rootCmd.Execute() } func init() { initViper() rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.cobra.yaml)") - rootCmd.PersistentFlags().StringVarP(&projectBase, "projectbase", "b", "", "base project directory, e.g. github.com/spf13/") - rootCmd.PersistentFlags().StringP("author", "a", "YOUR NAME", "Author name for copyright attribution") - rootCmd.PersistentFlags().StringVarP(&userLicense, "license", "l", "", "Name of license for the project (can provide `license` in config)") - rootCmd.PersistentFlags().Bool("viper", true, "Use Viper for configuration") + rootCmd.PersistentFlags().StringP("author", "a", "YOUR NAME", "author name for copyright attribution") + rootCmd.PersistentFlags().StringVarP(&userLicense, "license", "l", "", "name of license for the project") + rootCmd.PersistentFlags().Bool("viper", true, "use Viper for configuration") viper.BindPFlag("author", rootCmd.PersistentFlags().Lookup("author")) - viper.BindPFlag("projectbase", rootCmd.PersistentFlags().Lookup("projectbase")) viper.BindPFlag("useViper", rootCmd.PersistentFlags().Lookup("viper")) viper.SetDefault("author", "NAME HERE <EMAIL ADDRESS>") viper.SetDefault("license", "apache") - rootCmd.AddCommand(initCmd) rootCmd.AddCommand(addCmd) - + rootCmd.AddCommand(initCmd) } func initViper() { diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/testdata/root.go.golden b/vendor/github.com/spf13/cobra/cobra/cmd/testdata/root.go.golden index 13e9a7760..0085d5ace 100644 --- a/vendor/github.com/spf13/cobra/cobra/cmd/testdata/root.go.golden +++ b/vendor/github.com/spf13/cobra/cobra/cmd/testdata/root.go.golden @@ -48,7 +48,7 @@ func Execute() { } } -func init() { +func init() { cobra.OnInitialize(initConfig) // Here you will define your flags and configuration settings. |