rename the root package to match import path

args.go

@@ -11,7 +11,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package doit
+package doctl
 
 const (
 	// ArgActionID is an action id argument.

cmd/release-doctl/main.go

@@ -22,7 +22,7 @@ import (
 )
 
 var (
-	ver    = flag.String("ver", doit.DoitVersion.String(), "doit version")
+	ver    = flag.String("ver", doctl.DoitVersion.String(), "doit version")
 	path   = flag.String("path", "", "upload path")
 	user   = flag.String("user", "", "bintray user")
 	apikey = flag.String("apikey", "", "bintray apikey")

command.go

@@ -11,7 +11,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package doit
+package doctl
 
 import (
 	"os"

commands/actions.go

@@ -40,16 +40,16 @@ func Actions() *Command {
 
 	cmdActionList := CmdBuilder(cmd, RunCmdActionList, "list", "list actions", Writer,
 		aliasOpt("ls"), displayerType(&action{}), docCategories("action"))
-	AddStringFlag(cmdActionList, doit.ArgActionResourceType, "", "Action resource type")
-	AddStringFlag(cmdActionList, doit.ArgActionRegion, "", "Action region")
-	AddStringFlag(cmdActionList, doit.ArgActionAfter, "", "Action completed after in RFC3339 format")
-	AddStringFlag(cmdActionList, doit.ArgActionBefore, "", "Action completed before in RFC3339 format")
-	AddStringFlag(cmdActionList, doit.ArgActionStatus, "", "Action status")
-	AddStringFlag(cmdActionList, doit.ArgActionType, "", "Action type")
+	AddStringFlag(cmdActionList, doctl.ArgActionResourceType, "", "Action resource type")
+	AddStringFlag(cmdActionList, doctl.ArgActionRegion, "", "Action region")
+	AddStringFlag(cmdActionList, doctl.ArgActionAfter, "", "Action completed after in RFC3339 format")
+	AddStringFlag(cmdActionList, doctl.ArgActionBefore, "", "Action completed before in RFC3339 format")
+	AddStringFlag(cmdActionList, doctl.ArgActionStatus, "", "Action status")
+	AddStringFlag(cmdActionList, doctl.ArgActionType, "", "Action type")
 
 	cmdActionWait := CmdBuilder(cmd, RunCmdActionWait, "wait ACTIONID", "wait for action to complete", Writer,
 		aliasOpt("w"), displayerType(&action{}), docCategories("action"))
-	AddIntFlag(cmdActionWait, doit.ArgPollTime, 5, "Re-poll time in seconds")
+	AddIntFlag(cmdActionWait, doctl.ArgPollTime, 5, "Re-poll time in seconds")
 
 	return cmd
 }
@@ -85,28 +85,28 @@ func (a actionsByCompletedAt) Less(i, j int) bool {
 }
 
 func filterActionList(c *CmdConfig, in do.Actions) (do.Actions, error) {
-	resourceType, err := c.Doit.GetString(c.NS, doit.ArgActionResourceType)
+	resourceType, err := c.Doit.GetString(c.NS, doctl.ArgActionResourceType)
 	if err != nil {
 		return nil, err
 	}
 
-	region, err := c.Doit.GetString(c.NS, doit.ArgActionRegion)
+	region, err := c.Doit.GetString(c.NS, doctl.ArgActionRegion)
 	if err != nil {
 		return nil, err
 	}
 
-	status, err := c.Doit.GetString(c.NS, doit.ArgActionStatus)
+	status, err := c.Doit.GetString(c.NS, doctl.ArgActionStatus)
 	if err != nil {
 		return nil, err
 	}
 
-	actionType, err := c.Doit.GetString(c.NS, doit.ArgActionType)
+	actionType, err := c.Doit.GetString(c.NS, doctl.ArgActionType)
 	if err != nil {
 		return nil, err
 	}
 
 	var before, after time.Time
-	beforeStr, err := c.Doit.GetString(c.NS, doit.ArgActionBefore)
+	beforeStr, err := c.Doit.GetString(c.NS, doctl.ArgActionBefore)
 	if err != nil {
 		return nil, err
 	}
@@ -117,7 +117,7 @@ func filterActionList(c *CmdConfig, in do.Actions) (do.Actions, error) {
 		}
 	}
 
-	afterStr, err := c.Doit.GetString(c.NS, doit.ArgActionAfter)
+	afterStr, err := c.Doit.GetString(c.NS, doctl.ArgActionAfter)
 	if err != nil {
 		return nil, err
 	}
@@ -176,7 +176,7 @@ func isZeroTime(t time.Time) bool {
 // RunCmdActionGet runs action get.
 func RunCmdActionGet(c *CmdConfig) error {
 	if len(c.Args) != 1 {
-		return doit.NewMissingArgsErr(c.NS)
+		return doctl.NewMissingArgsErr(c.NS)
 	}
 
 	id, err := strconv.Atoi(c.Args[0])
@@ -196,15 +196,15 @@ func RunCmdActionGet(c *CmdConfig) error {
 // RunCmdActionWait waits for an action to complete or error.
 func RunCmdActionWait(c *CmdConfig) error {
 	if len(c.Args) != 1 {
-		return doit.NewMissingArgsErr(c.NS)
+		return doctl.NewMissingArgsErr(c.NS)
 	}
 
 	id, err := strconv.Atoi(c.Args[0])
 	if err != nil {
 		return err
 	}
 
-	pollTime, err := c.Doit.GetInt(c.NS, doit.ArgPollTime)
+	pollTime, err := c.Doit.GetInt(c.NS, doctl.ArgPollTime)
 	if err != nil {
 		return err
 	}

commands/actions_test.go

@@ -88,12 +88,12 @@ func Test_filterActions(t *testing.T) {
 
 	for _, c := range cases {
 		withTestClient(t, func(config *CmdConfig, tm *tcMocks) {
-			config.Doit.Set(config.NS, doit.ArgActionResourceType, c.resourceType)
-			config.Doit.Set(config.NS, doit.ArgActionRegion, c.region)
-			config.Doit.Set(config.NS, doit.ArgActionAfter, c.after)
-			config.Doit.Set(config.NS, doit.ArgActionBefore, c.before)
-			config.Doit.Set(config.NS, doit.ArgActionStatus, c.status)
-			config.Doit.Set(config.NS, doit.ArgActionType, c.actionType)
+			config.Doit.Set(config.NS, doctl.ArgActionResourceType, c.resourceType)
+			config.Doit.Set(config.NS, doctl.ArgActionRegion, c.region)
+			config.Doit.Set(config.NS, doctl.ArgActionAfter, c.after)
+			config.Doit.Set(config.NS, doctl.ArgActionBefore, c.before)
+			config.Doit.Set(config.NS, doctl.ArgActionStatus, c.status)
+			config.Doit.Set(config.NS, doctl.ArgActionType, c.actionType)
 
 			newActions, err := filterActionList(config, actions)
 			assert.NoError(t, err)

commands/auth.go

@@ -49,7 +49,7 @@ func (use *UnknownSchemeError) Error() string {
 	return "unknown scheme: " + use.Scheme
 }
 
-// Auth creates auth commands for doit.
+// Auth creates auth commands for doctl.
 func Auth() *Command {
 	cmd := &Command{
 		Command: &cobra.Command{
@@ -78,7 +78,7 @@ func RunAuthLogin(c *CmdConfig) error {
 		return err
 	}
 
-	cf, err := doit.NewConfigFile()
+	cf, err := doctl.NewConfigFile()
 	if err != nil {
 		return err
 	}

commands/commands.go

@@ -33,13 +33,13 @@ type Displayable interface {
 
 type displayer struct {
 	ns     string
-	config doit.Config
+	config doctl.Config
 	item   Displayable
 	out    io.Writer
 }
 
 func (d *displayer) Display() error {
-	output, err := doit.DoitConfig.GetString(doit.NSRoot, "output")
+	output, err := doctl.DoitConfig.GetString(doctl.NSRoot, "output")
 	if err != nil {
 		return nil
 	}

commands/commands_test.go

@@ -142,13 +142,13 @@ type tcMocks struct {
 }
 
 func withTestClient(t *testing.T, tFn testFn) {
-	ogConfig := doit.DoitConfig
+	ogConfig := doctl.DoitConfig
 	defer func() {
-		doit.DoitConfig = ogConfig
+		doctl.DoitConfig = ogConfig
 	}()
 
 	cfg := NewTestConfig()
-	doit.DoitConfig = cfg
+	doctl.DoitConfig = cfg
 
 	tm := &tcMocks{}
 
@@ -194,18 +194,18 @@ type TestConfig struct {
 	v     *viper.Viper
 }
 
-var _ doit.Config = &TestConfig{}
+var _ doctl.Config = &TestConfig{}
 
 func NewTestConfig() *TestConfig {
 	return &TestConfig{
 		SSHFn: func(u, h, kp string, p int) runner.Runner {
-			return &doit.MockRunner{}
+			return &doctl.MockRunner{}
 		},
 		v: viper.New(),
 	}
 }
 
-var _ doit.Config = &TestConfig{}
+var _ doctl.Config = &TestConfig{}
 
 func (c *TestConfig) GetGodoClient(trace bool) *godo.Client {
 	return &godo.Client{}

commands/doit.go

@@ -62,7 +62,7 @@ func init() {
 
 // LoadConfig loads out configuration.
 func LoadConfig() error {
-	cf, err := doit.NewConfigFile()
+	cf, err := doctl.NewConfigFile()
 	if err != nil {
 		return err
 	}
@@ -210,7 +210,7 @@ func AddStringSliceFlag(cmd *Command, name string, def []string, desc string, op
 }
 
 func flagName(cmd *Command, name string) string {
-	parentName := doit.NSRoot
+	parentName := doctl.NSRoot
 	if cmd.Parent() != nil {
 		parentName = cmd.Parent().Name()
 	}
@@ -219,7 +219,7 @@ func flagName(cmd *Command, name string) string {
 }
 
 func cmdNS(cmd *cobra.Command) string {
-	parentName := doit.NSRoot
+	parentName := doctl.NSRoot
 	if cmd.Parent() != nil {
 		parentName = cmd.Parent().Name()
 	}
@@ -233,7 +233,7 @@ type CmdRunner func(*CmdConfig) error
 // CmdConfig is a command configuration.
 type CmdConfig struct {
 	NS   string
-	Doit doit.Config
+	Doit doctl.Config
 	Out  io.Writer
 	Args []string
 
@@ -254,7 +254,7 @@ type CmdConfig struct {
 }
 
 // NewCmdConfig creates an instance of a CmdConfig.
-func NewCmdConfig(ns string, dc doit.Config, out io.Writer, args []string) *CmdConfig {
+func NewCmdConfig(ns string, dc doctl.Config, out io.Writer, args []string) *CmdConfig {
 	godoClient := dc.GetGodoClient(Trace)
 
 	return &CmdConfig{
@@ -300,7 +300,7 @@ func CmdBuilder(parent *Command, cr CmdRunner, cliText, desc string, out io.Writ
 		Run: func(cmd *cobra.Command, args []string) {
 			c := NewCmdConfig(
 				cmdNS(cmd),
-				doit.DoitConfig,
+				doctl.DoitConfig,
 				out,
 				args,
 			)
@@ -323,8 +323,8 @@ func CmdBuilder(parent *Command, cr CmdRunner, cliText, desc string, out io.Writ
 	if cols := c.fmtCols; cols != nil {
 		formatHelp := fmt.Sprintf("Columns for output in a comma seperated list. Possible values: %s",
 			strings.Join(cols, ","))
-		AddStringFlag(c, doit.ArgFormat, "", formatHelp)
-		AddBoolFlag(c, doit.ArgNoHeader, false, "hide headers")
+		AddStringFlag(c, doctl.ArgFormat, "", formatHelp)
+		AddBoolFlag(c, doctl.ArgNoHeader, false, "hide headers")
 	}
 
 	return c