define some error vars and improve error handling. add more output to…

… commands. sort cmd functions.

README.md

@@ -29,7 +29,7 @@ Go to [release page](https://github.com/guumaster/hostctl/releases) and download
 
 
 ## Sample Usage
-[![sample usage](docs/hostctl.gif)]
+![sample usage](docs/hostctl.gif)
 
 
 ## Linux/Mac/Windows and permissions

cmd/add.go

@@ -37,12 +37,14 @@ If the profile already exists it will be added to it.`,
 	PreRunE: func(cmd *cobra.Command, args []string) error {
 		profile, _ := cmd.Flags().GetString("profile")
 
-		err := host.NotEmptyProfile(profile)
-		if err != nil {
-			return err
+		if profile == "" {
+			return host.MissingProfileError
 		}
 
-		return host.ValidProfile(profile)
+		if profile == "default" {
+			return host.DefaultProfileError
+		}
+		return nil
 	},
 }
 
@@ -53,14 +55,22 @@ var addDomainsCmd = &cobra.Command{
 	Long: `
 Set content in your hosts file.
 If the profile already exists it will be added to it.`,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		src, _ := cmd.Flags().GetString("host-file")
-		ip, _ := cmd.Flags().GetString("ip")
+	PreRunE: func(cmd *cobra.Command, args []string) error {
 		profile, _ := cmd.Flags().GetString("profile")
+
 		if profile == "" {
-			profile = "other"
+			return host.MissingProfileError
 		}
 
+		if profile == "default" {
+			return host.DefaultProfileError
+		}
+		return nil
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
+		src, _ := cmd.Flags().GetString("host-file")
+		ip, _ := cmd.Flags().GetString("ip")
+		profile, _ := cmd.Flags().GetString("profile")
 		h, _ := cmd.Flags().GetString("host-file")
 
 		err := host.AddFromArgs(&host.AddFromArgsOptions{
@@ -74,15 +84,15 @@ If the profile already exists it will be added to it.`,
 			return err
 		}
 
+		err = host.Enable(src, profile)
+		if err != nil {
+			return err
+		}
+
 		return host.ListProfiles(src, &host.ListOptions{
 			Profile: profile,
 		})
 	},
-	PreRunE: func(cmd *cobra.Command, args []string) error {
-		profile, _ := cmd.Flags().GetString("profile")
-
-		return host.ValidProfile(profile)
-	},
 }
 
 func init() {

cmd/backup.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"errors"
-	"github.com/guumaster/tablewriter"
+	"fmt"
 	"log"
 	"os"
 
@@ -32,12 +32,15 @@ as extension.
 		dst, _ := cmd.Flags().GetString("path")
 
 		backupFile, err := host.BackupFile(src, dst)
+		if err != nil {
+			return err
+		}
+
+		_ = host.ListProfiles(backupFile, &host.ListOptions{})
 
-		table := tablewriter.NewWriter(os.Stdout)
-		table.Append([]string{backupFile})
-		table.Render()
+		fmt.Printf("Backup completed.")
 
-		return err
+		return nil
 	},
 }
 

cmd/disable.go

@@ -1,8 +1,6 @@
 package cmd
 
 import (
-	"errors"
-
 	"github.com/spf13/cobra"
 
 	"github.com/guumaster/hostctl/pkg/host"
@@ -16,6 +14,19 @@ var disableCmd = &cobra.Command{
 Disable a profile from your hosts file without removing it.
 It will be  listed as "off" while it is disabled.
 `,
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		profile, _ := cmd.Flags().GetString("profile")
+		all, _ := cmd.Flags().GetBool("all")
+
+		if !all && profile == "" {
+			return host.MissingProfileError
+		}
+
+		if profile == "default" {
+			return host.DefaultProfileError
+		}
+		return nil
+	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		src, _ := cmd.Flags().GetString("host-file")
 		profile, _ := cmd.Flags().GetString("profile")
@@ -35,16 +46,6 @@ It will be  listed as "off" while it is disabled.
 			Profile: profile,
 		})
 	},
-	PreRunE: func(cmd *cobra.Command, args []string) error {
-		profile, _ := cmd.Flags().GetString("profile")
-		all, _ := cmd.Flags().GetBool("all")
-
-		if !all && profile == "" {
-			return errors.New("missing profile name")
-		}
-
-		return host.ValidProfile(profile)
-	},
 }
 
 func init() {

cmd/enable.go

@@ -1,8 +1,6 @@
 package cmd
 
 import (
-	"errors"
-
 	"github.com/spf13/cobra"
 
 	"github.com/guumaster/hostctl/pkg/host"
@@ -16,6 +14,19 @@ var enableCmd = &cobra.Command{
 Disable an existing profile from your hosts file without removing it.
 It will be  listed as "on" while it is enabled.
 `,
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		profile, _ := cmd.Flags().GetString("profile")
+		all, _ := cmd.Flags().GetBool("all")
+
+		if !all && profile == "" {
+			return host.MissingProfileError
+		}
+
+		if profile == "default" {
+			return host.DefaultProfileError
+		}
+		return nil
+	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		profile, _ := cmd.Flags().GetString("profile")
 
@@ -35,16 +46,6 @@ It will be  listed as "on" while it is enabled.
 			Profile: profile,
 		})
 	},
