Version 1.0.5

Bumped JUnit version to 5.11.3
Bumped PMD extension version to 1.1.7
Bumped JDK to version 23 (GitHub CI Workflow)

.github/workflows/bld.yml

@@ -4,11 +4,13 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build-bld-project:
-    runs-on: ubuntu-latest
-
     strategy:
       matrix:
-        java-version: [17, 21, 22]
+        java-version: [ 17, 21, 24 ]
+        kotlin-version: [ 1.9.25, 2.0.21, 2.1.20 ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout source repository
@@ -22,11 +24,8 @@ jobs:
           distribution: "zulu"
           java-version: ${{ matrix.java-version }}
 
-      - name: Grant execute permission for bld
+      - name: Download dependencies
-        run: chmod +x bld
-
-      - name: Download the dependencies
         run: ./bld download
 
-      - name: Run tests with bld
+      - name: Run tests
         run: ./bld compile test

.github/workflows/pages.yml

@@ -47,11 +47,11 @@ jobs:
         uses: actions/configure-pages@v3
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           # Upload generated Javadocs repository
           path: "build/javadoc/"
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4

.idea/bld.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="BldConfiguration">
+    <events />
+  </component>
+</project>

.idea/copyright/Apache_License.xml

@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
   <copyright>
-    <option name="notice" value="Copyright 2023-Copyright &amp;#36;today.yearamp;#36;today.year the original author or authors.&#10; &#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;    https://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+    <option name="notice" value="Copyright 2023-&amp;#36;today.year the original author or authors.&#10; &#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;    https://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
     <option name="myName" value="Apache License" />
   </copyright>
 </component>

.idea/icon.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 179 108" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(1,0,0,1,-210.511,-96.3382)">
+        <g transform="matrix(1,0,0,1,-23.3386,-649.816)">
+            <g transform="matrix(0.221288,0,0,0.24,73.9536,390.254)">
+                <path d="M722.568,1482.92L722.568,1921.1L808.968,1921.1L808.968,1888.7C822.168,1907.9 846.168,1930.1 893.568,1930.1C933.168,1930.1 961.968,1917.5 985.368,1893.5C1012.97,1865.9 1027.37,1827.5 1027.37,1786.1C1027.37,1741.7 1011.17,1705.1 985.368,1680.5C961.968,1658.3 928.968,1644.5 892.368,1644.5C862.968,1644.5 830.568,1654.1 808.968,1683.5L808.968,1482.92L722.568,1482.92ZM871.368,1718.9C888.768,1718.9 903.768,1723.7 917.568,1736.9C930.168,1748.9 938.568,1766.3 938.568,1787.9C938.568,1807.7 930.168,1825.1 917.568,1837.1C904.368,1849.7 887.568,1855.7 872.568,1855.7C856.368,1855.7 837.168,1849.1 823.368,1835.9C813.168,1826.3 803.568,1810.1 803.568,1787.9C803.568,1765.1 812.568,1749.5 822.768,1738.7C836.568,1724.3 852.768,1718.9 871.368,1718.9Z" style="fill:rgb(35,146,255);fill-rule:nonzero;"/>
+                <rect x="1083.77" y="1482.92" width="86.4" height="438.182" style="fill:rgb(250,144,82);fill-rule:nonzero;"/>
+                <path d="M1531.37,1482.92L1444.97,1482.92L1444.97,1683.5C1423.37,1654.1 1390.97,1644.5 1361.57,1644.5C1324.97,1644.5 1291.97,1658.3 1268.57,1680.5C1242.77,1705.1 1226.57,1741.7 1226.57,1786.1C1226.57,1827.5 1240.97,1865.9 1268.57,1893.5C1291.97,1917.5 1320.77,1930.1 1360.37,1930.1C1407.77,1930.1 1431.77,1907.9 1444.97,1888.7L1444.97,1921.1L1531.37,1921.1L1531.37,1482.92ZM1382.57,1718.9C1401.17,1718.9 1417.37,1724.3 1431.17,1738.7C1441.37,1749.5 1450.37,1765.1 1450.37,1787.9C1450.37,1810.1 1440.77,1826.3 1430.57,1835.9C1416.77,1849.1 1397.57,1855.7 1381.37,1855.7C1366.37,1855.7 1349.57,1849.7 1336.37,1837.1C1323.77,1825.1 1315.37,1807.7 1315.37,1787.9C1315.37,1766.3 1323.77,1748.9 1336.37,1736.9C1350.17,1723.7 1365.17,1718.9 1382.57,1718.9Z" style="fill:rgb(35,146,255);fill-rule:nonzero;"/>
+            </g>
+        </g>
+    </g>
+</svg>

.idea/libraries/bld.xml

@@ -2,12 +2,12 @@
   <library name="bld">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.0.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.0-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1-sources.jar!/" />
     </SOURCES>
     <excluded>
       <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

.idea/libraries/compile.xml

@@ -7,7 +7,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/compile" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
   </library>
 </component>

.idea/libraries/runtime.xml

@@ -8,7 +8,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/runtime" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
   </library>
 </component>

.idea/libraries/test.xml

@@ -8,7 +8,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/test" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
   </library>
 </component>

.vscode/settings.json

@@ -9,7 +9,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.bld/dist/bld-1.9.0.jar",
+        "${HOME}/.bld/dist/bld-2.2.1.jar",
         "lib/**/*.jar"
     ]
 }

