Merge pull request #57 from ajayd-san/podman

✨ Podman compatibility ✨

Author: ajayd-san

.github/workflows/go.yml

@@ -4,6 +4,7 @@
 name: Go
 
 on:
+  workflow_dispatch:
   push:
     branches: [ "main" ]
   pull_request:
@@ -14,9 +15,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-12]
+        os: [ubuntu-20.04, macos-12]
     steps:
     - uses: actions/checkout@v4
+    - uses: awalsh128/cache-apt-pkgs-action@latest
+      if: ${{ matrix.os == 'ubuntu-20.04' }}
+      with:
+        packages: dia libbtrfs-dev libgpgme-dev
+        version: 1.0
+
+    - name: install mac os deps
+      if: ${{ matrix.os == 'macos-12' }}
+      run: brew install gpgme
 
     - name: Set up Go
       uses: actions/setup-go@v4

cmd/p.go

@@ -0,0 +1,23 @@
+/*
+Copyright © 2024 Saivenkat Ajay D. <[email protected]>
+*/
+package cmd
+
+import (
+	"github.com/ajayd-san/gomanagedocker/service/types"
+	"github.com/ajayd-san/gomanagedocker/tui"
+	"github.com/spf13/cobra"
+)
+
+// pCmd represents the p command
+var pCmd = &cobra.Command{
+	Use:   "p",
+	Short: "Manage Podman objects",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return tui.StartTUI(debug, types.Podman)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(pCmd)
+}

cmd/root.go

@@ -7,6 +7,7 @@ import (
 	_ "embed"
 	"os"
 
+	"github.com/ajayd-san/gomanagedocker/service/types"
 	"github.com/ajayd-san/gomanagedocker/tui"
 	"github.com/spf13/cobra"
 )
@@ -19,7 +20,7 @@ var (
 		Long:    `The Definitive TUI to manage docker objects with ease.`,
 		Version: "1.4",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return tui.StartTUI(debug)
+			return tui.StartTUI(debug, types.Docker)
 		},
 	}
 )
@@ -32,5 +33,5 @@ func Execute() {
 }
 
 func init() {
-	rootCmd.Flags().BoolVar(&debug, "debug", false, "Send logs to ./gmd_debug.log")
+	rootCmd.PersistentFlags().BoolVar(&debug, "debug", false, "Send logs to ./gmd_debug.log")
 }

config/config_test.go

@@ -16,19 +16,35 @@ func TestReadConfig(t *testing.T) {
 	}{
 		{
 			UserConfig: "",
-			Want:       map[string]any{"config.Polling-Time": 500, "config.Tab-Order": []any{"images", "containers", "volumes"}, "config.Notification-Timeout": 2000},
+			Want: map[string]any{
+				"config.Polling-Time":         500,
+				"config.Tab-Order.Docker":     []any{"images", "containers", "volumes"},
+				"config.Tab-Order.Podman":     []any{"images", "containers", "volumes", "pods"},
+				"config.Notification-Timeout": 2000,
+			},
 		},
 		{
 			UserConfig: `config:
   Polling-Time: 100`,
-			Want: map[string]any{"config.Polling-Time": 100, "config.Tab-Order": []any{"images", "containers", "volumes"}, "config.Notification-Timeout": 2000},
+			Want: map[string]any{
+				"config.Polling-Time":         100,
+				"config.Tab-Order.Docker":     []any{"images", "containers", "volumes"},
+				"config.Tab-Order.Podman":     []any{"images", "containers", "volumes", "pods"},
+				"config.Notification-Timeout": 2000,
+			},
 		},
 		{
 			UserConfig: `config:
   Polling-Time: 200
-  Tab-Order: [containers, volumes]
+  Tab-Order:
+    Docker: [containers, volumes]
   Notification-Timeout: 10000`,
-			Want: map[string]any{"config.Polling-Time": 200, "config.Tab-Order": []any{"containers", "volumes"}, "config.Notification-Timeout": 10000},
+			Want: map[string]any{
+				"config.Polling-Time":         200,
+				"config.Tab-Order.Docker":     []any{"containers", "volumes"},
+				"config.Tab-Order.Podman":     []any{"images", "containers", "volumes", "pods"},
+				"config.Notification-Timeout": 10000,
+			},
 		},
 	}
 

config/defaultConfig.yaml

@@ -1,4 +1,6 @@
 config:
   Polling-Time: 500
-  Tab-Order: [images, containers, volumes]
+  Tab-Order:
+    Docker: [images, containers, volumes]
+    Podman: [images, containers, volumes, pods]
   Notification-Timeout: 2000