Use Go toolbox, updated docs

patsoffice · patsoffice · commit 381103a724e8 · 2020-05-02T18:32:03.000-07:00
- Make use of common code moved to the toolbox package
- Updated installation instructions and fixed the root help output
diff --git a/README.md b/README.md
@@ -10,10 +10,19 @@ The tool is currently only tested on Mac OS X systems, but should just work on o
 
 ## Installing
 
-Installing Aliasman is easy. First, use `go get` to install the latest version
-of the application from GitHub. This command will install the `aliasman` executable in the Go path:
+### Directly From GitHub
 
-    go get -u github.com/aliasman/cmd/aliasman
+Installing aliasman is easy. First, use `go get` to install the latest version of the application
+from GitHub. This command will install the `aliasman` executable in the Go path:
+
+    go get -u github.com/patsoffice/aliasman
+
+The above command requires a working [Go compiler installed](https://golang.org/doc/install).
+
+### Homebrew
+
+    brew tap patsoffice/tools
+    brew install aliasman
 
 ## Configuring
 
diff --git a/go.mod b/go.mod
@@ -19,6 +19,7 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/mapstructure v1.2.2 // indirect
 	github.com/patsoffice/reago v0.0.0-20200328164243-566c8e8c6e4d
+	github.com/patsoffice/toolbox v0.0.0-20200503001601-b719ff99c0d8
 	github.com/pelletier/go-toml v1.6.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0
 	github.com/spf13/afero v1.2.2 // indirect
diff --git a/go.sum b/go.sum
@@ -211,6 +211,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/patsoffice/reago v0.0.0-20200328164243-566c8e8c6e4d h1:H2Nk5vJJMI4xqpcDfYi+l9YJ5y5GsAhBo55rjKRtrCM=
 github.com/patsoffice/reago v0.0.0-20200328164243-566c8e8c6e4d/go.mod h1:e8D1ij7jFejEUg+ntZzBSDyNX3EMMQdc5+d3dfiTYfk=
+github.com/patsoffice/toolbox v0.0.0-20200503001601-b719ff99c0d8 h1:plcsbSAPRs8omu7lA/u7yBnw+zwRm1EujQbSqjHsf9o=
+github.com/patsoffice/toolbox v0.0.0-20200503001601-b719ff99c0d8/go.mod h1:eZ/mepRzc2S6sEz1JDXIxLwIjHcmaxWcJ0WwCVNIXpM=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
diff --git a/internal/alias/alias.go b/internal/alias/alias.go
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/patsoffice/aliasman/internal/util"
+	"github.com/patsoffice/toolbox"
 	"github.com/pmezard/go-difflib/difflib"
 )
 
