replace pkgx with pkgm

.github/workflows/build.yml

@@ -1,8 +1,6 @@
 name: Go Build
 
 on:
-  push:
-    branches: [ "**" ]
   pull_request:
     branches: [ "master" ]
 

README.md

@@ -33,3 +33,10 @@ pkgx install github.com/mycreepy/pakku@latest
   * `pakku add brew awscli`
 * Install the packages on your system:
   * `pakku apply`
+
+## Supported Package Managers
+
+* apt
+* brew
+* dnf
+* pkgm

internal/manager/pkgm.go

@@ -0,0 +1,34 @@
+package manager
+
+import (
+	"context"
+	"fmt"
+)
+
+type Pkgm struct {
+	Packages []string
+	Sudo     bool
+}
+
+func (m *Pkgm) InstallPackages(ctx context.Context, verbose bool) error {
+	for _, pkg := range m.Packages {
+		fmt.Printf("Installing %s with pkgm...\n", pkg)
+
+		err := runCommand(ctx, []string{"pkgm", "install", pkg}, m.Sudo, verbose)
+		if err != nil {
+			return fmt.Errorf("failed to install %s: %w", pkg, err)
+		}
+	}
+
+	return nil
+}
+
+func (m *Pkgm) UpdatePackages(ctx context.Context, verbose bool) error {
+	if len(m.Packages) == 0 {
+		return nil
+	}
+
+	fmt.Println("Updating packages with pkgm...")
+
+	return runCommand(ctx, []string{"pkgm", "update"}, m.Sudo, verbose)
+}

internal/pakku/config.go