README.md

@@ -2,12 +2,20 @@
 
 [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
-[![bld](https://img.shields.io/badge/1.9.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
+[![bld](https://img.shields.io/badge/2.2.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
 [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-exec/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-exec)
 [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-exec/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-exec)
 [![GitHub CI](https://github.com/rife2/bld-exec/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-exec/actions/workflows/bld.yml)
 
-To install, please refer to the [extensions documentation](https://github.com/rife2/bld/wiki/Extensions).
+To install the latest version, add the following to the `lib/bld/bld-wrapper.properties` file:
+
+```properties
+bld.extension-exec=com.uwyn.rife2:bld-exec
+```
+
+For more information, please refer to the [extensions](https://github.com/rife2/bld/wiki/Extensions) documentation.
+
+## Execute a Command
 
 To execute a command at the command line, add the following to your build file:
 
@@ -21,15 +29,15 @@ public void startServer() throws Exception {
 }
 ```
 
-## Exit Status
+## Exit Value
 
-Use the `failOnExit` function to specify whether a command non-zero exit status constitutes a failure.
+Use the `failOnExit` function to specify whether a command non-zero exit value (status) constitutes a failure.
 
 ```java
 @BuildCommand
 public void startServer() throws Exception {
     final List<String> cmds;
-    if (System.getProperty("os.name").toLowerCase().contains("windows")) {
+    if (System.getProperty("os.name").toLowerCase().contains("win")) {
         cmds = List.of("cmd", "/c", "stop.bat");
     } else {
         cmds = List.of("./stop.sh");

config/pmd.xml

@@ -7,9 +7,9 @@
     <!-- BEST PRACTICES -->
     <rule ref="category/java/bestpractices.xml">
         <exclude name="AvoidPrintStackTrace"/>
-        <exclude name="JUnit4TestShouldUseTestAnnotation"/>
-        <exclude name="JUnitTestContainsTooManyAsserts"/>
         <exclude name="GuardLogStatement"/>
+        <exclude name="UnitTestContainsTooManyAsserts"/>
+        <exclude name="UnitTestShouldUseTestAnnotation"/>
     </rule>
 
     <rule ref="category/java/bestpractices.xml/MissingOverride">

lib/bld/bld-wrapper.properties

@@ -1,8 +1,7 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
-bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.8
-bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.5
-bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
+bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.2
+bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.sourceDirectories=
-bld.version=1.9.0
+bld.version=2.2.1

src/bld/java/rife/bld/extension/ExecOperationBuild.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,9 @@ import rife.bld.publish.PublishDeveloper;
 import rife.bld.publish.PublishLicense;
 import rife.bld.publish.PublishScm;
 
-import java.io.IOException;
 import java.util.List;
 
-import static rife.bld.dependencies.Repository.MAVEN_CENTRAL;
+import static rife.bld.dependencies.Repository.*;
-import static rife.bld.dependencies.Repository.RIFE2_RELEASES;
 import static rife.bld.dependencies.Scope.compile;
 import static rife.bld.dependencies.Scope.test;
 import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING;
@@ -35,20 +33,21 @@ public class ExecOperationBuild extends Project {
     public ExecOperationBuild() {
         pkg = "rife.bld.extension";
         name = "ExecOperation";
-        version = version(1, 0, 0);
+        version = version(1, 0, 5);
 
         javaRelease = 17;
 
         downloadSources = true;
         autoDownloadPurge = true;
 
-        repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
+        repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
+        
         scope(compile)
-                .include(dependency("com.uwyn.rife2", "bld", version(1, 9, 0)));
+                .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1)));
         scope(test)
-                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2)))
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1)))
-                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2)))
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1)))
-                .include(dependency("org.assertj", "assertj-core", version(3, 25, 3)));
+                .include(dependency("org.assertj", "assertj-core", version(3, 27, 3)));
 
         javadocOperation()
                 .javadocOptions()
