Migrate to use spf13/cobra and spf13/viper CLI frameworks, target for potential v3 release

.ahoy.yml

@@ -0,0 +1,114 @@
+ahoyapi: v2
+commands:
+  build:
+    usage: Build ahoy with version information using Goreleaser.
+    description: |
+      Compiles the ahoy binary using Goreleaser with version
+      information automatically embedded.
+
+      This creates a snapshot build with proper version flags and
+      optimisation.
+      The binary will be created in the dist directory.
+    cmd: goreleaser build --config ../.goreleaser.yml --snapshot --clean --single-target
+
+  build-all:
+    usage: Build all supported architectures and OSes using Goreleaser.
+    description: |
+      Builds ahoy for all supported platforms (linux, darwin, windows) and
+      architectures (amd64, arm64, arm) using Goreleaser configuration.
+      Creates optimised binaries for distribution with proper naming and
+      packaging.
+    cmd: goreleaser build --config ../.goreleaser.yml --snapshot --clean
+
+  install:
+    usage: Install ahoy locally using go install.
+    description: |
+      Installs ahoy directly to your GOPATH/bin using go install.
+      This is useful for development but doesn't include version information
+      that Goreleaser builds provide.
+    cmd: "go install"
+
+  bats:
+    usage: "Run the BATS bash testing command."
+    description: |
+      Executes the BATS (Bash Automated Testing System) test suite.
+      This runs integration tests that verify ahoy's command-line behavior
+      and functionality across different scenarios.
+    cmd: |
+      bats tests
+
+  test:
+    usage: Run automated tests.
+    description: |
+      Executes the complete test suite for ahoy including:
+      - Go vet for code quality checks
+      - Go unit tests with race detection
+      - BATS integration tests for command-line behavior
+      Stops on first failure and reports overall results.
+    cmd: |
+      set -euo pipefail
+      TESTS=(
+        'go vet'
+        'go test -v -race'
+        'bats tests'
+      )
+      for cmd in "${TESTS[@]}"; do
+        printf "\n=== TEST: %s ===\n\n" "$cmd"
+        eval "$cmd"
+      done
+      echo "All tests passed."
+
+  gomod:
+    usage: Manage Go module dependencies.
+    description: |
+      Performs complete Go module maintenance:
+      - Tidies the go.mod file by removing unused dependencies
+      - Downloads and vendors all dependencies
+      - Verifies downloaded modules against checksums
+    cmd: |
+      go mod tidy
+      go mod vendor
+      go mod verify
+
+  gofmt:
+    usage: Format Go code according to standards.
+    description: |
+      Automatically formats all Go source files in the current directory
+      according to Go's standard formatting rules.
+      This ensures consistent code style across the project.
+    cmd: gofmt -w .
+
+  release:
+    usage: Create a release using Goreleaser.
+    description: |
+      Creates a full release using Goreleaser including:
+      - Building for all platforms and architectures
+      - Generating checksums and SBOMs
+      - Creating archives and signing artifacts
+      Requires proper git tags and GPG setup for signing.
+    cmd: goreleaser release --config ../.goreleaser.yml --clean
+
+  echo:
+    usage: Display a message
+    description: |
+      This is a simple command that echoes any arguments passed to it.
+      Useful for testing and basic output.
+    cmd: echo "$@"
+
+  list:
+    usage: List directory contents
+    description: |
+      Lists all files and directories in the specified location.
+
+      Shows hidden files (starting with .) and supports all standard
+      ls options.
+
+      If no directory is specified, lists the current directory.
+    cmd: ls -a "$@"
+
+  whalesay:
+    usage: Make a whale say something
+    description: |
+      Uses Docker to run the whalesay container with a dragon figure to
+      display your message in ASCII art.
+    cmd: docker run --rm docker/whalesay cowsay -f dragon "$@"

.github/workflows/build_and_test.yml

@@ -11,10 +11,16 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+        version: [v3, v2]
+        include:
+          - version: v3
+            directory: .
+          - version: v2
+            directory: ./v2
     runs-on: ${{ matrix.os }}
     defaults:
       run:
-        working-directory: ./v2
+        working-directory: ${{ matrix.directory }}
 
     steps:
       - uses: actions/checkout@v4
@@ -42,13 +48,13 @@ jobs:
           # Create proper directory structure that BATS expects
           New-Item -ItemType Directory -Force -Path "C:\bats\bin"
           New-Item -ItemType Directory -Force -Path "C:\bats\libexec\bats-core"