@@ -23,7 +23,7 @@ type Config struct {
 	Apt  ConfigPackageManager `yaml:"apt"`
 	Brew ConfigPackageManager `yaml:"brew"`
 	Dnf  ConfigPackageManager `yaml:"dnf"`
-	Pkgx ConfigPackageManager `yaml:"pkgx"`
+	Pkgm ConfigPackageManager `yaml:"pkgm"`
 }
 
 func resolveAbsoluteConfigPath() (string, error) {

internal/pakku/pakku.go

@@ -19,7 +19,7 @@ type Pakku struct {
 	AptManager  manager.Manager
 	BrewManager manager.Manager
 	DnfManager  manager.Manager
-	PkgxManager manager.Manager
+	PkgmManager manager.Manager
 }
 
 func New() (*Pakku, error) {
@@ -39,7 +39,7 @@ func (p *Pakku) setupManagers() error {
 	p.AptManager = &manager.Apt{Packages: p.config.Apt.Packages, Sudo: p.config.Apt.Sudo}
 	p.BrewManager = &manager.Brew{Packages: p.config.Brew.Packages, Sudo: p.config.Brew.Sudo}
 	p.DnfManager = &manager.Dnf{Packages: p.config.Dnf.Packages, Sudo: p.config.Dnf.Sudo}
-	p.PkgxManager = &manager.Pkgx{Packages: p.config.Pkgx.Packages, Sudo: p.config.Pkgx.Sudo}
+	p.PkgmManager = &manager.Pkgm{Packages: p.config.Pkgm.Packages, Sudo: p.config.Pkgm.Sudo}
 
 	return nil
 }
@@ -103,7 +103,7 @@ func (p *Pakku) printHelp() error {
 	fmt.Println("	apt")
 	fmt.Println("	brew")
 	fmt.Println("	dnf")
-	fmt.Println("	pkgx")
+	fmt.Println("	pkgm")
 	fmt.Println()
 
 	return nil
@@ -194,14 +194,14 @@ func (p *Pakku) addPackageToConfig(manager, pkg string) error {
 		p.config.Dnf.Packages = append(p.config.Dnf.Packages, pkg)
 
 		slices.Sort(p.config.Dnf.Packages)
-	case "pkgx":
-		if slices.Contains(p.config.Pkgx.Packages, pkg) {
+	case "pkgm":
+		if slices.Contains(p.config.Pkgm.Packages, pkg) {
 			return fmt.Errorf("package %s has already been added for %s", pkg, manager)
 		}
 
-		p.config.Pkgx.Packages = append(p.config.Pkgx.Packages, pkg)
+		p.config.Pkgm.Packages = append(p.config.Pkgm.Packages, pkg)
 
-		slices.Sort(p.config.Pkgx.Packages)
+		slices.Sort(p.config.Pkgm.Packages)
 	default:
 		return fmt.Errorf("unsupported package manager: %s", manager)
 	}
@@ -235,14 +235,14 @@ func (p *Pakku) removePackageFromConfig(manager, pkg string) error {
 		idx := slices.Index(p.config.Dnf.Packages, pkg)
 
 		p.config.Dnf.Packages = slices.Delete(p.config.Dnf.Packages, idx, idx+1)
-	case "pkgx":
-		if !slices.Contains(p.config.Pkgx.Packages, pkg) {
+	case "pkgm":
+		if !slices.Contains(p.config.Pkgm.Packages, pkg) {
 			return fmt.Errorf("package %s has not been added for %s", pkg, manager)
 		}
 
-		idx := slices.Index(p.config.Pkgx.Packages, pkg)
+		idx := slices.Index(p.config.Pkgm.Packages, pkg)
 
-		p.config.Pkgx.Packages = slices.Delete(p.config.Pkgx.Packages, idx, idx+1)
+		p.config.Pkgm.Packages = slices.Delete(p.config.Pkgm.Packages, idx, idx+1)
 	default:
 		return fmt.Errorf("unsupported package manager: %s", manager)
 	}
@@ -310,9 +310,9 @@ func (p *Pakku) applyPackages(ctx context.Context) error {
 		return fmt.Errorf("failed to install packages for dnf: %w", err)
 	}
 
-	err = p.PkgxManager.InstallPackages(ctx, *verbose)
+	err = p.PkgmManager.InstallPackages(ctx, *verbose)
 	if err != nil {
-		return fmt.Errorf("failed to install packages for pkgx: %w", err)
+		return fmt.Errorf("failed to install packages for pkgm: %w", err)
 	}
 
 	return nil
@@ -343,9 +343,9 @@ func (p *Pakku) applyUpdate(ctx context.Context) error {
 		return fmt.Errorf("failed to update packages for dnf: %w", err)
 	}
 
-	err = p.PkgxManager.UpdatePackages(ctx, *verbose)
+	err = p.PkgmManager.UpdatePackages(ctx, *verbose)
 	if err != nil {
-		return fmt.Errorf("failed to update packages for pkgx: %w", err)
+		return fmt.Errorf("failed to update packages for pkgm: %w", err)
 	}
 
 	return nil

internal/pakku/pakku_integration_test.go

@@ -104,9 +104,9 @@ func TestBrew(t *testing.T) {
 	mustSucceed(t, container, []string{"pakku", "remove", "brew", "curl"})
 }
 
-func TestPkgx(t *testing.T) {
+func TestPkgm(t *testing.T) {
 	req := testcontainers.ContainerRequest{
-		Image:      "pkgxdev/pkgx:v1",
+		Image:      "pkgxdev/pkgx:v2",
 		Entrypoint: []string{"bash", "-c", "echo ready && sleep 300"},
 		Files:      []testcontainers.ContainerFile{pakkuFile},
 		WaitingFor: wait.ForLog("ready"),
@@ -121,8 +121,8 @@ func TestPkgx(t *testing.T) {
 
 	mustSucceed(t, container, []string{"pakku", "init"})
 	mustSucceed(t, container, []string{"pakku", "config"})
-	mustSucceed(t, container, []string{"pakku", "add", "pkgx", "curl.se@8"})
+	mustSucceed(t, container, []string{"pakku", "add", "pkgm", "curl.se^8"})
 	mustSucceed(t, container, []string{"pakku", "apply", "-verbose"})
 	mustSucceed(t, container, []string{"pakku", "update", "-verbose"})
-	mustSucceed(t, container, []string{"pakku", "remove", "pkgx", "curl.se@8"})
+	mustSucceed(t, container, []string{"pakku", "remove", "pkgm", "curl.se^8"})
 }

pkgx.yml

@@ -1,5 +1,5 @@
 dependencies:
-  go.dev: 1.23.2
-  goreleaser.com: 2.3.2
-  golangci-lint.run: 1.61.0
+  go.dev: 1.23.5
+  goreleaser.com: 2.5.1
+  golangci-lint.run: 1.63.4
   gnu.org/make: 4.3.0

testdata/config.yml

@@ -2,6 +2,6 @@ version: 1
 apt:
   packages:
     - curl
-pkgx:
+pkgm:
   packages:
-    - kubectl@1.31.0
+    - kubectl^1