makefile updates (#118)

* refactor silence msg handling and add tests

Signed-off-by: Chris Collins <collins.christopher@gmail.com>

* Improve handling of incident wait msg

Improves the waitForIncidentThenDo function, removing the unnecessary
sleep that may have been causing slow responsiveness in the TUI, and
consolidating specific "wait" functions into the generic
waitForSelectedIncidentThenDo function.

Signed-off-by: Chris Collins <collins.christopher@gmail.com>

* Enable journal/system logging

Enable logging to the system log location (/var/log, or Mac equiv.) or
the systemd journal if using systemd.

Signed-off-by: Chris Collins <collins.christopher@gmail.com>

* Update and cleanup Makefile

Update and cleanup makefile

Signed-off-by: Chris Collins <collins.christopher@gmail.com>

---------

Signed-off-by: Chris Collins <collins.christopher@gmail.com>

Author: clcollins

.gitignore

@@ -8,3 +8,5 @@ log/
 # Build and goreleaser output dirs
 dist/
 build/
+
+coverage.out

Makefile

@@ -1,73 +1,102 @@
 unexport GOFLAGS
 
-GOOS?=linux
-TESTOPTS ?=
-GOARCH?=amd64
-GOENV=GOOS=${GOOS} GOARCH=${GOARCH} CGO_ENABLED=0 GOFLAGS=
+GOOS ?= linux
+GOARCH ?= amd64
+GOENV = GOOS=${GOOS} GOARCH=${GOARCH} CGO_ENABLED=0 GOFLAGS=
 GOPATH := $(shell go env GOPATH | awk -F: '{print $1}')
-HOME?=$(shell mktemp -d)
+BIN_DIR := $(GOPATH)/bin
+HOME ?= $(shell echo ~)
 
-GOLANGCI_LINT_VERSION=v2.1.5
-
-GORELEASER_VERSION=v2.8.2
+GOLANGCI_LINT_VERSION = v2.1.5
+GORELEASER_VERSION = v2.8.2
 
 # Ensure go modules are enabled:
-export GO111MODULE=on
-export GOPROXY=https://proxy.golang.org
+export GO111MODULE = on
+export GOPROXY = https://proxy.golang.org
 
 # Disable CGO so that we always generate static binaries:
-export CGO_ENABLED=0
+export CGO_ENABLED = 0
+
+.DEFAULT_GOAL := help
 
-default: build
+.PHONY: help
+help: ## Show this help message
+	@echo "Available targets:"
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[36m%-20s\033[0m %s\n", $$1, $$2}'
 
 .PHONY: build
-build:
-	$(GOENV) go build -o build/$(PROJECT_NAME) .
+build: ## Build the application
+	@echo "Building the application..."
+	goreleaser build --snapshot --clean --single-target
 
 .PHONY: install
-install: build
-	cp build/srepd ~/.local/bin/$(PROJECT_NAME)
-
-.PHONY: mod
-mod:
+install: ## Install the application to $(GOPATH)/bin
+	@echo "Installing the application..."
+	go build -o ${BIN_DIR}/srepd .
+
+.PHONY: install-local
+install-local: build ## Install the application locally to ~/.local/bin
+	@echo "Installing the application locally..."
+	cp dist/*/srepd $(HOME)/.local/bin/srepd
+
+.PHONY: tidy
+tidy: ## Tidy up go modules
+	@echo "Tidying up go modules..."
 	go mod tidy
 
 .PHONY: test
-test:
+test: ## Run tests
+	@echo "Running tests..."
 	go test ./... -v $(TESTOPTS)
 
 .PHONY: coverage
-coverage:
+coverage: ## Generate test coverage report
+	@echo "Generating test coverage report..."
 	hack/codecov.sh
 
-# Installed using instructions from: https://golangci-lint.run/usage/install/#linux-and-windows
-getlint:
-	@mkdir -p $(GOPATH)/bin
-	@ls $(GOPATH)/bin/golangci-lint 1>/dev/null 2>&1 || (echo "Installing golangci-lint..." && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin $(GOLANGCI_LINT_VERSION))
+.PHONY: getlint
+getlint: ## Install golangci-lint if not already installed
+	@echo "Checking for golangci-lint..."
+	@which golangci-lint >/dev/null 2>&1 || (echo "Installing golangci-lint..." && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(BIN_DIR) $(GOLANGCI_LINT_VERSION))
 
 .PHONY: lint
-lint: getlint
-	$(GOPATH)/bin/golangci-lint --version
-	$(GOPATH)/bin/golangci-lint run --timeout 5m
+lint: getlint ## Run golangci-lint
+	@echo "Running golangci-lint..."
+	$(BIN_DIR)/golangci-lint --version
+	$(BIN_DIR)/golangci-lint run --timeout 5m
+
+.PHONY: vet
+vet: ## Run go vet to catch common mistakes
+	@echo "Running go vet..."
+	go vet ./...
+
+.PHONY: check
+check: fmt lint vet ## Run all code checks (fmt, lint, vet)
+	@echo "Running all code checks..."
 
 .PHONY: ensure-goreleaser
-ensure-goreleaser:
-	@ls $(GOPATH)/bin/goreleaser 1>/dev/null 2>&1 || go install github.com/goreleaser/goreleaser/v2@${GORELEASER_VERSION}
+ensure-goreleaser: ## Ensure goreleaser is installed
+	@echo "Checking for goreleaser..."
+	@which goreleaser >/dev/null 2>&1 || go install github.com/goreleaser/goreleaser/v2@${GORELEASER_VERSION}
 
 .PHONY: release
-release: ensure-goreleaser
+release: ensure-goreleaser ## Create a release using goreleaser
+	@echo "Creating a release..."
 	GITHUB_TOKEN=$$(jq -r .goreleaser_token ~/.config/goreleaser/goreleaser_token) && \
 	export GITHUB_TOKEN && \
 	goreleaser release --clean
 
 .PHONY: fmt
-fmt:
-	gofmt -s -l -w cmd pkg tests
+fmt: ## Format the code
+	@echo "Formatting the code..."
+	gofmt -s -l -w cmd pkg
 
 .PHONY: clean
-clean:
-	rm -rf \
-		build/*
-
-	rm -rf \
-		dist/*
+clean: ## Clean up build artifacts
+	@echo "Cleaning up build artifacts..."
+	rm -rf build/* dist/*
+
+.PHONY: run
+run: ## Run the application locally
+	@echo "Running the application..."
+	go run main.go

cmd/root.go

@@ -25,13 +25,16 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"runtime"
 	"strconv"
+	"strings"
 	"time"
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/log"
 	"github.com/clcollins/srepd/pkg/launcher"
 	"github.com/clcollins/srepd/pkg/tui"
+	"github.com/coreos/go-systemd/journal"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -136,7 +139,7 @@ func (f cliFlag) BoolValue() bool {
 
 func init() {
 	var flags = []cliFlag{
-		{"bool", "debug", "d", "false", "enable debug logging (~/.config/srepd/debug.log)"},
+		{"bool", "debug", "d", "false", "enable debug logging"},
 		// TODO - For some reason the parsed cluster-login-command flag does not work (the "%%" is stripped out)
 		// Commenting out the config options for now, as the config file is the preferred method
 		// {"string", "token", "T", "", "PagerDuty API token"},
@@ -148,7 +151,7 @@ func init() {
 		// {"stringSlice", "cluster-login-command", "c", defaultClusterLoginCmd, "cluster login command"},
 	}
 
-	cobra.OnInitialize(initConfig)
+	cobra.OnInitialize(initConfig, configureLogging)
 
 	for _, f := range flags {
 		switch f.flagType {
@@ -190,3 +193,58 @@ func initConfig() {
 		}
 	}
 }
+
+func configureLogging() {
+	log.SetPrefix("srepd")
+
+	switch runtime.GOOS {
+	case "linux":
+		// Check if running under systemd
+		if journal.Enabled() {
+			log.SetOutput(journalWriter{})
+			log.Info("Logging to systemd journal")
+			return
+		}
+
+		// Fallback to /var/log/srepd.log for non-systemd Linux
+		logFile := "/var/log/srepd.log"
+		setupFileLogging(logFile)
+		log.Info("Logging to /var/log/srepd.log")
+
+	case "darwin":
+		// macOS: Log to ~/Library/Logs/srepd.log
+		home, err := os.UserHomeDir()
+		if err != nil {
+			log.Fatal("Failed to get user home directory:", err)
+		}
+		logFile := home + "/Library/Logs/srepd.log"
+		setupFileLogging(logFile)
+		log.Info("Logging to ~/Library/Logs/srepd.log")
+
+	default:
+		// Default fallback for other OSes
+		log.SetOutput(os.Stderr)
+		log.Warn("Unsupported OS: logging to stderr")
+	}
+}
+
+// setupFileLogging configures logging to a file
+func setupFileLogging(filePath string) {
+	file, err := os.OpenFile(filePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	if err != nil {
+		log.Fatal("Failed to open log file:", err)
+	}
+	log.SetOutput(file)
+}
+
+// journalWriter implements io.Writer for systemd journal
+type journalWriter struct{}
+
+func (jw journalWriter) Write(p []byte) (n int, err error) {
+	message := strings.TrimSpace(string(p))
+	err = journal.Send(message, journal.PriInfo, nil)
+	if err != nil {
+		return 0, err
+	}
+	return len(p), nil
+}

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/charmbracelet/glamour v0.10.0
 	github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834
 	github.com/charmbracelet/log v0.4.1
+	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/viper v1.20.1
 	github.com/stretchr/testify v1.10.0

go.sum

@@ -36,6 +36,8 @@ github.com/charmbracelet/x/exp/slice v0.0.0-20250424195755-e256bf9b4ee5 h1:OgXxQ
 github.com/charmbracelet/x/exp/slice v0.0.0-20250424195755-e256bf9b4ee5/go.mod h1:vI5nDVMWi6veaYH+0Fmvpbe/+cv/iJfMntdh+N0+Tms=
 github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
 github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
+github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
+github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

hack/codecov.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# filepath: /home/chcollin/Projects/github.com/clcollins/srepd/hack/codecov.sh
+
+set -euo pipefail
+
+# Ensure the script is run from the project root
+PROJECT_ROOT=$(git rev-parse --show-toplevel)
+cd "$PROJECT_ROOT"
+
+# Output file for coverage
+COVERAGE_FILE="coverage.out"
+
+# Generate test coverage report
+echo "Generating test coverage report..."
+go test ./... -coverprofile="$COVERAGE_FILE" -covermode=atomic
+
+# Check if the coverage file was generated
+if [ ! -f "$COVERAGE_FILE" ]; then
+    echo "Error: Coverage file not generated."
+    exit 1
+fi
+
+# Display coverage summary
+echo "Coverage summary:"
+go tool cover -func="$COVERAGE_FILE"
+
+# Upload coverage to Codecov if the codecov CLI is installed
+if command -v codecov >/dev/null 2>&1; then
+    echo "Uploading coverage report to Codecov..."
+    codecov -f "$COVERAGE_FILE"
+else
+    echo "Codecov CLI not found. Skipping upload."
+    echo "You can install it from https://docs.codecov.io/docs/codecov-cli."
+fi
+
+# Clean up
+echo "Cleaning up..."
+rm -f "$COVERAGE_FILE"
+
+echo "Test coverage report generation complete."