From 552ed95a0fb4c0791762c82e9919ad934da74bc9 Mon Sep 17 00:00:00 2001
From: teru <teru@kteru.net>
Date: Tue, 25 Jul 2017 11:19:25 +0900
Subject: [PATCH] Integrate subpackage

---
 cmd/mailfull/{command => }/aliasdomainadd.go |  2 +-
 cmd/mailfull/{command => }/aliasdomaindel.go |  2 +-
 cmd/mailfull/{command => }/aliasdomains.go   |  2 +-
 cmd/mailfull/{command => }/aliasuseradd.go   |  2 +-
 cmd/mailfull/{command => }/aliasuserdel.go   |  2 +-
 cmd/mailfull/{command => }/aliasusermod.go   |  2 +-
 cmd/mailfull/{command => }/aliasusers.go     |  2 +-
 cmd/mailfull/{command => }/catchall.go       |  2 +-
 cmd/mailfull/{command => }/catchallset.go    |  2 +-
 cmd/mailfull/{command => }/catchallunset.go  |  2 +-
 cmd/mailfull/{command => }/commit.go         |  2 +-
 cmd/mailfull/{command => }/domainadd.go      |  2 +-
 cmd/mailfull/{command => }/domaindel.go      |  2 +-
 cmd/mailfull/{command => }/domaindisable.go  |  2 +-
 cmd/mailfull/{command => }/domainenable.go   |  2 +-
 cmd/mailfull/{command => }/domains.go        |  2 +-
 cmd/mailfull/{command => }/genconfig.go      |  2 +-
 cmd/mailfull/{command => }/init.go           |  2 +-
 cmd/mailfull/mailfull.go                     | 49 ++++++++++----------
 cmd/mailfull/{command => }/main.go           |  2 +-
 cmd/mailfull/{command => }/useradd.go        |  2 +-
 cmd/mailfull/{command => }/usercheckpw.go    |  2 +-
 cmd/mailfull/{command => }/userdel.go        |  2 +-
 cmd/mailfull/{command => }/userpasswd.go     |  2 +-
 cmd/mailfull/{command => }/users.go          |  2 +-
 25 files changed, 48 insertions(+), 49 deletions(-)
 rename cmd/mailfull/{command => }/aliasdomainadd.go (99%)
 rename cmd/mailfull/{command => }/aliasdomaindel.go (98%)
 rename cmd/mailfull/{command => }/aliasdomains.go (98%)
 rename cmd/mailfull/{command => }/aliasuseradd.go (99%)
 rename cmd/mailfull/{command => }/aliasuserdel.go (99%)
 rename cmd/mailfull/{command => }/aliasusermod.go (99%)
 rename cmd/mailfull/{command => }/aliasusers.go (98%)
 rename cmd/mailfull/{command => }/catchall.go (98%)
 rename cmd/mailfull/{command => }/catchallset.go (99%)
 rename cmd/mailfull/{command => }/catchallunset.go (98%)
 rename cmd/mailfull/{command => }/commit.go (98%)
 rename cmd/mailfull/{command => }/domainadd.go (99%)
 rename cmd/mailfull/{command => }/domaindel.go (98%)
 rename cmd/mailfull/{command => }/domaindisable.go (99%)
 rename cmd/mailfull/{command => }/domainenable.go (99%)
 rename cmd/mailfull/{command => }/domains.go (98%)
 rename cmd/mailfull/{command => }/genconfig.go (98%)
 rename cmd/mailfull/{command => }/init.go (97%)
 rename cmd/mailfull/{command => }/main.go (97%)
 rename cmd/mailfull/{command => }/useradd.go (99%)
 rename cmd/mailfull/{command => }/usercheckpw.go (99%)
 rename cmd/mailfull/{command => }/userdel.go (99%)
 rename cmd/mailfull/{command => }/userpasswd.go (99%)
 rename cmd/mailfull/{command => }/users.go (98%)

