Improve inventory command, update vendor

Author: tyler-sommer

Gopkg.lock

@@ -89,7 +89,7 @@ func NewCLIEnv(conf CLIConfig, historyPath string) (*CLIEnv, error) {
 		fmt.Printf("Enter \"%s\" in the prompt for detailed help information.\n", text.Boldf("help"))
 	}
 
-	srv := cli.NewServer(appEnv.Logger)
+	srv := cli.NewServer(appEnv.Logger, appEnv.Client)
 	if f, err := os.Open(historyPath); err == nil {
 		srv.ReadHistory(f)
 		f.Close()
@@ -98,7 +98,8 @@ func NewCLIEnv(conf CLIConfig, historyPath string) (*CLIEnv, error) {
 
 	srv.SetCommands(
 		command.NewEVETypesCommand(prompter),
-		command.NewProductCommand(appEnv.Client, prompter, appEnv.Logger))
+		command.NewProductCommand(appEnv.Client, prompter, appEnv.Logger),
+		command.NewInventoryCommand(appEnv.Client, prompter, appEnv.Logger))
 	srv.SetCtrlCAborts(true)
 	env := &CLIEnv{
 		ClientEnv: appEnv,

app/cli.go

@@ -43,10 +43,23 @@ type Command interface {
 	PrintHelp()
 }
 
+// authRequirer is implemented by commands that require authentication
+// to function. This allows filtering of unworkable commands from being registered.
+type authRequirer interface {
+	Command
+	RequiresAuth() bool
+}
+
+// Authenticator is implemented by a type that is responsible for authentication.
+type Authenticator interface {
+	Authenticated() bool
+}
+
 // A Server handles command-line requests and prints responses to standard output.
 type Server struct {
 	*liner.State
 	logger log.Logger
+	auth   Authenticator
 
 	abort chan struct{}
 
@@ -58,10 +71,11 @@ type Server struct {
 }
 
 // NewServer initializes a new CLI server.
-func NewServer(logger log.Logger) *Server {
+func NewServer(logger log.Logger, a Authenticator) *Server {
 	return &Server{
 		State:  liner.NewLiner(),
 		logger: logger,
+		auth:   a,
 
 		abort: make(chan struct{}, 1),
 
@@ -153,6 +167,12 @@ func (srv *Server) PrintHelp() {
 
 Commands:`)
 	for _, cmd := range srv.commands {
+		if v, ok := cmd.(authRequirer); ok && v.RequiresAuth() {
+			if !srv.auth.Authenticated() {
+				// Not authenticated, skip this command.
+				continue
+			}
+		}
 		for _, prefix := range cmd.Prefixes() {
 			fmt.Printf("  %s %s\n", text.Boldf(text.PadTextRight(prefix, 15)), cmd.Description())
 			break
@@ -183,15 +203,15 @@ func (c quitCommand) Description() string {
 
 func (c quitCommand) PrintHelp() {
 	fmt.Println()
-	fmt.Printf(`Command "quit" exits the application.
+	fmt.Printf(`Command \"%s\" exits the application.
 
 Aliases for quit:
 	quit
 	q
 	exit
 	\q
 
-%s`, text.WrapText(`Additionally, the program can be exited by sending a SIGINT or SIGKILL signal, for example by pressing CTRL+C.`, text.StandardTerminalWidthInChars))
+%s`, text.Boldf("quit"), text.WrapText(`Additionally, the program can be exited by sending a SIGINT or SIGKILL signal, for example by pressing CTRL+C.`, text.StandardTerminalWidthInChars))
 	fmt.Println()
 }
 
@@ -207,9 +227,19 @@ func (c helpCommand) Prefixes() []string {
 func (c helpCommand) Handle(subcmd string, args ...string) {
 	if len(subcmd) > 0 {
 		if cmd, ok := c.env.commandLookup[subcmd]; ok {
+			if aer, ok := cmd.(authRequirer); ok && aer.RequiresAuth() {
+				if !c.env.auth.Authenticated() {
+					fmt.Printf("Command \"%s\" requires authentication.\n", text.Boldf(subcmd))
+					fmt.Printf("Run %s with the %s flag to authenticate. For example:\n", text.Boldf("motki"), text.Boldf("-credentials"))
+					fmt.Printf("  motki -credentials frank:mypass\n\n")
+					fmt.Printf("Run %s for additional information.\n", text.Boldf("motki -h"))
+					return
+				}
+			}
 			cmd.PrintHelp()
 			return
 		}
+		fmt.Println("Unknown command:", subcmd)
 	}
 	c.PrintHelp()
 }

cli.go

@@ -71,6 +71,6 @@ about items that exist in the EVE universe.`, text.Boldf("types")), text.Standar
 		text.Boldf(text.PadTextRight("show [query|typeID]", 25)))
 	fmt.Println()
 	fmt.Println()
-	fmt.Println(text.WrapText(`Note that the registry are identical, and either one accepts an optional integer or string argument. If an integer is given as an argument or in the prompt, the command will attempt to load the Item Type with the given Type ID. If a string is given as an argument or in the prompt, the command will show results matching the input.`, text.StandardTerminalWidthInChars))
+	fmt.Println(text.WrapText(`Note that the commands are identical, and either one accepts an optional integer or string argument. If an integer is given as an argument or in the prompt, the command will attempt to load the Item Type with the given Type ID. If a string is given as an argument or in the prompt, the command will show results matching the input.`, text.StandardTerminalWidthInChars))
 	fmt.Println()
 }