Skip to content

Commit

Permalink
feat: remove verbose flag and always print headers
Browse files Browse the repository at this point in the history
  • Loading branch information
eynopv committed May 29, 2024
1 parent fcbbb91 commit 8910f0e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
2 changes: 0 additions & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ var (

VariablesInput []string
HeadersInput []string
Verbose bool
Variables map[string]string
Headers map[string]string
Timeout int
Expand All @@ -63,7 +62,6 @@ func Execute() error {
}

func init() {
rootCmd.PersistentFlags().BoolVarP(&Verbose, "verbose", "v", false, "verbose output")
rootCmd.PersistentFlags().StringSliceVar(&VariablesInput, "vars", []string{}, "variables")
rootCmd.PersistentFlags().StringSliceVar(&HeadersInput, "headers", []string{}, "headers")
rootCmd.PersistentFlags().IntVarP(&Timeout, "timeout", "t", 15, "request timeout")
Expand Down
2 changes: 1 addition & 1 deletion cmd/runcmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ func runCommandFunction(
os.Exit(1)
}

result.Print(Verbose)
result.Print()
}
11 changes: 4 additions & 7 deletions internal/result/result.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,10 @@ func NewResult(
return result, nil
}

func (r *Result) Print(showHeaders bool) {
func (r *Result) Print() {
fmt.Println(r.Path)
fmt.Println()

// TODO: add protocol
// HTTP 1.1 200 OK
if r.StatusCode < 300 {
fmt.Println(r.Protocol, printer.Green(r.Status))
} else if r.StatusCode >= 300 && r.StatusCode < 400 {
Expand All @@ -71,10 +70,8 @@ func (r *Result) Print(showHeaders bool) {

fmt.Println(fmt.Sprintf("%s: %s", printer.Cyan("Elapsed Time"), r.ElapsedTime))

if showHeaders {
for key, value := range r.Headers {
fmt.Println(fmt.Sprintf("%s: %s", printer.Cyan(key), strings.Join(value, ", ")))
}
for key, value := range r.Headers {
fmt.Println(fmt.Sprintf("%s: %s", printer.Cyan(key), strings.Join(value, ", ")))
}

if r.Body != nil {
Expand Down

0 comments on commit 8910f0e

Please sign in to comment.