Merge pull request #1 from ingbyr/dev

Author: ingbyr

cmd/group.go

@@ -5,6 +5,7 @@
 package cmd
 
 import (
+	"github.com/ingbyr/gohost/conf"
 	"github.com/ingbyr/gohost/host"
 	"github.com/spf13/cobra"
 	"strings"
@@ -22,10 +23,10 @@ var (
 		Run: func(cmd *cobra.Command, args []string) {
 			hostName := args[0]
 			if groupDel != "" {
-				host.Manager.DeleteHostGroups(hostName, strings.Split(groupDel, ","))
+				host.Manager.DeleteHostGroups(hostName, strings.Split(groupDel, conf.SepInCmd))
 			}
 			if groupAdd != "" {
-				host.Manager.AddGroup(hostName, strings.Split(groupAdd, ","))
+				host.Manager.AddGroup(hostName, strings.Split(groupAdd, conf.SepInCmd))
 			}
 			if groupList {
 				host.Manager.PrintGroup(hostName)

cmd/new.go

@@ -5,17 +5,23 @@
 package cmd
 
 import (
+	"github.com/ingbyr/gohost/conf"
 	"github.com/ingbyr/gohost/host"
 	"github.com/spf13/cobra"
+	"strings"
 )
 
 var (
 	newCmd = &cobra.Command{
 		Use:   "new",
 		Short: "create new host file",
-		Args:  cobra.MinimumNArgs(1),
+		Args:  cobra.RangeArgs(1, 2),
 		Run: func(cmd *cobra.Command, args []string) {
-			host.Manager.CreateNewHost(args[0], args[1:])
+			if len(args) == 1 {
+				host.Manager.CreateNewHost(args[0], []string{})
+			} else {
+				host.Manager.CreateNewHost(args[0], strings.Split(args[1], conf.SepInCmd))
+			}
 		},
 	}
 )

cmd/remove.go

@@ -5,20 +5,23 @@
 package cmd
 
 import (
+	"github.com/ingbyr/gohost/conf"
 	"github.com/ingbyr/gohost/host"
 	"github.com/spf13/cobra"
+	"strings"
 )
 
 var (
 	removeGroup bool
 	removeCmd   = &cobra.Command{
 		Use:   "rm",
 		Short: "Delete host or group",
+		Args: cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
 			if removeGroup {
-				host.Manager.DeleteGroups(args)
+				host.Manager.DeleteGroups(strings.Split(args[0], conf.SepInCmd))
 			} else {
-				host.Manager.DeleteHostsByNames(args)
+				host.Manager.DeleteHosts(strings.Split(args[0], conf.SepInCmd))
 			}
 		},
 	}

cmd/root.go

@@ -17,7 +17,7 @@ var rootCmd = &cobra.Command{
 func Execute() {
 	rootCmd.AddCommand(listCmd)
 	rootCmd.AddCommand(editCmd)
-	rootCmd.AddCommand(applyCmd)
+	rootCmd.AddCommand(useCmd)
 	rootCmd.AddCommand(newCmd)
 	rootCmd.AddCommand(renameCmd)
 	rootCmd.AddCommand(sysCmd)

cmd/use.go

@@ -10,12 +10,18 @@ import (
 )
 
 var (
-	applyCmd = &cobra.Command{
+	useSimulateFlag bool
+
+	useCmd = &cobra.Command{
 		Use:   "use",
-		Short: "apply group host to system host",
+		Short: "use group host as system host",
 		Args:  cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
-			host.Manager.ApplyGroup(args[0])
+			host.Manager.ApplyGroup(args[0], useSimulateFlag)
 		},
 	}
 )
+
+func init() {
+	useCmd.PersistentFlags().BoolVarP(&useSimulateFlag, "simulate", "s", false, "just print host content")
+}

compile.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -o gohost-windows-32bit.exe .
-CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o gohost-windows-64bit.exe .
+#CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -o gohost-windows-32bit.exe .
+#CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o gohost-windows-64bit.exe .
 
 CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -o gohost-linux-32bit .
 CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o gohost-linux-64bit .

const/const.go renamed to conf/const.go

@@ -1,27 +1,28 @@
-package _const
+package conf
 
 import (
 	"os/user"
 	"path/filepath"
 )
 
 const (
-	SepGroup        = "_"
+	SepGroupInFile  = "_"
+	SepInCmd        = ","
 	TmpCombinedHost = ".tmp_combined"
+	BaseHostFileName = "base"
 )
 
 var (
-	BaseHostFile string
 	BaseDir      string
-	ConfigFile   string
+	BaseHostFile string
 )
 
 func init() {
 	curr, err := user.Current()
 	if err != nil {
 		panic(err)
 	}
+
 	BaseDir = filepath.Join(curr.HomeDir, ".gohost")
-	BaseHostFile = filepath.Join(BaseDir, "base")
-	ConfigFile = filepath.Join(BaseDir, ".conf")
+	BaseHostFile = filepath.Join(BaseDir, "."+BaseHostFileName)
 }

display/display.go renamed to display/logger.go

@@ -6,7 +6,6 @@ package display
 
 import (
 	"fmt"
-	"github.com/olekukonko/tablewriter"
 	"os"
 )
 
@@ -29,9 +28,7 @@ func ErrExit(err error) {
 	}
 }
 
-func Table(header []string, data [][]string) {
-	table := tablewriter.NewWriter(os.Stdout)
-	table.SetHeader(header)
-	table.AppendBulk(data)
-	table.Render()
+func Panic(msg string, err error) {
+	fmt.Printf("[panic] %s\n", msg)
+	ErrExit(err)
 }

display/table.go

@@ -0,0 +1,17 @@
+/*
+ @Author: ingbyr
+*/
+
+package display
+
+import (
+	"github.com/olekukonko/tablewriter"
+	"os"
+)
+
+func Table(header []string, data [][]string) {
+	table := tablewriter.NewWriter(os.Stdout)
+	table.SetHeader(header)
+	table.AppendBulk(data)
+	table.Render()
+}

editor/micro.go

@@ -6,12 +6,9 @@ import (
 	"os/exec"
 )
 
-const (
-	vim    = "vim"
-	noSwap = "-n"
-)
-
 func OpenByVim(filePath string) error {
+	const vim = "vim"
+	const noSwap = "-n"
 	if _, err := exec.LookPath(vim); err != nil {
 		return fmt.Errorf("please install vim before editing file\n")
 	}

editor/vim.go

@@ -3,19 +3,7 @@ module github.com/ingbyr/gohost
 go 1.16
 
 require (
-	github.com/go-errors/errors v1.4.0 // indirect
-	github.com/ingbyr/micro/v2 v2.1.3
-	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
-	github.com/npat-efault/poller v2.0.0+incompatible // indirect
 	github.com/olekukonko/tablewriter v0.0.5
-	github.com/sergi/go-diff v1.2.0 // indirect
 	github.com/spf13/cobra v1.2.1
-	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
-	github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9 // indirect
-	github.com/zyedidia/poller v2.0.0+incompatible // indirect
-	golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	layeh.com/gopher-luar v1.0.10 // indirect
 )