Merge dev to main: Complete CLI subsystem implementation and unit/integration test suite

.github/workflows/tests.yml

@@ -1,34 +1,42 @@
 name: Tests
 
 on:
-  push:
-    branches: [tests, core, main]
-  pull_request:
-    branches: [main]
+    push:
+        branches: [dev, main, test/all]
+    pull_request:
+        branches: [main]
 
 jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
+    build-and-test:
+        runs-on: ubuntu-latest
 
-    steps:
-      - uses: actions/checkout@v4
+        steps:
+            - uses: actions/checkout@v4
 
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y cmake ninja-build
+            - name: Install dependencies
+              run: |
+                  sudo apt-get update
+                  sudo apt-get install -y cmake ninja-build
 
-      - name: Install vcpkg
-        run: |
-          git clone https://github.com/microsoft/vcpkg.git
-          ./vcpkg/bootstrap-vcpkg.sh
-          echo "VCPKG_ROOT=$PWD/vcpkg" >> $GITHUB_ENV
+            - name: Install vcpkg
+              run: |
+                  git clone https://github.com/microsoft/vcpkg.git
+                  ./vcpkg/bootstrap-vcpkg.sh
+                  echo "VCPKG_ROOT=$PWD/vcpkg" >> $GITHUB_ENV
 
-      - name: Configure
-        run: cmake -B build -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake
+            - name: Configure
+              run: cmake -B build -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake
 
-      - name: Build
-        run: cmake --build build
+            - name: Build
+              run: cmake --build build
 
-      - name: Run tests
-        run: ctest --test-dir build --output-on-failure
+            - name: Run tests
+              run: cd build && ./test_config_manager && ./test_task_runner && ./test_session_logger && ./test_flowhook_core
+
+            - name: Install flowhook binary
+              run: |
+                  sudo cmake --install build
+                  which flowhook || echo "flowhook not found after install"
+
+            - name: Run CLI tests
+              run: bash cli/tests/test_cli.sh

CMakeLists.txt

@@ -5,7 +5,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 configure_file(src/version.h.in version.h)
 set(CMAKE_CXX_STANDARD 20)
 
-find_package(ftxui CONFIG REQUIRED)
+option(BUILD_TESTING "Build the test suite" ON)
 
 # core library
 add_library(flowhook_lib
@@ -16,39 +16,56 @@ add_library(flowhook_lib
     src/config_manager.cpp
 )
 
-target_link_libraries(flowhook_lib PRIVATE ftxui::screen ftxui::dom ftxui::component)
 target_include_directories(flowhook_lib PUBLIC src/include)
+target_include_directories(flowhook_lib PUBLIC src/include ${CMAKE_CURRENT_BINARY_DIR})
 
 # main executables
-add_executable(flowhook src/main.cpp)
-target_link_libraries(flowhook PRIVATE flowhook_lib)
+add_executable(flowhook_core src/main.cpp)
+target_link_libraries(flowhook_core PRIVATE flowhook_lib)
+
 
+if(BUILD_TESTING)
+    # tests
+    add_executable(test_filewatcher tests/unit/test_filewatcher.cpp)
+    target_link_libraries(test_filewatcher PRIVATE flowhook_lib)
+    target_include_directories(test_filewatcher PRIVATE tests)
 
-# tests
-add_executable(test_filewatcher tests/unit/test_filewatcher.cpp)
-target_link_libraries(test_filewatcher PRIVATE flowhook_lib)
-target_include_directories(test_filewatcher PRIVATE tests)
+    add_executable(test_task_runner tests/unit/test_task_runner.cpp)
+    target_link_libraries(test_task_runner PRIVATE flowhook_lib)
+    target_include_directories(test_task_runner PRIVATE tests)
 
-add_executable(test_task_runner tests/unit/test_task_runner.cpp)
-target_link_libraries(test_task_runner PRIVATE flowhook_lib)
-target_include_directories(test_task_runner PRIVATE tests)
+    add_executable(test_session_logger tests/unit/test_session_logger.cpp)
+    target_link_libraries(test_session_logger PRIVATE flowhook_lib)
+    target_include_directories(test_session_logger PRIVATE tests)
 
-add_executable(test_session_logger tests/unit/test_session_logger.cpp)
-target_link_libraries(test_session_logger PRIVATE flowhook_lib)
-target_include_directories(test_session_logger PRIVATE tests)
+    add_executable(test_config_manager tests/unit/test_config_manager.cpp)
+    target_link_libraries(test_config_manager PRIVATE flowhook_lib)
+    target_include_directories(test_config_manager PRIVATE tests)
+    target_include_directories(test_config_manager PUBLIC tests/unit ${CMAKE_CURRENT_BINARY_DIR})
+    target_compile_definitions(test_config_manager PRIVATE FLOWHOOK_TESTING)
 
-add_executable(test_config_manager tests/unit/test_config_manager.cpp)
-target_link_libraries(test_config_manager PRIVATE flowhook_lib)
-target_include_directories(test_config_manager PRIVATE tests)
-target_compile_definitions(test_config_manager PRIVATE FLOWHOOK_TESTING)
+    add_executable(test_flowhook_core tests/integration/test_flowhook_core.cpp)
+    target_link_libraries(test_flowhook_core PRIVATE flowhook_lib)
+    target_include_directories(test_flowhook_core PRIVATE tests)
 
-add_executable(test_flowhook_core tests/integration/test_flowhook_core.cpp)
-target_link_libraries(test_flowhook_core PRIVATE flowhook_lib)
-target_include_directories(test_flowhook_core PRIVATE tests)
+    enable_testing()
+    add_test(NAME flowhook_filewatcher_tests COMMAND test_filewatcher)
+    add_test(NAME flowhook_task_runner_tests COMMAND test_task_runner)
+    add_test(NAME flowhook_session_logger_tests COMMAND test_session_logger)
+    add_test(NAME flowhook_config_manager_tests COMMAND test_config_manager)
+    add_test(NAME flowhook_core_tests COMMAND test_flowhook_core)
+endif()
+
+add_executable(flowhook cli/src/main.cpp
+                            cli/src/commands/add.cpp
+                            cli/src/commands/run.cpp
+                            cli/src/commands/init.cpp
+                            cli/src/commands/list.cpp
+                            cli/src/commands/remove.cpp
+                            cli/src/commands/set.cpp
+                            cli/src/commands/check.cpp)
+target_link_libraries(flowhook PRIVATE flowhook_lib)
+target_include_directories(flowhook PRIVATE cli/src)
+target_include_directories(flowhook PRIVATE cli/src ${CMAKE_CURRENT_BINARY_DIR})
 
-enable_testing()
-add_test(NAME flowhook_filewatcher_tests COMMAND test_filewatcher)
-add_test(NAME flowhook_task_runner_tests COMMAND test_task_runner)
-add_test(NAME flowhook_session_logger_tests COMMAND test_session_logger)
-add_test(NAME flowhook_config_manager_tests COMMAND test_config_manager)
-add_test(NAME flowhook_core_tests COMMAND test_flowhook_core)
+install(TARGETS flowhook DESTINATION bin)