Adjust help messages

Author: datadavev

README.md

@@ -6,17 +6,20 @@ Simple command line utility for tracing HTTP requests over redirects.
 Usage: htrace [OPTIONS] URL
 
 Options:
-  -T, --timeout INTEGER    Request timeout in seconds
   -a, --accept TEXT        Accept header value
   -b, --body               Show response body
+  -C, --colors             Console colors
   -j, --json               Report in JSON
   -k, --insecure           Don't verify certificates
   -L, --link-type TEXT     Follow link header with type
+  -m, --minimal            Minimal redirect info
   -P, --link-profile TEXT  Follow link header with profile
   -R, --link-rel TEXT      Follow link header with rel
+  -T, --timeout INTEGER    Request timeout in seconds
   -U, --user-agent TEXT    User agent header value
+  --log_time               Show timestamp in output
   --help                   Show this message and exit.
-  --version                Print version info
+  --version                Show the version and exit.
 ```
 
 Example:

htrace/__main__.py

@@ -19,15 +19,17 @@
 # Global for access by event hooks
 session = requests.Session()
 
+
 def enableColors():
-    global W,R,G,O,B,P
+    global W, R, G, O, B, P
     W = "\033[0m"  # white (normal)
     R = "\033[31m"  # red
     G = "\033[32m"  # green
     O = "\033[33m"  # orange
     B = "\033[34m"  # blue
     P = "\033[35m"  # purple
 
+
 def printSummary(s):
     L = logging.getLogger("SUMMARY:")
     L.info(f"Start URL: {s['responses'][0]['url']}")
@@ -100,39 +102,37 @@ def cbLinkFollow(response, *args, **kwargs):
 @click.command()
 @click.version_option()
 @click.argument("url")
-@click.option("-T", "--timeout", default=10, help="Request timeout in seconds")
 @click.option("-a", "--accept", default="*/*", help="Accept header value")
 @click.option("-b", "--body", is_flag=True, help="Show response body")
-@click.option(
-    "-C", "--colors", default=False, is_flag=True, help="Console colors"
-)
+@click.option("-C", "--colors", default=False, is_flag=True, help="Enable console colors")
 @click.option("-j", "--json", "json_report", is_flag=True, help="Report in JSON")
 @click.option(
     "-k", "--insecure", default=False, is_flag=True, help="Don't verify certificates"
 )
 @click.option("-L", "--link-type", default=None, help="Follow link header with type")
+@click.option("-m", "--minimal", is_flag=True, help="Minimal redirect info")
 @click.option(
     "-P", "--link-profile", default=None, help="Follow link header with profile"
 )
 @click.option(
     "-R", "--link-rel", default="alternate", help="Follow link header with rel"
 )
+@click.option("-T", "--timeout", default=10, help="Request timeout in seconds")
 @click.option("-U", "--user-agent", default=None, help="User agent header value")
-@click.option("-m", "--minimal", is_flag=True, help="Minimal redirect info")
 @click.option("--log_time", is_flag=True, help="Show timestamp in output")
 def main(
     url,
-    timeout,
     accept,
     body,
     colors,
     json_report,
     insecure,
     link_type,
+    minimal,
     link_profile,
     link_rel,
+    timeout,
     user_agent,
-    minimal,
     log_time,
 ):
     if insecure: