Nosial/ncc
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases 13 Packages Wiki Activity Actions 2

Fixed issue where dependency conflicts are thrown even when --reinstall is used

Browse source
This commit is contained in:
Netkas 2023-02-07 15:28:44 -05:00
parent 4dfcb43b20
commit 070ad4caca
3 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Bug fix where resources are not decoded correctly when installing packages [#31](https://git.n64.cc/nosial/ncc/-/issues/42)
- Fixed issue where dependency conflicts are thrown even when `--reinstall` is used
## [1.0.0] - 2022-01-29

4
src/ncc/CLI/Management/PackageManagerMenu.php
View file

@ -428,7 +428,7 @@ namespace ncc\CLI\Management;
Console::out(' Trademark: ' . Console::formatColor($package->Assembly->Trademark, ConsoleColors::LightGreen));
Console::out((string)null);
if(count($package->Dependencies) > 0 && !in_array(InstallPackageOptions::Reinstall, $installer_options))
if(count($package->Dependencies) > 0)
{
$dependencies = [];
foreach($package->Dependencies as $dependency)
@ -497,8 +497,6 @@ namespace ncc\CLI\Management;
if(!$user_confirmation)
$user_confirmation = Console::getBooleanInput(sprintf('Do you want to install %s', $package->Assembly->Package));
if($user_confirmation)
{
try

33
src/ncc/Managers/PackageManager.php
View file

@ -71,6 +71,7 @@
use ncc\Utilities\IO;
use ncc\Utilities\PathFinder;
use ncc\Utilities\Resolver;
use ncc\Utilities\RuntimeCache;
use ncc\Utilities\Validate;
use ncc\ZiProto\ZiProto;
use SplFileInfo;
@ -133,6 +134,12 @@
$package = Package::load($package_path);
if(RuntimeCache::get(sprintf('installed.%s=%s', $package->Assembly->Package, $package->Assembly->Version)))
{
Console::outDebug(sprintf('skipping installation of %s=%s, already processed', $package->Assembly->Package, $package->Assembly->Version));
return $package->Assembly->Package;
}
$extension = $package->Header->CompilerExtension->Extension;
$installation_paths = new InstallationPaths($this->PackagesPath . DIRECTORY_SEPARATOR . $package->Assembly->Package . '=' . $package->Assembly->Version);
@ -187,7 +194,7 @@
}
}
$this->processDependency($dependency, $package, $package_path, $entry);
$this->processDependency($dependency, $package, $package_path, $entry, $options);
}
}
@ -406,6 +413,8 @@
$this->getPackageLockManager()->getPackageLock()->addPackage($package, $installation_paths->getInstallationPath());
$this->getPackageLockManager()->save();
RuntimeCache::set(sprintf('installed.%s=%s', $package->Assembly->Package, $package->Assembly->Version), true);
return $package->Assembly->Package;
}
@ -567,16 +576,17 @@
*
* @param string $source
* @param Entry|null $entry
* @param array $options
* @return string
* @throws InstallationException
*/
public function installFromSource(string $source, ?Entry $entry): string
public function installFromSource(string $source, ?Entry $entry, array $options=[]): string
{
try
{
Console::outVerbose(sprintf('Installing package from source %s', $source));
$package = $this->fetchFromSource($source, $entry);
return $this->install($package, $entry);
return $this->install($package, $entry, $options);
}
catch(Exception $e)
{
@ -589,6 +599,7 @@
* @param Package $package
* @param string $package_path
* @param Entry|null $entry
* @param array $options
* @return void
* @throws AccessDeniedException
* @throws FileNotFoundException
@ -602,13 +613,19 @@
* @throws PackageLockException
* @throws PackageNotFoundException
* @throws PackageParsingException
* @throws RunnerExecutionException
* @throws SymlinkException
* @throws UnsupportedCompilerExtensionException
* @throws VersionNotFoundException
* @throws RunnerExecutionException
*/
private function processDependency(Dependency $dependency, Package $package, string $package_path, ?Entry $entry=null): void
private function processDependency(Dependency $dependency, Package $package, string $package_path, ?Entry $entry=null, array $options=[]): void
{
if(RuntimeCache::get(sprintf('depndency_installed.%s=%s', $dependency->Name, $dependency->Version ?? 'null')))
{
Console::outDebug(sprintf('dependency %s=%s already processed, skipping', $dependency->Name, $dependency->Version ?? 'null'));
return;
}
Console::outVerbose('processing dependency ' . $dependency->Name . ' (' . $dependency->Version . ')');
$dependent_package = $this->getPackage($dependency->Name);
$dependency_met = false;
@ -638,7 +655,8 @@
$basedir = dirname($package_path);
if (!file_exists($basedir . DIRECTORY_SEPARATOR . $dependency->Source))
throw new FileNotFoundException($basedir . DIRECTORY_SEPARATOR . $dependency->Source);
$this->install($basedir . DIRECTORY_SEPARATOR . $dependency->Source);
$this->install($basedir . DIRECTORY_SEPARATOR . $dependency->Source, null, $options);
RuntimeCache::set(sprintf('dependency_installed.%s=%s', $dependency->Name, $dependency->Version), true);
break;
case DependencySourceType::StaticLinking:
@ -646,7 +664,8 @@
case DependencySourceType::RemoteSource:
Console::outDebug('installing from remote source ' . $dependency->Source);
$this->installFromSource($dependency->Source, $entry);
$this->installFromSource($dependency->Source, $entry, $options);
RuntimeCache::set(sprintf('dependency_installed.%s=%s', $dependency->Name, $dependency->Version), true);
break;
default: