From ec9703a5aa4bda8d764537ea040e464bd422980b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:10 -0400
Subject: [PATCH] Reformat CmdLineParser
---
src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java | 134 +++++++++++++++++++++++++++++++-------------
1 files changed, 94 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java b/src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java
index 0cbf354..bed966d 100644
--- a/src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java
@@ -15,19 +15,20 @@
*/
package com.gitblit.transport.ssh.gitblit;
-import java.text.MessageFormat;
import java.util.List;
import org.kohsuke.args4j.Argument;
-import org.kohsuke.args4j.Option;
-import org.parboiled.common.StringUtils;
import com.gitblit.manager.IGitblit;
import com.gitblit.models.RegistrantAccessPermission;
+import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
import com.gitblit.transport.ssh.commands.CommandMetaData;
import com.gitblit.transport.ssh.commands.DispatchCommand;
+import com.gitblit.transport.ssh.commands.ListFilterCommand;
import com.gitblit.transport.ssh.commands.SshCommand;
+import com.gitblit.utils.FlipTable;
+import com.gitblit.utils.FlipTable.Borders;
@CommandMetaData(name = "users", description = "User management commands", admin = true)
public class UsersDispatcher extends DispatchCommand {
@@ -46,60 +47,113 @@
@Override
public void run() throws UnloggedFailure {
IGitblit gitblit = getContext().getGitblit();
- UserModel user = gitblit.getUserModel(username);
- if (user == null) {
+ UserModel u = gitblit.getUserModel(username);
+ if (u == null) {
throw new UnloggedFailure(1, String.format("Unknown user \"%s\"", username));
}
- stdout.println();
- stdout.println(user.username);
- stdout.println();
- for (RegistrantAccessPermission ap : user.getRepositoryPermissions()) {
- stdout.println(String.format("%s %s", ap.registrant, ap.permission));
+
+ // fields
+ String [] fheaders = new String [] { "Field", "Value" };
+ Object [][] fdata = new Object[5][];
+ fdata[0] = new Object [] { "Email", u.emailAddress };
+ fdata[1] = new Object [] { "Type", u.accountType };
+ fdata[2] = new Object [] { "Can Admin", u.canAdmin() ? "Y":"N" };
+ fdata[3] = new Object [] { "Can Fork", u.canFork() ? "Y":"N" };
+ fdata[4] = new Object [] { "Can Create", u.canCreate() ? "Y":"N" };
+ String fields = FlipTable.of(fheaders, fdata, Borders.COLS);
+
+ // teams
+ String [] theaders = new String [] { "Team", "Type" };
+ Object [][] tdata = new Object[u.teams.size()][];
+ int i = 0;
+ for (TeamModel t : u.teams) {
+ tdata[i] = new Object [] { t.name, t.accountType };
+ i++;
}
+ String teams = FlipTable.of(theaders, tdata, Borders.COLS);
+
+ // permissions
+ List<RegistrantAccessPermission> perms = u.getRepositoryPermissions();
+ String[] pheaders = { "Repository", "Permission", "Type", "Source", "Mutable" };
+ Object [][] pdata = new Object[perms.size()][];
+ for (i = 0; i < perms.size(); i++) {
+ RegistrantAccessPermission ap = perms.get(i);
+ pdata[i] = new Object[] { ap.registrant, ap.permission, ap.permissionType, ap.source, ap.mutable ? "Y":"N" };
+ }
+ String permissions = FlipTable.of(pheaders, pdata, Borders.COLS);
+
+ // assemble user table
+ String [] headers = new String[] { u.getDisplayName() + (u.username.equals(u.getDisplayName()) ? "" : (" (" + u.username + ")")) };
+ String[][] data = new String[6][];
+ data[0] = new String [] { "FIELDS" };
+ data[1] = new String [] { fields };
+ data[2] = new String [] { "TEAMS" };
+ data[3] = new String [] { teams };
+ data[4] = new String [] { "PERMISSIONS" };
+ data[5] = new String [] { permissions };
+ stdout.println(FlipTable.of(headers, data));
}
}
@CommandMetaData(name = "list", aliases= { "ls" }, description = "List users")
- public static class ListUsers extends SshCommand {
-
- @Option(name = "--verbose", aliases = { "-v" }, usage = "verbose")
- private boolean verbose;
+ public static class ListUsers extends ListFilterCommand<UserModel> {
@Override
- public void run() {
+ protected List<UserModel> getItems() {
IGitblit gitblit = getContext().getGitblit();
List<UserModel> users = gitblit.getAllUsers();
- int displaynameLen = 0;
- int usernameLen = 0;
- for (UserModel user : users) {
- int len = user.getDisplayName().length();
- if (len > displaynameLen) {
- displaynameLen = len;
- }
- if (!StringUtils.isEmpty(user.username)) {
- len = user.username.length();
- if (len > usernameLen) {
- usernameLen = len;
- }
- }
- }
+ return users;
+ }
- String pattern;
+ @Override
+ protected boolean matches(String filter, UserModel u) {
+ return u.username.matches(filter);
+ }
+
+ @Override
+ protected void asTable(List<UserModel> list) {
+ String[] headers;
if (verbose) {
- pattern = MessageFormat.format("%-{0,number,0}s\t%-{1,number,0}s\t%-10s\t%s", displaynameLen, usernameLen);
+ String[] h = { "Name", "Display name", "Type", "Email", "Create?", "Fork?"};
+ headers = h;
} else {
- pattern = MessageFormat.format("%-{0,number,0}s\t%-{1,number,0}s", displaynameLen, usernameLen);
+ String[] h = { "Name", "Display name", "Type", "Email"};
+ headers = h;
}
- for (UserModel user : users) {
- if (user.disabled) {
- continue;
+ Object[][] data = new Object[list.size()][];
+ for (int i = 0; i < list.size(); i++) {
+ UserModel u = list.get(i);
+
+ String name = u.disabled ? "-" : ((u.canAdmin() ? "*" : " ")) + u.username;
+ if (verbose) {
+ data[i] = new Object[] { name, u.displayName, u.accountType,
+ u.emailAddress, u.canCreate() ? "Y":"", u.canFork() ? "Y" : ""};
+ } else {
+ data[i] = new Object[] { name, u.displayName, u.accountType,
+ u.emailAddress };
}
- stdout.println(String.format(pattern,
- user.getDisplayName(),
- (user.canAdmin() ? "*":" ") + user.username,
- user.accountType,
- user.emailAddress == null ? "" : user.emailAddress));
+ }
+ stdout.print(FlipTable.of(headers, data, Borders.BODY_HCOLS));
+ stdout.println(" * = admin account, - = disabled account");
+ stdout.println();
+ }
+
+ @Override
+ protected void asTabbed(List<UserModel> users) {
+ if (verbose) {
+ for (UserModel u : users) {
+ outTabbed(u.disabled ? "-" : ((u.canAdmin() ? "*" : " ")) + u.username,
+ u.getDisplayName(),
+ u.accountType,
+ u.emailAddress == null ? "" : u.emailAddress,
+ u.canCreate() ? "Y":"",
+ u.canFork() ? "Y" : "");
+ }
+ } else {
+ for (UserModel u : users) {
+ outTabbed(u.disabled ? "-" : ((u.canAdmin() ? "*" : " ")) + u.username);
+ }
}
}
}
--
Gitblit v1.9.1