Use silent runner factory

sormuras · May 24, 2024 · 7cef26a · 7cef26a
1 parent b245b86
commit 7cef26a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/.bach/src/run.bach/run/bach b/.bach/src/run.bach/run/bach
diff --git a/.bach/src/run.bach/run/demo/Ant.java b/.bach/src/run.bach/run/demo/Ant.java
@@ -12,7 +12,7 @@
 import java.util.spi.ToolProvider;
 import run.bach.ToolInstaller;
 import run.bach.ToolProgram;
-import run.bach.ToolSpace;
+import run.bach.ToolRunner;
 
 /**
  * Apache Ant installer.
@@ -48,8 +48,7 @@ public ToolProvider install(Path into) throws Exception {
               .withProcessBuilderTweaker(builder -> builder.directory(into.toFile()))
               .withProcessWaiter(process -> process.waitFor(1, TimeUnit.MINUTES) ? 0 : 1)
               .tool();
-      var silent = new ToolSpace(ToolSpace.Flag.SILENT);
-      silent.run(jar, "--extract", "--file", archive);
+      ToolRunner.ofSilence().run(jar, "--extract", "--file", archive);
     }
     return ToolProgram.java(
         "--class-path",

diff --git a/.bach/src/run.bach/run/demo/JResolveDemo.java b/.bach/src/run.bach/run/demo/JResolveDemo.java
@@ -6,11 +6,11 @@
 import java.util.stream.Stream;
 import run.bach.Tool;
 import run.bach.ToolFinder;
-import run.bach.ToolSpace;
+import run.bach.ToolRunner;
 
 public class JResolveDemo {
   public static void main(String... args) {
-    var runner = new ToolSpace(ToolSpace.Flag.SILENT);
+    var runner = ToolRunner.ofSilence();
     var jresolve =
         Tool.of(
             "https://github.com/bowbahdoe/jresolve-cli/releases/download/v2024.05.10/jresolve.jar#SIZE=754432");

diff --git a/src/test.bach/test/java/test/bach/Tests.java b/src/test.bach/test/java/test/bach/Tests.java
@@ -2,7 +2,7 @@
 
 import java.io.PrintWriter;
 import java.util.spi.ToolProvider;
-import run.bach.ToolSpace;
+import run.bach.ToolRunner;
 
 public record Tests(String name) implements ToolProvider {
   public static void main(String... args) {
@@ -15,14 +15,11 @@ public Tests() {
 
   @Override
   public int run(PrintWriter out, PrintWriter err, String... args) {
-    var silent = new ToolSpace(ToolSpace.Flag.SILENT);
-    var run = silent.run("jar", "--version");
+    var actual = ToolRunner.ofSilence().run("jar", "--version").out();
     var expected = "jar " + System.getProperty("java.version");
-    if (!run.out().equals(expected)) {
-      err.println("expected: " + expected);
-      err.println("actual  : " + run.out());
-      return 1;
-    }
-    return 0;
+    if (actual.equals(expected)) return 0;
+    err.println("expected: " + expected);
+    err.println("actual  : " + actual);
+    return 1;
   }
 }