cmd/forwarder: move PAC supportedFunctions to root

- Rename wrap.go to decorators.go
- Add withPACSupportedFunctions
- Decorate pac-[eval,server] and proxy

cmd/forwarder/wrap.go → cmd/forwarder/decorators.go

@@ -4,9 +4,25 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/saucelabs/forwarder/pac"
 	"github.com/spf13/cobra"
 )
 
+func withPACSupportedFunctions(cmd *cobra.Command) *cobra.Command {
+	cmd.Example += "\n" + pacSupportedFunctions()
+	return cmd
+}
+
+func pacSupportedFunctions() string {
+	var sb strings.Builder
+	sb.WriteString("Supported PAC util functions:")
+	for _, fn := range pac.SupportedFunctions() {
+		sb.WriteString("\n  ")
+		sb.WriteString(fn)
+	}
+	return sb.String()
+}
+
 func wrapLongAt(cmd *cobra.Command, width int) {
 	cmd.Long = wrapTextAt(cmd.Long, width)
 }

cmd/forwarder/paceval/paceval.go

@@ -5,7 +5,6 @@ import (
 	"net"
 	"net/url"
 	"os"
-	"strings"
 
 	"github.com/saucelabs/forwarder"
 	"github.com/saucelabs/forwarder/bind"
@@ -80,7 +79,7 @@ func Command() (cmd *cobra.Command) {
 		Short:   "Evaluate a PAC file for given URLs",
 		Long:    long,
 		RunE:    c.RunE,
-		Example: example + "\n" + supportedFunctions(),
+		Example: example,
 	}
 }
 
@@ -104,13 +103,3 @@ const example = `  # Evaluate a PAC file for a URL
   # Evaluate a PAC file for multiple URLs using a PAC file from a URL
   forwarder pac-eval --pac https://example.com/pac.js https://www.google.com https://www.facebook.com
 `
-
-func supportedFunctions() string {
-	var sb strings.Builder
-	sb.WriteString("Supported PAC util functions:")
-	for _, fn := range pac.SupportedFunctions() {
-		sb.WriteString("\n  ")
-		sb.WriteString(fn)
-	}
-	return sb.String()
-}

cmd/forwarder/pacserver/pacserver.go

@@ -6,7 +6,6 @@ import (
 	"net/http"
 	"net/url"
 	"os/signal"
-	"strings"
 	"syscall"
 
 	"github.com/saucelabs/forwarder"
@@ -80,7 +79,7 @@ func Command() (cmd *cobra.Command) {
 		Short:   "Start HTTP(S) server that serves a PAC file",
 		Long:    long,
 		RunE:    c.RunE,
-		Example: example + "\n" + supportedFunctions(),
+		Example: example,
 	}
 }
 
@@ -96,24 +95,14 @@ If you start an HTTPS server and you don't provide a certificate, the server wil
 `
 
 const example = `  # Start a HTTP server serving a PAC file
-  pac-server --pac pac.js --protocol http --address localhost:8080
+  forwarder pac-server --pac pac.js --protocol http --address localhost:8080
 
   # Start a HTTPS server serving a PAC file
-  pac-server --pac pac.js --protocol https --address localhost:80443
+  forwarder pac-server --pac pac.js --protocol https --address localhost:80443
 
   # Start a HTTPS server serving a PAC file with custom certificate
-  pac-server --pac pac.js --protocol https --address localhost:80443 --cert-file cert.pem --key-file key.pem
+  forwarder pac-server --pac pac.js --protocol https --address localhost:80443 --cert-file cert.pem --key-file key.pem
 
   # Start a HTTPS server serving a PAC file with basic authentication
-  pac-server --pac pac.js --protocol https --address localhost:80443 --basic-auth user:pass
+  forwarder pac-server --pac pac.js --protocol https --address localhost:80443 --basic-auth user:pass
 `
-
-func supportedFunctions() string {
-	var sb strings.Builder
-	sb.WriteString("Supported PAC util functions:")
-	for _, fn := range pac.SupportedFunctions() {
-		sb.WriteString("\n  ")
-		sb.WriteString(fn)
-	}
-	return sb.String()
-}

cmd/forwarder/root.go

@@ -27,9 +27,9 @@ func rootCommand() *cobra.Command {
 	}
 
 	rootCmd.AddCommand(
-		paceval.Command(),
-		pacserver.Command(),
-		proxy.Command(),
+		withPACSupportedFunctions(paceval.Command()),
+		withPACSupportedFunctions(pacserver.Command()),
+		withPACSupportedFunctions(proxy.Command()),
 		version.Command(),
 	)
 	for _, cmd := range rootCmd.Commands() {