Merge pull request #19 from directorz/feature/vendoring_glide

Feature/vendoring glide

Gomfile

@@ -1,6 +0,0 @@
-gom 'github.com/BurntSushi/toml'
-gom 'github.com/armon/go-radix'
-gom 'github.com/bgentry/speakeasy'
-gom 'github.com/jsimonetti/pwscheme'
-gom 'github.com/mattn/go-isatty'
-gom 'github.com/mitchellh/cli'

Makefile

@@ -10,19 +10,19 @@ VERSION=$(patsubst "%",%,$(lastword $(shell grep 'const Version' version.go)))
 default: build
 
 installdeps:
-	gom install
+	glide install -v
 
 build:
 	go build -v -ldflags "-X main.gittag=`git rev-parse --short HEAD`" -o build/mailfull_$(GOOS)_$(GOARCH)/mailfull cmd/mailfull/mailfull.go
 
 build-linux-amd64:
 	docker run --rm -v $(PWD):/go/src/github.com/directorz/mailfull-go -w /go/src/github.com/directorz/mailfull-go \
-	-e GOOS=linux -e GOARCH=amd64 golang:1.7 \
+	-e GOOS=linux -e GOARCH=amd64 golang:1.7.1 \
 	go build -v -ldflags "-X main.gittag=`git rev-parse --short HEAD`" -o "build/mailfull_linux_amd64/mailfull" cmd/mailfull/mailfull.go
 
 build-linux-386:
 	docker run --rm -v $(PWD):/go/src/github.com/directorz/mailfull-go -w /go/src/github.com/directorz/mailfull-go \
-	-e GOOS=linux -e GOARCH=386 golang:1.7 \
+	-e GOOS=linux -e GOARCH=386 golang:1.7.1 \
 	go build -v -ldflags "-X main.gittag=`git rev-parse --short HEAD`" -o "build/mailfull_linux_386/mailfull" cmd/mailfull/mailfull.go
 
 release: release-linux-amd64 release-linux-386

cmd/mailfull/command/aliasdomainadd.go