@@ -59,25 +58,23 @@ public class ExecOperationBuild extends Project {
 
         publishOperation()
                 .repository(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2"))
+                .repository(repository("github"))
                 .info()
                 .groupId("com.uwyn.rife2")
                 .artifactId("bld-exec")
                 .description("Command Line Execution Extension for bld")
                 .url("https://github.com/rife2/bld-exec")
-                .developer(
+                .developer(new PublishDeveloper()
-                        new PublishDeveloper()
                         .id("ethauvin")
                         .name("Erik C. Thauvin")
                         .email("erik@thauvin.net")
                         .url("https://erik.thauvin.net/")
                 )
-                .license(
+                .license(new PublishLicense()
-                        new PublishLicense()
                         .name("The Apache License, Version 2.0")
                         .url("https://www.apache.org/licenses/LICENSE-2.0.txt")
                 )
-                .scm(
+                .scm(new PublishScm()
-                        new PublishScm()
                         .connection("scm:git:https://github.com/rife2/bld-exec.git")
                         .developerConnection("scm:git:git@github.com:rife2/bld-exec.git")
                         .url("https://github.com/rife2/bld-exec")
@@ -90,15 +87,8 @@ public class ExecOperationBuild extends Project {
         new ExecOperationBuild().start(args);
     }
 
-    @BuildCommand(summary = "Generates JaCoCo Reports")
-    public void jacoco() throws IOException {
-        new JacocoReportOperation()
-                .fromProject(this)
-                .execute();
-    }
-
     @BuildCommand(summary = "Runs PMD analysis")
-    public void pmd() {
+    public void pmd() throws Exception {
         new PmdOperation()
                 .fromProject(this)
                 .failOnViolation(true)

src/main/java/rife/bld/extension/ExecOperation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,14 @@ package rife.bld.extension;
 
 import rife.bld.BaseProject;
 import rife.bld.operations.AbstractOperation;
+import rife.bld.operations.exceptions.ExitStatusException;
 
 import java.io.File;
-import java.io.IOException;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -36,11 +38,11 @@ import java.util.logging.Logger;
  */
 public class ExecOperation extends AbstractOperation<ExecOperation> {
     private static final Logger LOGGER = Logger.getLogger(ExecOperation.class.getName());
-    private final List<String> args_ = new ArrayList<>();
+    private final Collection<String> args_ = new ArrayList<>();
     private boolean failOnExit_ = true;
     private BaseProject project_;
-    private int timeout = 30;
+    private int timeout_ = 30;
-    private String workDir_;
+    private File workDir_;
 
     /**
      * Configures the command and arguments to be executed.
@@ -56,10 +58,19 @@ public class ExecOperation extends AbstractOperation<ExecOperation> {
      * @see #command(Collection)
      */
     public ExecOperation command(String... arg) {
-        args_.addAll(List.of(arg));
+        return command(List.of(arg));
-        return this;
     }
 
+    /**
+     * Returns the command and arguments to be executed.
+     *
+     * @return the command and arguments
+     */
+    public Collection<String> command() {
+        return args_;
+    }
+
+
     /**
      * Configures the command and arguments to be executed.
      *
@@ -78,42 +89,54 @@ public class ExecOperation extends AbstractOperation<ExecOperation> {
     @Override
     public void execute() throws Exception {
         if (project_ == null) {
+            if (LOGGER.isLoggable(Level.SEVERE) && !silent()) {
                 LOGGER.severe("A project must be specified.");
             }
-
+            throw new ExitStatusException(ExitStatusException.EXIT_FAILURE);
-        final File workDir;
-        if (workDir_ == null || workDir_.isBlank()) {
-            workDir = new File(project_.workDirectory().getAbsolutePath());
         } else {
-            workDir = new File(workDir_);
+            final File workDir = Objects.requireNonNullElseGet(workDir_,
+                    () -> new File(project_.workDirectory().getAbsolutePath()));
+
+            if (LOGGER.isLoggable(Level.INFO)) {
+                LOGGER.info("Working directory: " + workDir.getAbsolutePath());
             }
 
             if (workDir.isDirectory()) {
                 var pb = new ProcessBuilder();
                 pb.inheritIO();
-            pb.command(args_);
+                pb.command(args_.stream().toList());
                 pb.directory(workDir);
 
-            if (LOGGER.isLoggable(Level.INFO)) {
+                if (LOGGER.isLoggable(Level.INFO) && !silent()) {
                     LOGGER.info(String.join(" ", args_));
                 }
 
                 var proc = pb.start();
-            var err = proc.waitFor(timeout, TimeUnit.SECONDS);
+                var err = proc.waitFor(timeout_, TimeUnit.SECONDS);
 
                 if (!err) {
                     proc.destroy();
-                throw new IOException("The command timed out.");
+                    if (LOGGER.isLoggable(Level.SEVERE) && !silent()) {
+                        LOGGER.severe("The command timed out.");
+                    }
+                    throw new ExitStatusException(ExitStatusException.EXIT_FAILURE);
                 } else if (proc.exitValue() != 0 && failOnExit_) {
-                throw new IOException("The command exit status is: " + proc.exitValue());
+                    if (LOGGER.isLoggable(Level.SEVERE) && !silent()) {
+                        LOGGER.severe("The command exit value/status is: " + proc.exitValue());
+                    }
+                    ExitStatusException.throwOnFailure(proc.exitValue());
                 }
             } else {
-            throw new IOException("Invalid work directory: " + workDir);
+                if (LOGGER.isLoggable(Level.SEVERE) && !silent()) {
+                    LOGGER.severe("Invalid working directory: " + workDir);
+                }
+                throw new ExitStatusException(ExitStatusException.EXIT_FAILURE);
+            }
         }
     }
 
     /**
-     * Configures whether the operation should fail if the command exit status is not 0.
+     * Configures whether the operation should fail if the command exit value/status is not 0.
      * <p>
      * Default is {@code TRUE}
      *
@@ -136,6 +159,15 @@ public class ExecOperation extends AbstractOperation<ExecOperation> {
         return this;
     }
 
+    /**
+     * Returns whether the operation should fail if the command exit value/status is not 0.
+     *
+     * @return {@code true} or {@code false}
+     */
+    public boolean isFailOnExit() {
+        return failOnExit_;
+    }
+
     /**
      * Configure the command timeout.
      *
@@ -143,18 +175,57 @@ public class ExecOperation extends AbstractOperation<ExecOperation> {
      * @return this operation instance
      */
     public ExecOperation timeout(int timeout) {
-        this.timeout = timeout;
+        timeout_ = timeout;
         return this;
     }
 
     /**
-     * Configures the work directory.
+     * Returns the command timeout.
+     *
+     * @return the timeout
+     */
+    public int timeout() {
+        return timeout_;
+    }
+
+    /**
+     * Configures the working directory.
+     *
+     * @param dir the directory
+     * @return this operation instance
+     */
+    public ExecOperation workDir(File dir) {
+        workDir_ = dir;
+        return this;
+    }
+
+    /**
+     * Configures the working directory.
+     *
+     * @param dir the directory
+     * @return this operation instance
+     */
+    public ExecOperation workDir(Path dir) {
+        return workDir(dir.toFile());
+    }
+
+
+    /**
+     * Configures the working directory.
      *
      * @param dir the directory path
      * @return this operation instance
      */
     public ExecOperation workDir(String dir) {
-        workDir_ = dir;
+        return workDir(new File(dir));
-        return this;
+    }
+
+    /**
+     * Returns the working directory.
+     *
+     * @return the directory
+     */
+    public File workDir() {
+        return workDir_;
     }
 }

src/test/java/rife/bld/extension/ExecOperationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,30 +17,30 @@
 package rife.bld.extension;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import rife.bld.BaseProject;
 import rife.bld.Project;
+import rife.bld.WebProject;
+import rife.bld.operations.exceptions.ExitStatusException;
 
 import java.io.File;
 import java.util.List;
+import java.util.Locale;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 
-
+@SuppressWarnings("PMD.AvoidDuplicateLiterals")
 class ExecOperationTest {
     private static final String FOO = "foo";
+    private static final boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase(Locale.US).contains("win");
 
     @Test
-    void testCat() throws Exception {
+    void testCommand() {
-        var tmpFile = new File("hello.tmp");
+        var op = new ExecOperation().fromProject(new WebProject())
-        tmpFile.deleteOnExit();
+                .command(FOO, "bar");
-        new ExecOperation()
+        assertThat(op.command()).containsExactly(FOO, "bar");
-                .fromProject(new Project())
-                .timeout(10)
-                .command("touch", tmpFile.getName())
-                .execute();
-
-        assertThat(tmpFile).exists();
     }
 
     @Test
@@ -53,41 +53,102 @@ class ExecOperationTest {
     }
 
     @Test
-    void testExitStatus() {
+    void testExitValue() {
+        List<String> cat;
+        if (IS_WINDOWS) {
+            cat = List.of("cmd", "/c", "type", FOO);
+        } else {
+            cat = List.of("cat", FOO);
+        }
         assertThatCode(() ->
                 new ExecOperation()
                         .fromProject(new BaseProject())
-                        .command(List.of("cat", FOO))
+                        .command(cat)
-                        .execute()).message().contains("exit status");
+                        .execute()).isInstanceOf(ExitStatusException.class);
     }
 
     @Test
     void testFailOnExit() {
-        assertThatCode(() ->
+        List<String> cat;
-                new ExecOperation()
+        if (IS_WINDOWS) {
+            cat = List.of("cmd", "/c", "type", FOO);
+        } else {
+            cat = List.of("cat", FOO);
+        }
+        var op = new ExecOperation()
                 .fromProject(new BaseProject())
-                        .command(List.of("cat", FOO))
+                .command(cat)
-                        .failOnExit(false)
+                .failOnExit(false);
-                        .execute()).doesNotThrowAnyException();
+        assertThat(op.isFailOnExit()).isFalse();
+        assertThatCode(op::execute).doesNotThrowAnyException();
+
+        op.failOnExit(true);
+        assertThat(op.isFailOnExit()).isTrue();
     }
 
     @Test
     void testTimeout() {
-        assertThatCode(() ->
+        List<String> sleep;
-                new ExecOperation()
+        if (IS_WINDOWS) {
+            sleep = List.of("cmd", "/c", "timeout", "/t", "10");
+        } else {
+            sleep = List.of("sleep", "10");
+        }
+        var op = new ExecOperation()
                 .fromProject(new BaseProject())
                 .timeout(5)
-                        .command(List.of("sleep", "10"))
+                .command(sleep);
-                        .execute()).message().contains("timed out");
+        assertThat(op.timeout()).isEqualTo(5);
+        assertThatCode(op::execute).isInstanceOf(ExitStatusException.class);
+    }
+
+    @Test
+    @EnabledOnOs({OS.LINUX, OS.MAC})
+    void testTouch() throws Exception {
+        var tmpFile = new File("hello.tmp");
+        tmpFile.deleteOnExit();
+        new ExecOperation()
+                .fromProject(new Project())
+                .timeout(10)
+                .command("touch", tmpFile.getName())
+                .execute();
+
+        assertThat(tmpFile).exists();
     }
 
     @Test
     void testWorkDir() {
+        List<String> echo;
+        if (IS_WINDOWS) {
+            echo = List.of("cmd", "/c", "echo", FOO);
+        } else {
+            echo = List.of("echo", FOO);
+        }
+        var workDir = new File(System.getProperty("java.io.tmpdir"));
+        var op = new ExecOperation()
+                .fromProject(new BaseProject())
+                .command(echo)
+                .workDir(workDir);
+        assertThat(op.workDir()).as("as file").isEqualTo(workDir);
+        assertThatCode(op::execute).doesNotThrowAnyException();
+
+        var build = "build";
+        op = op.workDir(build);
+        assertThat(op.workDir()).as("as string").isEqualTo(new File(build));
+        assertThatCode(op::execute).doesNotThrowAnyException();
+
+        op = op.workDir(workDir.toPath());
+        assertThat(op.workDir()).as("as path").isEqualTo(workDir);
+        assertThatCode(op::execute).doesNotThrowAnyException();
+    }
+
+    @Test
+    void testWorkDirInvalid() {
         assertThatCode(() ->
                 new ExecOperation()
                         .fromProject(new BaseProject())
                         .command("echo")
                         .workDir(FOO)
-                        .execute()).message().startsWith("Invalid work directory: ").endsWith(FOO);
+                        .execute()).isInstanceOf(ExitStatusException.class);
     }
 }