Make request and respond more uniform

Author: stilvoid

cmd/request/request.go

@@ -11,33 +11,31 @@ import (
 )
 
 var headersIncluded bool
-var outputHeaders bool
-var outputStatus bool
+var outputResponse bool
 var bodyFn string
 
 func init() {
 	Cmd.Flags().BoolVarP(&headersIncluded, "include-headers", "i", false, "Read headers from the request body")
-	Cmd.Flags().BoolVarP(&outputHeaders, "output-headers", "o", false, "Output response headers")
-	Cmd.Flags().BoolVarP(&outputStatus, "output-status", "s", false, "Output response status line")
+	Cmd.Flags().BoolVarP(&outputResponse, "output-response", "o", false, "Output response status line and headers")
 	Cmd.Flags().StringVarP(&bodyFn, "body", "b", "", "Filename to read the request body from. Use - for stdin.")
 }
 
 var Cmd = &cobra.Command{
 	Use:     "request [method] [url]",
-	Short:   "Send a web request to a url",
+	Short:   "Send a web request to a url and print the response",
 	Aliases: []string{"get", "post", "put", "delete"},
 	Args:    cobra.RangeArgs(1, 2),
 	Run: func(cmd *cobra.Command, args []string) {
 		var method, url string
 
 		if cmd.CalledAs() == "request" {
-			if len(args) != 2 {
-				cmd.Help()
-				os.Exit(1)
+			if len(args) == 1 {
+				method = "get"
+				url = args[0]
+			} else {
+				method = args[0]
+				url = args[1]
 			}
-
-			method = args[0]
-			url = args[1]
 		} else {
 			if len(args) != 1 {
 				cmd.Help()
@@ -67,6 +65,6 @@ var Cmd = &cobra.Command{
 		resp, err := internal.MakeRequest(method, url, input, headersIncluded)
 		cobra.CheckErr(err)
 
-		cobra.CheckErr(internal.PrintResponse(resp, outputHeaders, outputStatus))
+		cobra.CheckErr(internal.PrintResponse(resp, outputResponse))
 	},
 }

cmd/respond/respond.go

@@ -16,8 +16,6 @@ import (
 
 var headersIncluded bool
 var includeHeaders bool
-var includeMethod bool
-var includeUrl bool
 var bodyFn string
 var address string
 var port int
@@ -26,8 +24,6 @@ var status int
 func init() {
 	Cmd.Flags().BoolVarP(&headersIncluded, "include-headers", "i", false, "Read headers from the response body")
 	Cmd.Flags().BoolVarP(&includeHeaders, "output-headers", "o", false, "Output request headers")
-	Cmd.Flags().BoolVarP(&includeMethod, "output-method", "m", false, "Output request method")
-	Cmd.Flags().BoolVarP(&includeUrl, "output-url", "u", false, "Output request URL")
 	Cmd.Flags().StringVarP(&bodyFn, "body", "b", "", "Filename to read the response body from. Use - or omit for stdin")
 	Cmd.Flags().StringVarP(&address, "address", "a", "", "Address to listen on")
 	Cmd.Flags().IntVarP(&port, "port", "p", 8000, "Port to listen on")
@@ -47,8 +43,6 @@ var Cmd = &cobra.Command{
 		handler := responder{
 			status:          status,
 			includeHeaders:  includeHeaders,
-			includeMethod:   includeMethod,
-			includeUrl:      includeUrl,
 			headersIncluded: headersIncluded,
 		}
 
@@ -74,6 +68,8 @@ var Cmd = &cobra.Command{
 			}
 		}()
 
+		fmt.Println("Listening on", address)
+
 		<-ch
 
 		server.Shutdown(context.Background())
@@ -85,14 +81,12 @@ var ch chan bool
 type responder struct {
 	status          int
 	includeHeaders  bool
-	includeMethod   bool
-	includeUrl      bool
 	headersIncluded bool
 	data            io.Reader
 }
 
 func (h responder) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	cobra.CheckErr(internal.PrintRequest(req, h.includeMethod, h.includeUrl, h.includeHeaders))
+	cobra.CheckErr(internal.PrintRequest(req, h.includeHeaders))
 
 	inputReader := bufio.NewReader(h.data)
 

internal/web.go

@@ -56,20 +56,14 @@ func MakeRequest(method string, url string, input io.Reader, headersIncluded boo
 }
 
 // PrintRequest writes an http.Request to stdout
-func PrintRequest(req *http.Request, includeMethod bool, includeUrl bool, includeHeaders bool) error {
+func PrintRequest(req *http.Request, includeHeaders bool) error {
 	body, err := ioutil.ReadAll(req.Body)
 	req.Body.Close()
 	if err != nil {
 		return err
 	}
 
-	if includeMethod {
-		fmt.Println(req.Method)
-	}
-
-	if includeUrl {
-		fmt.Println(req.URL)
-	}
+	fmt.Printf("%s %s\n", req.Method, req.URL)
 
 	if includeHeaders {
 		req.Header.Write(os.Stdout)
@@ -82,19 +76,16 @@ func PrintRequest(req *http.Request, includeMethod bool, includeUrl bool, includ
 }
 
 // PrintResponse writes an http.Response to stdout
-func PrintResponse(resp *http.Response, includeHeaders bool, includeStatus bool) error {
+func PrintResponse(resp *http.Response, includeHeaders bool) error {
 	body, err := ioutil.ReadAll(resp.Body)
 	resp.Body.Close()
-
 	if err != nil {
 		return err
 	}
 
-	if includeStatus {
+	if includeHeaders {
 		fmt.Println(resp.Status)
-	}
 
-	if includeHeaders {
 		resp.Header.Write(os.Stdout)
 		fmt.Println()
 	}