@@ -41,7 +41,7 @@ func (a Alias) Equal(b Alias) bool {
 	if !a.CreatedTS.Equal(b.CreatedTS) || !a.ModifiedTS.Equal(b.ModifiedTS) || !a.SuspendedTS.Equal(b.SuspendedTS) {
 		return false
 	}
-	if !util.StringSliceEqual(a.EmailAddresses, b.EmailAddresses) {
+	if !toolbox.StringSliceEqual(a.EmailAddresses, b.EmailAddresses) {
 		return false
 	}
 	return true
diff --git a/internal/cmd/config.go b/internal/cmd/config.go
@@ -29,7 +29,7 @@ import (
 
 	"github.com/patsoffice/aliasman/internal/email"
 	"github.com/patsoffice/aliasman/internal/storage"
-	"github.com/patsoffice/aliasman/internal/util"
+	"github.com/patsoffice/toolbox"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -61,15 +61,15 @@ func runInit(cmd *cobra.Command, args []string) {
 
 	scanner := bufio.NewScanner(os.Stdin)
 
-	if ok := util.CheckYes(scanner, "Set a default domain?", false); ok {
-		defaultDomain := util.GetInputString(scanner, "Domain", viper.GetString("default_domain"))
+	if ok := toolbox.CheckYes(scanner, "Set a default domain?", false); ok {
+		defaultDomain := toolbox.GetInputString(scanner, "Domain", viper.GetString("default_domain"))
 		viper.Set("default_domain", defaultDomain)
 	}
 
-	if ok := util.CheckYes(scanner, "Set default email address(es)?", false); ok {
+	if ok := toolbox.CheckYes(scanner, "Set default email address(es)?", false); ok {
 		defaultEmails := strings.Join(viper.GetStringSlice("default_addresses"), ", ")
 		for {
-			defaultEmails = util.GetInputString(scanner, "Email addresses (comma separated)", defaultEmails)
+			defaultEmails = toolbox.GetInputString(scanner, "Email addresses (comma separated)", defaultEmails)
 			defaultEmails = strings.ReplaceAll(defaultEmails, " ", "")
 			emails := strings.Split(defaultEmails, ",")
 			if len(emails) == 0 {
@@ -83,15 +83,15 @@ func runInit(cmd *cobra.Command, args []string) {
 
 	cfgDir := DefaultDir()
 	if !pathExists(cfgDir) {
-		if ok := util.CheckYes(scanner, fmt.Sprintf("Create configuration directory: %s?", cfgDir), true); ok {
+		if ok := toolbox.CheckYes(scanner, fmt.Sprintf("Create configuration directory: %s?", cfgDir), true); ok {
 			if err := os.MkdirAll(rootFlags.cfgDir, os.ModeDir|0700); err != nil {
 				ErrorExit(err, nil)
 			}
 		}
 	}
 
 	cfgPath := filepath.Join(cfgDir, DefaultConfigFile())
-	if ok := util.CheckYes(scanner, fmt.Sprintf("Write config file: %s?", cfgPath), true); ok {
+	if ok := toolbox.CheckYes(scanner, fmt.Sprintf("Write config file: %s?", cfgPath), true); ok {
 		viper.WriteConfigAs(cfgPath)
 	}
 }
diff --git a/internal/cmd/root.go b/internal/cmd/root.go
@@ -33,8 +33,9 @@ var (
 	rootCmd = &cobra.Command{
 		Use:   "aliasman",
 		Short: "aliasman is a tool for managing email aliases",
-		Long: `Rackspace email allows for a large number of email aliases. The aliasman tool
-allows for the creation, read, update and delete of Rackspace email aliases.
+		Long: `Rackspace email, GSuite and others allow for a large number of email aliases.
+The aliasman tool allows for the creation, read, update and delete of
+ aliases with various service providers.
 `,
 	}
 	rootFlags = struct {
diff --git a/internal/cmd/sync.go b/internal/cmd/sync.go
@@ -28,7 +28,7 @@ import (
 
 	"github.com/patsoffice/aliasman/internal/alias"
 	"github.com/patsoffice/aliasman/internal/storage"
-	"github.com/patsoffice/aliasman/internal/util"
+	"github.com/patsoffice/toolbox"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -130,9 +130,9 @@ func syncCmdRun(cmd *cobra.Command, args []string) {
 			ok := false
 			if !syncFlags.yes {
 				if doCopy {
-					ok = util.CheckYes(scanner, fmt.Sprintf("Add alias for %s@%s to %s?", v.Alias, v.Domain, destProvider.Type()), true)
+					ok = toolbox.CheckYes(scanner, fmt.Sprintf("Add alias for %s@%s to %s?", v.Alias, v.Domain, destProvider.Type()), true)
 				} else {
-					ok = util.CheckYes(scanner, fmt.Sprintf("Update alias for %s@%s to %s: %s?", v.Alias, v.Domain, destProvider.Type(), uDiff), true)
+					ok = toolbox.CheckYes(scanner, fmt.Sprintf("Update alias for %s@%s to %s: %s?", v.Alias, v.Domain, destProvider.Type(), uDiff), true)
 				}
 			}
 
diff --git a/internal/cmd/syncFromEmail.go b/internal/cmd/syncFromEmail.go
@@ -27,7 +27,7 @@ import (
 	"regexp"
 
 	"github.com/patsoffice/aliasman/internal/alias"
-	"github.com/patsoffice/aliasman/internal/util"
+	"github.com/patsoffice/toolbox"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -97,7 +97,7 @@ func syncFromEmailCmdRun(cmd *cobra.Command, args []string) {
 		if _, ok := destMap[k]; !ok {
 			yes := false
 			if !syncFromEmailFlags.yes {
-				yes = util.CheckYes(scanner, fmt.Sprintf("Add alias for %s@%s to %s?", v.Alias, v.Domain, sp.Type()), true)
+				yes = toolbox.CheckYes(scanner, fmt.Sprintf("Add alias for %s@%s to %s?", v.Alias, v.Domain, sp.Type()), true)
 			}
 
 			if yes || syncFromEmailFlags.yes {
diff --git a/internal/providers/gsuite/factory.go b/internal/providers/gsuite/factory.go
@@ -32,7 +32,7 @@ import (
 
 	"github.com/patsoffice/aliasman/internal/cmd"
 	"github.com/patsoffice/aliasman/internal/email"
-	"github.com/patsoffice/aliasman/internal/util"
+	"github.com/patsoffice/toolbox"
 	"github.com/spf13/viper"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
@@ -60,7 +60,7 @@ func (cn *ConfigerNewer) getTokenFromWeb(config *oauth2.Config) (*oauth2.Token,
 
 	authURL := config.AuthCodeURL("state-token", oauth2.AccessTypeOffline)
 	msg := "Go to the following link in your browser: \n\n%v\n\nthen type the authorization code"
-	authCode := util.GetInputString(scanner, fmt.Sprintf(msg, authURL), "")
+	authCode := toolbox.GetInputString(scanner, fmt.Sprintf(msg, authURL), "")
 
 	tok, err := config.Exchange(context.TODO(), authCode)
 	if err != nil {
@@ -97,8 +97,8 @@ func (cn *ConfigerNewer) saveToken(path string, token *oauth2.Token) error {
 func (cn *ConfigerNewer) Config() error {
 	scanner := bufio.NewScanner(os.Stdin)
 
-	if ok := util.CheckYes(scanner, "Configure gsuite provider", false); ok {
-		credentiasPath := util.GetInputString(scanner, "GSuite credential path", viper.GetString("gsuite_credentials"))
+	if ok := toolbox.CheckYes(scanner, "Configure gsuite provider", false); ok {
+		credentiasPath := toolbox.GetInputString(scanner, "GSuite credential path", viper.GetString("gsuite_credentials"))
 		b, err := ioutil.ReadFile(credentiasPath)
 		if err != nil {
 			return fmt.Errorf("Unable to read client secret file: %v", err)
@@ -109,7 +109,7 @@ func (cn *ConfigerNewer) Config() error {
 		}
 		viper.Set("gsuite_credentials,", credentiasPath)
 
-		tokenPath := util.GetInputString(scanner, "GSuite token path", viper.GetString("gsuite_token"))
+		tokenPath := toolbox.GetInputString(scanner, "GSuite token path", viper.GetString("gsuite_token"))
 		if tok, err := cn.tokenFromFile(tokenPath); err != nil {
 			cmd.ErrorNoExit(err)
 			if tok, err = cn.getTokenFromWeb(config); err != nil {
@@ -121,7 +121,7 @@ func (cn *ConfigerNewer) Config() error {
 		}
 		viper.Set("gsuite_token,", tokenPath)
 
-		if ok := util.CheckYes(scanner, "Make gsuite the default email provider?", true); ok {
+		if ok := toolbox.CheckYes(scanner, "Make gsuite the default email provider?", true); ok {
 			viper.Set("email_type", "gsuite")
 		}
 	}
diff --git a/internal/providers/gsuite/types.go b/internal/providers/gsuite/types.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/patsoffice/aliasman/internal/alias"
 	"github.com/patsoffice/aliasman/internal/email"
-	"github.com/patsoffice/aliasman/internal/util"
+	"github.com/patsoffice/toolbox"
 	admin "google.golang.org/api/admin/directory/v1"
 )
 
@@ -41,7 +41,7 @@ type ConfigerNewer struct{}
 // Emailer implements the email provder methods for the rackspace_email_api.
 type Emailer struct {
 	readOnly bool
-	clock    util.Clock
+	clock    toolbox.Clock
 	aliases  alias.AliasesMap
 	srv      *admin.Service
 	ctx      context.Context
diff --git a/internal/providers/rea/factory.go b/internal/providers/rea/factory.go
@@ -28,8 +28,8 @@ import (
 
 	"github.com/patsoffice/aliasman/internal/cmd"
 	"github.com/patsoffice/aliasman/internal/email"
-	"github.com/patsoffice/aliasman/internal/util"
 	"github.com/patsoffice/reago"
+	"github.com/patsoffice/toolbox"
 	"github.com/spf13/viper"
 )
 
@@ -51,14 +51,14 @@ func init() {
 func (cn *ConfigerNewer) Config() error {
 	scanner := bufio.NewScanner(os.Stdin)
 
-	if ok := util.CheckYes(scanner, "Configure rackspace_email_api provider", false); ok {
-		userKey := util.GetInputString(scanner, "Rackspace API user key", viper.GetString("rackspace_api_user_key"))
+	if ok := toolbox.CheckYes(scanner, "Configure rackspace_email_api provider", false); ok {
+		userKey := toolbox.GetInputString(scanner, "Rackspace API user key", viper.GetString("rackspace_api_user_key"))
 		viper.Set("rackspace_api_user_key,", userKey)
 
-		secretKey := util.GetInputString(scanner, "Rackspace API secret key", viper.GetString("rackspace_api_secret_key"))
+		secretKey := toolbox.GetInputString(scanner, "Rackspace API secret key", viper.GetString("rackspace_api_secret_key"))
 		viper.Set("rackspace_api_secret_key,", secretKey)
 
-		if ok := util.CheckYes(scanner, "Make rackspace_email_api the default email provider?", true); ok {
+		if ok := toolbox.CheckYes(scanner, "Make rackspace_email_api the default email provider?", true); ok {
 			viper.Set("email_type", "rackspace_email_api")
 		}
 	}
diff --git a/internal/providers/rea/types.go b/internal/providers/rea/types.go
@@ -23,8 +23,8 @@ package rea
 import (
 	"github.com/patsoffice/aliasman/internal/alias"
 	"github.com/patsoffice/aliasman/internal/email"
-	"github.com/patsoffice/aliasman/internal/util"
 	"github.com/patsoffice/reago"
+	"github.com/patsoffice/toolbox"
 	"golang.org/x/net/context"
 )
 
@@ -40,7 +40,7 @@ type ConfigerNewer struct{}
 // Emailer implements the email provder methods for the rackspace_email_api.
 type Emailer struct {
 	readOnly bool
-	clock    util.Clock
+	clock    toolbox.Clock
 	aliases  map[string]alias.Alias
 	client   *reago.Client
 	ctx      context.Context
diff --git a/internal/providers/s3/factory.go b/internal/providers/s3/factory.go
@@ -31,7 +31,7 @@ import (
 	"github.com/patsoffice/aliasman/internal/alias"
 	"github.com/patsoffice/aliasman/internal/cmd"
 	"github.com/patsoffice/aliasman/internal/storage"
-	"github.com/patsoffice/aliasman/internal/util"
+	"github.com/patsoffice/toolbox"
 	"github.com/spf13/viper"
 )
 
@@ -64,28 +64,28 @@ func init() {
 func (cn *ConfigerNewer) Config() error {
 	scanner := bufio.NewScanner(os.Stdin)
 
-	if ok := util.CheckYes(scanner, "Configure S3 provider?", false); ok {
-		region := util.GetInputString(scanner, "S3 region", viper.GetString("s3_region"))
+	if ok := toolbox.CheckYes(scanner, "Configure S3 provider?", false); ok {
+		region := toolbox.GetInputString(scanner, "S3 region", viper.GetString("s3_region"))
 		viper.Set("s3_region", region)
 
-		accessKey := util.GetInputString(scanner, "S3 access key", viper.GetString("s3_access_key"))
+		accessKey := toolbox.GetInputString(scanner, "S3 access key", viper.GetString("s3_access_key"))
 		viper.Set("s3_access_key", accessKey)
 
-		secretKey := util.GetInputString(scanner, "S3 secret key", viper.GetString("s3_secret_key"))
+		secretKey := toolbox.GetInputString(scanner, "S3 secret key", viper.GetString("s3_secret_key"))
 		viper.Set("s3_secret_key", secretKey)
 
-		bucket := util.GetInputString(scanner, "S3 bucket", viper.GetString("s3_bucket"))
+		bucket := toolbox.GetInputString(scanner, "S3 bucket", viper.GetString("s3_bucket"))
 		viper.Set("s3_bucket", bucket)
 
-		if ok := util.CheckYes(scanner, "Configure advanced S3 options?", false); ok {
-			concurrentHeads := util.GetInputInt(scanner, "Number of concurrent HEAD calls", viper.GetInt("s3_concurrent_heads"))
+		if ok := toolbox.CheckYes(scanner, "Configure advanced S3 options?", false); ok {
+			concurrentHeads := toolbox.GetInputInt(scanner, "Number of concurrent HEAD calls", viper.GetInt("s3_concurrent_heads"))
 			viper.Set("s3_concurrent_heads", concurrentHeads)
 
-			channelDepth := util.GetInputInt(scanner, "Size of concurrency channels", viper.GetInt("s3_channel_depth"))
+			channelDepth := toolbox.GetInputInt(scanner, "Size of concurrency channels", viper.GetInt("s3_channel_depth"))
 			viper.Set("s3_channel_depth", channelDepth)
 		}
 
-		if ok := util.CheckYes(scanner, "Make s3 the default storage provider?", true); ok {
+		if ok := toolbox.CheckYes(scanner, "Make s3 the default storage provider?", true); ok {
 			viper.Set("storage_type", "s3")
 		}
 	}
@@ -101,7 +101,7 @@ func (cn *ConfigerNewer) New() (storage.Provider, error) {
 
 	storer := Storer{
 		bucket: bucket,
-		clock:  util.RealClock{},
+		clock:  toolbox.RealClock{},
 	}
 	storer.svc = s3.New(session.New(&aws.Config{
 		Region:      aws.String(region),
diff --git a/internal/providers/s3/storer_test.go b/internal/providers/s3/storer_test.go
@@ -30,7 +30,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3iface"
-	"github.com/patsoffice/aliasman/internal/util"
+	"github.com/patsoffice/toolbox"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -174,7 +174,7 @@ func TestParseTS(t *testing.T) {
 
 	for _, table := range tables {
 		s := Storer{
-			clock: util.MockClock{NowTime: table.expected},
+			clock: toolbox.MockClock{NowTime: table.expected},
 		}
 
 		ts := s.parseTS(table.metadata, table.key)
diff --git a/internal/providers/s3/types.go b/internal/providers/s3/types.go
@@ -28,7 +28,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/s3/s3iface"
 	"github.com/patsoffice/aliasman/internal/alias"
 	"github.com/patsoffice/aliasman/internal/storage"
-	"github.com/patsoffice/aliasman/internal/util"
+	"github.com/patsoffice/toolbox"
 )
 
 func init() {
@@ -65,7 +65,7 @@ type IndexAliases []IndexAlias
 // provider.
 type Storer struct {
 	readOnly        bool
-	clock           util.Clock
+	clock           toolbox.Clock
 	aliases         alias.AliasesMap
 	objects         objects
 	region          string
diff --git a/internal/providers/sqlite3/factory.go b/internal/providers/sqlite3/factory.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/patsoffice/aliasman/internal/cmd"
 	"github.com/patsoffice/aliasman/internal/storage"
-	"github.com/patsoffice/aliasman/internal/util"
+	"github.com/patsoffice/toolbox"
 	"github.com/spf13/viper"
 )
 
@@ -45,11 +45,11 @@ func init() {
 func (cn *ConfigerNewer) Config() error {
 	scanner := bufio.NewScanner(os.Stdin)
 
-	if ok := util.CheckYes(scanner, "Configure sqlite3 provider", false); ok {
-		dbPath := util.GetInputString(scanner, "Sqlite3 database path", viper.GetString("sqlite3_db_path"))
+	if ok := toolbox.CheckYes(scanner, "Configure sqlite3 provider", false); ok {
+		dbPath := toolbox.GetInputString(scanner, "Sqlite3 database path", viper.GetString("sqlite3_db_path"))
 		viper.Set("sqlite3_db_path", dbPath)
 
-		if ok := util.CheckYes(scanner, "Make sqlite3 the default storage provider?", true); ok {
+		if ok := toolbox.CheckYes(scanner, "Make sqlite3 the default storage provider?", true); ok {
 			viper.Set("storage_type", "sqlite3")
 		}
 	}
diff --git a/internal/util/clock.go b/internal/util/clock.go
diff --git a/internal/util/clock_test.go b/internal/util/clock_test.go
diff --git a/internal/util/input.go b/internal/util/input.go
diff --git a/internal/util/input_test.go b/internal/util/input_test.go
diff --git a/internal/util/slice.go b/internal/util/slice.go
diff --git a/internal/util/slice_test.go b/internal/util/slice_test.go

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`"time"`
`27`	`27`
`28`	`28`	`"github.com/davecgh/go-spew/spew"`
`29`		`- "github.com/patsoffice/aliasman/internal/util"`
	`29`	`+ "github.com/patsoffice/toolbox"`
`30`	`30`	`"github.com/pmezard/go-difflib/difflib"`
`31`	`31`	`)`
`32`	`32`
`@@ -41,7 +41,7 @@ func (a Alias) Equal(b Alias) bool {`
`41`	`41`	`if !a.CreatedTS.Equal(b.CreatedTS) \|\| !a.ModifiedTS.Equal(b.ModifiedTS) \|\| !a.SuspendedTS.Equal(b.SuspendedTS) {`
`42`	`42`	`return false`
`43`	`43`	`}`
`44`		`- if !util.StringSliceEqual(a.EmailAddresses, b.EmailAddresses) {`
	`44`	`+ if !toolbox.StringSliceEqual(a.EmailAddresses, b.EmailAddresses) {`
`45`	`45`	`return false`
`46`	`46`	`}`
`47`	`47`	`return true`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`
`30`	`30`	`"github.com/patsoffice/aliasman/internal/email"`
`31`	`31`	`"github.com/patsoffice/aliasman/internal/storage"`
`32`		`- "github.com/patsoffice/aliasman/internal/util"`
	`32`	`+ "github.com/patsoffice/toolbox"`
`33`	`33`	`"github.com/spf13/cobra"`
`34`	`34`	`"github.com/spf13/viper"`
`35`	`35`	`)`
`@@ -61,15 +61,15 @@ func runInit(cmd *cobra.Command, args []string) {`
`61`	`61`
`62`	`62`	`scanner := bufio.NewScanner(os.Stdin)`
`63`	`63`
`64`		`- if ok := util.CheckYes(scanner, "Set a default domain?", false); ok {`
`65`		`- defaultDomain := util.GetInputString(scanner, "Domain", viper.GetString("default_domain"))`
	`64`	`+ if ok := toolbox.CheckYes(scanner, "Set a default domain?", false); ok {`
	`65`	`+ defaultDomain := toolbox.GetInputString(scanner, "Domain", viper.GetString("default_domain"))`
`66`	`66`	`viper.Set("default_domain", defaultDomain)`
`67`	`67`	`}`
`68`	`68`
`69`		`- if ok := util.CheckYes(scanner, "Set default email address(es)?", false); ok {`
	`69`	`+ if ok := toolbox.CheckYes(scanner, "Set default email address(es)?", false); ok {`
`70`	`70`	`defaultEmails := strings.Join(viper.GetStringSlice("default_addresses"), ", ")`
`71`	`71`	`for {`
`72`		`- defaultEmails = util.GetInputString(scanner, "Email addresses (comma separated)", defaultEmails)`
	`72`	`+ defaultEmails = toolbox.GetInputString(scanner, "Email addresses (comma separated)", defaultEmails)`
`73`	`73`	`defaultEmails = strings.ReplaceAll(defaultEmails, " ", "")`
`74`	`74`	`emails := strings.Split(defaultEmails, ",")`
`75`	`75`	`if len(emails) == 0 {`
`@@ -83,15 +83,15 @@ func runInit(cmd *cobra.Command, args []string) {`
`83`	`83`
`84`	`84`	`cfgDir := DefaultDir()`
`85`	`85`	`if !pathExists(cfgDir) {`
`86`		`- if ok := util.CheckYes(scanner, fmt.Sprintf("Create configuration directory: %s?", cfgDir), true); ok {`
	`86`	`+ if ok := toolbox.CheckYes(scanner, fmt.Sprintf("Create configuration directory: %s?", cfgDir), true); ok {`
`87`	`87`	`if err := os.MkdirAll(rootFlags.cfgDir, os.ModeDir\|0700); err != nil {`
`88`	`88`	`ErrorExit(err, nil)`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`cfgPath := filepath.Join(cfgDir, DefaultConfigFile())`
`94`		`- if ok := util.CheckYes(scanner, fmt.Sprintf("Write config file: %s?", cfgPath), true); ok {`
	`94`	`+ if ok := toolbox.CheckYes(scanner, fmt.Sprintf("Write config file: %s?", cfgPath), true); ok {`
`95`	`95`	`viper.WriteConfigAs(cfgPath)`
`96`	`96`	`}`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`
`29`	`29`	`"github.com/patsoffice/aliasman/internal/alias"`
`30`	`30`	`"github.com/patsoffice/aliasman/internal/storage"`
`31`		`- "github.com/patsoffice/aliasman/internal/util"`
	`31`	`+ "github.com/patsoffice/toolbox"`
`32`	`32`	`"github.com/spf13/cobra"`
`33`	`33`	`"github.com/spf13/viper"`
`34`	`34`	`)`
`@@ -130,9 +130,9 @@ func syncCmdRun(cmd *cobra.Command, args []string) {`
`130`	`130`	`ok := false`
`131`	`131`	`if !syncFlags.yes {`
`132`	`132`	`if doCopy {`
`133`		`- ok = util.CheckYes(scanner, fmt.Sprintf("Add alias for %s@%s to %s?", v.Alias, v.Domain, destProvider.Type()), true)`
	`133`	`+ ok = toolbox.CheckYes(scanner, fmt.Sprintf("Add alias for %s@%s to %s?", v.Alias, v.Domain, destProvider.Type()), true)`
`134`	`134`	`} else {`
`135`		`- ok = util.CheckYes(scanner, fmt.Sprintf("Update alias for %s@%s to %s: %s?", v.Alias, v.Domain, destProvider.Type(), uDiff), true)`
	`135`	`+ ok = toolbox.CheckYes(scanner, fmt.Sprintf("Update alias for %s@%s to %s: %s?", v.Alias, v.Domain, destProvider.Type(), uDiff), true)`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`