fix(binary): fix version checker for dolt and protoc

Author: roxblnfk

README.md

@@ -176,6 +176,7 @@ Add the following to your `composer.json`:
 ```
 
 This configuration:
+
 - Automatically downloads required binaries after `composer update`
 - Provides a custom command `composer get:binaries` to force download all binaries with detailed output
 

resources/software.json

@@ -50,7 +50,7 @@
             ],
             "binary": {
                 "name": "dolt",
-                "version-command": "--version"
+                "version-command": "version"
             }
         },
         {
@@ -137,4 +137,4 @@
             }
         }
     ]
-}
+}

src/Module/Binary/Internal/VersionResolver.php

@@ -14,7 +14,7 @@ final class VersionResolver
     /**
      * Pattern to extract semantic version (X.Y.Z) from text.
      */
-    private const VERSION_PATTERN = '/(?:version:?\s*)?(?:v(?:er(?:sion)?)?\.?\s*)?(\d+\.\d+\.\d+(?:[-+][\w\.]+)?)/i';
+    private const VERSION_PATTERN = '/(?:version:?\s*)?(?:v(?:er(?:sion)?)?\.?\s*)?(\d+\.\d+\.\d+(?:[-+][\w.]+)?)/i';
 
     /**
      * Resolves the version from binary command output.
@@ -41,13 +41,18 @@ public function resolveVersion(string $output): ?string
      */
     private function extractVersionWithFallbacks(string $output): ?string
     {
+        // Fallback pattern for partial semver (e.g., "2.0")
+        if (\preg_match('/version:?\s*(\d+\.\d+)/i', $output, $matches)) {
+            return $matches[1];
+        }
+
         // Fallback pattern for simple digits-only version (e.g., "2", "15")
         if (\preg_match('/version:?\s*(\d+)/i', $output, $matches)) {
             return $matches[1];
         }
 
-        // Fallback pattern for partial semver (e.g., "2.0")
-        if (\preg_match('/version:?\s*(\d+\.\d+)/i', $output, $matches)) {
+        // Fallback pattern for 'libprotoc 30.2'
+        if (\preg_match('/^[\w-]+\s+v?(\d+(?:\\.\d+){0,2})/i', $output, $matches)) {
             return $matches[1];
         }
 

tests/Unit/Module/Binary/Internal/VersionResolverTest.php

@@ -0,0 +1,167 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Module\Binary\Internal;
+
+use Internal\DLoad\Module\Binary\Internal\VersionResolver;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+#[CoversClass(VersionResolver::class)]
+final class VersionResolverTest extends TestCase
+{
+    private VersionResolver $versionResolver;
+
+    /**
+     * Provides test cases for semantic version extraction.
+     */
+    public static function provideSemanticVersionOutputs(): \Generator
+    {
+        // Basic semantic versions
+        yield 'simple semantic version' => [
+            'App v1.2.3',
+            '1.2.3',
+        ];
+
+        yield 'version with v prefix' => [
+            'Version: v2.5.1',
+            '2.5.1',
+        ];
+
+        yield 'version without v prefix' => [
+            'Version: 3.7.12',
+            '3.7.12',
+        ];
+
+        // Common version output formats
+        yield 'CLI help with version' => [
+            "MyApp CLI Tool\nVersion: 4.1.9\nUsage: myapp [options]",
+            '4.1.9',
+        ];
+
+        yield 'verbose version output' => [
+            "myapp version 2.0.10 (build 2023-04-15)\nCompiled with GCC 9.3.0",
+            '2.0.10',
+        ];
+
+        // Version with pre-release or build metadata
+        yield 'semver with pre-release' => [
+            'Version 1.0.0-alpha.1',
+            '1.0.0-alpha.1',
+        ];
+
+        yield 'semver with build metadata' => [
+            'App version 2.3.4+20230415',
+            '2.3.4+20230415',
+        ];
+
+        // Case insensitivity
+        yield 'mixed case version string' => [
+            'VERSION: 5.1.2',
+            '5.1.2',
+        ];
+
+        // Spacing variations
+        yield 'no space after version label' => [
+            'version:1.0.5',
+            '1.0.5',
+        ];
+
+        // RoadRunner
+        yield 'roadrunner' => [
+            'rr.exe version 2.12.3 (build time: 2023-02-16T13:08:35+0000, go1.20), OS: windows, arch: amd64',
+            '2.12.3',
+        ];
+
+        // Protoc
+        yield 'protoc' => [
+            'libprotoc 30.2',
+            '30.2',
+        ];
+
+        // Dolt
+        yield 'dolt' => [
+            'dolt version 1.51.1',
+            '1.51.1',
+        ];
+    }
+
+    /**
+     * Provides test cases for fallback version extraction.
+     */
+    public static function provideFallbackVersionOutputs(): \Generator
+    {
+        // Single digit version
+        yield 'single digit version' => [
+            'Version: 7',
+            '7',
+        ];
+
+        // Partial semantic version
+        yield 'partial semver with two components' => [
+            'Application version 2.0',
+            '2.0',
+        ];
+
+        // Edge cases
+        yield 'version with text suffix' => [
+            'version: 5 beta',
+            '5',
+        ];
+
+        // Null cases
+        yield 'non-version digit' => [
+            'There are 5 items available',
+            null,
+        ];
+    }
+
+    /**
+     * Tests that the resolver correctly extracts semantic versions.
+     */
+    #[DataProvider('provideSemanticVersionOutputs')]
+    public function testResolveVersionExtractsSemanticVersions(string $output, string $expectedVersion): void
+    {
+        // Act
+        $result = $this->versionResolver->resolveVersion($output);
+
+        // Assert
+        self::assertSame($expectedVersion, $result);
+    }
+
+    /**
+     * Tests that the resolver correctly extracts versions using fallback patterns.
+     */
+    #[DataProvider('provideFallbackVersionOutputs')]
+    public function testResolveVersionExtractsVersionsWithFallbacks(string $output, ?string $expectedVersion): void
+    {
+        // Act
+        $result = $this->versionResolver->resolveVersion($output);
+
+        // Assert
+        self::assertSame($expectedVersion, $result);
+    }
+
+    /**
+     * Tests that the resolver returns null when no version can be extracted.
+     */
+    public function testResolveVersionReturnsNullWhenNoVersionFound(): void
+    {
+        // Arrange
+        $output = 'This output contains no version information.';
+
+        // Act
+        $result = $this->versionResolver->resolveVersion($output);
+
+        // Assert
+        self::assertNull($result);
+    }
+
+    protected function setUp(): void
+    {
+        // Arrange
+        $this->versionResolver = new VersionResolver();
+    }
+}