-	PreRunE: func(cmd *cobra.Command, args []string) error {
-		profile, _ := cmd.Flags().GetString("profile")
-		all, _ := cmd.Flags().GetBool("all")
-
-		if !all && profile == "" {
-			return errors.New("missing profile name")
-		}
-
-		return host.ValidProfile(profile)
-	},
 }
 
 func init() {

cmd/remove.go

@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 
 	"github.com/guumaster/hostctl/pkg/host"
@@ -17,20 +19,36 @@ It cannot be undone unless you have a backup and restore it.
 If you want to remove a profile but would like to use it later, 
 use 'hosts disable' instead.
 `,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	PreRunE: func(cmd *cobra.Command, args []string) error {
 		profile, _ := cmd.Flags().GetString("profile")
-		dst, _ := cmd.Flags().GetString("host-file")
+		all, _ := cmd.Flags().GetBool("all")
+
+		if !all && profile == "" {
+			return host.MissingProfileError
+		}
 
-		return host.Remove(dst, profile)
+		if profile == "default" {
+			return host.DefaultProfileError
+		}
+		return nil
 	},
-	PreRunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(cmd *cobra.Command, args []string) error {
 		profile, _ := cmd.Flags().GetString("profile")
-		return host.ValidProfile(profile)
+		dst, _ := cmd.Flags().GetString("host-file")
+
+		err := host.Remove(dst, profile)
+		if err != nil {
+			return err
+		}
+
+		fmt.Printf("Profile '%s' removed.", profile)
+
+		return nil
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(removeCmd)
 
-	removeCmd.Flags().BoolP("all", "", false, "Remove all profiles")
+	removeCmd.Flags().Bool("all", false, "Remove all profiles")
 }

cmd/restore.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/spf13/cobra"
 
@@ -29,7 +30,15 @@ WARNING: the complete hosts file will be overwritten with the backup data.
 		dst, _ := cmd.Flags().GetString("host-file")
 		from, _ := cmd.Flags().GetString("from")
 
-		return host.RestoreFile(from, dst)
+		err := host.RestoreFile(from, dst)
+		if err != nil {
+			return err
+		}
+		_ = host.ListProfiles(dst, &host.ListOptions{})
+
+		fmt.Printf("Restore completed.")
+
+		return nil
 	},
 }
 

cmd/set.go

@@ -14,6 +14,18 @@ var setFromFileCmd = &cobra.Command{
 Reads from a file and set content to a profile in your hosts file.
 If the profile already exists it will be overwritten.
 `,
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		profile, _ := cmd.Flags().GetString("profile")
+
+		if profile == "" {
+			return host.MissingProfileError
+		}
+
+		if profile == "default" {
+			return host.DefaultProfileError
+		}
+		return nil
+	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		src, _ := cmd.Flags().GetString("host-file")
 		from, _ := cmd.Flags().GetString("from")
@@ -35,16 +47,6 @@ If the profile already exists it will be overwritten.
 			Profile: profile,
 		})
 	},
-	PreRunE: func(cmd *cobra.Command, args []string) error {
-		profile, _ := cmd.Flags().GetString("profile")
-
-		err := host.NotEmptyProfile(profile)
-		if err != nil {
-			return err
-		}
-
-		return host.ValidProfile(profile)
-	},
 }
 
 // setDomainsCmd represents the fromFile command
@@ -54,14 +56,26 @@ var setDomainsCmd = &cobra.Command{
 	Long: `
 Set content in your hosts file.
 If the profile already exists it will be added to it.`,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		src, _ := cmd.Flags().GetString("host-file")
-		ip, _ := cmd.Flags().GetString("ip")
+	PreRunE: func(cmd *cobra.Command, domains []string) error {
 		profile, _ := cmd.Flags().GetString("profile")
+
 		if profile == "" {
-			profile = "other"
+			return host.MissingProfileError
 		}
 
+		if profile == "default" {
+			return host.DefaultProfileError
+		}
+
+		if len(domains) == 0 {
+			return host.MissingDomainsError
+		}
+		return nil
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
+		src, _ := cmd.Flags().GetString("host-file")
+		ip, _ := cmd.Flags().GetString("ip")
+		profile, _ := cmd.Flags().GetString("profile")
 		h, _ := cmd.Flags().GetString("host-file")
 
 		err := host.AddFromArgs(&host.AddFromArgsOptions{
@@ -79,11 +93,6 @@ If the profile already exists it will be added to it.`,
 			Profile: profile,
 		})
 	},
-	PreRunE: func(cmd *cobra.Command, args []string) error {
-		profile, _ := cmd.Flags().GetString("profile")
-
-		return host.ValidProfile(profile)
-	},
 }
 
 func init() {

pkg/host/add.go

@@ -1,7 +1,6 @@
 package host
 
 import (
-	"errors"
 	"os"
 )
 
@@ -17,7 +16,7 @@ type AddFromFileOptions struct {
 	Dst     string
 	Profile string
 	Reset   bool
-	From string
+	From    string
 }
 
 // AddFromArgsOptions contains available options for adding from arguments.
@@ -33,7 +32,7 @@ type AddFromArgsOptions struct {
 // If you pass reset=true it will delete all previous content of the profile.
 func AddFromFile(opts *AddFromFileOptions) error {
 	if opts.From == "" {
-		return errors.New("missing source file")
+		return MissingSourceError
 	}
 	newData, _ := ReadHostFileStrict(opts.From)
 
@@ -46,7 +45,7 @@ func AddFromFile(opts *AddFromFileOptions) error {
 
 func AddFromArgs(opts *AddFromArgsOptions) error {
 	if len(opts.Domains) == 0 {
-		return errors.New("missing domains")
+		return MissingDomainsError
 	}
 	newData := ReadFromArgs(opts.Domains, opts.IP)
 
@@ -59,7 +58,7 @@ func AddFromArgs(opts *AddFromArgsOptions) error {
 
 func add(n *hostFile, opts *commonAddOptions) error {
 	if opts.Dst == "" {
-		return errors.New("missing destination file")
+		return MissingDestError
 	}
 	if opts.Profile == "" {
 		opts.Profile = "default"