moving run command #11
@@ -8,6 +8,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
|
"code.jakeyoungdev.com/jake/mctl/constants"
|
||||||
"code.jakeyoungdev.com/jake/mctl/database"
|
"code.jakeyoungdev.com/jake/mctl/database"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
@@ -42,8 +43,8 @@ var addCmd = &cobra.Command{
|
|||||||
|
|
||||||
err = db.SaveCmd(cfgname, cfgcmd)
|
err = db.SaveCmd(cfgname, cfgcmd)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if err.Error() == ErrInit {
|
if err.Error() == constants.ErrInit {
|
||||||
fmt.Println(ErrInitRsp)
|
fmt.Println(constants.ErrInitRsp)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,13 +7,6 @@ import (
|
|||||||
"github.com/spf13/cobra"
|
"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
|
// CommandCmd is such a cool name lol
|
||||||
var CommandCmd = &cobra.Command{
|
var CommandCmd = &cobra.Command{
|
||||||
Use: "command",
|
Use: "command",
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
|
"code.jakeyoungdev.com/jake/mctl/constants"
|
||||||
"code.jakeyoungdev.com/jake/mctl/database"
|
"code.jakeyoungdev.com/jake/mctl/database"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
@@ -23,8 +24,8 @@ var deleteCmd = &cobra.Command{
|
|||||||
|
|
||||||
err = db.DeleteCmd(args[0])
|
err = db.DeleteCmd(args[0])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if err.Error() == ErrInit {
|
if err.Error() == constants.ErrInit {
|
||||||
fmt.Println(ErrInitRsp)
|
fmt.Println(constants.ErrInitRsp)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ package command
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
|
"code.jakeyoungdev.com/jake/mctl/constants"
|
||||||
"code.jakeyoungdev.com/jake/mctl/database"
|
"code.jakeyoungdev.com/jake/mctl/database"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
@@ -22,8 +23,8 @@ var viewCmd = &cobra.Command{
|
|||||||
|
|
||||||
ts, err := db.AllCmds()
|
ts, err := db.AllCmds()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if err.Error() == ErrInit {
|
if err.Error() == constants.ErrInit {
|
||||||
fmt.Println(ErrInitRsp)
|
fmt.Println(constants.ErrInitRsp)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"code.jakeyoungdev.com/jake/mctl/cmd/command"
|
"code.jakeyoungdev.com/jake/mctl/constants"
|
||||||
"code.jakeyoungdev.com/jake/mctl/database"
|
"code.jakeyoungdev.com/jake/mctl/database"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
@@ -32,8 +32,8 @@ var destroyCmd = &cobra.Command{
|
|||||||
|
|
||||||
err = db.Destroy()
|
err = db.Destroy()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if err.Error() == command.ErrInit {
|
if err.Error() == constants.ErrInit {
|
||||||
fmt.Println(command.ErrInitRsp)
|
fmt.Println(constants.ErrInitRsp)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
Copyright © 2025 Jake jake.young.dev@gmail.com
|
Copyright © 2025 Jake jake.young.dev@gmail.com
|
||||||
*/
|
*/
|
||||||
package command
|
package cmd
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
@@ -9,6 +9,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"code.jakeyoungdev.com/jake/mctl/client"
|
"code.jakeyoungdev.com/jake/mctl/client"
|
||||||
|
"code.jakeyoungdev.com/jake/mctl/constants"
|
||||||
"code.jakeyoungdev.com/jake/mctl/database"
|
"code.jakeyoungdev.com/jake/mctl/database"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
@@ -19,7 +20,7 @@ var (
|
|||||||
|
|
||||||
var runCmd = &cobra.Command{
|
var runCmd = &cobra.Command{
|
||||||
Use: "run",
|
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",
|
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`,
|
Long: `Runs the named command with the provided args on the default/active server unless -s is specified`,
|
||||||
SilenceUsage: true,
|
SilenceUsage: true,
|
||||||
@@ -34,8 +35,8 @@ var runCmd = &cobra.Command{
|
|||||||
|
|
||||||
crun, err := db.Cmd(cname)
|
crun, err := db.Cmd(cname)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if err.Error() == ErrInit {
|
if err.Error() == constants.ErrInit {
|
||||||
fmt.Println(ErrInitRsp)
|
fmt.Println(constants.ErrInitRsp)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
@@ -76,5 +77,5 @@ var runCmd = &cobra.Command{
|
|||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
runCmd.Flags().StringVarP(&cfgserver, "server", "s", "", "server name")
|
runCmd.Flags().StringVarP(&cfgserver, "server", "s", "", "server name")
|
||||||
CommandCmd.AddCommand(runCmd)
|
rootCmd.AddCommand(runCmd)
|
||||||
}
|
}
|
||||||
8
constants/error.go
Normal file
8
constants/error.go
Normal file
@@ -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"
|
||||||
|
)
|
||||||
Reference in New Issue
Block a user