@@ -20,7 +20,7 @@ func (c *AliasDomainAddCommand) Synopsis() string {
 func (c *AliasDomainAddCommand) Help() string {
 	txt := fmt.Sprintf(`
 Usage:
-    %s %s domain target
+    %s %s [-n] domain target
 
 Description:
     %s
@@ -30,6 +30,10 @@ Required Args:
         The domain name that you want to create.
     target
         The target domain name.
+
+Optional Args:
+    -n
+        Don't update databases.
 `,
 		c.CmdName, c.SubCmdName,
 		c.Synopsis())
@@ -39,6 +43,12 @@ Required Args:
 
 // Run runs the command and returns the exit status.
 func (c *AliasDomainAddCommand) Run(args []string) int {
+	noCommit, err := noCommitFlag(&args)
+	if err != nil {
+		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
+		return 1
+	}
+
 	if len(args) != 2 {
 		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
 		return 1
@@ -64,6 +74,10 @@ func (c *AliasDomainAddCommand) Run(args []string) int {
 		return 1
 	}
 
+	if noCommit {
+		return 0
+	}
+
 	mailData, err := repo.MailData()
 	if err != nil {
 		fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)

cmd/mailfull/command/aliasdomaindel.go

@@ -20,7 +20,7 @@ func (c *AliasDomainDelCommand) Synopsis() string {
 func (c *AliasDomainDelCommand) Help() string {
 	txt := fmt.Sprintf(`
 Usage:
-    %s %s domain
+    %s %s [-n] domain
 
 Description:
     %s
@@ -28,6 +28,10 @@ Description:
 Required Args:
     domain
         The domain name that you want to delete.
+
+Optional Args:
+    -n
+        Don't update databases.
 `,
 		c.CmdName, c.SubCmdName,
 		c.Synopsis())
@@ -37,6 +41,12 @@ Required Args:
 
 // Run runs the command and returns the exit status.
 func (c *AliasDomainDelCommand) Run(args []string) int {
+	noCommit, err := noCommitFlag(&args)
+	if err != nil {
+		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
+		return 1
+	}
+
 	if len(args) != 1 {
 		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
 		return 1
@@ -55,6 +65,10 @@ func (c *AliasDomainDelCommand) Run(args []string) int {
 		return 1
 	}
 
+	if noCommit {
+		return 0
+	}
+
 	mailData, err := repo.MailData()
 	if err != nil {
 		fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)

cmd/mailfull/command/aliasuseradd.go

@@ -21,7 +21,7 @@ func (c *AliasUserAddCommand) Synopsis() string {
 func (c *AliasUserAddCommand) Help() string {
 	txt := fmt.Sprintf(`
 Usage:
-    %s %s address target [target...]
+    %s %s [-n] address target [target...]
 
 Description:
     %s
@@ -31,6 +31,10 @@ Required Args:
         The email address that you want to create.
     target
         Target email addresses.
+
+Optional Args:
+    -n
+        Don't update databases.
 `,
 		c.CmdName, c.SubCmdName,
 		c.Synopsis())
@@ -40,6 +44,12 @@ Required Args:
 
 // Run runs the command and returns the exit status.
 func (c *AliasUserAddCommand) Run(args []string) int {
+	noCommit, err := noCommitFlag(&args)
+	if err != nil {
+		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
+		return 1
+	}
+
 	if len(args) < 2 {
 		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
 		return 1
@@ -73,6 +83,10 @@ func (c *AliasUserAddCommand) Run(args []string) int {
 		return 1
 	}
 
+	if noCommit {
+		return 0
+	}
+
 	mailData, err := repo.MailData()
 	if err != nil {
 		fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)

cmd/mailfull/command/aliasuserdel.go

@@ -21,7 +21,7 @@ func (c *AliasUserDelCommand) Synopsis() string {
 func (c *AliasUserDelCommand) Help() string {
 	txt := fmt.Sprintf(`
 Usage:
-    %s %s address
+    %s %s [-n] address
 
 Description:
     %s
@@ -29,6 +29,10 @@ Description:
 Required Args:
     address
         The email address that you want to delete.
+
+Optional Args:
+    -n
+        Don't update databases.
 `,
 		c.CmdName, c.SubCmdName,
 		c.Synopsis())
@@ -38,6 +42,12 @@ Required Args:
 
 // Run runs the command and returns the exit status.
 func (c *AliasUserDelCommand) Run(args []string) int {
+	noCommit, err := noCommitFlag(&args)
+	if err != nil {
+		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
+		return 1
+	}
+
 	if len(args) != 1 {
 		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
 		return 1
@@ -63,6 +73,10 @@ func (c *AliasUserDelCommand) Run(args []string) int {
 		return 1
 	}
 
+	if noCommit {
+		return 0
+	}
+
 	mailData, err := repo.MailData()
 	if err != nil {
 		fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)

cmd/mailfull/command/aliasusermod.go

@@ -21,7 +21,7 @@ func (c *AliasUserModCommand) Synopsis() string {
 func (c *AliasUserModCommand) Help() string {
 	txt := fmt.Sprintf(`
 Usage:
-    %s %s address target [target...]
+    %s %s [-n] address target [target...]
 
 Description:
     %s
@@ -31,6 +31,10 @@ Required Args:
         The email address that you want to modify.
     target
         Target email addresses.
+
+Optional Args:
+    -n
+        Don't update databases.
 `,
 		c.CmdName, c.SubCmdName,
 		c.Synopsis())
@@ -40,6 +44,12 @@ Required Args:
 
 // Run runs the command and returns the exit status.
 func (c *AliasUserModCommand) Run(args []string) int {
+	noCommit, err := noCommitFlag(&args)
+	if err != nil {
+		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
+		return 1
+	}
+
 	if len(args) < 2 {
 		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
 		return 1
@@ -82,6 +92,10 @@ func (c *AliasUserModCommand) Run(args []string) int {
 		return 1
 	}
 
+	if noCommit {
+		return 0
+	}
+
 	mailData, err := repo.MailData()
 	if err != nil {
 		fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)

cmd/mailfull/command/catchallset.go

@@ -20,7 +20,7 @@ func (c *CatchAllSetCommand) Synopsis() string {
 func (c *CatchAllSetCommand) Help() string {
 	txt := fmt.Sprintf(`
 Usage:
-    %s %s domain user
+    %s %s [-n] domain user
 
 Description:
     %s
@@ -30,6 +30,10 @@ Required Args:
         The domain name.
     user
         The user name that you want to set as catchall user.
+
+Optional Args:
+    -n
+        Don't update databases.
 `,
 		c.CmdName, c.SubCmdName,
 		c.Synopsis())
@@ -39,6 +43,12 @@ Required Args:
 
 // Run runs the command and returns the exit status.
 func (c *CatchAllSetCommand) Run(args []string) int {
+	noCommit, err := noCommitFlag(&args)
+	if err != nil {
+		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
+		return 1
+	}
+
 	if len(args) != 2 {
 		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
 		return 1
@@ -64,6 +74,10 @@ func (c *CatchAllSetCommand) Run(args []string) int {
 		return 1
 	}
 
+	if noCommit {
+		return 0
+	}
+
 	mailData, err := repo.MailData()
 	if err != nil {
 		fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)

cmd/mailfull/command/catchallunset.go

@@ -20,7 +20,7 @@ func (c *CatchAllUnsetCommand) Synopsis() string {
 func (c *CatchAllUnsetCommand) Help() string {
 	txt := fmt.Sprintf(`
 Usage:
-    %s %s domain
+    %s %s [-n] domain
 
 Description:
     %s
@@ -28,6 +28,10 @@ Description:
 Required Args:
     domain
         The domain name.
+
+Optional Args:
+    -n
+        Don't update databases.
 `,
 		c.CmdName, c.SubCmdName,
 		c.Synopsis())
@@ -37,6 +41,12 @@ Required Args:
 
 // Run runs the command and returns the exit status.
 func (c *CatchAllUnsetCommand) Run(args []string) int {
+	noCommit, err := noCommitFlag(&args)
+	if err != nil {
+		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
+		return 1
+	}
+
 	if len(args) != 1 {
 		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
 		return 1
@@ -55,6 +65,10 @@ func (c *CatchAllUnsetCommand) Run(args []string) int {
 		return 1
 	}
 
+	if noCommit {
+		return 0
+	}
+
 	mailData, err := repo.MailData()
 	if err != nil {
 		fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)

cmd/mailfull/command/domainadd.go

@@ -20,7 +20,7 @@ func (c *DomainAddCommand) Synopsis() string {
 func (c *DomainAddCommand) Help() string {
 	txt := fmt.Sprintf(`
 Usage:
-    %s %s domain
+    %s %s [-n] domain
 
 Description:
     %s
@@ -28,6 +28,10 @@ Description:
 Required Args:
     domain
         The domain name that you want to create.
+
+Optional Args:
+    -n
+        Don't update databases.
 `,
 		c.CmdName, c.SubCmdName,
 		c.Synopsis())
@@ -37,6 +41,12 @@ Required Args:
 
 // Run runs the command and returns the exit status.
 func (c *DomainAddCommand) Run(args []string) int {
+	noCommit, err := noCommitFlag(&args)
+	if err != nil {
+		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
+		return 1
+	}
+
 	if len(args) != 1 {
 		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
 		return 1
@@ -72,6 +82,10 @@ func (c *DomainAddCommand) Run(args []string) int {
 		return 1
 	}
 
+	if noCommit {
+		return 0
+	}
+
 	mailData, err := repo.MailData()
 	if err != nil {
 		fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)

cmd/mailfull/command/domaindel.go

@@ -20,7 +20,7 @@ func (c *DomainDelCommand) Synopsis() string {
 func (c *DomainDelCommand) Help() string {
 	txt := fmt.Sprintf(`
 Usage:
-    %s %s domain
+    %s %s [-n] domain
 
 Description:
     %s
@@ -28,6 +28,10 @@ Description:
 Required Args:
     domain
         The domain name that you want to delete.
+
+Optional Args:
+    -n
+        Don't update databases.
 `,
 		c.CmdName, c.SubCmdName,
 		c.Synopsis())
@@ -37,6 +41,12 @@ Required Args:
 
 // Run runs the command and returns the exit status.
 func (c *DomainDelCommand) Run(args []string) int {
+	noCommit, err := noCommitFlag(&args)
+	if err != nil {
+		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
+		return 1
+	}
+
 	if len(args) != 1 {
 		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
 		return 1
@@ -55,6 +65,10 @@ func (c *DomainDelCommand) Run(args []string) int {
 		return 1
 	}
 
+	if noCommit {
+		return 0
+	}
+
 	mailData, err := repo.MailData()
 	if err != nil {
 		fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)

cmd/mailfull/command/domaindisable.go

@@ -20,7 +20,7 @@ func (c *DomainDisableCommand) Synopsis() string {
 func (c *DomainDisableCommand) Help() string {
 	txt := fmt.Sprintf(`
 Usage:
-    %s %s domain
+    %s %s [-n] domain
 
 Description:
     %s
@@ -28,6 +28,10 @@ Description:
 Required Args:
     domain
         The domain name that you want to disable.
+
+Optional Args:
+    -n
+        Don't update databases.
 `,
 		c.CmdName, c.SubCmdName,
 		c.Synopsis())
@@ -37,6 +41,12 @@ Required Args:
 
 // Run runs the command and returns the exit status.
 func (c *DomainDisableCommand) Run(args []string) int {
+	noCommit, err := noCommitFlag(&args)
+	if err != nil {
+		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
+		return 1
+	}
+
 	if len(args) != 1 {
 		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
 		return 1
@@ -67,6 +77,10 @@ func (c *DomainDisableCommand) Run(args []string) int {
 		return 1
 	}
 
+	if noCommit {
+		return 0
+	}
+
 	mailData, err := repo.MailData()
 	if err != nil {
 		fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)

cmd/mailfull/command/domainenable.go

@@ -20,7 +20,7 @@ func (c *DomainEnableCommand) Synopsis() string {
 func (c *DomainEnableCommand) Help() string {
 	txt := fmt.Sprintf(`
 Usage:
-    %s %s domain
+    %s %s [-n] domain
 
 Description:
     %s
@@ -28,6 +28,10 @@ Description:
 Required Args:
     domain
         The domain name that you want to enable.
+
+Optional Args:
+    -n
+        Don't update databases.
 `,
 		c.CmdName, c.SubCmdName,
 		c.Synopsis())
@@ -37,6 +41,12 @@ Required Args:
 
 // Run runs the command and returns the exit status.
 func (c *DomainEnableCommand) Run(args []string) int {
+	noCommit, err := noCommitFlag(&args)
+	if err != nil {
+		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
+		return 1
+	}
+
 	if len(args) != 1 {
 		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
 		return 1
@@ -67,6 +77,10 @@ func (c *DomainEnableCommand) Run(args []string) int {
 		return 1
 	}
 
+	if noCommit {
+		return 0
+	}
+
 	mailData, err := repo.MailData()
 	if err != nil {
 		fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)

cmd/mailfull/command/main.go

@@ -1,6 +1,9 @@
 package command
 
 import (
+	"bytes"
+	"flag"
+
 	"github.com/mitchellh/cli"
 )
 
@@ -11,3 +14,17 @@ type Meta struct {
 	SubCmdName string
 	Version    string
 }
+
+// noCommitFlag returns true if `pargs` has "-n" flag.
+// `pargs` is overwrites with non-flag arguments.
+func noCommitFlag(pargs *[]string) (bool, error) {
+	nFlag := false
+
+	flagSet := flag.NewFlagSet("", flag.ContinueOnError)
+	flagSet.SetOutput(&bytes.Buffer{})
+	flagSet.BoolVar(&nFlag, "n", nFlag, "")
+	err := flagSet.Parse(*pargs)
+	*pargs = flagSet.Args()
+
+	return nFlag, err
+}

cmd/mailfull/command/useradd.go

@@ -21,7 +21,7 @@ func (c *UserAddCommand) Synopsis() string {
 func (c *UserAddCommand) Help() string {
 	txt := fmt.Sprintf(`
 Usage:
-    %s %s address
+    %s %s [-n] address
 
 Description:
     %s
@@ -29,6 +29,10 @@ Description:
 Required Args:
     address
         The email address that you want to create.
+
+Optional Args:
+    -n
+        Don't update databases.
 `,
 		c.CmdName, c.SubCmdName,
 		c.Synopsis())
@@ -38,6 +42,12 @@ Required Args:
 
 // Run runs the command and returns the exit status.
 func (c *UserAddCommand) Run(args []string) int {
+	noCommit, err := noCommitFlag(&args)
+	if err != nil {
+		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
+		return 1
+	}
+
 	if len(args) != 1 {
 		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
 		return 1
@@ -70,6 +80,10 @@ func (c *UserAddCommand) Run(args []string) int {
 		return 1
 	}
 
+	if noCommit {
+		return 0
+	}
+
 	mailData, err := repo.MailData()
 	if err != nil {
 		fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)

cmd/mailfull/command/usercheckpw.go

@@ -34,7 +34,7 @@ Required Args:
 Optional Args:
     password
         Specify the password instead of your typing.
-        This option is not recommended because the password will be visible in your shell history.
+        This option is NOT recommended because the password will be visible in your shell history.
 `,
 		c.CmdName, c.SubCmdName,
 		c.Synopsis())

cmd/mailfull/command/userdel.go

@@ -21,7 +21,7 @@ func (c *UserDelCommand) Synopsis() string {
 func (c *UserDelCommand) Help() string {
 	txt := fmt.Sprintf(`
 Usage:
-    %s %s address
+    %s %s [-n] address
 
 Description:
     %s
@@ -29,6 +29,10 @@ Description:
 Required Args:
     address
         The email address that you want to delete.
+
+Optional Args:
+    -n
+        Don't update databases.
 `,
 		c.CmdName, c.SubCmdName,
 		c.Synopsis())
@@ -38,6 +42,12 @@ Required Args:
 
 // Run runs the command and returns the exit status.
 func (c *UserDelCommand) Run(args []string) int {
+	noCommit, err := noCommitFlag(&args)
+	if err != nil {
+		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
+		return 1
+	}
+
 	if len(args) != 1 {
 		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
 		return 1
@@ -69,6 +79,10 @@ func (c *UserDelCommand) Run(args []string) int {
 		return 1
 	}
 
+	if noCommit {
+		return 0
+	}
+
 	mailData, err := repo.MailData()
 	if err != nil {
 		fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)

cmd/mailfull/command/userpasswd.go

@@ -22,7 +22,7 @@ func (c *UserPasswdCommand) Synopsis() string {
 func (c *UserPasswdCommand) Help() string {
 	txt := fmt.Sprintf(`
 Usage:
-    %s %s address [password]
+    %s %s [-n] address [password]
 
 Description:
     %s
@@ -32,9 +32,11 @@ Required Args:
         The email address that you want to update the password.
 
 Optional Args:
+    -n
+        Don't update databases.
     password
         Specify the password instead of your typing.
-        This option is not recommended because the password will be visible in your shell history.
+        This option is NOT recommended because the password will be visible in your shell history.
 `,
 		c.CmdName, c.SubCmdName,
 		c.Synopsis())
@@ -44,6 +46,12 @@ Optional Args:
 
 // Run runs the command and returns the exit status.
 func (c *UserPasswdCommand) Run(args []string) int {
+	noCommit, err := noCommitFlag(&args)
+	if err != nil {
+		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
+		return 1
+	}
+
 	if len(args) != 1 && len(args) != 2 {
 		fmt.Fprintf(c.UI.ErrorWriter, "%v\n", c.Help())
 		return 1
@@ -115,6 +123,10 @@ func (c *UserPasswdCommand) Run(args []string) int {
 		return 1
 	}
 
+	if noCommit {
+		return 0
+	}
+
 	mailData, err := repo.MailData()
 	if err != nil {
 		fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)

glide.lock

@@ -0,0 +1,22 @@
+hash: 451657f03f297af9163863497cf6c2f60abfe12d88a282f5aab6deb865d91119
+updated: 2016-09-29T12:05:32.00075722+09:00
+imports:
+- name: github.com/armon/go-radix
+  version: 4239b77079c7b5d1243b7b4736304ce8ddb6f0f2
+- name: github.com/bgentry/speakeasy
+  version: a1ccbf2c40dfc8ce514b5c5c6e6d1429ea6880da
+- name: github.com/BurntSushi/toml
+  version: 99064174e013895bbd9b025c31100bd1d9b590ca
+- name: github.com/jsimonetti/pwscheme
+  version: 76804708ecad54773871b35dbaa44f517973e395
+  subpackages:
+  - ssha
+- name: github.com/mattn/go-isatty
+  version: 66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8
+- name: github.com/mitchellh/cli
+  version: fcf521421aa29bde1d93b6920dfce826d7932208
+- name: golang.org/x/sys
+  version: 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9
+  subpackages:
+  - unix
+testImports: []

glide.yaml

@@ -0,0 +1,7 @@
+package: github.com/directorz/mailfull-go
+import:
+- package: github.com/BurntSushi/toml
+- package: github.com/jsimonetti/pwscheme
+  subpackages:
+  - ssha
+- package: github.com/mitchellh/cli

version.go

@@ -1,4 +1,4 @@
 package mailfull
 
 // Version is a version number.
-const Version = "v0.0.4"
+const Version = "v0.0.6"