release: v2.3.0 — Docker runtime-agnostic, updated README

- Docker tool now supports Docker, Podman, nerdctl, OrbStack, Rancher Desktop (PR #1)
- README: added Releasing section, updated to 33 tools / 300 tests
- 300 tests, 0 failures

Author: noahalorwu

DXTools/Services/DockerService.swift

@@ -11,9 +11,87 @@ struct DockerService {
         var isRunning: Bool { status.lowercased().contains("up") }
     }
 
+    enum Runtime: String, CaseIterable {
+        case docker = "docker"
+        case podman = "podman"
+        case nerdctl = "nerdctl"
+
+        var displayName: String {
+            switch self {
+            case .docker: return "Docker"
+            case .podman: return "Podman"
+            case .nerdctl: return "nerdctl"
+            }
+        }
+    }
+
+    /// Detected runtime name for display (e.g. "Docker", "Podman")
+    static var detectedRuntimeName: String {
+        detectRuntime()?.displayName ?? "Container runtime"
+    }
+
+    /// Search common paths for a container runtime binary, returning the first one found.
+    static func detectRuntime() -> Runtime? {
+        let searchPaths = [
+            "/usr/local/bin",
+            "/opt/homebrew/bin",
+            "/usr/bin",
+            NSHomeDirectory() + "/.docker/bin",
+            NSHomeDirectory() + "/.rd/bin",           // Rancher Desktop
+            "/Applications/OrbStack.app/Contents/MacOS", // OrbStack
+        ]
+
+        for runtime in Runtime.allCases {
+            // First try `which` to respect the user's PATH
+            let whichResult = shell("/usr/bin/which \(runtime.rawValue) 2>/dev/null")
+            if !whichResult.isEmpty && FileManager.default.isExecutableFile(atPath: whichResult) {
+                return runtime
+            }
+            // Then check common install locations
+            for dir in searchPaths {
+                let path = "\(dir)/\(runtime.rawValue)"
+                if FileManager.default.isExecutableFile(atPath: path) {
+                    return runtime
+                }
+            }
+        }
+        return nil
+    }
+
+    /// Resolve the full path to the runtime binary.
+    private static func runtimePath() -> String? {
+        guard let runtime = detectRuntime() else { return nil }
+        let searchPaths = [
+            "/usr/local/bin",
+            "/opt/homebrew/bin",
+            "/usr/bin",
+            NSHomeDirectory() + "/.docker/bin",
+            NSHomeDirectory() + "/.rd/bin",
+            "/Applications/OrbStack.app/Contents/MacOS",
+        ]
+
+        let whichResult = shell("/usr/bin/which \(runtime.rawValue) 2>/dev/null")
+        if !whichResult.isEmpty && FileManager.default.isExecutableFile(atPath: whichResult) {
+            return whichResult
+        }
+        for dir in searchPaths {
+            let path = "\(dir)/\(runtime.rawValue)"
+            if FileManager.default.isExecutableFile(atPath: path) {
+                return path
+            }
+        }
+        return nil
+    }
+
+    /// Run a container runtime command using the detected binary.
+    private static func run(_ arguments: String) -> String {
+        guard let bin = runtimePath() else { return "" }
+        return shell("\(bin) \(arguments)")
+    }
+
     static func listContainers(all: Bool = true) -> [Container] {
         let flag = all ? "-a" : ""
-        let output = shell("docker ps \(flag) --format '{{.ID}}|{{.Names}}|{{.Image}}|{{.Status}}|{{.Ports}}|{{.CreatedAt}}' 2>/dev/null")
+        let output = run("ps \(flag) --format '{{.ID}}|{{.Names}}|{{.Image}}|{{.Status}}|{{.Ports}}|{{.CreatedAt}}' 2>/dev/null")
         guard !output.isEmpty else { return [] }
 
         return output.split(separator: "\n").compactMap { line in
@@ -31,32 +109,34 @@ struct DockerService {
     }
 
     static func start(_ containerId: String) -> Bool {
-        let output = shell("docker start \(containerId) 2>&1")
+        let output = run("start \(containerId) 2>&1")
         return !output.isEmpty
     }
 
     static func stop(_ containerId: String) -> Bool {
-        let output = shell("docker stop \(containerId) 2>&1")
+        let output = run("stop \(containerId) 2>&1")
         return !output.isEmpty
     }
 
     static func restart(_ containerId: String) -> Bool {
-        let output = shell("docker restart \(containerId) 2>&1")
+        let output = run("restart \(containerId) 2>&1")
         return !output.isEmpty
     }
 
     static func remove(_ containerId: String) -> Bool {
-        let output = shell("docker rm -f \(containerId) 2>&1")
+        let output = run("rm -f \(containerId) 2>&1")
         return !output.isEmpty
     }
 
     static func logs(_ containerId: String, lines: Int = 100) -> String {
-        shell("docker logs --tail \(lines) \(containerId) 2>&1")
+        run("logs --tail \(lines) \(containerId) 2>&1")
     }
 
     static func isDockerRunning() -> Bool {
-        let output = shell("docker info 2>&1")
+        guard runtimePath() != nil else { return false }
+        let output = run("info 2>&1")
         return output.contains("Server Version") || output.contains("Containers:")
+            || output.contains("host")  // podman info output
     }
 
     private static func shell(_ command: String) -> String {

DXTools/ViewModels/DockerViewModel.swift

@@ -9,6 +9,7 @@ class DockerViewModel {
     var logs: String = ""
     var isDockerAvailable: Bool = false
     var isLoading: Bool = false
+    var runtimeName: String = "Docker"
 
     var filtered: [DockerService.Container] {
         if searchQuery.isEmpty { return containers }
@@ -23,9 +24,11 @@ class DockerViewModel {
     func refresh() {
         isLoading = true
         DispatchQueue.global(qos: .userInitiated).async { [self] in
+            let name = DockerService.detectedRuntimeName
             let available = DockerService.isDockerRunning()
             let list = available ? DockerService.listContainers(all: showAll) : []
             DispatchQueue.main.async {
+                self.runtimeName = name
                 self.isDockerAvailable = available
                 self.containers = list
                 self.isLoading = false

DXTools/Views/Tools/DockerView.swift

@@ -26,8 +26,8 @@ struct DockerView: View {
                 VStack(spacing: 10) {
                     Spacer()
                     Image(systemName: "shippingbox").font(.system(size: 30, weight: .ultraLight)).foregroundStyle(t.textGhost)
-                    Text("Docker not running").font(.system(size: 12, weight: .semibold, design: .rounded)).foregroundStyle(t.textTertiary)
-                    Text("Start Docker Desktop and refresh").font(.system(size: 10, weight: .medium)).foregroundStyle(t.textGhost)
+                    Text("No container runtime found").font(.system(size: 12, weight: .semibold, design: .rounded)).foregroundStyle(t.textTertiary)
+                    Text("Install Docker, Podman, or OrbStack and refresh").font(.system(size: 10, weight: .medium)).foregroundStyle(t.textGhost)
                     Spacer()
                 }
                 .frame(maxWidth: .infinity)

README.md

@@ -1,18 +1,19 @@
 <p align="center">
   <img src="https://img.shields.io/badge/macOS-14%2B-000?logo=apple&logoColor=white" />
   <img src="https://img.shields.io/badge/Swift-5.9-F05138?logo=swift&logoColor=white" />
-  <img src="https://img.shields.io/badge/tools-23-FF8C42" />
-  <img src="https://img.shields.io/badge/tests-245-4ADE80" />
+  <img src="https://img.shields.io/badge/tools-33-FF8C42" />
+  <img src="https://img.shields.io/badge/tests-300-4ADE80" />
   <img src="https://img.shields.io/badge/dependencies-0-blue" />
-  <img src="https://img.shields.io/badge/size-2.3MB-purple" />
+  <img src="https://img.shields.io/badge/size-~3MB-purple" />
   <img src="https://img.shields.io/github/license/OpenStruct/dx-tools" />
+  <img src="https://img.shields.io/github/v/release/OpenStruct/dx-tools?color=FF8C42" />
 </p>
 
 # ⚡ DX Tools
 
-**23 developer tools in one native macOS app.** JSON formatting, JWT decoding, port killing, DNS lookups, regex testing — all offline, instant, keyboard-first.
+**33 developer tools in one native macOS app.** JSON formatting, JWT decoding, port killing, QR codes, SQL formatting, API testing — all offline, instant, keyboard-first.
 
-> No Electron. No web wrapper. Pure SwiftUI. 2.3 MB.
+> No Electron. No web wrapper. Pure SwiftUI. ~3 MB.
 
 ---
 
@@ -61,6 +62,7 @@ xcodebuild -project DXTools.xcodeproj -scheme DXTools -configuration Release bui
 | **JSON → Swift** | Convert JSON to Swift Codable models |
 | **JSON → TypeScript** | Convert JSON to TypeScript interfaces |
 | **JSON Diff** | Side-by-side structural diff with path tracking |
+| **JSON Schema Validator** | Validate JSON against a schema — type, required, min/max, pattern |
 
 ### Encoding
 | Tool | Description |
@@ -69,32 +71,41 @@ xcodebuild -project DXTools.xcodeproj -scheme DXTools -configuration Release bui
 | **Base64** | Encode/decode, standard and URL-safe |
 | **Hash Generator** | MD5, SHA-1, SHA-256, SHA-512 |
 | **URL Encoder** | Percent-encode/decode, parse components |
+| **Image Base64** | Encode images to base64/data URI, decode back to image |
 
 ### Generators
 | Tool | Description |
 |------|-------------|
 | **UUID Generator** | v4 UUIDs, bulk generation, one-click copy |
 | **Color Converter** | HEX ↔ RGB ↔ HSL, code gen for Swift/CSS/Flutter/Android/Tailwind |
-| **Epoch Converter** | Unix timestamp ↔ human date, 6 world clocks |
+| **Epoch Converter** | Unix timestamp ↔ human date, 8 world clocks |
 | **Password Generator** | Secure passwords & passphrases, strength meter |
 | **Unix Permissions** | chmod calculator, numeric ↔ symbolic, interactive checkboxes |
 | **Cron Parser** | Human-readable descriptions, next 10 run times |
+| **QR Code Generator** | Generate from text/URL, 4 error correction levels, copy/save PNG |
+| **SSH Key Generator** | RSA, Ed25519, ECDSA with custom comments, copy/export |
+| **Timestamp Converter** | Unix ↔ ISO 8601 ↔ RFC 2822, timezone support |
 
 ### DevOps
 | Tool | Description |
 |------|-------------|
 | **Port Manager** | List listening ports, kill processes, search & sort |
 | **Network Info** | Local/public IP, DNS lookup (A/AAAA/CNAME/MX/NS/TXT) |
-| **API Request Builder** | Send HTTP requests, headers, body, response viewer |
+| **API Request Builder** | Send HTTP requests, headers, query params, body, response viewer |
 | **Env Manager** | Parse .env files, mask secrets, diff two envs |
 | **cURL → Code** | Paste cURL, get Swift/Go/Python/JS/Ruby |
+| **Docker Manager** | Container list, start/stop/remove, image management |
+| **Git Stats** | Repository stats, branch info, recent commits |
+| **HTTP Status Codes** | Searchable reference, 35+ codes, color-coded categories |
 
 ### Text
 | Tool | Description |
 |------|-------------|
 | **Regex Tester** | Live matching, capture groups, replace mode |
 | **Markdown Preview** | Side-by-side editor and rendered preview |
 | **Lorem Generator** | Words, sentences, paragraphs, fake data, JSON |
+| **Text Diff** | LCS-based diff, unified output, side-by-side view |
+| **SQL Formatter** | Format & minify SQL, 3 indent styles, JOINs/subqueries |
 
 ---
 
@@ -140,10 +151,12 @@ dx env diff .env .env.production
 - **Menu Bar** — Quick UUID, Epoch, Password without opening the app
 - **Favorites** — Right-click to pin tools to sidebar
 - **Dark / Light / System** — Theme toggle in Settings
-- **Global Hotkey** — ⌘⇧Space to summon the app
+- **Syntax Highlighting** — Live JSON/SQL coloring in editors
+- **History** — Per-tool history of recent operations
+- **URL Handler** — `dx://tool-name` opens app to specific tool
+- **Auto-Update** — Checks GitHub Releases on launch
 - **Drag & Drop** — Drop files onto editors
 - **Export** — Save output to file (⌘S)
-- **History** — Per-tool history of recent operations
 
 ### Keyboard Shortcuts
 
@@ -165,16 +178,16 @@ dx env diff .env .env.production
 ```
 DXTools/
 ├── Models/          # Tool enum, Theme
-├── Services/        # Pure logic (23 service files)
+├── Services/        # Pure logic (28 service files)
 ├── ViewModels/      # @Observable view models
 ├── Views/
-│   ├── Components/  # CodeEditor, SplitLayout, Toast
+│   ├── Components/  # CodeEditor, SplitLayout, ToolHeader, HistoryPanel
 │   ├── Sidebar/     # Navigation, Welcome
-│   └── Tools/       # 23 tool views
+│   └── Tools/       # 33 tool views
 └── DXToolsApp.swift # App entry, menu bar, clipboard
 
 Sources/             # CLI (swift-argument-parser)
-DXToolsTests/        # 245 tests across 21 suites
+DXToolsTests/        # 300 tests across 25 suites
 ```
 
 - **SwiftUI** with `@Observable` (macOS 14+)
@@ -193,7 +206,7 @@ xcodegen generate
 # Build & run
 xcodebuild -project DXTools.xcodeproj -scheme DXTools build
 
-# Run tests (245 tests)
+# Run tests (300 tests)
 xcodebuild -project DXTools.xcodeproj -scheme DXToolsTests test
 
 # Build CLI
@@ -205,6 +218,75 @@ swift build -c release
 
 ---
 
+## Releasing
+
+Releases follow a `dev` → `main` → tag workflow. CI builds, tests, and publishes automatically.
+
+### Quick Release
+
+```bash
+# 1. Make sure you're on dev with everything committed
+git checkout dev
+
+# 2. Bump version in project.yml
+#    MARKETING_VERSION: "X.Y.Z"
+
+# 3. Regenerate Xcode project
+xcodegen generate
+
+# 4. Commit and push
+git add -A && git commit -m "chore: bump version to X.Y.Z"
+git push
+
+# 5. Merge to main
+git checkout main
+git merge dev --no-ff -m "release: vX.Y.Z — description"
+git push
+
+# 6. Tag and push — this triggers CI release
+git tag vX.Y.Z
+git push origin vX.Y.Z
+
+# 7. Go back to dev
+git checkout dev
+```
+
+### What CI Does on Tag Push
+
+1. **Builds CLI** — `swift build -c release` → uploads `dx` binary
+2. **Builds macOS app** — XcodeGen → xcodebuild → `DX Tools.app`
+3. **Runs 300 tests** — all must pass
+4. **Packages DMG** — app + Applications symlink + volume icon
+5. **Creates GitHub Release** — attaches `DXTools.dmg` + `dx` CLI binary
+6. **Deploys website** — if `web/` changed, GitHub Pages updates automatically
+
+### Release Checklist
+
+```
+[ ] Version bumped in project.yml (MARKETING_VERSION)
+[ ] xcodegen generate ran
+[ ] All 300 tests pass locally
+[ ] Committed and pushed to dev
+[ ] Merged dev → main
+[ ] Tag pushed (vX.Y.Z)
+[ ] CI green — check https://github.com/OpenStruct/dx-tools/actions
+[ ] Release has both DXTools.dmg and dx assets
+[ ] Website updated (if web/ changed)
+```
+
+### Hotfix
+
+```bash
+# Fix directly on dev, then follow normal release flow
+git checkout dev
+# ... make fix ...
+git add -A && git commit -m "fix: description"
+git push
+# Then merge + tag as above
+```
+
+---
+
 ## License
 
 MIT — see [LICENSE](LICENSE)

project.yml

@@ -10,7 +10,7 @@ settings:
   base:
     SWIFT_VERSION: "5.9"
     MACOSX_DEPLOYMENT_TARGET: "14.0"
-    MARKETING_VERSION: "2.2.1"
+    MARKETING_VERSION: "2.3.0"
     CURRENT_PROJECT_VERSION: 1
 
 targets: