chore: Refactor CLI.cs to use ConcurrentQueue for message handling

devantler · Aug 11, 2024 · 91c714f · 91c714f
1 parent f858dc6
commit 91c714f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/Devantler.CLIRunner.Tests/CLITests/RunAsyncTests.cs b/Devantler.CLIRunner.Tests/CLITests/RunAsyncTests.cs
@@ -12,8 +12,8 @@ public class RunAsyncTests
   /// </summary>
   /// <returns></returns>
   [Fact]
-    public async Task RunAsync_GivenValidCommand_ReturnsZeroExitCodeAndStdout()
-    {
+  public async Task RunAsync_GivenValidCommand_ReturnsZeroExitCodeAndStdout()
+  {
     // Arrange
     Environment.SetEnvironmentVariable("DEBUG", "true");
     var command = new Command("echo")
@@ -38,8 +38,8 @@ public async Task RunAsync_GivenValidCommand_ReturnsZeroExitCodeAndStdout()
   /// </summary>
   /// <returns></returns>
   [Fact]
-    public async Task RunAsync_GivenInvalidCommand_ReturnsOneExitCodeAndNoOutput()
-    {
+  public async Task RunAsync_GivenInvalidCommand_ReturnsOneExitCodeAndNoOutput()
+  {
     // Arrange
     var command = new Command("ech")
       .WithArguments("Hello, World!");
@@ -60,8 +60,8 @@ public async Task RunAsync_GivenInvalidCommand_ReturnsOneExitCodeAndNoOutput()
   /// </summary>
   /// <returns></returns>
   [Fact]
-    public async Task RunAsync_GivenInvalidArgument_ReturnsOneExitCodeAndStderr()
-    {
+  public async Task RunAsync_GivenInvalidArgument_ReturnsOneExitCodeAndStderr()
+  {
     // Arrange
     var command = new Command("cat")
       .WithArguments("--invalid")
@@ -81,8 +81,8 @@ public async Task RunAsync_GivenInvalidArgument_ReturnsOneExitCodeAndStderr()
   /// Tests that the <see cref="CLI.RunAsync"/> method throws an <see cref="ArgumentNullException"/> when the command is null
   /// </summary>
   [Fact]
-    public async Task RunAsync_GivenNullCommand_ReturnsArgumentNullException()
-    {
+  public async Task RunAsync_GivenNullCommand_ReturnsArgumentNullException()
+  {
     // Arrange
     Command command = null!;
     var cancellationToken = CancellationToken.None;

diff --git a/Devantler.CLIRunner/CLI.cs b/Devantler.CLIRunner/CLI.cs
@@ -1,3 +1,4 @@
+using System.Collections.Concurrent;
 using System.Text;
 using CliWrap;
 using CliWrap.EventStream;
@@ -22,7 +23,7 @@ public static class CLI
   {
     ArgumentNullException.ThrowIfNull(command);
     bool isFaulty = false;
-    StringBuilder result = new();
+    ConcurrentQueue<string> messageQueue = new();
     try
     {
       await foreach (var cmdEvent in command.WithValidation(validation).ListenAsync(cancellationToken: cancellationToken))
@@ -38,14 +39,14 @@ public static class CLI
             {
               Console.WriteLine(stdOut.Text);
             }
-            _ = result.AppendLine(stdOut.Text);
+            messageQueue.Enqueue(stdOut.Text);
             break;
           case StandardErrorCommandEvent stdErr:
             if (!silent)
             {
               Console.WriteLine(stdErr.Text);
             }
-            _ = result.AppendLine(stdErr.Text);
+            messageQueue.Enqueue(stdErr.Text);
             break;
           case ExitedCommandEvent exited:
             if (System.Diagnostics.Debugger.IsAttached || Environment.GetEnvironmentVariable("DEBUG") is not null)
@@ -62,6 +63,11 @@ public static class CLI
     {
       isFaulty = true;
     }
+    StringBuilder result = new();
+    while (messageQueue.TryDequeue(out string? message))
+    {
+      _ = result.AppendLine(message);
+    }
     return isFaulty ? (1, result.ToString()) : (0, result.ToString());
   }
 }