diff --git a/cmd/mailfull/command/aliasdomainadd.go b/cmd/mailfull/aliasdomainadd.go
similarity index 99%
rename from cmd/mailfull/command/aliasdomainadd.go
rename to cmd/mailfull/aliasdomainadd.go
index 2eb90d5..5cec85b 100644
--- a/cmd/mailfull/command/aliasdomainadd.go
+++ b/cmd/mailfull/aliasdomainadd.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/aliasdomaindel.go b/cmd/mailfull/aliasdomaindel.go
similarity index 98%
rename from cmd/mailfull/command/aliasdomaindel.go
rename to cmd/mailfull/aliasdomaindel.go
index 1310f93..c38f42f 100644
--- a/cmd/mailfull/command/aliasdomaindel.go
+++ b/cmd/mailfull/aliasdomaindel.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/aliasdomains.go b/cmd/mailfull/aliasdomains.go
similarity index 98%
rename from cmd/mailfull/command/aliasdomains.go
rename to cmd/mailfull/aliasdomains.go
index 62cbac7..bdc8856 100644
--- a/cmd/mailfull/command/aliasdomains.go
+++ b/cmd/mailfull/aliasdomains.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/aliasuseradd.go b/cmd/mailfull/aliasuseradd.go
similarity index 99%
rename from cmd/mailfull/command/aliasuseradd.go
rename to cmd/mailfull/aliasuseradd.go
index 9d6ee93..4cc004c 100644
--- a/cmd/mailfull/command/aliasuseradd.go
+++ b/cmd/mailfull/aliasuseradd.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/aliasuserdel.go b/cmd/mailfull/aliasuserdel.go
similarity index 99%
rename from cmd/mailfull/command/aliasuserdel.go
rename to cmd/mailfull/aliasuserdel.go
index 0eb5d12..8c628cd 100644
--- a/cmd/mailfull/command/aliasuserdel.go
+++ b/cmd/mailfull/aliasuserdel.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/aliasusermod.go b/cmd/mailfull/aliasusermod.go
similarity index 99%
rename from cmd/mailfull/command/aliasusermod.go
rename to cmd/mailfull/aliasusermod.go
index 459cd67..793b063 100644
--- a/cmd/mailfull/command/aliasusermod.go
+++ b/cmd/mailfull/aliasusermod.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/aliasusers.go b/cmd/mailfull/aliasusers.go
similarity index 98%
rename from cmd/mailfull/command/aliasusers.go
rename to cmd/mailfull/aliasusers.go
index 036b23a..c2db6ff 100644
--- a/cmd/mailfull/command/aliasusers.go
+++ b/cmd/mailfull/aliasusers.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/catchall.go b/cmd/mailfull/catchall.go
similarity index 98%
rename from cmd/mailfull/command/catchall.go
rename to cmd/mailfull/catchall.go
index 3c1db48..9bac493 100644
--- a/cmd/mailfull/command/catchall.go
+++ b/cmd/mailfull/catchall.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/catchallset.go b/cmd/mailfull/catchallset.go
similarity index 99%
rename from cmd/mailfull/command/catchallset.go
rename to cmd/mailfull/catchallset.go
index 24acd67..0d86d23 100644
--- a/cmd/mailfull/command/catchallset.go
+++ b/cmd/mailfull/catchallset.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/catchallunset.go b/cmd/mailfull/catchallunset.go
similarity index 98%
rename from cmd/mailfull/command/catchallunset.go
rename to cmd/mailfull/catchallunset.go
index a6f3fe9..60b7df0 100644
--- a/cmd/mailfull/command/catchallunset.go
+++ b/cmd/mailfull/catchallunset.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/commit.go b/cmd/mailfull/commit.go
similarity index 98%
rename from cmd/mailfull/command/commit.go
rename to cmd/mailfull/commit.go
index 790b071..829a955 100644
--- a/cmd/mailfull/command/commit.go
+++ b/cmd/mailfull/commit.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/domainadd.go b/cmd/mailfull/domainadd.go
similarity index 99%
rename from cmd/mailfull/command/domainadd.go
rename to cmd/mailfull/domainadd.go
index 1983d30..9744eb4 100644
--- a/cmd/mailfull/command/domainadd.go
+++ b/cmd/mailfull/domainadd.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/domaindel.go b/cmd/mailfull/domaindel.go
similarity index 98%
rename from cmd/mailfull/command/domaindel.go
rename to cmd/mailfull/domaindel.go
index a8b9be9..0a4c782 100644
--- a/cmd/mailfull/command/domaindel.go
+++ b/cmd/mailfull/domaindel.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/domaindisable.go b/cmd/mailfull/domaindisable.go
similarity index 99%
rename from cmd/mailfull/command/domaindisable.go
rename to cmd/mailfull/domaindisable.go
index c254c77..83a7d74 100644
--- a/cmd/mailfull/command/domaindisable.go
+++ b/cmd/mailfull/domaindisable.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/domainenable.go b/cmd/mailfull/domainenable.go
similarity index 99%
rename from cmd/mailfull/command/domainenable.go
rename to cmd/mailfull/domainenable.go
index 6fff76d..5d4c924 100644
--- a/cmd/mailfull/command/domainenable.go
+++ b/cmd/mailfull/domainenable.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/domains.go b/cmd/mailfull/domains.go
similarity index 98%
rename from cmd/mailfull/command/domains.go
rename to cmd/mailfull/domains.go
index 83b65d5..0d4ede2 100644
--- a/cmd/mailfull/command/domains.go
+++ b/cmd/mailfull/domains.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/genconfig.go b/cmd/mailfull/genconfig.go
similarity index 98%
rename from cmd/mailfull/command/genconfig.go
rename to cmd/mailfull/genconfig.go
index e2a4b27..dfc8ab4 100644
--- a/cmd/mailfull/command/genconfig.go
+++ b/cmd/mailfull/genconfig.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/init.go b/cmd/mailfull/init.go
similarity index 97%
rename from cmd/mailfull/command/init.go
rename to cmd/mailfull/init.go
index b915c7c..12ccd4d 100644
--- a/cmd/mailfull/command/init.go
+++ b/cmd/mailfull/init.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/mailfull.go b/cmd/mailfull/mailfull.go
index 905a77a..c2fb110 100644
--- a/cmd/mailfull/mailfull.go
+++ b/cmd/mailfull/mailfull.go
@@ -9,7 +9,6 @@ import (
 	"path/filepath"
 
 	"github.com/directorz/mailfull-go"
-	"github.com/directorz/mailfull-go/cmd/mailfull/command"
 	"github.com/mitchellh/cli"
 )
 
