From 521cb6022a9ee30bf3115a8dcb991aa5c7e420e3 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 10 Apr 2014 19:01:30 -0400 Subject: [PATCH] Unit tests for ssh daemon and keys dispatcher --- src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java index b916bb1..f8239b5 100644 --- a/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java +++ b/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java @@ -318,6 +318,10 @@ return false; } + public String getDescription() { + return getClass().getAnnotation(CommandMetaData.class).description(); + } + @Override public String usage() { Set<String> cmds = new TreeSet<String>(); @@ -332,9 +336,9 @@ continue; } - String displayName = name; + String displayName = name + (meta.admin() ? "*" : ""); if (commandToAliases.containsKey(meta.name())) { - displayName = name + " (" + Joiner.on(',').join(commandToAliases.get(meta.name())) + ")"; + displayName = name + (meta.admin() ? "*" : "")+ " (" + Joiner.on(',').join(commandToAliases.get(meta.name())) + ")"; } displayNames.put(name, displayName); @@ -351,6 +355,16 @@ String format = "%-" + maxLength + "s %s"; final StringBuilder usage = new StringBuilder(); + if (!StringUtils.isEmpty(getName())) { + String title = getName().toUpperCase() + ": " + getDescription(); + String b = com.gitblit.utils.StringUtils.leftPad("", title.length() + 2, '═'); + usage.append('\n'); + usage.append(b).append('\n'); + usage.append(' ').append(title).append('\n'); + usage.append(b).append('\n'); + usage.append('\n'); + } + if (!cmds.isEmpty()) { usage.append("Available commands"); if (!getName().isEmpty()) { -- Gitblit v1.9.1