Merge pull request #50598 from dmlloyd/rere-cli

Author: dmlloyd

devtools/cli-common/src/main/java/io/quarkus/cli/common/build/ExecuteUtil.java

@@ -3,14 +3,10 @@
 import static picocli.CommandLine.ExitCode.OK;
 import static picocli.CommandLine.ExitCode.SOFTWARE;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.file.Path;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
+import java.util.List;
 
 import io.quarkus.cli.common.OutputOptionMixin;
 import io.quarkus.devtools.exec.ExecSupport;
@@ -41,39 +37,31 @@ public static int executeProcess(OutputOptionMixin output, String[] args, File p
             output.out().println();
         }
 
-        int exit = SOFTWARE;
+        var holder = new Object() {
+            int exitCode;
+        };
+        io.smallrye.common.process.ProcessBuilder.Input<Void> pb = io.smallrye.common.process.ProcessBuilder.newBuilder(args[0])
+                .arguments(List.of(args).subList(1, args.length))
+                .directory(parentDir.toPath())
+                .exitCodeChecker(ec -> {
+                    holder.exitCode = ec;
+                    return true;
+                })
+                .softExitTimeout(null)
+                .hardExitTimeout(null)
+                .input().inherited();
         if (output.isCliTest()) {
             // We have to capture IO differently in tests..
-            Process process = new ProcessBuilder()
-                    .command(args)
-                    .redirectInput(ProcessBuilder.Redirect.INHERIT)
-                    .directory(parentDir)
-                    .start();
-
-            // Drain the output/errors streams
-            ExecutorService service = Executors.newFixedThreadPool(2);
-            service.submit(() -> {
-                new BufferedReader(new InputStreamReader(process.getInputStream())).lines()
-                        .forEach(output.out()::println);
-            });
-            service.submit(() -> {
-                new BufferedReader(new InputStreamReader(process.getErrorStream())).lines()
-                        .forEach(output.err()::println);
-            });
-            process.waitFor(5, TimeUnit.MINUTES);
-            service.shutdown();
-
-            exit = process.exitValue();
+            pb.output().consumeWith(br -> br.lines().forEach(output.out()::println))
+                    .error().consumeWith(br -> br.lines().forEach(output.err()::println))
+                    .run();
         } else {
-            Process process = new ProcessBuilder()
-                    .command(args)
-                    .inheritIO()
-                    .directory(parentDir)
-                    .start();
-            exit = process.waitFor();
+            pb.output().inherited()
+                    .error().inherited()
+                    .run();
         }
 
-        if (exit != 0) {
+        if (holder.exitCode != 0) {
             return SOFTWARE;
         } else {
             return OK;

devtools/cli/pom.xml

@@ -66,6 +66,10 @@
             <groupId>org.jboss.logmanager</groupId>
             <artifactId>log4j-jboss-logmanager</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.smallrye.common</groupId>
+            <artifactId>smallrye-common-process</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-devtools-testing</artifactId>

devtools/cli/src/test/java/io/quarkus/cli/CliDriver.java

@@ -8,7 +8,9 @@
 import java.io.PrintStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -33,7 +35,7 @@ public class CliDriver {
     public static class CliDriverBuilder {
 
         private Path startingDir;
-        private List<String> args = new ArrayList<>();
+        private final List<String> args = new ArrayList<>();
         private String mavenLocalRepo;
         private String mavenSettings;
 
@@ -46,9 +48,7 @@ public CliDriverBuilder setStartingDir(Path startingDir) {
         }
 
         public CliDriverBuilder addArgs(String... args) {
-            for (String s : args) {
-                this.args.add(s);
-            }
+            Collections.addAll(this.args, args);
             return this;
         }
 
@@ -151,34 +151,25 @@ public static void preserveLocalRepoSettings(Collection<String> args) {
         getMavenSettingsProperty().map(SETTINGS_ARG_FORMATTER).ifPresent(args::add);
     }
 
-    public static Result executeArbitraryCommand(Path startingDir, String... args) throws Exception {
+    public static Result executeArbitraryCommand(Path startingDir, String... args) {
         System.out.println("$ " + String.join(" ", args));
 
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        PrintStream outPs = new PrintStream(out);
-        System.setOut(outPs);
+        Result result = new Result();
 
-        ByteArrayOutputStream err = new ByteArrayOutputStream();
-        PrintStream errPs = new PrintStream(err);
-        System.setErr(errPs);
+        io.smallrye.common.process.ProcessBuilder.newBuilder(Path.of(args[0]))
+                .arguments(Arrays.copyOfRange(args, 1, args.length))
+                .exitCodeChecker(ec -> {
+                    result.exitCode = ec;
+                    return true;
+                })
+                .directory(startingDir)
+                // since there is no I/O, we need an explicit timeout
+                .softExitTimeout(Duration.ofMinutes(5))
+                .hardExitTimeout(Duration.ofMinutes(5))
+                .output().inherited()
+                .error().logOnSuccess(false).gatherOnFail(false).inherited()
+                .run();
 
-        Result result = new Result();
-        try {
-            ProcessBuilder pb = new ProcessBuilder(args);
-            pb.directory(startingDir.toFile());
-            pb.redirectError(ProcessBuilder.Redirect.INHERIT);
-            pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
-
-            Process p = pb.start();
-            p.waitFor();
-            outPs.flush();
-            errPs.flush();
-        } finally {
-            System.setOut(stdout);
-            System.setErr(stderr);
-        }
-        result.stdout = out.toString();
-        result.stderr = err.toString();
         return result;
     }