@@ -31,7 +30,7 @@ func main() {
 		Args:    os.Args[1:],
 	}
 
-	meta := command.Meta{
+	meta := Meta{
 		UI: &cli.BasicUi{
 			Reader:      os.Stdin,
 			Writer:      os.Stdout,
@@ -44,95 +43,95 @@ func main() {
 	c.Commands = map[string]cli.CommandFactory{
 		"init": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.InitCommand{Meta: meta}, nil
+			return &InitCommand{Meta: meta}, nil
 		},
 		"genconfig": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.GenConfigCommand{Meta: meta}, nil
+			return &GenConfigCommand{Meta: meta}, nil
 		},
 		"domains": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.DomainsCommand{Meta: meta}, nil
+			return &DomainsCommand{Meta: meta}, nil
 		},
 		"domainadd": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.DomainAddCommand{Meta: meta}, nil
+			return &DomainAddCommand{Meta: meta}, nil
 		},
 		"domaindel": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.DomainDelCommand{Meta: meta}, nil
+			return &DomainDelCommand{Meta: meta}, nil
 		},
 		"domaindisable": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.DomainDisableCommand{Meta: meta}, nil
+			return &DomainDisableCommand{Meta: meta}, nil
 		},
 		"domainenable": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.DomainEnableCommand{Meta: meta}, nil
+			return &DomainEnableCommand{Meta: meta}, nil
 		},
 		"aliasdomains": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.AliasDomainsCommand{Meta: meta}, nil
+			return &AliasDomainsCommand{Meta: meta}, nil
 		},
 		"aliasdomainadd": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.AliasDomainAddCommand{Meta: meta}, nil
+			return &AliasDomainAddCommand{Meta: meta}, nil
 		},
 		"aliasdomaindel": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.AliasDomainDelCommand{Meta: meta}, nil
+			return &AliasDomainDelCommand{Meta: meta}, nil
 		},
 		"users": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.UsersCommand{Meta: meta}, nil
