Merge pull request #39 from fizzed/feature/powershell

Feature/powershell

Author: jjlauer

blaze-core/src/main/java/com/fizzed/blaze/Config.java

@@ -37,7 +37,7 @@ public interface Config {
     static Boolean DEFAULT_DEPENDENCY_CLEAN = Boolean.FALSE;
 
     static List<String> DEFAULT_COMMAND_EXTS_UNIX = Arrays.asList("", ".sh");
-    static List<String> DEFAULT_COMMAND_EXTS_WINDOWS = Arrays.asList(".exe", ".bat", ".cmd");
+    static List<String> DEFAULT_COMMAND_EXTS_WINDOWS = Arrays.asList(".exe", ".ps1", ".bat", ".cmd");
 
     /**
      * Gets a configuration value by its key.

blaze-core/src/main/java/com/fizzed/blaze/local/LocalExec.java

@@ -120,7 +120,17 @@ protected Exec.Result doRun() throws BlazeException {
             finalCommand.add("sh");
             finalCommand.add("-c");
         }
-        
+
+        // is this a powershell command?
+        if (exeFile.getFileName().toString().toLowerCase().endsWith(".ps1")) {
+            // we need to actually execute powershell.exe
+            final Path powershellExe = new Which(context)
+                .command("powershell")
+                .run();
+
+            finalCommand.add(powershellExe.toAbsolutePath().toString());
+        }
+
         finalCommand.add(exeFile.toAbsolutePath().toString());
 
         finalCommand.addAll(this.arguments);

blaze-core/src/test/java/com/fizzed/blaze/system/ExecTest.java

@@ -123,6 +123,22 @@ public void captureOutput() throws Exception {
 
         assertThat(output.trim(), is("Hello World 7586930100"));
     }
+
+    @Test
+    public void captureOutputWithPs1() throws Exception {
+        CaptureOutput capture = Streamables.captureOutput();
+
+        new LocalExec(context)
+            .command("hello-world-test2")       // will be .ps1 on windows, using powershell.exe
+            .path(getBinDirAsResource())
+            .pipeInput(Streamables.standardInput())
+            .pipeOutput(capture)
+            .run();
+
+        String output = capture.asString();
+
+        assertThat(output.trim(), is("Hello World 5624112309877"));
+    }
 
     @Test
     public void customInput() throws Exception {

blaze-core/src/test/java/com/fizzed/blaze/system/ShellTestHelper.java

@@ -28,6 +28,8 @@ static public File getBinDirAsResource() throws Exception {
         // fix permissions from maven copy (otherwise test fails)
         FileHelper.resourceAsFile("/bin/hello-world-test").setExecutable(true);
         FileHelper.resourceAsFile("/bin/hello-world-test.bat").setExecutable(true);
+        FileHelper.resourceAsFile("/bin/hello-world-test2").setExecutable(true);
+        FileHelper.resourceAsFile("/bin/hello-world-test2.ps1").setExecutable(true);
 
         // must use a resource that exists to then get its parent
         return FileHelper.resourceAsFile("/bin/hello-world-test").getParentFile();

blaze-core/src/test/java/com/fizzed/blaze/system/WhichTest.java

@@ -76,6 +76,22 @@ public void worksOnWindows() throws Exception {
         assertThat(Files.isRegularFile(f), is(true));
         assertThat(Files.isExecutable(f), is(true));
     }
+
+    @Test
+    public void worksOnWindowsForPs1() throws Exception {
+        assumeTrue("Test only valid on windows", ConfigHelper.OperatingSystem.windows());
+
+        Path f = new Which(context)
+            .command("hello-world-test2")
+            .path(getBinDirAsResource())
+            .run();
+
+        log.debug("which: {}", f);
+
+        assertThat(f, is(not(nullValue())));
+        // .ps1 should be preferred to .bat
+        assertThat(f.getFileName().toString(), either(is("hello-world-test2")).or(is("hello-world-test2.ps1")));
+    }
 
     @Test
     public void worksOnUnix() throws Exception {

blaze-core/src/test/resources/bin/hello-world-test2

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+echo "Hello World 5624112309877"

blaze-core/src/test/resources/bin/hello-world-test2.ps1

@@ -0,0 +1 @@
+Write-Output "Hello World 5624112309877"

buildx-results.txt

@@ -1,14 +1,9 @@
 Buildx Results
 --------------
 Cross platform tests use the Buildx project: https://github.com/fizzed/buildx
-Commit: e1d7ca02771846e2fae81441202099a6b7f596b4
-Date: 2025-01-10T21:08:43.065163Z[UTC]
+Commit: 725390b97265018dce4d42f336f1a637fba91cec
+Date: 2025-01-21T20:54:53.271163Z[UTC]
 
-linux-x64                                                         success
-linux-arm64                                                       success
-linux_musl-x64                                                    success
-macos-x64                                                         success
-macos-arm64                                                       success
 windows-x64                                                       success
 windows-arm64                                                     success