Changes to tablewriter exposed

Author: djthorpe

cmd/api/bitwarden.go

@@ -19,10 +19,10 @@ import (
 // TYPES
 
 type bwCipher struct {
-	Name     string
-	Username string
-	URI      string
-	Folder   string
+	Name     string `json:"name,wrap"`
+	Username string `json:"username,width:30"`
+	URI      string `json:"uri,width:40"`
+	Folder   string `json:"folder,width:36"`
 }
 
 ///////////////////////////////////////////////////////////////////////////////

cmd/api/flags.go

@@ -90,10 +90,12 @@ func (flags *Flags) Parse(args []string) error {
 	}
 
 	// Parse the commands
-	for _, cmd := range flags.cmds {
-		if err := cmd.Parse(flags, opts...); err != nil {
-			fmt.Fprintf(os.Stderr, "%v: %v\n", cmd.Name, err)
-			return err
+	if flags.NArg() > 0 {
+		if cmd := flags.GetCommandSet(flags.Arg(0)); cmd != nil {
+			if err := cmd.Parse(flags, opts...); err != nil {
+				fmt.Fprintf(os.Stderr, "%v: %v\n", cmd.Name, err)
+				return err
+			}
 		}
 	}
 

pkg/bitwarden/schema/folder.go

@@ -12,10 +12,10 @@ import (
 type Folders []*Folder
 
 type Folder struct {
-	Id           string    `json:"id"`
+	Id           string    `json:"id,width:36"`
 	Name         string    `json:"name"` // Encrypted
-	RevisionDate time.Time `json:"revisionDate"`
-	Object       string    `json:"object"`
+	RevisionDate time.Time `json:"revisionDate,width:29"`
+	Object       string    `json:"object,width:6"`
 }
 
 ///////////////////////////////////////////////////////////////////////////////

pkg/bitwarden/schema/kdf.go

@@ -4,6 +4,6 @@ package schema
 // TYPES
 
 type Kdf struct {
-	Type       int `json:"kdf"`
-	Iterations int `json:"KdfIterations"`
+	Type       int `json:"kdf,right"`
+	Iterations int `json:"KdfIterations,right"`
 }

pkg/bitwarden/schema/profile.go

@@ -9,22 +9,20 @@ import (
 // TYPES
 
 type Profile struct {
-	Id                      string          `json:"id"`
+	Id                      string          `json:"id,width:36"`
 	Name                    string          `json:"name"`
 	Email                   string          `json:"email"`
-	EmailVerified           bool            `json:"emailVerified"`
-	Key                     string          `json:"key"`
-	Premium                 bool            `json:"premium"`
-	PremiumFromOrganization bool            `json:"premiumFromOrganization"`
-	MasterPasswordHash      string          `json:"masterPasswordHash"`
-	MasterPasswordHint      *string         `json:"masterPasswordHint,omitempty"`
-	Culture                 string          `json:"culture"`
-	TwoFactorEnabled        bool            `json:"twoFactorEnabled"`
-	SecurityStamp           *string         `json:"securityStamp,omitempty"`
-	ForcePasswordReset      bool            `json:"forcePasswordReset"`
-	UsesKeyConnector        bool            `json:"usesKeyConnector"`
+	EmailVerified           bool            `json:"emailVerified,width:5,right"`
+	Key                     string          `json:"key,wrap"`
+	Premium                 bool            `json:"premium,width:5,right"`
+	PremiumFromOrganization bool            `json:"premiumFromOrganization,width:5,right"`
+	Culture                 string          `json:"culture,width:5,right"`
+	TwoFactorEnabled        bool            `json:"twoFactorEnabled,width:5,right"`
+	SecurityStamp           *string         `json:"securityStamp,omitempty,width:5,right"`
+	ForcePasswordReset      bool            `json:"forcePasswordReset,width:5,right"`
+	UsesKeyConnector        bool            `json:"usesKeyConnector,width:5,right"`
 	Organizations           []*Organization `json:"organizations,omitempty"`
-	Object                  string          `json:"object"`
+	Object                  string          `json:"object,width:7,right"`
 }
 
 ///////////////////////////////////////////////////////////////////////////////

pkg/bitwarden/schema/session.go

@@ -20,10 +20,10 @@ import (
 // Session represents a long-running session with the Bitwarden server
 type Session struct {
 	// Device identifier
-	Device *Device `json:"device,omitempty"`
+	Device *Device `json:"device,omitempty,wrap"`
 
 	// Login Token
-	Token *Token `json:"token,omitempty"`
+	Token *Token `json:"token,omitempty,wrap"`
 
 	// Encryption parameters
 	Kdf