minor bug fixes

Author: dhruv160410116084

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: 1.20
       -
         name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2

cmd/completion.go

@@ -0,0 +1,48 @@
+/*
+Copyright © 2023 NAME HERE <EMAIL ADDRESS>
+*/
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+// completionCmd represents the completion command
+var completionCmd = &cobra.Command{
+	Use:                   "completion [bash|zsh|fish|powershell]",
+	Short:                 "Generate completion script",
+	Long:                  `To load completions`,
+	DisableFlagsInUseLine: true,
+	ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
+	Args:                  cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Println("completion called")
+		switch args[0] {
+		case "bash":
+			cmd.Root().GenBashCompletion(os.Stdout)
+		case "zsh":
+			cmd.Root().GenZshCompletion(os.Stdout)
+		case "fish":
+			cmd.Root().GenFishCompletion(os.Stdout, true)
+		case "powershell":
+			cmd.Root().GenPowerShellCompletionWithDesc(os.Stdout)
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(completionCmd)
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// completionCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// completionCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}

cmd/connect.go

@@ -23,6 +23,13 @@ var connectCmd = &cobra.Command{
 	Example:
 			sshm connect 1
 			sshm connect fb-stage`,
+	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+		fmt.Println("in valid func")
+		if len(args) != 0 {
+			return nil, cobra.ShellCompDirectiveNoFileComp
+		}
+		return getConnection(toComplete), cobra.ShellCompDirectiveNoFileComp
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("connect called")
 		// command := exec.Command("ssh", "[email protected]")
@@ -48,7 +55,7 @@ var connectCmd = &cobra.Command{
 		command.Stderr = os.Stderr
 		e := command.Run()
 		if e != nil {
-			log.Fatal(err)
+			log.Fatal(e)
 		}
 
 	},

cmd/delete.go

@@ -23,10 +23,6 @@ Example:
 
 		index, err := strconv.Atoi(args[0])
 		if err == nil && index < len(SshList.List) {
-
-			// SshList.List = append(SshList.List[:index], SshList.List[index+1:]...)
-			// s[i] = s[len(s)-1]
-			// return s[:len(s)-1]
 			SshList.List[index] = SshList.List[len(SshList.List)-1]
 			fmt.Println(SshList.List[index].Project, SshList.List[index].Env, "deleted")
 			SshList.List = SshList.List[:len(SshList.List)-1]

cmd/helper.go

@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
+	"regexp"
 )
 
 func LoadData() ConList {
@@ -68,3 +69,23 @@ func SaveData(data ConList) {
 	}
 
 }
+
+func getConnection(data string) []string {
+	// fmt.Println("in getConnection")
+	keys := []string{}
+	for k, _ := range SshShortMap {
+
+		m, err := regexp.MatchString(`.*`+data+`.*`, k)
+		if err != nil {
+			fmt.Println(err)
+		}
+		if m {
+			// fmt.Println("found: ", m, k)
+
+			keys = append(keys, k)
+		}
+	}
+	fmt.Println(keys)
+
+	return keys
+}

cmd/list.go

@@ -18,9 +18,10 @@ var listCmd = &cobra.Command{
 	Long: `This command will list your ssh connections list. For example:
 
 sshm list`,
+	// ValidArgs: []string{"fb", "google"},
 	Run: func(cmd *cobra.Command, args []string) {
 		// fmt.Println("list called")
-
+		// getConnection("st")
 		table := tablewriter.NewWriter(os.Stdout)
 		table.SetHeader([]string{"Index", "Project", "Env", "Shrotcut", "Con"})
 		table.SetAutoWrapText(false)

cmd/root.go

@@ -1,13 +1,10 @@
 /*
-Copyright © 2022 NAME HERE <EMAIL ADDRESS>
+Copyright © 2022 Dhruv <[email protected]>
 */
 package cmd
 
 import (
-	"fmt"
 	"os"
-	"path"
-	"runtime"
 
 	"github.com/spf13/cobra"
 )
@@ -26,40 +23,27 @@ type ConList struct {
 
 var SshIndexMap = make(map[int]SshCon)
 var SshShortMap = make(map[string]SshCon)
-var Version = "development"
+var Version = "v1.1.7"
 
 var DATA_PATH string = ""
 var SshList ConList
 
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
-	Use:   "sshm",
-	Short: "sshm is a simple cli tool to manage your ssh connections",
-	Long:  `sshm is a simple cli tool to manage your ssh connections. You can add,edit and view the connection strings.`,
-	// Uncomment the following line if your bare application
-	// has an action associated with it:
-	// Run: func(cmd *cobra.Command, args []string) { },
+	Use:               "sshm",
+	Short:             "sshm is a simple cli tool to manage your ssh connections",
+	Long:              `sshm is a simple cli tool to manage your ssh connections. You can add,edit and delete the connections.`,
+	CompletionOptions: cobra.CompletionOptions{DisableDefaultCmd: true},
 }
 
-// Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
-	mydir, erri := os.Getwd()
-	if erri != nil {
-		fmt.Println(erri)
-	}
-	fmt.Println("current working dir is : ", mydir)
-	_, filename, _, ok := runtime.Caller(0)
-	if !ok {
-		panic("No caller information")
-	}
-	// fmt.Println(version)
-	// fmt.Printf("Filename : %q, Dir : %q\n", filename, path.Dir(filename))
-	fmt.Println(path.Dir(filename))
-	// DATA_PATH = path.Dir(filename) + "/data.json"
-	DATA_PATH = "./data.json"
+	dataPath := "./data.json"
+
+	DATA_PATH = dataPath
 
 	SshList = LoadData()
+	// fmt.Println(SshIndexMap, SshShortMap)
 	err := rootCmd.Execute()
 	if err != nil {
 		os.Exit(1)
@@ -76,4 +60,6 @@ func init() {
 	// Cobra also supports local flags, which will only run
 	// when this action is called directly.
 	// rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+	// rootCmd.CompletionOptions.DisableDefaultCmd = true
+
 }

data.json

@@ -0,0 +1,3 @@
+{
+    "List":[]
+}

main.go

@@ -1,6 +1,5 @@
 /*
-Copyright © 2022 NAME HERE <EMAIL ADDRESS>
-
+Copyright © 2022 Dhruv <[email protected]>
 */
 package main