From 1f0f86a80070cf955d8b3e80b3d1d2100e24b7f7 Mon Sep 17 00:00:00 2001
From: Scott Sunarto <github@smsunarto.com>
Date: Mon, 6 Nov 2023 15:22:13 -0800
Subject: [PATCH] refactor: move main.go to cmd/world (#13)

---
 .github/workflows/build.yml          | 4 ++--
 .github/workflows/test.yml           | 3 ++-
 cmd/{ => world}/cardinal/cardinal.go | 0
 cmd/{ => world}/cardinal/create.go   | 0
 cmd/{ => world}/cardinal/dev.go      | 0
 cmd/{ => world}/cardinal/purge.go    | 0
 cmd/{ => world}/cardinal/restart.go  | 0
 cmd/{ => world}/cardinal/start.go    | 0
 cmd/{ => world}/cardinal/stop.go     | 0
 cmd/world/main.go                    | 9 +++++++++
 cmd/{ => world/root}/doctor.go       | 2 +-
 cmd/{ => world/root}/root.go         | 4 ++--
 cmd/{ => world/root}/version.go      | 2 +-
 main.go                              | 7 -------
 14 files changed, 17 insertions(+), 14 deletions(-)
 rename cmd/{ => world}/cardinal/cardinal.go (100%)
 rename cmd/{ => world}/cardinal/create.go (100%)
 rename cmd/{ => world}/cardinal/dev.go (100%)
 rename cmd/{ => world}/cardinal/purge.go (100%)
 rename cmd/{ => world}/cardinal/restart.go (100%)
 rename cmd/{ => world}/cardinal/start.go (100%)
 rename cmd/{ => world}/cardinal/stop.go (100%)
 create mode 100644 cmd/world/main.go
 rename cmd/{ => world/root}/doctor.go (99%)
 rename cmd/{ => world/root}/root.go (94%)
 rename cmd/{ => world/root}/version.go (97%)
 delete mode 100644 main.go

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 881ceed..985206f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Set up Docker Buildx
+      - name: Set up Docker Build
         uses: docker/setup-buildx-action@v2
       - name: Install Go
         uses: actions/setup-go@v4
@@ -40,7 +40,7 @@ jobs:
           output_name=world_${{ matrix.goos }}_${{ matrix.goarch }}
           [ ${{ matrix.goos }} = "windows" ] && output_name+=".exe"
 
-          env GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go build -o $output_name
+          env GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go build ./cmd/world -o $output_name
           echo "output_name=$output_name" >> $GITHUB_OUTPUT
       - name: Compress Build Binary
         uses: a7ul/tar-action@v1.1.3
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 06056eb..95d2fbc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Set up Docker Buildx
+      - name: Set up Docker Build
         uses: docker/setup-buildx-action@v2
       - name: Install Go
         uses: actions/setup-go@v4
@@ -34,6 +34,7 @@ jobs:
         with:
           name: coverage
           path: ./coverage.out
+          
   upload-codecov:
     name: Upload coverage output to Codecov.io
     runs-on: ubuntu-latest
diff --git a/cmd/cardinal/cardinal.go b/cmd/world/cardinal/cardinal.go
similarity index 100%
rename from cmd/cardinal/cardinal.go
rename to cmd/world/cardinal/cardinal.go
diff --git a/cmd/cardinal/create.go b/cmd/world/cardinal/create.go
similarity index 100%
rename from cmd/cardinal/create.go
rename to cmd/world/cardinal/create.go
diff --git a/cmd/cardinal/dev.go b/cmd/world/cardinal/dev.go
similarity index 100%
rename from cmd/cardinal/dev.go
rename to cmd/world/cardinal/dev.go
diff --git a/cmd/cardinal/purge.go b/cmd/world/cardinal/purge.go
similarity index 100%
rename from cmd/cardinal/purge.go
rename to cmd/world/cardinal/purge.go
diff --git a/cmd/cardinal/restart.go b/cmd/world/cardinal/restart.go
similarity index 100%
rename from cmd/cardinal/restart.go
rename to cmd/world/cardinal/restart.go
diff --git a/cmd/cardinal/start.go b/cmd/world/cardinal/start.go
similarity index 100%
rename from cmd/cardinal/start.go
rename to cmd/world/cardinal/start.go
diff --git a/cmd/cardinal/stop.go b/cmd/world/cardinal/stop.go
similarity index 100%
rename from cmd/cardinal/stop.go
rename to cmd/world/cardinal/stop.go
diff --git a/cmd/world/main.go b/cmd/world/main.go
new file mode 100644
index 0000000..4974dee
--- /dev/null
+++ b/cmd/world/main.go
@@ -0,0 +1,9 @@
+package main
+
+import (
+	"pkg.world.dev/world-cli/cmd/world/root"
+)
+
+func main() {
+	root.Execute()
+}
diff --git a/cmd/doctor.go b/cmd/world/root/doctor.go
similarity index 99%
rename from cmd/doctor.go
rename to cmd/world/root/doctor.go
index bebd48a..c687150 100644
--- a/cmd/doctor.go
+++ b/cmd/world/root/doctor.go
@@ -1,4 +1,4 @@
-package cmd
+package root
 
 import (
 	tea "github.com/charmbracelet/bubbletea"
diff --git a/cmd/root.go b/cmd/world/root/root.go
similarity index 94%
rename from cmd/root.go
rename to cmd/world/root/root.go
index e5beb90..ca94c09 100644
--- a/cmd/root.go
+++ b/cmd/world/root/root.go
@@ -1,11 +1,11 @@
-package cmd
+package root
 
 import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 	"os"
-	"pkg.world.dev/world-cli/cmd/cardinal"
+	"pkg.world.dev/world-cli/cmd/world/cardinal"
 	"pkg.world.dev/world-cli/tea/style"
 )
 
diff --git a/cmd/version.go b/cmd/world/root/version.go
similarity index 97%
rename from cmd/version.go
rename to cmd/world/root/version.go
index f9d770f..169528a 100644
--- a/cmd/version.go
+++ b/cmd/world/root/version.go
@@ -1,4 +1,4 @@
-package cmd
+package root
 
 import (
 	"fmt"
diff --git a/main.go b/main.go
deleted file mode 100644
index 875db01..0000000
--- a/main.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package main
-
-import "pkg.world.dev/world-cli/cmd"
-
-func main() {
-	cmd.Execute()
-}