[fix] Testing fixes

- sqlite error handling and wrapping
- more responsive commands
- database updates

cmd/server/active.go

@@ -12,15 +12,20 @@ import (
 )
 
 var activeCmd = &cobra.Command{
-	Use:     "active",
-	Example: "mctl server active <server>",
-	Short:   "sets the active server to run commands on",
+	Use:          "active",
+	Example:      "mctl server active <server>",
+	Short:        "sets the active server to run commands on",
+	SilenceUsage: true,
 	Run: func(cmd *cobra.Command, args []string) {
 		db, err := database.New()
 		cobra.CheckErr(err)
 		defer db.Close()
 
 		err = db.SetActiveServer(args[0])
+		if err.Error() == ErrInit {
+			fmt.Println(ErrInitRsp)
+			return
+		}
 		cobra.CheckErr(err)
 
 		fmt.Println("Active server updated")

cmd/server/add.go

@@ -17,10 +17,11 @@ import (
 )
 
 var addCmd = &cobra.Command{
-	Use:     "add",
-	Example: "mctl server add",
-	Short:   "Saves a new server configuration",
-	Long:    `Saves server address, alias, port, and password to the database.`,
+	Use:          "add",
+	Example:      "mctl server add",
+	Short:        "Saves a new server configuration",
+	Long:         `Saves server address, alias, port, and password to the database.`,
+	SilenceUsage: true,
 	Run: func(cmd *cobra.Command, args []string) {
 		scanner := bufio.NewScanner(os.Stdin)
 
@@ -62,6 +63,10 @@ var addCmd = &cobra.Command{
 			Port:     fp,
 			Password: base64.StdEncoding.EncodeToString(ps),
 		})
+		if err.Error() == ErrInit {
+			fmt.Println(ErrInitRsp)
+			return
+		}
 		cobra.CheckErr(err)
 
 		fmt.Println("Server saved")

cmd/server/delete.go

@@ -5,22 +5,30 @@ package server
 
 import (
 	"errors"
+	"fmt"
 
 	"code.jakeyoungdev.com/jake/mctl/database"
 	"github.com/spf13/cobra"
 )
 
 var deleteCmd = &cobra.Command{
-	Use:     "delete",
-	Example: "mctl server delete <server>",
-	Short:   "deletes a server from the database",
+	Use:          "delete",
+	Example:      "mctl server delete <server>",
+	Short:        "deletes a server from the database",
+	SilenceUsage: true,
 	Run: func(cmd *cobra.Command, args []string) {
 		db, err := database.New()
 		cobra.CheckErr(err)
 		defer db.Close()
 
 		err = db.DeleteServer(args[0])
+		if err.Error() == ErrInit {
+			fmt.Println(ErrInitRsp)
+			return
+		}
 		cobra.CheckErr(err)
+
+		fmt.Println("Server deleted")
 	},
 	PreRunE: func(cmd *cobra.Command, args []string) error {
 		if len(args) == 0 {

cmd/server/server.go

@@ -7,6 +7,11 @@ import (
 	"github.com/spf13/cobra"
 )
 
+const (
+	ErrInit    = "sqlite3: SQL logic error: no such table: servers"
+	ErrInitRsp = "The 'init' command must be run before mctl can be used"
+)
+
 var ServerCmd = &cobra.Command{
 	Use:     "server",
 	Example: "mctl server <subcommand>",

cmd/server/update.go

@@ -15,9 +15,10 @@ import (
 )
 
 var updateCmd = &cobra.Command{
-	Use:     "update",
-	Example: "mctl server update <name>",
-	Short:   "updates a saved servers password in the database",
+	Use:          "update",
+	Example:      "mctl server update <name>",
+	Short:        "updates a saved servers password in the database",
+	SilenceUsage: true,
 	Run: func(cmd *cobra.Command, args []string) {
 		//read in password using term to keep it secure/hidden from bash history
 		fmt.Printf("Password: ")
@@ -29,6 +30,10 @@ var updateCmd = &cobra.Command{
 		defer db.Close()
 
 		err = db.UpdateServer(args[0], base64.StdEncoding.EncodeToString(ps))
+		if err.Error() == ErrInit {
+			fmt.Println(ErrInitRsp)
+			return
+		}
 		cobra.CheckErr(err)
 
 		fmt.Printf("%s password updated!", args[0])

cmd/server/view.go

@@ -11,15 +11,20 @@ import (
 )
 
 var viewCmd = &cobra.Command{
-	Use:     "view",
-	Example: "mctl server view",
-	Short:   "view all saved servers",
+	Use:          "view",
+	Example:      "mctl server view",
+	Short:        "view all saved servers",
+	SilenceUsage: true,
 	Run: func(cmd *cobra.Command, args []string) {
 		db, err := database.New()
 		cobra.CheckErr(err)
 		defer db.Close()
 
 		ts, err := db.GetAllServers()
+		if err.Error() == ErrInit {
+			fmt.Println(ErrInitRsp)
+			return
+		}
 		cobra.CheckErr(err)
 
 		for _, s := range ts {