Skip to content

Commit eaaf750

Browse files
authored
Merge pull request #316 from metafacture/help-formatted
Tweak help output for Markdown formatting
2 parents 1115f16 + 4d80ab4 commit eaaf750

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

metafacture-flux/src/main/java/org/metafacture/flux/HelpPrinter.java

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,13 @@ private HelpPrinter() {
4747

4848
public static void print(final ObjectFactory<?> factory,
4949
final PrintStream out) {
50-
out.println("WELCOME TO METAFACTURE");
50+
out.println("Welcome to Metafacture");
51+
out.println("======================");
52+
out.println();
5153
out.println(getVersionInfo());
5254

5355
out.println("\nUsage:\tflux FLOW_FILE [VARNAME=VALUE ...]\n");
54-
out.println("Available pipe elements:\n");
56+
out.println("Available flux commands:\n");
5557

5658
final List<String> keyWords = new ArrayList<String>();
5759
keyWords.addAll(factory.keySet());
@@ -75,49 +77,53 @@ private static <T> void describe(String name, ObjectFactory<T> factory,
7577
final Description desc = moduleClass.getAnnotation(Description.class);
7678

7779
out.println(name);
80+
name.chars().forEach(c-> {
81+
out.print("-");
82+
});
83+
out.println();
7884

7985
if (desc != null) {
80-
out.println("description:\t" + desc.value());
86+
out.println("- description:\t" + desc.value());
8187
}
8288
final Collection<String> arguments = getAvailableArguments(moduleClass);
8389
if (!arguments.isEmpty()) {
84-
out.println("argument in\t" + arguments);
90+
out.println("- arguments:\t" + arguments);
8591
}
8692

8793
final Map<String, Class<?>> attributes = factory.get(name).getSetterTypes();
8894

8995
if (!attributes.isEmpty()) {
90-
out.print("options:\t");
96+
out.print("- options:\t");
9197
final StringBuilder builder = new StringBuilder();
9298
for (Entry<String, Class<?>> entry : attributes.entrySet()) {
9399
if (entry.getValue().isEnum()) {
94100
builder.append(entry.getKey())
95101
.append(" ")
96-
.append(Arrays.toString(entry.getValue().getEnumConstants()))
102+
.append(Arrays.asList(entry.getValue().getEnumConstants()))
97103
.append(", ");
98104
} else {
99105
builder.append(entry.getKey())
100106
.append(" (")
101-
.append(entry.getValue().getName())
107+
.append(entry.getValue().getSimpleName())
102108
.append("), ");
103109
}
104110

105111
}
106112
out.println(builder.substring(0, builder.length() - 2));
107113
}
108114

109-
out.println("implementation:\t" + moduleClass.getCanonicalName());
110115
String inString = "<unknown>";
111116
String outString = "";
112117
final In inClass = moduleClass.getAnnotation(In.class);
113118
if (inClass != null) {
114-
inString = inClass.value().getCanonicalName();
119+
inString = inClass.value().getSimpleName();
115120
}
116121
final Out outClass = moduleClass.getAnnotation(Out.class);
117122
if (outClass != null) {
118-
outString = outClass.value().getCanonicalName();
123+
outString = outClass.value().getSimpleName();
119124
}
120-
out.println("signature:\t" + inString + " -> " + outString);
125+
out.println("- signature:\t" + inString + " -> " + outString);
126+
out.println("- java class:\t" + moduleClass.getCanonicalName());
121127
out.println();
122128
}
123129

0 commit comments

Comments
 (0)