Merge pull request #20 from shakg/fix/build-parallel

Fix/build parallel

Author: shakg

.github/workflows/release.yml

@@ -14,39 +14,77 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
         include:
           - os: ubuntu-latest
-            artifact_suffix: linux
+            artifact_suffix: linux-x86_64
+            archive_name: g-systemctl-linux-x86_64.tar.gz
           - os: macos-latest
             artifact_suffix: macos
+            archive_name: g-systemctl-macos.tar.gz
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Install dependencies (Linux)
-        if: matrix.os == 'ubuntu-latest'
+        if: runner.os == 'Linux'
         run: |
           sudo apt-get update
           sudo apt-get install -y cmake build-essential
 
       - name: Install dependencies (macOS)
-        if: matrix.os == 'macos-latest'
+        if: runner.os == 'macOS'
         run: brew install cmake
 
-      - name: Configure and Build
+      - name: Get version
+        id: version
+        shell: bash
+        run: |
+          if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then
+            echo "VERSION=${GITHUB_REF_NAME#v}" >> "$GITHUB_OUTPUT"
+          else
+            echo "VERSION=0.0.0-${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Configure and build
+        run: |
+          cmake -S . -B build \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DG_SYSTEMCTL_VERSION=${{ steps.version.outputs.VERSION }}
+          cmake --build build --config Release --parallel
+
+      - name: Package binary archive
+        shell: bash
+        run: |
+          mkdir -p dist/g-systemctl-${{ steps.version.outputs.VERSION }}
+          cp build/g-systemctl dist/g-systemctl-${{ steps.version.outputs.VERSION }}/
+          chmod +x dist/g-systemctl-${{ steps.version.outputs.VERSION }}/g-systemctl
+          tar -czf dist/${{ matrix.archive_name }} -C dist g-systemctl-${{ steps.version.outputs.VERSION }}
+
+      - name: Build Debian package
+        if: runner.os == 'Linux'
+        shell: bash
+        run: |
+          cmake --build build --target package --config Release
+          deb_package="$(find build -maxdepth 1 -name '*.deb' -print -quit)"
+          cp "$deb_package" dist/g-systemctl-linux-amd64.deb
+
+      - name: Generate checksums
+        shell: bash
         run: |
