Catch unknown arguments and refer to help page (#19)

* Fix building without passing build type

* Update utl and cista

* Update fmt

Using fmt::runtime as a workaround there, I wasn't able to figure out
which change caused the compiler to complain about command not being a
constexpr.

* Update boost and zlib

* Catch unknown arguments

* Update doctest

Author: jbruechert

CMakeLists.txt

@@ -33,7 +33,7 @@ target_compile_features(pkglib PUBLIC cxx_std_17)
 add_executable(pkg src/main.cc)
 target_link_libraries(pkg pkglib)
 target_compile_features(pkg PRIVATE cxx_std_17)
-if (${CMAKE_BUILD_TYPE} STREQUAL Release AND NOT MSVC)
+if ("${CMAKE_BUILD_TYPE}" STREQUAL Release AND NOT MSVC)
     add_custom_command(
             TARGET pkg
             POST_BUILD

deps/boost

@@ -4,7 +4,7 @@
 #include <set>
 #include <string>
 
-#include "utl/struct/comparable.h"
+#include "cista/reflection/comparable.h"
 
 #include "boost/filesystem/path.hpp"
 
@@ -14,7 +14,7 @@ constexpr auto const ROOT = ".";
 constexpr auto const PKG_FILE = ".pkg";
 
 struct branch_commit {
-  MAKE_COMPARABLE()
+  CISTA_COMPARABLE()
   std::string branch_, commit_;
 };
 

deps/cista

@@ -28,14 +28,14 @@ exec_result exec(boost::filesystem::path const& working_directory,
 
 template <typename... Args>
 exec_result exec(boost::filesystem::path const& working_directory,
-                 char const* command, Args... args) {
-  return exec(working_directory, fmt::format(command, args...));
+                 fmt::format_string<Args...> command, Args&&... args) {
+  return exec(working_directory, fmt::format(fmt::runtime(command), args...));
 }
 
 struct executor {
   template <typename... Args>
   exec_result exec(boost::filesystem::path const& working_directory,
-                   char const* command, Args... args) {
+                   fmt::format_string<Args...> command, Args... args) {
     try {
       return results_.emplace_back(
           ::pkg::exec(working_directory, command, std::forward<Args>(args)...));

deps/fmt

@@ -3,7 +3,7 @@
 #include <set>
 #include <string>
 
-#include "utl/struct/comparable.h"
+#include "cista/reflection/comparable.h"
 
 #include "boost/filesystem/path.hpp"
 
@@ -13,7 +13,7 @@
 namespace pkg {
 
 struct commit_info {
-  MAKE_COMPARABLE()
+  CISTA_COMPARABLE()
   std::string info_;
   branch_commit bc_;
 };

deps/utl

@@ -16,7 +16,8 @@ bool has_flag(int argc, char** argv, char const* str) {
 }
 
 int main(int argc, char** argv) {
-  if (argc < 2) {
+  if (argc < 2 || has_flag(argc - 1, argv + 1, "--help") ||
+      has_flag(argc - 1, argv + 1, "-h")) {
     printf(
         "Usage:\n"
         "  pkg load | -l      [clone dependencies]\n"
@@ -40,6 +41,8 @@ int main(int argc, char** argv) {
                 has_flag(argc - 1, argv + 1, "-r"));
     } else if (mode == "status" || mode == "-s") {
       print_status(fs::path{"."}, fs::path("deps"));
+    } else {
+      fmt::print("Unknown mode {}. See pkg --help for usage.", mode);
     }
   } catch (std::exception const& e) {
     std::cerr << "error: " << e.what() << "\n";