Adjust output for create project, refs #724

main
Jordi Boggiano 12 years ago
parent 713309b38c
commit 99513ba52b

@ -24,7 +24,6 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Composer\Json\JsonFile; use Composer\Json\JsonFile;
use Composer\Util\Filesystem;
use Composer\Util\RemoteFilesystem; use Composer\Util\RemoteFilesystem;
use Composer\Package\Version\VersionParser; use Composer\Package\Version\VersionParser;
@ -118,10 +117,7 @@ EOT
} }
} }
$fs = new Filesystem(); $io->write('<info>Installing ' . $package->getName() . ' (' . VersionParser::formatVersion($package, false) . ')</info>', true);
$prettyDirectory = rtrim($fs->isAbsolutePath($directory) ? $fs->findShortestPath(getcwd(), $directory, true) : $directory, '\\/') . '/';
$io->write('<info>Installing ' . $package->getName() . ' (' . VersionParser::formatVersion($package) . ') in '.$prettyDirectory.'</info>', true);
$projectInstaller = new ProjectInstaller($directory, $dm); $projectInstaller = new ProjectInstaller($directory, $dm);
$projectInstaller->install(new InstalledFilesystemRepository(new JsonFile('php://memory')), $package); $projectInstaller->install(new InstalledFilesystemRepository(new JsonFile('php://memory')), $package);

@ -59,13 +59,13 @@ class VersionParser
return $stability === 'rc' ? 'RC' : $stability; return $stability === 'rc' ? 'RC' : $stability;
} }
static public function formatVersion(PackageInterface $package) static public function formatVersion(PackageInterface $package, $truncate = true)
{ {
if (!$package->isDev() || !in_array($package->getSourceType(), array('hg', 'git'))) { if (!$package->isDev() || !in_array($package->getSourceType(), array('hg', 'git'))) {
return $package->getPrettyVersion(); return $package->getPrettyVersion();
} }
return $package->getPrettyVersion().' '.substr($package->getSourceReference(), 0, 6); return $package->getPrettyVersion() . ' ' . ($truncate ? substr($package->getSourceReference(), 0, 6) : $package->getSourceReference());
} }
/** /**

Loading…
Cancel
Save