Merge pull request #28: Hotfixes

Author: roxblnfk

README.md

@@ -159,6 +159,27 @@ DLoad handles both binary executables and regular files:
 </software>
 ```
 
+### Automatic Binary Downloads with Composer Update
+
+Integrate DLoad with Composer to automatically download required binaries whenever dependencies are updated.
+This ensures your team always has the necessary tools without manual intervention.
+
+Add the following to your `composer.json`:
+
+```json
+{
+    "scripts": {
+        "post-update-cmd": "dload get --no-interaction -v",
+        "get:binaries": "dload get --no-interaction --force -vv"
+    }
+}
+```
+
+This configuration:
+
+- Automatically downloads required binaries after `composer update`
+- Provides a custom command `composer get:binaries` to force download all binaries with detailed output
+
 ## Custom Software Registry
 
 ### Defining Custom Software

psalm-baseline.xml

@@ -67,9 +67,6 @@
     <MoreSpecificReturnType>
       <code><![CDATA[non-empty-string]]></code>
     </MoreSpecificReturnType>
-    <PossiblyNullReference>
-      <code><![CDATA[getPathname]]></code>
-    </PossiblyNullReference>
   </file>
   <file src="src/Module/Archive/ArchiveFactory.php">
     <MixedPropertyTypeCoercion>
@@ -113,16 +110,6 @@
       <code><![CDATA[$output]]></code>
     </MixedArgumentTypeCoercion>
   </file>
-  <file src="src/Module/Binary/Internal/VersionComparator.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$versionOnly]]></code>
-      <code><![CDATA[\preg_replace('/[-+].*$/', '', $constraint)]]></code>
-    </PossiblyNullArgument>
-    <RedundantCondition>
-      <code><![CDATA[!$hasPreB]]></code>
-      <code><![CDATA[$bIsNum]]></code>
-    </RedundantCondition>
-  </file>
   <file src="src/Module/Common/Config/Action/Download.php">
     <MissingConstructor>
       <code><![CDATA[$software]]></code>

resources/software.json

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

src/DLoad.php

@@ -77,27 +77,46 @@ public function addTask(DownloadConfig $action, bool $force = false): void
             // Check different constraints
             $binary = $this->binaryProvider->getBinary($destinationPath, $software->binary);
 
+            if ($binary === null) {
+                goto add_task;
+            }
+
+            \assert($binary !== null);
+            $version = $binary->getVersion();
+            if ($action->version === null) {
+                $this->logger->info(
+                    'Binary `%s` exists with version `%s`, but no version constraint specified. Skipping download.',
+                    $binary->getName(),
+                    $version ?? 'unknown',
+                );
+                $this->logger->info('Use flag `--force` to force download.');
+
+                // Skip task creation entirely
+                return;
+            }
+
             // Check if binary exists and satisfies version constraint
-            if ($binary !== null && ($version = $binary->getVersion()) !== null) {
-                if ($action->version !== null && $binary->satisfiesVersion($action->version)) {
-                    $this->logger->info(
-                        'Binary `%s` exists with version `%s`, satisfies constraint `%s`. Skipping download. Use `--force` to override.',
-                        $binary->getName(),
-                        (string) $binary->getVersion(),
-                        $action->version,
-                    );
-
-                    // Skip task creation entirely
-                    return;
-                }
+            if ($binary->satisfiesVersion($action->version)) {
+                $this->logger->info(
+                    'Binary `%s` exists with version `%s`, satisfies constraint `%s`. Skipping download.',
+                    $binary->getName(),
+                    (string) $binary->getVersion(),
+                    $action->version,
+                );
+                $this->logger->info('Use flag `--force` to force download.');
 
-                // Download a newer version only if version is specified
-                if ($version) {
-                    // todo
-                }
+                // Skip task creation entirely
+                return;
+            }
+
+            // Download a newer version only if version is specified
+            if ($version !== null) {
+                // todo
             }
         }
 
+        add_task:
+
         $this->taskManager->addTask(function () use ($software, $action): void {
             // Create a Download task
             $task = $this->prepareDownloadTask($software, $action);
@@ -175,7 +194,11 @@ private function prepareExtractTask(Software $software, DownloadConfig $action):
 
                 $to = $this->shouldBeExtracted($file, $files, $action);
 
-                $overwrite = \is_file($to->getPathname());
+                if ($to === null) {
+                    $extractor->next();
+                    continue;
+                }
+
                 $extractor->send($to);
 
                 // Success
@@ -185,7 +208,7 @@ private function prepareExtractTask(Software $software, DownloadConfig $action):
                         '%s (<comment>%s</comment>) has been installed%s into <info>%s</info>',
                         $to->getFilename(),
                         $downloadResult->version,
-                        $overwrite ? ' (overwriting)' : '',
+                        $to->isFile() ? ' (overwriting)' : '',
                         $path,
                     ),
                 );

src/Module/Binary/Internal/BinaryHandle.php

@@ -4,6 +4,7 @@
 
 namespace Internal\DLoad\Module\Binary\Internal;
 
+use Composer\Semver\Semver;
 use Internal\DLoad\Module\Binary\Binary;
 use Internal\DLoad\Module\Common\Config\Embed\Binary as BinaryConfig;
 use Internal\DLoad\Module\Common\FileSystem\Path;
@@ -23,15 +24,13 @@ final class BinaryHandle implements Binary
      * @param BinaryConfig $config Original configuration
      * @param BinaryExecutor $executor Binary execution service
      * @param VersionResolver $versionResolver Version extraction service
-     * @param VersionComparator $versionComparator Version comparison service
      */
     public function __construct(
         private readonly string $name,
         private readonly Path $path,
         private readonly BinaryConfig $config,
         private readonly BinaryExecutor $executor,
         private readonly VersionResolver $versionResolver,
-        private readonly VersionComparator $versionComparator,
     ) {}
 
     public function getName(): string
@@ -77,7 +76,7 @@ public function satisfiesVersion(string $versionConstraint): ?bool
         $version = $this->getVersion();
         return $version === null
             ? null
-            : $this->versionComparator->satisfies($version, $versionConstraint);
+            : Semver::satisfies($version, $versionConstraint);
     }
 
     public function getSize(): ?int

src/Module/Binary/Internal/BinaryProviderImpl.php

@@ -21,7 +21,6 @@ public function __construct(
         private readonly OperatingSystem $operatingSystem,
         private readonly BinaryExecutor $executor,
         private readonly VersionResolver $versionResolver,
-        private readonly VersionComparator $versionComparator,
     ) {}
 
     public function getBinary(Path|string $destinationPath, BinaryConfig $config): ?Binary
@@ -36,7 +35,6 @@ public function getBinary(Path|string $destinationPath, BinaryConfig $config): ?
             config: $config,
             executor: $this->executor,
             versionResolver: $this->versionResolver,
-            versionComparator: $this->versionComparator,
         );
 
         // Return binary only if it exists