From fa3f82e7d9e5a5d3a97bd894f5db4f7c083848ec Mon Sep 17 00:00:00 2001 From: Nofre Date: Thu, 22 May 2025 07:28:06 +0200 Subject: [PATCH] fix(cmd): cmd arch logic restored --- .goreleaser.yml | 8 ++++---- Taskfile.yml | 6 +++--- cmd/{cli => }/apply/apply.go | 0 cmd/{cli => }/check/check.go | 0 cmd/{cli => }/cleanup/cleanup.go | 0 cmd/{cli => }/edit/edit.go | 0 cmd/{cli => }/generator/generate.go | 0 cmd/{qube => }/main.go | 3 +-- cmd/{cli => }/rollback/rollback.go | 0 cmd/{cli => }/root.go | 17 ++++++++--------- cmd/{cli => }/search/execution.go | 0 cmd/{cli => }/search/options.go | 0 cmd/{cli => }/search/results.go | 0 cmd/{cli => }/search/search.go | 0 cmd/{cli => }/version.go | 4 ++-- 15 files changed, 18 insertions(+), 20 deletions(-) rename cmd/{cli => }/apply/apply.go (100%) rename cmd/{cli => }/check/check.go (100%) rename cmd/{cli => }/cleanup/cleanup.go (100%) rename cmd/{cli => }/edit/edit.go (100%) rename cmd/{cli => }/generator/generate.go (100%) rename cmd/{qube => }/main.go (80%) rename cmd/{cli => }/rollback/rollback.go (100%) rename cmd/{cli => }/root.go (77%) rename cmd/{cli => }/search/execution.go (100%) rename cmd/{cli => }/search/options.go (100%) rename cmd/{cli => }/search/results.go (100%) rename cmd/{cli => }/search/search.go (100%) rename cmd/{cli => }/version.go (93%) diff --git a/.goreleaser.yml b/.goreleaser.yml index 196fc60..3c83ca8 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,12 +1,12 @@ version: 2 builds: - - main: ./cmd/qube + - main: ./cmd id: "qube" binary: qube ldflags: - - -s -w -X github.com/apiqube/cli/cmd/cli.Version={{.Version}} - - -s -w -X github.com/apiqube/cli/cmd/cli.Commit={{.ShortCommit}} - - -s -w -X github.com/apiqube/cli/cmd/cli.Date={{.Date}} + - -s -w -X main.Version={{.Version}} + - -s -w -X main.Commit={{.ShortCommit}} + - -s -w -X main.Date={{.Date}} env: - CGO_ENABLED=0 goos: [linux, darwin, windows] diff --git a/Taskfile.yml b/Taskfile.yml index 64be8c1..75df5b2 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -3,7 +3,7 @@ version: '3' vars: BINARY_NAME: qube BUILD_DIR: C:/Users/admin/go/bin - MAIN: ./cmd/qube + MAIN: ./cmd VERSION: sh: git describe --tags --abbrev=0 2>/dev/null || echo "dev" @@ -16,13 +16,13 @@ tasks: desc: ๐Ÿ”ง Build Qube CLI cmds: - echo "๐Ÿ”ง Building {{.BINARY_NAME}} version {{.VERSION}}" - - go build -ldflags="-X github.com/apiqube/cli/cmd/cli.version={{.VERSION}}" -o={{.BUILD_DIR}}/{{.BINARY_NAME}}.exe {{.MAIN}} + - go build -ldflags="-X github.com/apiqube/cli/cmd.version={{.VERSION}}" -o={{.BUILD_DIR}}/{{.BINARY_NAME}}.exe {{.MAIN}} build-versioned: desc: ๐Ÿ”ง Build Qube CLI cmds: - echo "๐Ÿ”ง Building {{.BINARY_NAME}} version {{.VERSION}}" - - go build -ldflags="-X github.com/apiqube/cli/cmd/cli.version={{.VERSION}}" -o {{.BUILD_DIR}}/{{.BINARY_NAME}}-{{.VERSION}}.exe {{.MAIN}} + - go build -ldflags="-X github.com/apiqube/cli/cmd.version={{.VERSION}}" -o {{.BUILD_DIR}}/{{.BINARY_NAME}}-{{.VERSION}}.exe {{.MAIN}} clean: desc: ๐Ÿงน Clean build directory diff --git a/cmd/cli/apply/apply.go b/cmd/apply/apply.go similarity index 100% rename from cmd/cli/apply/apply.go rename to cmd/apply/apply.go diff --git a/cmd/cli/check/check.go b/cmd/check/check.go similarity index 100% rename from cmd/cli/check/check.go rename to cmd/check/check.go diff --git a/cmd/cli/cleanup/cleanup.go b/cmd/cleanup/cleanup.go similarity index 100% rename from cmd/cli/cleanup/cleanup.go rename to cmd/cleanup/cleanup.go diff --git a/cmd/cli/edit/edit.go b/cmd/edit/edit.go similarity index 100% rename from cmd/cli/edit/edit.go rename to cmd/edit/edit.go diff --git a/cmd/cli/generator/generate.go b/cmd/generator/generate.go similarity index 100% rename from cmd/cli/generator/generate.go rename to cmd/generator/generate.go diff --git a/cmd/qube/main.go b/cmd/main.go similarity index 80% rename from cmd/qube/main.go rename to cmd/main.go index 5bf9e04..e692f02 100644 --- a/cmd/qube/main.go +++ b/cmd/main.go @@ -1,7 +1,6 @@ package main import ( - "github.com/apiqube/cli/cmd/cli" "github.com/apiqube/cli/internal/core/store" uicli "github.com/apiqube/cli/ui/cli" ) @@ -13,5 +12,5 @@ func main() { store.Init() defer store.Stop() - cli.Execute() + Execute() } diff --git a/cmd/cli/rollback/rollback.go b/cmd/rollback/rollback.go similarity index 100% rename from cmd/cli/rollback/rollback.go rename to cmd/rollback/rollback.go diff --git a/cmd/cli/root.go b/cmd/root.go similarity index 77% rename from cmd/cli/root.go rename to cmd/root.go index 0d34fad..92a388b 100644 --- a/cmd/cli/root.go +++ b/cmd/root.go @@ -1,4 +1,4 @@ -package cli +package main import ( "context" @@ -6,17 +6,16 @@ import ( "os/signal" "syscall" - "github.com/apiqube/cli/cmd/cli/edit" + "github.com/apiqube/cli/cmd/apply" + "github.com/apiqube/cli/cmd/check" + "github.com/apiqube/cli/cmd/cleanup" + "github.com/apiqube/cli/cmd/edit" + "github.com/apiqube/cli/cmd/generator" + "github.com/apiqube/cli/cmd/rollback" + "github.com/apiqube/cli/cmd/search" "github.com/apiqube/cli/ui/cli" - "github.com/apiqube/cli/cmd/cli/apply" - "github.com/apiqube/cli/cmd/cli/check" - "github.com/apiqube/cli/cmd/cli/cleanup" - "github.com/apiqube/cli/cmd/cli/generator" - "github.com/apiqube/cli/cmd/cli/rollback" - "github.com/apiqube/cli/cmd/cli/search" - "github.com/apiqube/cli/internal/config" "github.com/spf13/cobra" ) diff --git a/cmd/cli/search/execution.go b/cmd/search/execution.go similarity index 100% rename from cmd/cli/search/execution.go rename to cmd/search/execution.go diff --git a/cmd/cli/search/options.go b/cmd/search/options.go similarity index 100% rename from cmd/cli/search/options.go rename to cmd/search/options.go diff --git a/cmd/cli/search/results.go b/cmd/search/results.go similarity index 100% rename from cmd/cli/search/results.go rename to cmd/search/results.go diff --git a/cmd/cli/search/search.go b/cmd/search/search.go similarity index 100% rename from cmd/cli/search/search.go rename to cmd/search/search.go diff --git a/cmd/cli/version.go b/cmd/version.go similarity index 93% rename from cmd/cli/version.go rename to cmd/version.go index 2ae7668..ab6dbb3 100644 --- a/cmd/cli/version.go +++ b/cmd/version.go @@ -1,4 +1,4 @@ -package cli +package main import ( "fmt" @@ -13,7 +13,7 @@ var ( ) var versionCmd = &cobra.Command{ - Use: "Version", + Use: "version", Short: "Print the Version number", SilenceUsage: true, SilenceErrors: true,