adjust some cmd

Author: ingbyr

cmd/group.go

@@ -23,10 +23,10 @@ var (
 		Run: func(cmd *cobra.Command, args []string) {
 			hostName := args[0]
 			if groupDel != "" {
-				host.Manager.DeleteHostGroups(hostName, strings.Split(groupDel, conf.SepGroupInCmd))
+				host.Manager.DeleteHostGroups(hostName, strings.Split(groupDel, conf.SepInCmd))
 			}
 			if groupAdd != "" {
-				host.Manager.AddGroup(hostName, strings.Split(groupAdd, conf.SepGroupInCmd))
+				host.Manager.AddGroup(hostName, strings.Split(groupAdd, conf.SepInCmd))
 			}
 			if groupList {
 				host.Manager.PrintGroup(hostName)

cmd/new.go

@@ -20,7 +20,7 @@ var (
 			if len(args) == 1 {
 				host.Manager.CreateNewHost(args[0], []string{})
 			} else {
-				host.Manager.CreateNewHost(args[0], strings.Split(args[1], conf.SepGroupInCmd))
+				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))
 			}
 		},
 	}

conf/const.go

@@ -6,9 +6,9 @@ import (
 )
 
 const (
-	SepGroupInFile        = "_"
-	SepGroupInCmd         = ","
-	TmpCombinedHost       = ".tmp_combined"
+	SepGroupInFile  = "_"
+	SepInCmd        = ","
+	TmpCombinedHost = ".tmp_combined"
 	BaseHostFileName = "base"
 )
 

host/manger.go

@@ -171,7 +171,7 @@ func (m *manager) CreateNewHost(name string, groups []string) {
 	}
 }
 
-func (m *manager) DeleteHostsByNames(hostNames []string) {
+func (m *manager) DeleteHosts(hostNames []string) {
 	deleted := make([]string, 0)
 	for _, hostName := range hostNames {
 		if host, exist := m.Hosts[hostName]; exist {

readme.md

@@ -4,81 +4,68 @@ Gohost is a simple host switcher tool supporting Linux and macOS.
 
 **To modify the system host file gohost need running in admin mode, such as `sudo gohost`.
 
+
 ## Usage
 
-### And new host file
+### Create new host file
 
-`gohost new HOST_NAME GROUP_NAME_1 GROUP_NAME_2 ... `
+`gohost new HOST_NAME GROUP_NAME_1,GROUP_NAME_2,... `
 
 For example
 
 ```shell
 # create a devHost host file which belongs to dev1 and dev2 group
-> gohost new devHost dev1 dev2
+> gohost new devHost dev1,dev2
 ```
 
 ### Edit existed host file
-> Make sure `vim` is in system PATH
+
+> Make sure **vim** is installed
 
 `gohost edit HOST_NAME`
 
 
 ### Delete existed host file
 
-`gohost rm HOST_NAME`
+`gohost rm HOST_NAME_1,HOST_NAME_2,...`
 
 
-### List host
+### Delete existed group
 
-`gohost ls [-a]`
+`gohost rm [-g|--group] GROUP_NAME_1,GROUP_NAME_2,...`
 
-For example
 
-```shell
-# List host group
-> gohost ls
-+-------+---------+
-| GROUP |  HOSTS  |
-+-------+---------+
-| dev1  | devHost |
-| dev2  | devHost |
-+-------+---------+
-
-# List host
-> gohost ls -a
-+---------+------------+
-|  HOST   |   GROUPS   |
-+---------+------------+
-| devHost | dev1, dev2 |
-+---------+------------+
+### List host group
 
-```
+`gohost ls`
 
 
-### Edit group
+### List host file
 
-`gohost cg HOST_NAME [ -a | -d ] GROUP_NAME_1,GROUP_NAME_2...`
+`gohost ls [-a|--all]`
+
+
+### Add group for existed host
+
+`gohost cg HOST_NAME [-a|--add] GROUP_NAME_1,GROUP_NAME_2...`
 
 For example
 
 ```shell
 # add group dev3, dev4 for devHost
 > gohost cg devHost -a dev3,dev4
-added groups 'dev3, dev4'
-+---------+------------------------+
-|  HOST   |         GROUPS         |
-+---------+------------------------+
-| devHost | dev1, dev2, dev3, dev4 |
-+---------+------------------------+
+```
 
+
+### Remove group for existed host
+
+`gohost cg HOST_NAME [-d|--delete] GROUP_NAME_1,GROUP_NAME_2...`
+
+For example
+
+```shell
 # remove group dev1 for devHost
 > gohost cg devHost -d dev1
-removed groups 'dev1'
-+---------+------------------+
-|  HOST   |      GROUPS      |
-+---------+------------------+
-| devHost | dev2, dev3, dev4 |
-+---------+------------------+
 ```
 
 
@@ -87,6 +74,11 @@ removed groups 'dev1'
 `gohost use GROUP_NAME`
 
 
+### Display group but not apply to system host
+
+`gohost use GROUP_NAME [-s|--simulate]`
+
+
 ### Display current system host
 
 `gohost sys`