added verbose logging for artifact directory scan
parent
0aad11801e
commit
586911f7a1
|
@ -12,42 +12,36 @@
|
||||||
|
|
||||||
namespace Composer\Repository;
|
namespace Composer\Repository;
|
||||||
|
|
||||||
|
use Composer\IO\IOInterface;
|
||||||
|
use Composer\Json\JsonFile;
|
||||||
|
use Composer\Package\Loader\ArrayLoader;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Serge Smertin <serg.smertin@gmail.com>
|
* @author Serge Smertin <serg.smertin@gmail.com>
|
||||||
*/
|
*/
|
||||||
use Composer\IO\IOInterface;
|
|
||||||
use Composer\Config;
|
|
||||||
use Composer\Json\JsonFile;
|
|
||||||
use Composer\Package\Loader\LoaderInterface;
|
|
||||||
use Composer\Package\Version\VersionParser;
|
|
||||||
use Composer\Package\Loader\ArrayLoader;
|
|
||||||
|
|
||||||
class ArtifactRepository extends ArrayRepository
|
class ArtifactRepository extends ArrayRepository
|
||||||
{
|
{
|
||||||
protected $path;
|
|
||||||
|
|
||||||
/** @var LoaderInterface */
|
/** @var LoaderInterface */
|
||||||
protected $loader;
|
protected $loader;
|
||||||
|
|
||||||
public function __construct(array $repoConfig, IOInterface $io, Config $config, array $drivers = null)
|
protected $lookup;
|
||||||
|
|
||||||
|
public function __construct(array $repoConfig, IOInterface $io)
|
||||||
{
|
{
|
||||||
$this->path = $repoConfig['url'];
|
$this->loader = new ArrayLoader();
|
||||||
|
$this->lookup = $repoConfig['url'];
|
||||||
$this->io = $io;
|
$this->io = $io;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function initialize()
|
protected function initialize()
|
||||||
{
|
{
|
||||||
parent::initialize();
|
parent::initialize();
|
||||||
$this->versionParser = new VersionParser;
|
$this->scanDirectory($this->lookup);
|
||||||
if (!$this->loader) {
|
|
||||||
$this->loader = new ArrayLoader($this->versionParser);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->getDirectoryPackages($this->path);
|
private function scanDirectory($path)
|
||||||
}
|
|
||||||
|
|
||||||
private function getDirectoryPackages($path)
|
|
||||||
{
|
{
|
||||||
|
$io = $this->io;
|
||||||
foreach (new \RecursiveDirectoryIterator($path) as $file) {
|
foreach (new \RecursiveDirectoryIterator($path) as $file) {
|
||||||
/* @var $file \SplFileInfo */
|
/* @var $file \SplFileInfo */
|
||||||
if (!$file->isFile()) {
|
if (!$file->isFile()) {
|
||||||
|
@ -56,11 +50,18 @@ class ArtifactRepository extends ArrayRepository
|
||||||
|
|
||||||
$package = $this->getComposerInformation($file);
|
$package = $this->getComposerInformation($file);
|
||||||
if (!$package) {
|
if (!$package) {
|
||||||
$this->io->write("File <comment>{$file->getBasename()}</comment> doesn't seem to hold a package");
|
if ($io->isVerbose()) {
|
||||||
|
$msg = "File <comment>{$file->getBasename()}</comment> doesn't seem to hold a package";
|
||||||
|
$io->write($msg);
|
||||||
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$package = $this->loader->load($package);
|
if ($io->isVerbose()) {
|
||||||
|
$template = 'Found package <info>%s</info> (<comment>%s</comment>) in file <info>%s</info>';
|
||||||
|
$msg = sprintf($template, $package->getName(), $package->getPrettyVersion(), $file->getBasename());
|
||||||
|
$io->write($msg);
|
||||||
|
}
|
||||||
|
|
||||||
$this->addPackage($package);
|
$this->addPackage($package);
|
||||||
}
|
}
|
||||||
|
@ -68,12 +69,22 @@ class ArtifactRepository extends ArrayRepository
|
||||||
|
|
||||||
private function getComposerInformation(\SplFileInfo $file)
|
private function getComposerInformation(\SplFileInfo $file)
|
||||||
{
|
{
|
||||||
$config = "zip://{$file->getPathname()}#composer.json";
|
$composerFile = "zip://{$file->getPathname()}#composer.json";
|
||||||
$json = @file_get_contents($config);
|
$json = @file_get_contents($composerFile);
|
||||||
if (!$json) {
|
if (!$json) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return JsonFile::parseJson($json, $config);
|
$package = JsonFile::parseJson($json, $composerFile);
|
||||||
|
$package['dist'] = array(
|
||||||
|
'type' => 'zip',
|
||||||
|
'url' => $file->getRealPath(),
|
||||||
|
'reference' => $file->getBasename(),
|
||||||
|
'shasum' => sha1_file($file->getRealPath())
|
||||||
|
);
|
||||||
|
|
||||||
|
$package = $this->loader->load($package);
|
||||||
|
|
||||||
|
return $package;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This file is part of Composer.
|
* This file is part of Composer.
|
||||||
*
|
*
|
||||||
|
@ -18,7 +19,8 @@ use Composer\Package\Package;
|
||||||
|
|
||||||
class ArtifactRepositoryTest extends TestCase
|
class ArtifactRepositoryTest extends TestCase
|
||||||
{
|
{
|
||||||
public function testExtractsConfigsFromZipArchives() {
|
public function testExtractsConfigsFromZipArchives()
|
||||||
|
{
|
||||||
$expectedPackages = array(
|
$expectedPackages = array(
|
||||||
'vendor0/package0-0.0.1',
|
'vendor0/package0-0.0.1',
|
||||||
'vendor1/package2-4.3.2',
|
'vendor1/package2-4.3.2',
|
||||||
|
|
Loading…
Reference in New Issue