Merge pull request #1 from metaspartan/development

mactop v2.0.0

Author: metaspartan

.cursorrules

@@ -0,0 +1,26 @@
+# AI Coding Rules for mactop
+
+## General Principles
+- **Modern Go**: Use Go 1.21+ features where appropriate.
+- **DRY (Don't Repeat Yourself)**: Avoid code duplication. Extract common logic into helper functions or packages.
+- **Clean Code**: Write readable, maintainable, and self-documenting code. No comments.
+- **Error Handling**: proper error checks, wrap errors with context using `fmt.Errorf("%w", err)` or `errors.Join`.
+- **Concurrency**: Use `sync.Mutex` for shared state, `channels` for communication, and `context` for cancellation.
+
+## Formatting & Style
+- Follow `gofmt` and `goimports` standards.
+- Use explicit variable names (avoid single letters unless for loop indices like `i`).
+- Group imports: standard library first, then 3rd party, then local.
+- Ensure `make sexy` passes.
+
+## Testing
+- Write table-driven tests.
+- Ensure high test coverage for logic-heavy functions.
+- Use `t.Parallel()` where safe.
+
+## Project Structure
+- `internal/`: Private application code.
+
+## Specific to mactop
+- `app.go` should remain the coordinator but delegate work to specific domains (metrics, ui, parsing).
+- Ensure cross-compilation compatibility where possible (though heavily macOS focused to support all Apple Silicon devices).

.goreleaser.yaml

@@ -35,12 +35,12 @@ changelog:
 
 brews:
   - name: "{{ .ProjectName }}"
-    homepage: "https://github.com/context-labs/mactop"
+    homepage: "https://github.com/metaspartan/mactop"
     description: "Apple Silicon Monitor Top written in Go Lang"
-    url_template: "https://github.com/context-labs/mactop/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
-    caveats: "mactop requires macOS 12+, and runs only on Apple Silicon."
+    url_template: "https://github.com/metaspartan/mactop/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
+    caveats: "mactop requires macOS 12+, and runs exclusively on Apple Silicon."
     install: |
       bin.install "{{ .ProjectName }}"
     repository:
-      owner: "context-labs"
+      owner: "metaspartan"
       name: "mactop"

Makefile

@@ -9,7 +9,13 @@ run:
 	go run main.go
 
 test:
-	go test -v ./...
+	go test -v ./internal/app/...
 
 clean:
 	rm -f $(APP_NAME)
+
+sexy:
+	go fmt ./...
+	go vet ./...
+	$$(go env GOPATH)/bin/gocyclo -over 15 .
+	$$(go env GOPATH)/bin/ineffassign ./...

README.md

@@ -1,10 +1,12 @@
 # mactop
 
-![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/context-labs/mactop/total) ![GitHub Release](https://img.shields.io/github/v/release/context-labs/mactop)
+[![Go Report Card](https://goreportcard.com/badge/github.com/metaspartan/mactop)](https://goreportcard.com/report/github.com/metaspartan/mactop/v2)
+[![GoDoc](https://godoc.org/github.com/metaspartan/mactop?status.svg)](https://godoc.org/github.com/metaspartan/mactop/v2)
+![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/metaspartan/mactop/total) ![GitHub Release](https://img.shields.io/github/v/release/metaspartan/mactop)
 
 `mactop` is a terminal-based monitoring tool "top" designed to display real-time metrics for Apple Silicon chips written by Carsen Klock. It provides a simple and efficient way to monitor CPU and GPU usage, E-Cores and P-Cores, power consumption, GPU frequency, temperatures, and other system metrics directly from your terminal
 
-![mactop](screenshotm.png)
+![mactop](mactop.gif)
 
 ## Compatibility
 
@@ -24,9 +26,9 @@
 - Disk I/O activity (read/write speeds)
 - Multiple volume display (shows Mac HD + mounted external volumes)
 - Easy-to-read terminal UI
-- **7 Layouts**: Default, Alternative, Alternative Full, Vertical, Compact, Dashboard, and Gauges Only (`L` to cycle layouts)
+- **10 Layouts**: (`L` to cycle layouts)
 - **Persistent Settings**: Remembers your Layout and Theme choice across restarts
-- Customizable UI color (green, red, blue, cyan, magenta, yellow, and white) (`C` to cycle colors)
+- Customizable UI color (green, red, blue, skyblue, magenta, yellow, gold, silver, white, lime, orange, violet, and pink) (`C` to cycle colors)
 - Customizable update interval (default is 1000ms) (`-` or `=` to speed up, `+` to slow down)
 - Process list matching htop format (VIRT in GB, CPU normalized by core count)
 - **Process Management**: Kill processes directly from the UI (F9). List pauses while selecting.
@@ -39,7 +41,7 @@
 
 ## Install via Homebrew
 
-You can install [mactop](https://github.com/context-labs/mactop) via Homebrew! https://brew.sh
+You can install [mactop](https://github.com/metaspartan/mactop) via Homebrew! https://brew.sh
 
 ```bash
 brew install mactop
@@ -67,7 +69,7 @@ To install `mactop`, follow these steps:
 
 2. Clone the repository:
    ```bash
-   git clone https://github.com/context-labs/mactop.git
+   git clone https://github.com/metaspartan/mactop.git
    cd mactop
    ```
 
@@ -99,7 +101,7 @@ mactop --interval 1000 --color green
 - `--count`: Number of samples to collect in headless mode (0 = infinite).
 - `--interval` or `-i`: Set the update interval in milliseconds. Default is 1000.
 - `--color` or `-c`: Set the UI color. Default is white. 
-Options are 'green', 'red', 'blue', 'cyan', 'magenta', 'yellow', and 'white'. (-c green)
+Options are 'green', 'red', 'blue', 'skyblue', 'magenta', 'yellow', 'gold', 'silver', 'white', 'lime', 'orange', 'violet', and 'pink'. (-c green)
 - `--prometheus` or `-p`: Set and enable the local Prometheus metrics server on the given port. Default is disabled. (e.g. -p 2112 to enable Prometheus metrics on port 2112)
 - `--unit-network`: Network unit: auto, byte, kb, mb, gb (default: auto)
 - `--unit-disk`: Disk unit: auto, byte, kb, mb, gb (default: auto)
@@ -114,7 +116,7 @@ Use the following keys to interact with the application while its running:
 - `r`: Refresh the UI data manually.
 - `c`: Cycle through the color themes.
 - `p`: Party Mode (Randomly cycles through colors)
-- `l`: Cycle through the 7 available layouts.
+- `l`: Cycle through the 10 available layouts.
 - `+` or `=`: Increase update interval (slower updates).
 - `-`: Decrease update interval (faster updates).
 - `F9`: Kill the currently selected process (pauses updates while selecting).
@@ -252,15 +254,16 @@ Distributed under the MIT License. See `LICENSE` for more information.
 
 Carsen Klock - [@carsenklock](https://x.com/carsenklock)
 
-Project Link: [https://github.com/context-labs/mactop](https://github.com/context-labs/mactop)
+Project Link: [https://github.com/metaspartan/mactop](https://github.com/metaspartan/mactop)
 
 ## Disclaimer
 
 This tool is not officially supported by Apple. It is provided as is, and may not work as expected. Use at your own risk.
 
 ## Acknowledgements
 
-- [termui](https://github.com/gizak/termui) for the terminal UI framework.
+- [gotui](https://github.com/metaspartan/gotui) for the modern terminal UI framework.
+- [termui](https://github.com/gizak/termui) for the original terminal UI framework.
 - [gopsutil](https://github.com/shirou/gopsutil) for system memory, network, and disk monitoring.
 - [asitop](https://github.com/tlkh/asitop) for the original inspiration!
 - [htop](https://github.com/htop-dev/htop) for the process list and CPU cores inspiration!

go.mod

@@ -1,39 +1,39 @@
-module github.com/context-labs/mactop/v2
+module github.com/metaspartan/mactop/v2
 
 go 1.25.5
 
 require (
-	github.com/gizak/termui/v3 v3.1.0
-	github.com/prometheus/client_golang v1.20.5
-	github.com/shirou/gopsutil/v4 v4.25.10
-	golang.org/x/term v0.37.0
+	github.com/metaspartan/gotui/v4 v4.2.2
+	github.com/prometheus/client_golang v1.23.2
+	github.com/shirou/gopsutil/v4 v4.25.11
+	golang.org/x/term v0.38.0
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/ebitengine/purego v0.9.0 // indirect
+	github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
+	github.com/ebitengine/purego v0.9.1 // indirect
 	github.com/gdamore/encoding v1.0.1 // indirect
-	github.com/gdamore/tcell/v2 v2.13.2 // indirect
+	github.com/gdamore/tcell/v2 v2.13.4 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
-	github.com/mattn/go-runewidth v0.0.4 // indirect
-	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+	github.com/mattn/go-runewidth v0.0.19 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.55.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.66.1 // indirect
+	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/tklauser/go-sysconf v0.3.15 // indirect
-	github.com/tklauser/numcpus v0.10.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.16 // indirect
+	github.com/tklauser/numcpus v0.11.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	golang.org/x/image v0.34.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
+	google.golang.org/protobuf v1.36.8 // indirect
 )
-
-replace github.com/nsf/termbox-go => ./internal/termbox_shim