Skip to content

Commit

Permalink
Merge pull request wildfly-extras#676 from spyrkob/issue_675
Browse files Browse the repository at this point in the history 
Enable colour output in the Prospero messages
  • Loading branch information
@spyrkob
spyrkob authored May 21, 2024
2 parents 7006311 + b9a02f7 commit 775ecc2
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 29 deletions.
25 changes: 20 additions & 5 deletions prospero-cli/src/main/java/org/wildfly/prospero/cli/CliConsole.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.wildfly.prospero.api.Console;
import org.wildfly.prospero.api.ProvisioningProgressEvent;
import org.wildfly.prospero.api.ArtifactChange;
import picocli.CommandLine;

import static org.jboss.galleon.Constants.TRACK_CONFIGS;
import static org.jboss.galleon.Constants.TRACK_LAYOUT_BUILD;
Expand Down Expand Up @@ -153,22 +154,22 @@ public void progressUpdate(ProvisioningProgressEvent update) {

public void updatesFound(List<ArtifactChange> artifactUpdates) {
if (artifactUpdates.isEmpty()) {
getStdOut().println(CliMessages.MESSAGES.noUpdatesFound());
println(CliMessages.MESSAGES.noUpdatesFound());
} else {
getStdOut().println(CliMessages.MESSAGES.updatesFound());
println(CliMessages.MESSAGES.updatesFound());
for (ArtifactChange artifactUpdate : artifactUpdates) {
final Optional<String> newVersion = artifactUpdate.getNewVersion();
final Optional<String> oldVersion = artifactUpdate.getOldVersion();
final String artifactName = artifactUpdate.getArtifactName();
final String channelName = artifactUpdate.getChannelName().map(name -> "[" + name + "]")
.orElse("");

getStdOut().printf(" %s%-50s %-20s ==> %-20s %-20s%n", artifactUpdate.isDowngrade()?"[*]":"", artifactName, oldVersion.orElse("[]"),
printf(" %s%-50s %-20s ==> %-20s %-20s%n", artifactUpdate.isDowngrade()?"@|fg(yellow) [*]|@":"", artifactName, oldVersion.orElse("[]"),
newVersion.orElse("[]"), channelName);
}

if (artifactUpdates.stream().anyMatch(ArtifactChange::isDowngrade)) {
getStdOut().printf(CliMessages.MESSAGES.possibleDowngrade());
printf(CliMessages.MESSAGES.possibleDowngrade());
}
}
}
Expand Down Expand Up @@ -246,7 +247,21 @@ public void error(String message, String... args) {

@Override
public void println(String text) {
getStdOut().println(text);
if (text == null) {
getStdOut().println();
} else {
final CommandLine.Help.Ansi.Text formatted = CommandLine.Help.Ansi.AUTO.new Text(text);
getStdOut().println(formatted.toString());
}
}

public void printf(String text, String... args) {
if (text == null) {
getStdOut().println();
} else {
final String formatted = String.format(text, (String[]) args);
getStdOut().print(CommandLine.Help.Ansi.AUTO.new Text(formatted));
}
}

}
10 changes: 6 additions & 4 deletions prospero-cli/src/main/java/org/wildfly/prospero/cli/DiffPrinter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,19 @@
public class DiffPrinter {

private final String initialTab;
private final CliConsole console;

public DiffPrinter(String initialTab) {
public DiffPrinter(CliConsole console, String initialTab) {
this.initialTab = initialTab;
this.console = console;
}

public void print(Diff diff) {
print(diff, initialTab, false);
}

private void print(Diff diff, String tab, boolean nested) {
System.out.print(tab);
console.printf(tab);


if (diff.getChildren().isEmpty()) {
Expand All @@ -53,13 +55,13 @@ private void print(Diff diff, String tab, boolean nested) {
}
}

private static void print(Diff diff, boolean nested, String text, String... args) {
private void print(Diff diff, boolean nested, String text, String... args) {
if (!nested) {
text = String.format("[%s] ", getStatus(diff)) + String.format(text, (String[]) args);
} else {
text = String.format(text, (String[]) args);
}
System.out.print(text);
console.printf(text);
}

private static String getStatus(Diff diff) {
Expand Down
20 changes: 13 additions & 7 deletions prospero-cli/src/main/java/org/wildfly/prospero/cli/LicensePrinter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,32 @@

public class LicensePrinter {

private final CliConsole console;

public LicensePrinter(CliConsole console) {
this.console = console;
}

public void print(List<License> pendingLicenses) {
if (!pendingLicenses.isEmpty()) {
boolean first = true;
for (License pendingLicense : pendingLicenses) {
if (!first) {
System.out.println();
console.println("");
}
first = false;

System.out.println("===============");
System.out.println(pendingLicense.getTitle());
System.out.println("===============");
console.println("===============");
console.println(pendingLicense.getTitle());
console.println("===============");
final String text = pendingLicense.getText();
final String[] lines = text.split("\n");
for (String line : lines) {
System.out.println(" " + WordUtils.wrap(line, 118, System.lineSeparator() + " ", true));
console.println(" " + WordUtils.wrap(line, 118, System.lineSeparator() + " ", true));
}
System.out.println("===============");
console.println("===============");
}
System.out.println();
console.println("");
}
}
}
2 changes: 1 addition & 1 deletion prospero-cli/src/main/java/org/wildfly/prospero/cli/commands/FeaturesCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public Integer call() throws Exception {

if (!pendingLicenses.isEmpty()) {
console.println(System.lineSeparator() + CliMessages.MESSAGES.featurePackRequiresLicense(fpl) + System.lineSeparator());
new LicensePrinter().print(pendingLicenses);
new LicensePrinter(console).print(pendingLicenses);

if (acceptAgreements) {
console.println(CliMessages.MESSAGES.agreementSkipped(CliConstants.ACCEPT_AGREEMENTS) + System.lineSeparator());
Expand Down
2 changes: 1 addition & 1 deletion prospero-cli/src/main/java/org/wildfly/prospero/cli/commands/HistoryCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public Integer call() throws Exception {
if (changes.isEmpty()) {
console.println(CliMessages.MESSAGES.noChangesFound());
} else {
final DiffPrinter diffPrinter = new DiffPrinter(" ");
final DiffPrinter diffPrinter = new DiffPrinter(console, " ");
boolean needsLineBreak = false;
if (!changes.getArtifactChanges().isEmpty()) {
console.println(CliMessages.MESSAGES.diffUpdates()+ ":");
Expand Down
8 changes: 4 additions & 4 deletions prospero-cli/src/main/java/org/wildfly/prospero/cli/commands/InstallCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,11 @@ public Integer call() throws Exception {
final List<License> pendingLicenses = provisioningAction.getPendingLicenses(provisioningConfig,
effectiveChannels);
if (!pendingLicenses.isEmpty()) {
new LicensePrinter().print(pendingLicenses);
System.out.println();
new LicensePrinter(console).print(pendingLicenses);
console.println("");
if (acceptAgreements) {
System.out.println(CliMessages.MESSAGES.agreementSkipped(CliConstants.ACCEPT_AGREEMENTS));
System.out.println();
console.println(CliMessages.MESSAGES.agreementSkipped(CliConstants.ACCEPT_AGREEMENTS));
console.println("");
} else {
if (!console.confirm(CliMessages.MESSAGES.acceptAgreements(), "", CliMessages.MESSAGES.installationCancelled())) {
return ReturnCodes.PROCESSING_ERROR;
Expand Down
12 changes: 6 additions & 6 deletions prospero-cli/src/main/java/org/wildfly/prospero/cli/commands/PrintLicensesCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ public Integer call() throws Exception {

final List<License> pendingLicenses = provisioningAction.getPendingLicenses(provisioningConfig, channels);
if (!pendingLicenses.isEmpty()) {
System.out.println();
System.out.println(CliMessages.MESSAGES.listAgreementsHeader());
System.out.println();
new LicensePrinter().print(pendingLicenses);
console.println("");
console.println(CliMessages.MESSAGES.listAgreementsHeader());
console.println("");
new LicensePrinter(console).print(pendingLicenses);
} else {
System.out.println();
System.out.println(CliMessages.MESSAGES.noAgreementsNeeded());
console.println("");
console.println(CliMessages.MESSAGES.noAgreementsNeeded());
}
return ReturnCodes.SUCCESS;
} finally {
Expand Down
2 changes: 1 addition & 1 deletion prospero-cli/src/main/resources/UsageMessages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ prospero.install.unknown_stability_level=Unknown stability level [%s]. Valid lev

prospero.updates.no_updates=No updates found.
prospero.updates.header=Updates found:
prospero.updates.downgrade.warning=%n[*] The update list contain one or more artifacts with lower versions then currently installed. Proceed with caution.%n%n
prospero.updates.downgrade.warning=%n@|fg(yellow) [*] The update list contain one or more artifacts with lower versions then currently installed. Proceed with caution.|@%n%n
prospero.updates.prompt=Continue with update [y/N]:
prospero.updates.cancelled=Update cancelled
prospero.updates.complete=Update complete!
Expand Down

0 comments on commit 775ecc2

Please sign in to comment.