-          mkdir -p build
-          cd build
-          cmake -DCMAKE_BUILD_TYPE=Release ..
-          make -j$(nproc)
+          cd dist
+          for file in *; do
+            if [[ -f "$file" ]]; then
+              shasum -a 256 "$file"
+            fi
+          done > SHA256SUMS-${{ matrix.artifact_suffix }}.txt
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: g-systemctl-${{ matrix.artifact_suffix }}
-          path: build/g-systemctl
+          path: dist/*
+          if-no-files-found: error
 
   create-release:
     needs: build
@@ -59,34 +97,45 @@ jobs:
 
       - name: Get version
         id: version
-        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+        run: |
+          echo "TAG=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
+          echo "VERSION=${GITHUB_REF_NAME#v}" >> "$GITHUB_OUTPUT"
 
-      - name: Download Linux artifact
+      - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          name: g-systemctl-linux
-          path: artifacts/linux
+          path: artifacts
+          merge-multiple: true
 
-      - name: Download macOS artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: g-systemctl-macos
-          path: artifacts/macos
+      - name: Generate Homebrew formula
+        shell: bash
+        run: |
+          source_url="https://github.com/shakg/g-systemctl/archive/refs/tags/${{ steps.version.outputs.TAG }}.tar.gz"
+          source_sha="$(curl -L "$source_url" | shasum -a 256 | awk '{print $1}')"
+          sed \
+            -e "s|refs/tags/v1.0.0.tar.gz|refs/tags/${{ steps.version.outputs.TAG }}.tar.gz|" \
+            -e "s|REPLACE_WITH_RELEASE_TARBALL_SHA256|${source_sha}|" \
+            Formula/g-systemctl.rb > artifacts/g-systemctl.rb
 
-      - name: Make artifacts executable
+      - name: Generate combined checksums
         run: |
-          chmod +x artifacts/linux/g-systemctl
-          chmod +x artifacts/macos/g-systemctl
+          cd artifacts
+          shasum -a 256 g-systemctl-linux-x86_64.tar.gz g-systemctl-macos.tar.gz g-systemctl-linux-amd64.deb g-systemctl.rb > SHA256SUMS.txt
 
       - name: Create Release
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: ${{ steps.version.outputs.VERSION }}
-          name: Release ${{ steps.version.outputs.VERSION }}
+          tag_name: ${{ steps.version.outputs.TAG }}
+          name: Release ${{ steps.version.outputs.TAG }}
           draft: false
           prerelease: false
           files: |
-            artifacts/linux/g-systemctl
-            artifacts/macos/g-systemctl
+            artifacts/g-systemctl-linux-x86_64.tar.gz
+            artifacts/g-systemctl-macos.tar.gz
+            artifacts/g-systemctl-linux-amd64.deb
+            artifacts/g-systemctl.rb
+            artifacts/SHA256SUMS.txt
+            artifacts/SHA256SUMS-linux-x86_64.txt
+            artifacts/SHA256SUMS-macos.txt
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CMakeLists.txt

@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 3.14)
+
+set(G_SYSTEMCTL_VERSION "1.0.0" CACHE STRING "g-systemctl release version")
+
 project(g-systemctl
-    VERSION 1.0.0
+    VERSION ${G_SYSTEMCTL_VERSION}
     LANGUAGES CXX
     DESCRIPTION "Terminal UI for system service management"
 )
@@ -16,6 +19,7 @@ endif()
 add_compile_options(-Wall -Wextra -Wpedantic)
 
 include(cmake/FetchFTXUI.cmake)
+find_package(Threads REQUIRED)
 
 option(BUILD_TESTING "Enable unit testing" OFF)
 
@@ -39,10 +43,15 @@ target_include_directories(g-systemctl PRIVATE
     ${PROJECT_SOURCE_DIR}/include
 )
 
+target_compile_definitions(g-systemctl PRIVATE
+    G_SYSTEMCTL_VERSION="${PROJECT_VERSION}"
+)
+
 target_link_libraries(g-systemctl PRIVATE
     ftxui::screen
     ftxui::dom
     ftxui::component
+    Threads::Threads
 )
 
 if(BUILD_TESTING)
@@ -51,3 +60,26 @@ if(BUILD_TESTING)
 endif()
 
 install(TARGETS g-systemctl RUNTIME DESTINATION bin)
+
+set(CPACK_PACKAGE_NAME "g-systemctl")
+set(CPACK_PACKAGE_VENDOR "shakg")
+set(CPACK_PACKAGE_CONTACT "shakg")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
+set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
+set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/shakg/g-systemctl")
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
+
+if(UNIX AND NOT APPLE)
+    set(CPACK_GENERATOR "TGZ;DEB")
+else()
+    set(CPACK_GENERATOR "TGZ")
+endif()
+
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "shakg")
+set(CPACK_DEBIAN_PACKAGE_SECTION "admin")
+set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
+set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "g-systemctl is a terminal user interface for browsing, filtering, and controlling system services.")
+
+include(CPack)

Formula/g-systemctl.rb

@@ -0,0 +1,23 @@
+class GSystemctl < Formula
+  desc "Terminal UI for managing system services"
+  homepage "https://github.com/shakg/g-systemctl"
+  url "https://github.com/shakg/g-systemctl/archive/refs/tags/v1.0.0.tar.gz"
+  sha256 "REPLACE_WITH_RELEASE_TARBALL_SHA256"
+  license "MIT"
+  head "https://github.com/shakg/g-systemctl.git", branch: "main"
+
+  depends_on "cmake" => :build
+
+  def install
+    system "cmake", "-S", ".", "-B", "build",
+           "-DCMAKE_BUILD_TYPE=Release",
+           "-DG_SYSTEMCTL_VERSION=#{version}",
+           *std_cmake_args
+    system "cmake", "--build", "build", "--parallel"
+    system "cmake", "--install", "build"
+  end
+
+  test do
+    assert_match version.to_s, shell_output("#{bin}/g-systemctl --version")
+  end
+end

Makefile

@@ -1,10 +1,30 @@
-.PHONY: build test clean
+BUILD_DIR ?= build
+BUILD_TYPE ?= Release
+JOBS ?= $(shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1)
 
-build:
-	rm -rf build && mkdir build && cd build && cmake -DBUILD_TESTING=ON .. && make -j4
+.PHONY: all configure build run test install clean distclean
+
+all: build
+
+configure:
+	cmake -S . -B $(BUILD_DIR) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
+
+build: configure
+	cmake --build $(BUILD_DIR) --parallel $(JOBS)
+
+run: build
+	cd $(BUILD_DIR) && ./g-systemctl
 
 test:
-	cd build/tests && ./g-systemctl-tests 2>&1 && ctest --output-on-failure
+	cmake -S . -B $(BUILD_DIR) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DBUILD_TESTING=ON
+	cmake --build $(BUILD_DIR) --parallel $(JOBS)
+	ctest --test-dir $(BUILD_DIR) --output-on-failure
+
+install: build
+	cmake --install $(BUILD_DIR)
 
 clean:
-	rm -rf build
+	cmake --build $(BUILD_DIR) --target clean
+
+distclean:
+	rm -rf $(BUILD_DIR)

README.md

@@ -30,6 +30,32 @@ g-systemctl is a terminal user interface (TUI) for managing system services on L
 
 ## Installation
 
+### Homebrew
+
+Download the formula from the latest release and install it locally:
+
+```bash
+curl -LO https://github.com/shakg/g-systemctl/releases/latest/download/g-systemctl.rb
+brew install ./g-systemctl.rb
+```
+
+### Debian / Ubuntu
+
+Download the `.deb` package from the latest release and install it:
+
+```bash
+curl -LO https://github.com/shakg/g-systemctl/releases/latest/download/g-systemctl-linux-amd64.deb
+sudo apt install ./g-systemctl-linux-amd64.deb
+```
+
+### Linux Binary
+
+```bash
+curl -LO https://github.com/shakg/g-systemctl/releases/latest/download/g-systemctl-linux-x86_64.tar.gz
+tar -xzf g-systemctl-linux-x86_64.tar.gz
+sudo install -m 755 g-systemctl-*/g-systemctl /usr/local/bin/g-systemctl
+```
+
 ### Build from source
 
 ```bash
