Merge pull request 'moving run command' (#11) from chore/cmd-structure-update into main

Reviewed-on: #11

cmd/command/add.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"os"
 
+	"code.jakeyoungdev.com/jake/mctl/constants"
 	"code.jakeyoungdev.com/jake/mctl/database"
 	"github.com/spf13/cobra"
 )
@@ -42,8 +43,8 @@ var addCmd = &cobra.Command{
 
 		err = db.SaveCmd(cfgname, cfgcmd)
 		if err != nil {
-			if err.Error() == ErrInit {
-				fmt.Println(ErrInitRsp)
+			if err.Error() == constants.ErrInit {
+				fmt.Println(constants.ErrInitRsp)
 				return
 			}
 		}

cmd/command/command.go

@@ -7,13 +7,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const (
-	//sqlite doesn't have an error type for this error, but we want to catch when this error is thrown
-	//and provide the proper response. It should not be treated as an error if the db isn't setup.
-	ErrInit    = "sqlite3: SQL logic error: no such table: commands"
-	ErrInitRsp = "The 'init' command must be run before mctl can be used"
-)
-
 // CommandCmd is such a cool name lol
 var CommandCmd = &cobra.Command{
 	Use:     "command",

cmd/command/delete.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 
+	"code.jakeyoungdev.com/jake/mctl/constants"
 	"code.jakeyoungdev.com/jake/mctl/database"
 	"github.com/spf13/cobra"
 )
@@ -23,8 +24,8 @@ var deleteCmd = &cobra.Command{
 
 		err = db.DeleteCmd(args[0])
 		if err != nil {
-			if err.Error() == ErrInit {
-				fmt.Println(ErrInitRsp)
+			if err.Error() == constants.ErrInit {
+				fmt.Println(constants.ErrInitRsp)
 				return
 			}
 		}

cmd/command/view.go

@@ -6,6 +6,7 @@ package command
 import (
 	"fmt"
 
+	"code.jakeyoungdev.com/jake/mctl/constants"
 	"code.jakeyoungdev.com/jake/mctl/database"
 	"github.com/spf13/cobra"
 )
@@ -22,8 +23,8 @@ var viewCmd = &cobra.Command{
 
 		ts, err := db.AllCmds()
 		if err != nil {
-			if err.Error() == ErrInit {
-				fmt.Println(ErrInitRsp)
+			if err.Error() == constants.ErrInit {
+				fmt.Println(constants.ErrInitRsp)
 				return
 			}
 		}

cmd/destroy.go

@@ -9,7 +9,7 @@ import (
 	"os"
 	"strings"
 
-	"code.jakeyoungdev.com/jake/mctl/cmd/command"
+	"code.jakeyoungdev.com/jake/mctl/constants"
 	"code.jakeyoungdev.com/jake/mctl/database"
 	"github.com/spf13/cobra"
 )
@@ -32,8 +32,8 @@ var destroyCmd = &cobra.Command{
 
 				err = db.Destroy()
 				if err != nil {
-					if err.Error() == command.ErrInit {
-						fmt.Println(command.ErrInitRsp)
+					if err.Error() == constants.ErrInit {
+						fmt.Println(constants.ErrInitRsp)
 						return
 					}
 				}

cmd/run.go

@@ -1,7 +1,7 @@
 /*
 Copyright © 2025 Jake jake.young.dev@gmail.com
 */
-package command
+package cmd
 
 import (
 	"errors"
@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"code.jakeyoungdev.com/jake/mctl/client"
+	"code.jakeyoungdev.com/jake/mctl/constants"
 	"code.jakeyoungdev.com/jake/mctl/database"
 	"github.com/spf13/cobra"
 )
@@ -19,7 +20,7 @@ var (
 
 var runCmd = &cobra.Command{
 	Use:          "run",
-	Example:      "mctl command run -s <server> <command> args...",
+	Example:      "mctl run -s <server> <command> args...",
 	Short:        "Runs a saved command on a server",
 	Long:         `Runs the named command with the provided args on the default/active server unless -s is specified`,
 	SilenceUsage: true,
@@ -34,8 +35,8 @@ var runCmd = &cobra.Command{
 
 		crun, err := db.Cmd(cname)
 		if err != nil {
-			if err.Error() == ErrInit {
-				fmt.Println(ErrInitRsp)
+			if err.Error() == constants.ErrInit {
+				fmt.Println(constants.ErrInitRsp)
 				return nil
 			}
 			return err
@@ -76,5 +77,5 @@ var runCmd = &cobra.Command{
 
 func init() {
 	runCmd.Flags().StringVarP(&cfgserver, "server", "s", "", "server name")
-	CommandCmd.AddCommand(runCmd)
+	rootCmd.AddCommand(runCmd)
 }

constants/error.go

@@ -0,0 +1,8 @@
+package constants
+
+const (
+	//sqlite doesn't have an error type for this error, but we want to catch when this error is thrown
+	//and provide the proper response. It should not be treated as an error if the db isn't setup.
+	ErrInit    = "sqlite3: SQL logic error: no such table: commands"
+	ErrInitRsp = "The 'init' command must be run before mctl can be used"
+)