Skip to content

Commit

Permalink
Print command
Browse files Browse the repository at this point in the history
  • Loading branch information
@ia3andy
ia3andy committed Feb 15, 2023
1 parent ebd6b43 commit 4975c55
Show file tree
Hide file tree
Showing 7 changed files with 99 additions and 80 deletions.
63 changes: 27 additions & 36 deletions devtools/cli/src/test/java/io/quarkus/cli/MavenProjectInfoAndUpdateTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,23 @@ void testClean() throws Exception {
final Path projectDir = workDir().resolve("acme-clean");
final CliDriver.Result infoResult = run(projectDir, "info");

assertQuarkusPlatformBoms(infoResult.stdout,
ArtifactCoords.pom("org.acme.quarkus.platform", "quarkus-bom", "2.0.0"),
ArtifactCoords.pom("org.acme.quarkus.platform", "acme-bom", "2.0.0"));
assertQuarkusPlatformBoms(infoResult.stdout, "org.acme.quarkus.platform:quarkus-bom:pom:2.0.0 ✔",
"org.acme.quarkus.platform:acme-bom:pom:2.0.0 ✔");
assertPlatformBomExtensions(infoResult.stdout, ArtifactCoords.pom("org.acme.quarkus.platform", "quarkus-bom", "2.0.0"),
ArtifactCoords.jar("io.quarkus", "quarkus-arc", null));
"io.quarkus:quarkus-arc ✔");
assertPlatformBomExtensions(infoResult.stdout, ArtifactCoords.pom("org.acme.quarkus.platform", "acme-bom", "2.0.0"),
ArtifactCoords.jar("org.acme.quarkus.platform", "acme-quarkus-supersonic", null));
"org.acme.quarkus.platform:acme-quarkus-supersonic ✔");
assertRegistryExtensions(infoResult.stdout, "registry.acme.org",
ArtifactCoords.jar("org.acme", "acme-quarkiverse-extension", "1.0"));
"org.acme:acme-quarkiverse-extension:1.0");

final CliDriver.Result updateResult = run(projectDir, "update");
assertThat(updateResult.stdout).contains("[INFO] The project is up-to-date");
assertQuarkusPlatformBoms(updateResult.stdout,
"org.acme.quarkus.platform:quarkus-bom:pom:2.0.0 ✔",
"org.acme.quarkus.platform:acme-bom:pom:2.0.0 ✔");
}

@Test
void testMissalignedPlatformExtensionVersion() throws Exception {
void testMisalignedPlatformExtensionVersion() throws Exception {

final CliDriver.Result createResult = run(workDir(), "create", "acme-misaligned-ext-version",
"-x supersonic,acme-quarkiverse-extension,org.acme.quarkus.platform:acme-quarkus-subatomic:1.0.0");
Expand All @@ -88,15 +89,15 @@ void testMissalignedPlatformExtensionVersion() throws Exception {
final CliDriver.Result infoResult = run(projectDir, "info");

assertQuarkusPlatformBoms(infoResult.stdout,
ArtifactCoords.pom("org.acme.quarkus.platform", "quarkus-bom", "2.0.0"),
ArtifactCoords.pom("org.acme.quarkus.platform", "acme-bom", "2.0.0"));
"org.acme.quarkus.platform:quarkus-bom:pom:2.0.0 ✔",
"org.acme.quarkus.platform:acme-bom:pom:2.0.0 ✔");
assertPlatformBomExtensions(infoResult.stdout, ArtifactCoords.pom("org.acme.quarkus.platform", "quarkus-bom", "2.0.0"),
ArtifactCoords.jar("io.quarkus", "quarkus-arc", null));
"io.quarkus:quarkus-arc ✔");
assertPlatformBomExtensions(infoResult.stdout, ArtifactCoords.pom("org.acme.quarkus.platform", "acme-bom", "2.0.0"),
ArtifactCoords.jar("org.acme.quarkus.platform", "acme-quarkus-supersonic", null),
ArtifactCoords.jar("org.acme.quarkus.platform", "acme-quarkus-subatomic", "1.0.0 | misaligned"));
"org.acme.quarkus.platform:acme-quarkus-supersonic ✔",
"org.acme.quarkus.platform:acme-quarkus-subatomic:1.0.0 ⚠");
assertRegistryExtensions(infoResult.stdout, "registry.acme.org",
ArtifactCoords.jar("org.acme", "acme-quarkiverse-extension", "1.0"));
"org.acme:acme-quarkiverse-extension:1.0");

