Skip to content

Commit f82b067

Browse files
committed
Update pom and better help menu
1 parent 14cf9d4 commit f82b067

8 files changed

Lines changed: 53 additions & 14 deletions

File tree

.idea/workspace.xml

Lines changed: 25 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</dependency>
2323
</dependencies>
2424
<build>
25-
<finalName>etapa3</finalName>
25+
<finalName>etapa4</finalName>
2626
<plugins>
2727
<plugin>
2828
<groupId>org.jacoco</groupId>

src/main/java/ko/carbonel/compiler/config/Config.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import java.util.stream.IntStream;
3434

3535
public class Config {
36-
public static final String JARFILE_NAME = "etapa3.jar";
36+
public static final String JARFILE_NAME = "etapa4.jar";
3737
public static final Map<ArgumentName, Argument<?>> arguments;
3838

3939
static {
@@ -92,7 +92,7 @@ private static void runAST() {
9292
}
9393

9494
private static void printHelpAdvanced() {
95-
printHelp();
95+
Logger.output(tableWriter().formatTable(List.of("Param", "Value"), arguments.keySet().stream().sorted(Comparator.comparing(it->arguments.get(it).getClass().getSimpleName())).map(key->List.of(key.name(), arguments.get(key).getFormattedValue())).toList(), Utils::centerPad));
9696
}
9797

9898
private static void runParser() {

src/main/java/ko/carbonel/config/Argument.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ default List<String> getHelp(){
1515
return List.of(getName().name(), getDescription(), getStringValue(), getValidValues());
1616
}
1717
String getValidValues();
18+
String getFormattedValue();
1819
}

src/main/java/ko/carbonel/config/EnumArg.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import ko.carbonel.compiler.config.ArgumentName;
44
import ko.carbonel.compiler.exception.InvalidEnumArgValueException;
5+
import ko.carbonel.compiler.runner.TermFont;
56

67
import java.util.Arrays;
78

@@ -56,4 +57,9 @@ public void setValue(String value) {
5657
public String getValidValues() {
5758
return Arrays.toString(value.getClass().getEnumConstants());
5859
}
60+
61+
@Override
62+
public String getFormattedValue() {
63+
return TermFont.primary(getStringValue());
64+
}
5965
}

src/main/java/ko/carbonel/config/FileArgument.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import ko.carbonel.Utils;
44
import ko.carbonel.compiler.config.ArgumentName;
5+
import ko.carbonel.compiler.runner.TermFont;
56

67
import java.io.File;
78
import java.util.List;
@@ -53,6 +54,11 @@ public String getValidValues() {
5354
return "Relative / Absolute File path";
5455
}
5556

57+
@Override
58+
public String getFormattedValue() {
59+
return TermFont.secondary(getStringValue());
60+
}
61+
5662
@Override
5763
public String getStringValue() {
5864
return value;

src/main/java/ko/carbonel/config/Flag.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ko.carbonel.config;
22

33
import ko.carbonel.compiler.config.ArgumentName;
4+
import ko.carbonel.compiler.runner.TermFont;
45

56
public class Flag implements Argument<Boolean> {
67
private final ArgumentName name;
@@ -51,4 +52,9 @@ public void setValue(String value) {
5152
public String getValidValues() {
5253
return "[-|+] => True / False";
5354
}
55+
56+
@Override
57+
public String getFormattedValue() {
58+
return TermFont.colorBoolean(set);
59+
}
5460
}

src/main/java/ko/carbonel/config/Param.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ko.carbonel.config;
22

33
import ko.carbonel.compiler.config.ArgumentName;
4+
import ko.carbonel.compiler.runner.TermFont;
45

56
public class Param implements Argument<String> {
67
private final ArgumentName name;
@@ -43,4 +44,9 @@ public String getValidValues() {
4344
public String getStringValue() {
4445
return value;
4546
}
47+
48+
@Override
49+
public String getFormattedValue() {
50+
return TermFont.secondary(value);
51+
}
4652
}

0 commit comments

Comments
 (0)