0.2.0-dev #2

Merged
jantytgat merged 9 commits from 0.2.0-dev into main 2025-06-09 20:38:21 +00:00
15 changed files with 308 additions and 102 deletions
Showing only changes of commit b37a283dfb - Show all commits

View File

@ -50,7 +50,7 @@ func persistentPreRunFuncE(cmd *cobra.Command, args []string) error {
slogd.FromContext(cmd.Context()).Log(cmd.Context(), slogd.LevelTrace, "executing PersistentPreRun") slogd.FromContext(cmd.Context()).Log(cmd.Context(), slogd.LevelTrace, "executing PersistentPreRun")
// Make sure we can always get the version // Make sure we can always get the version
if versionFlag.Value || cmd.CommandPath() == strings.Join([]string{appName, versionName}, " ") { if versionFlag.Value || cmd.CommandPath() == strings.Join([]string{appName, versionFlagName}, " ") {
slogd.FromContext(cmd.Context()).LogAttrs(cmd.Context(), slogd.LevelTrace, "overriding command", slog.String("old_function", runtime.FuncForPC(reflect.ValueOf(cmd.RunE).Pointer()).Name()), slog.String("new_function", runtime.FuncForPC(reflect.ValueOf(versionRunFuncE).Pointer()).Name())) slogd.FromContext(cmd.Context()).LogAttrs(cmd.Context(), slogd.LevelTrace, "overriding command", slog.String("old_function", runtime.FuncForPC(reflect.ValueOf(cmd.RunE).Pointer()).Name()), slog.String("new_function", runtime.FuncForPC(reflect.ValueOf(versionRunFuncE).Pointer()).Name()))
cmd.RunE = versionRunFuncE cmd.RunE = versionRunFuncE
return nil return nil

View File

@ -8,7 +8,11 @@ import (
) )
const ( const (
jsonOutputFlagDefault = false
noColorFlagDefault = false
quietFlagDefault = false
quietFlagShortCode = "q" quietFlagShortCode = "q"
verboseFlagDefault = false
verboseFlagShortCode = "v" verboseFlagShortCode = "v"
) )
@ -20,19 +24,19 @@ var (
) )
func addJsonOutputFlag(cmd *cobra.Command) { func addJsonOutputFlag(cmd *cobra.Command) {
cmd.PersistentFlags().BoolVarP(&jsonOutputFlag.Value, jsonOutputFlag.Name(), "", false, jsonOutputFlag.Usage()) cmd.PersistentFlags().BoolVarP(&jsonOutputFlag.Value, jsonOutputFlag.Name(), "", jsonOutputFlagDefault, jsonOutputFlag.Usage())
} }
func addNoColorFlag(cmd *cobra.Command) { func addNoColorFlag(cmd *cobra.Command) {
cmd.PersistentFlags().BoolVarP(&noColorFlag.Value, noColorFlag.Name(), "", false, noColorFlag.Usage()) cmd.PersistentFlags().BoolVarP(&noColorFlag.Value, noColorFlag.Name(), "", noColorFlagDefault, noColorFlag.Usage())
} }
func addQuietFlag(cmd *cobra.Command) { func addQuietFlag(cmd *cobra.Command) {
cmd.PersistentFlags().BoolVarP(&quietFlag.Value, quietFlag.Name(), quietFlagShortCode, false, quietFlag.Usage()) cmd.PersistentFlags().BoolVarP(&quietFlag.Value, quietFlag.Name(), quietFlagShortCode, quietFlagDefault, quietFlag.Usage())
} }
func addVerboseFlag(cmd *cobra.Command) { func addVerboseFlag(cmd *cobra.Command) {
cmd.PersistentFlags().BoolVarP(&verboseFlag.Value, verboseFlag.Name(), verboseFlagShortCode, false, verboseFlag.Usage()) cmd.PersistentFlags().BoolVarP(&verboseFlag.Value, verboseFlag.Name(), verboseFlagShortCode, verboseFlagDefault, verboseFlag.Usage())
} }
func configureOutputFlags(cmd *cobra.Command) { func configureOutputFlags(cmd *cobra.Command) {