final CliDriver.Result rectifyResult = run(projectDir, "update", "--platform-version=1.0.0");
assertThat(rectifyResult.stdout)
Expand All @@ -108,7 +109,7 @@ void testMissalignedPlatformExtensionVersion() throws Exception {
ArtifactCoords.pom("org.acme.quarkus.platform", "acme-bom", "1.0.0 -> 2.0.0"));
}

private static void assertPlatformBomExtensions(String output, ArtifactCoords bom, ArtifactCoords... extensions) {
private static void assertPlatformBomExtensions(String output, ArtifactCoords bom, String... extensions) {
final StringWriter buf = new StringWriter();
try (BufferedWriter writer = new BufferedWriter(buf)) {
writer.write("[INFO] Extensions from ");
Expand All @@ -117,15 +118,9 @@ private static void assertPlatformBomExtensions(String output, ArtifactCoords bo
writer.write(bom.getArtifactId());
writer.write(":");
writer.newLine();
for (ArtifactCoords c : extensions) {
writer.write("[INFO] ");
writer.write(c.getGroupId());
writer.write(":");
writer.write(c.getArtifactId());
if (c.getVersion() != null) {
writer.write(":");
writer.write(c.getVersion());
}
for (String c : extensions) {
writer.write("[INFO] ");
writer.write(c);
writer.newLine();
}
writer.write("[INFO] ");
Expand All @@ -136,20 +131,16 @@ private static void assertPlatformBomExtensions(String output, ArtifactCoords bo
assertThat(output).contains(buf.getBuffer().toString());
}

private static void assertRegistryExtensions(String output, String id, ArtifactCoords... extensions) {
private static void assertRegistryExtensions(String output, String id, String... extensions) {
final StringWriter buf = new StringWriter();
try (BufferedWriter writer = new BufferedWriter(buf)) {
writer.write("[INFO] Extensions from ");
writer.write(id);
writer.write(":");
writer.newLine();
for (ArtifactCoords c : extensions) {
writer.write("[INFO] ");
writer.write(c.getGroupId());
writer.write(":");
writer.write(c.getArtifactId());
writer.write(":");
writer.write(c.getVersion());
for (String c : extensions) {
writer.write("[INFO] ");
writer.write(c);
writer.newLine();
}
writer.write("[INFO] ");
Expand All @@ -160,14 +151,14 @@ private static void assertRegistryExtensions(String output, String id, ArtifactC
assertThat(output).contains(buf.getBuffer().toString());
}

private static void assertQuarkusPlatformBoms(String output, ArtifactCoords... coords) {
private static void assertQuarkusPlatformBoms(String output, String... coords) {
final StringWriter buf = new StringWriter();
try (BufferedWriter writer = new BufferedWriter(buf)) {
writer.write("[INFO] Quarkus platform BOMs:");
writer.newLine();
for (ArtifactCoords c : coords) {
writer.write("[INFO] ");
writer.write(c.toCompactCoords());
for (String c : coords) {
writer.write("[INFO] ");
writer.write(c);
writer.newLine();
}
writer.write("[INFO] ");
Expand Down
39 changes: 18 additions & 21 deletions ...common/src/main/java/io/quarkus/devtools/commands/handlers/ProjectInfoCommandHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ protected static boolean logState(ProjectState projectState, boolean perModule,
final StringBuilder sb = new StringBuilder();
if (platform.recommended == null) {
if (rectify) {
sb.append(String.format(UpdateProjectCommandHandler.PLATFORM_RECTIFY_FORMAT,
sb.append(String.format(UpdateProjectCommandHandler.ITEM_FORMAT,
UpdateProjectCommandHandler.REMOVE, platform.imported.toCompactCoords()));
recommendationsAvailable = true;
} else {
Expand All @@ -92,30 +92,26 @@ protected static boolean logState(ProjectState projectState, boolean perModule,
}
}
} else if (platform.isVersionUpdateRecommended()) {
sb.append(String.format(UpdateProjectCommandHandler.ITEM_FORMAT,
rectify ? UpdateProjectCommandHandler.UPDATE : "", platform.imported.toCompactCoords()));
if (rectify) {
sb.append(String.format(UpdateProjectCommandHandler.PLATFORM_RECTIFY_FORMAT,
UpdateProjectCommandHandler.UPDATE, platform.imported.toCompactCoords()));
sb.append(platform.imported.toCompactCoords()).append(" -> ")
.append(platform.getRecommendedVersion());
} else {
sb.append(" ");
sb.append(platform.imported.toCompactCoords()).append(" | misaligned");
sb.append(" ⚠");
}
recommendationsAvailable = true;
} else {
if (rectify) {
sb.append(String.format(UpdateProjectCommandHandler.PLATFORM_RECTIFY_FORMAT, "",
platform.imported.toCompactCoords()));
} else {
sb.append(" ").append(platform.imported.toCompactCoords());
}
sb.append(String.format(UpdateProjectCommandHandler.ITEM_FORMAT, "",
platform.imported.toCompactCoords()))
.append(" ✔");
}
log.info(sb.toString());
}
if (rectify && recommendExtraImports) {
for (PlatformInfo platform : providerInfo.values()) {
if (platform.imported == null) {
log.info(String.format(UpdateProjectCommandHandler.PLATFORM_RECTIFY_FORMAT,
log.info(String.format(UpdateProjectCommandHandler.ITEM_FORMAT,
UpdateProjectCommandHandler.ADD,
platform.recommended.toCompactCoords()));
}
Expand Down Expand Up @@ -177,10 +173,10 @@ private static boolean logExtensionInfo(TopExtensionDependency dep, boolean rect
if (dep.isPlatformExtension()) {
if (rectify) {
if (dep.isNonRecommendedVersion()) {
sb.append(String.format(UpdateProjectCommandHandler.PLATFORM_RECTIFY_FORMAT,
sb.append(String.format(UpdateProjectCommandHandler.ITEM_FORMAT,
UpdateProjectCommandHandler.UPDATE, ""));
} else {
sb.append(String.format(UpdateProjectCommandHandler.PLATFORM_RECTIFY_FORMAT, "", ""));
sb.append(String.format(UpdateProjectCommandHandler.ITEM_FORMAT, "", ""));
}
sb.append(dep.getArtifact().getGroupId()).append(':')
.append(dep.getArtifact().getArtifactId());
Expand All @@ -193,25 +189,26 @@ private static boolean logExtensionInfo(TopExtensionDependency dep, boolean rect
sb.append(" -> remove version (managed)");
}
recommendationsAvailable = true;
} else {
sb.append(" ✔");
}
} else {
sb.append(" ").append(dep.getArtifact().getGroupId()).append(':')
sb.append(String.format(UpdateProjectCommandHandler.ITEM_FORMAT, "", "")).append(dep.getArtifact().getGroupId())
.append(':')
.append(dep.getArtifact().getArtifactId());
if (!dep.getArtifact().getClassifier().isEmpty()) {
sb.append(':').append(dep.getArtifact().getClassifier());
}
if (dep.isNonRecommendedVersion()) {
sb.append(':').append(dep.getArtifact().getVersion());
sb.append(" | misaligned");
sb.append(" ⚠");
recommendationsAvailable = true;
} else {
sb.append(" ✔");
}
}
} else {
if (rectify) {
sb.append(String.format(UpdateProjectCommandHandler.PLATFORM_RECTIFY_FORMAT, "", ""));
} else {
sb.append(" ");
}
sb.append(String.format(UpdateProjectCommandHandler.ITEM_FORMAT, "", ""));
sb.append(dep.getArtifact().toCompactCoords());
}
if (dep.isTransitive()) {
Expand Down
Loading

0 comments on commit 4975c55

Please sign in to comment.