-          
+
           # Copy the main bats script
           Copy-Item "bin\bats" "C:\bats\bin\bats"
-          
+
           # Copy the core BATS files that are expected
           Copy-Item "libexec\bats-core\*" "C:\bats\libexec\bats-core\" -Recurse -Force
-          
+
           # Add to PATH
           echo "C:\bats\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
           cd ..
@@ -71,9 +77,9 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y php
 
-      - name: Install PHP (macOS)
+      - name: Install PHP and coreutils (macOS)
         if: runner.os == 'macOS'
-        run: brew install php
+        run: brew install php coreutils
 
       - name: Install PHP (Windows)
         if: runner.os == 'Windows'
@@ -118,7 +124,7 @@ jobs:
           # Test that the binary works (issue #147 fix validation)
           .\ahoy.exe --version
           .\ahoy.exe --help
-          
+
           # Test with a simple config file
           .\ahoy.exe -f testdata\simple.ahoy.yml echo "Windows functional test passed"
         shell: pwsh
@@ -142,14 +148,14 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always() && runner.os != 'Windows'
         with:
-          name: test-results-${{ matrix.os }}
+          name: test-results-${{ matrix.os }}-${{ matrix.version }}
           path: /tmp/test-reports/
           retention-days: 30
 
       - name: Upload test results (Windows)
         uses: actions/upload-artifact@v4
         if: always() && runner.os == 'Windows'
         with:
-          name: test-results-${{ matrix.os }}
+          name: test-results-${{ matrix.os }}-${{ matrix.version }}
           path: C:\tmp\test-reports\
           retention-days: 30

Dockerfile

@@ -0,0 +1,5 @@
+# Dockerfile for security testing.
+
+FROM scratch
+ENTRYPOINT ["/ahoy"]
+COPY ahoy /

Makefile

@@ -0,0 +1,65 @@
+GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)
+VERSION := $(shell git describe --tags --abbrev=0 $(GITCOMMIT) 2>/dev/null)
+
+GITBRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
+BUILDTIME := $(shell TZ=UTC date "+%Y-%m-%dT%H:%M:%SZ")
+LDFLAGS := "-s -w -X main.version=$(VERSION) -X main.GitCommit=$(GITCOMMIT) -X main.GitBranch=$(GITBRANCH) -X main.BuildTime=$(BUILDTIME)"
+
+# Set binary name based on OS
+ifeq ($(OS),Windows_NT)
+    BINARY_NAME := ahoy.exe
+else
+    BINARY_NAME := ahoy
+endif
+
+SRCS = $(shell find . -name '*.go' | grep -v '/vendor/')
+
+OS := linux darwin windows
+ARCH := amd64 arm64
+
+TESTARGS ?=
+
+default:
+	go build -ldflags $(LDFLAGS) -v -o ./$(BINARY_NAME)
+
+install:
+	cp ahoy /usr/local/bin/ahoy
+	chmod +x /usr/local/bin/ahoy
+
+build_dir:
+	mkdir -p ./builds
+
+cross: build_dir
+	$(foreach os,$(OS), \
+		$(foreach arch,$(ARCH), \
+			$(if $(filter windows,$(os)), \
+				GOOS=$(os) GOARCH=$(arch) go build -trimpath -ldflags $(LDFLAGS) -v -o ./builds/ahoy-bin-$(os)-$(arch).exe, \
+				GOOS=$(os) GOARCH=$(arch) go build -trimpath -ldflags $(LDFLAGS) -v -o ./builds/ahoy-bin-$(os)-$(arch) \
+			); \
+		) \
+	)
+
+clean:
+	rm -vRf ./builds/ahoy-bin-*
+
+fmtcheck:
+	$(foreach file,$(SRCS),gofmt $(file) | diff -u $(file) - || exit;)
+
+staticcheck:
+	@ go install honnef.co/go/tools/cmd/staticcheck@latest
+	staticcheck ./...
+
+vet:
+	go vet ./...
+
+gocyclo:
+	@ go install github.com/fzipp/gocyclo/cmd/gocyclo@latest
+	gocyclo -over 25 -avg -ignore "vendor" .
+
+test: fmtcheck staticcheck vet
+	go test ./*.go $(TESTARGS)
+
+version:
+	@echo $(VERSION)
+
+.PHONY: clean test fmtcheck staticcheck vet gocyclo version testdeps cross build_dir default install