+			return &UsersCommand{Meta: meta}, nil
 		},
 		"useradd": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.UserAddCommand{Meta: meta}, nil
+			return &UserAddCommand{Meta: meta}, nil
 		},
 		"userdel": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.UserDelCommand{Meta: meta}, nil
+			return &UserDelCommand{Meta: meta}, nil
 		},
 		"userpasswd": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.UserPasswdCommand{Meta: meta}, nil
+			return &UserPasswdCommand{Meta: meta}, nil
 		},
 		"usercheckpw": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.UserCheckPwCommand{Meta: meta}, nil
+			return &UserCheckPwCommand{Meta: meta}, nil
 		},
 		"aliasusers": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.AliasUsersCommand{Meta: meta}, nil
+			return &AliasUsersCommand{Meta: meta}, nil
 		},
 		"aliasuseradd": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.AliasUserAddCommand{Meta: meta}, nil
+			return &AliasUserAddCommand{Meta: meta}, nil
 		},
 		"aliasusermod": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.AliasUserModCommand{Meta: meta}, nil
+			return &AliasUserModCommand{Meta: meta}, nil
 		},
 		"aliasuserdel": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.AliasUserDelCommand{Meta: meta}, nil
+			return &AliasUserDelCommand{Meta: meta}, nil
 		},
 		"catchall": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.CatchAllCommand{Meta: meta}, nil
+			return &CatchAllCommand{Meta: meta}, nil
 		},
 		"catchallset": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.CatchAllSetCommand{Meta: meta}, nil
+			return &CatchAllSetCommand{Meta: meta}, nil
 		},
 		"catchallunset": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.CatchAllUnsetCommand{Meta: meta}, nil
+			return &CatchAllUnsetCommand{Meta: meta}, nil
 		},
 		"commit": func() (cli.Command, error) {
 			meta.SubCmdName = c.Subcommand()
-			return &command.CommitCommand{Meta: meta}, nil
+			return &CommitCommand{Meta: meta}, nil
 		},
 	}
 
diff --git a/cmd/mailfull/command/main.go b/cmd/mailfull/main.go
similarity index 97%
rename from cmd/mailfull/command/main.go
rename to cmd/mailfull/main.go
index 66be466..b64a8e9 100644
--- a/cmd/mailfull/command/main.go
+++ b/cmd/mailfull/main.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"bytes"
diff --git a/cmd/mailfull/command/useradd.go b/cmd/mailfull/useradd.go
similarity index 99%
rename from cmd/mailfull/command/useradd.go
rename to cmd/mailfull/useradd.go
index 943f493..f97a04f 100644
--- a/cmd/mailfull/command/useradd.go
+++ b/cmd/mailfull/useradd.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/usercheckpw.go b/cmd/mailfull/usercheckpw.go
similarity index 99%
rename from cmd/mailfull/command/usercheckpw.go
rename to cmd/mailfull/usercheckpw.go
index 4ef780a..7b673c0 100644
--- a/cmd/mailfull/command/usercheckpw.go
+++ b/cmd/mailfull/usercheckpw.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/userdel.go b/cmd/mailfull/userdel.go
similarity index 99%
rename from cmd/mailfull/command/userdel.go
rename to cmd/mailfull/userdel.go
index 858b8ff..41ae12c 100644
--- a/cmd/mailfull/command/userdel.go
+++ b/cmd/mailfull/userdel.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/userpasswd.go b/cmd/mailfull/userpasswd.go
similarity index 99%
rename from cmd/mailfull/command/userpasswd.go
rename to cmd/mailfull/userpasswd.go
index bbd724c..406cc28 100644
--- a/cmd/mailfull/command/userpasswd.go
+++ b/cmd/mailfull/userpasswd.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"
diff --git a/cmd/mailfull/command/users.go b/cmd/mailfull/users.go
similarity index 98%
rename from cmd/mailfull/command/users.go
rename to cmd/mailfull/users.go
index 2f5038d..b9b18c1 100644
--- a/cmd/mailfull/command/users.go
+++ b/cmd/mailfull/users.go
@@ -1,4 +1,4 @@
-package command
+package main
 
 import (
 	"fmt"