Updating command line display

Author: gershnik

dependencies.json

@@ -1,10 +1,10 @@
 {
     "argum": {
-        "version": "521524bd56692f62a0c1bcf1c7ec0295feb9bb34",
+        "version": "60b5687c48db889d27d0e97d62065bfe3f916a1e",
         "url": "https://github.com/gershnik/argum/tarball/${version}",
         "homepage": "https://github.com/gershnik/argum",
-        "sha256": "a1e02a6bfd515af95acc5ebca0a90a58bea2ceea4bea7e6e28c1efdd681baac1",
-        "md5": "da11ade8bab8cabbbcfe121bb805895c"
+        "sha256": "45dca7e68eb08093e738e778f588c75a35f0f8f30cd9e8e2e45b75fcdee1d1ce",
+        "md5": "be79f48e21b79c7d4ef4d9bba13b0e89"
     },
     "asio": {
         "version": "1.36.0",

src/command_line.cpp

@@ -199,14 +199,17 @@ static auto setChrootDir(CommandLine & cmdline, std::string_view val) {
 
 void CommandLine::parse(int argc, char * argv[]) {
 
-    const char * progname = (argc ? argv[0] : WSDDN_PROGNAME);
+    const char * const progname = (argc ? argv[0] : WSDDN_PROGNAME);
+    ColorStatus envColorStatus = environmentColorStatus();
 
     Argum::Parser parser;
     //Program options
     parser.add(Option("--help", "-h").
                help("show this help message and exit").
                handler([&]() {
-        fmt::print("{}", parser.formatHelp(progname).c_str());
+
+        auto colorizer = colorizerForFile(envColorStatus, stdout);
+        fmt::print("{}", parser.formatHelp(progname, terminalWidth(stdout), colorizer));
         exit(EXIT_SUCCESS);
     }));
     parser.add(Option("--version", "-v").
@@ -335,7 +338,7 @@ void CommandLine::parse(int argc, char * argv[]) {
     //Behavior options
     parser.add(Option("--log-level").
                argName("LEVEL").
-               help("set log level (default = 4). Log levels range from 0 (disable logging) to 6 (detailed trace)."
+               help("set log level (default = 4). Log levels range from 0 (disable logging) to 6 (detailed trace).\n"
                     "Passing values bigger than 6 is equivalent to 6").
                occurs(Argum::neverOrOnce).
                handler([this](std::string_view val){
@@ -386,8 +389,9 @@ void CommandLine::parse(int argc, char * argv[]) {
     try {
         parser.parse(argc, argv);
     } catch (ParsingException & ex) {
-        fmt::print(stderr, "{}\n\n", ex.message());
-        fmt::print(stderr, "{}", parser.formatUsage(progname));
+        auto colorizer = colorizerForFile(envColorStatus, stderr);
+        fmt::print(stderr, "{}\n\n", colorizer.error(ex.message()));
+        fmt::print(stderr, "{}", parser.formatUsage(progname, terminalWidth(stderr), colorizer));
         exit(EXIT_FAILURE);
     }
 }

src/pch.h

@@ -29,6 +29,7 @@
 #include <argum/parser.h>
 #include <argum/type-parsers.h>
 #include <argum/validators.h>
+#include <argum/detect-system.h>
 
 #include <spdlog/fmt/fmt.h>