@@ -41,10 +67,11 @@ make -j$(nproc)
 sudo make install
 ```
 
-### One-Line Release Download
+### Release Checksums
 
 ```bash
-curl https://api.github.com/repos/shakg/g-systemctl/releases/latest | jq '.assets[0].browser_download_url' | xargs wget
+curl -LO https://github.com/shakg/g-systemctl/releases/latest/download/SHA256SUMS.txt
+grep g-systemctl-linux-x86_64.tar.gz SHA256SUMS.txt | shasum -a 256 -c -
 ```
 
 ## Usage
@@ -66,10 +93,10 @@ sudo g-systemctl
 | `Up` / `k` | Move selection up |
 | `Down` / `j` | Move selection down |
 | `Enter` | Toggle selected service (start/stop) |
-| `r` | Refresh service list |
-| `l` | Open logs for selected service (tmux only) |
+| `Alt+r` | Restart selected service |
+| `Alt+l` | Open logs for selected service (tmux only) |
 | `?` | Show/hide help |
-| `q` / `Esc` | Quit |
+| `Alt+q` / `Esc` | Quit |
 | Type | Filter services by name |
 | `Backspace` | Delete filter character |
 
@@ -85,7 +112,8 @@ sudo g-systemctl
 ```bash
 g-systemctl --help              # Show help
 g-systemctl --version           # Show version
-g-systemctl --system            # Show system services instead of user services
+g-systemctl --system            # Show system services (default)
+g-systemctl --user              # Show user services
 g-systemctl -f <text>           # Start with an initial filter
 g-systemctl --filter <text>     # Start with an initial filter
 ```

docs/CONTRIBUTING.md

@@ -59,4 +59,4 @@ git tag v1.0.0
 git push origin v1.0.0
 ```
 
-This will trigger the release workflow, which builds binaries for Linux and macOS and creates a GitHub Release with the artifacts attached.
+This will trigger the release workflow, which builds binaries for Linux and macOS and creates a GitHub Release with the artifacts attached.