Merge remote-tracking branch 'ryan/use_symfony_command'

Conflicts:
	bin/composer
	src/Composer/Command/InstallCommand.php

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "src/Symfony/Component/BrowserKit"]
 	path = src/Symfony/Component/BrowserKit
 	url = http://github.com/symfony/BrowserKit.git
+[submodule "src/Symfony/Component/Console"]
+	path = src/Symfony/Component/Console
+	url = https://github.com/symfony/Console.git

bin/composer

@@ -7,16 +7,18 @@ use Composer\Composer;
 use Composer\Downloader\GitDownloader;
 use Composer\Downloader\PearDownloader;
 use Composer\Downloader\ZipDownloader;
-use Composer\Command\InstallCommand;
 use Composer\Installer\LibraryInstaller;
+use Composer\Console\Application;
 
 setlocale(LC_ALL, 'C');
 
+// initialize composer
 $composer = new Composer();
 $composer->addDownloader('git', new GitDownloader);
 $composer->addDownloader('pear', new PearDownloader);
 $composer->addDownloader('zip', new ZipDownloader);
 $composer->addInstaller('library', new LibraryInstaller);
 
-$cmd = new InstallCommand();
+// run the command application
-$cmd->install($composer);
+$application = new Application($composer);
+$application->run();

src/Composer/Command/Command.php

@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Command;
+
+use Symfony\Component\Console\Command\Command as BaseCommand;
+
+/**
+ * Base class for Composer commands
+ *
+ * @author Ryan Weaver <ryan@knplabs.com>
+ */
+abstract class Command extends BaseCommand
+{
+    /**
+     * @return \Composer\Composer
+     */
+    protected function getComposer()
+    {
+        return $this->getApplication()->getComposer();
+    }
+}

src/Composer/Command/InstallCommand.php

@@ -19,28 +19,45 @@ use Composer\DependencyResolver\Solver;
 use Composer\Repository\PlatformRepository;
 use Composer\Package\MemoryPackage;
 use Composer\Package\LinkConstraint\VersionConstraint;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
 
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @author Ryan Weaver <ryan@knplabs.com>
  */
-class InstallCommand
+class InstallCommand extends Command
 {
-    protected $composer;
+    protected function configure()
-
-    public function install($composer)
     {
-        $this->composer = $composer;
+        $this
+            ->setName('install')
+            ->setDescription('Parses the composer.json file and downloads the needed dependencies.')
+            ->setHelp(<<<EOT
+The <info>install</info> command reads the composer.json file from the
+current directory, processes it, and downloads and installs all the
+libraries and dependencies outlined in that file.
+
+<info>php composer install</info>
+
+EOT
+            )
+        ;
+    }
 
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
         // TODO this needs a parameter to enable installing from source (i.e. git clone, instead of downloading archives)
         $sourceInstall = false;
 
         $config = $this->loadConfig();
 
-        echo 'Loading repositories'.PHP_EOL;
+        $output->writeln('<info>Loading repositories</info>');
 
         if (isset($config['repositories'])) {
             foreach ($config['repositories'] as $name => $spec) {
-                $composer->addRepository($name, $spec);
+                $this->getComposer()->addRepository($name, $spec);
             }
         }
 
@@ -52,15 +69,15 @@ class InstallCommand
         // TODO check the lock file to see what's currently installed
         // $repoInstalled->addPackage(new MemoryPackage('$Package', '$Version'));
 
-        echo 'Loading package list'.PHP_EOL;
+        $output->writeln('Loading package list');
 
-        foreach ($composer->getRepositories() as $repository) {
+        foreach ($this->getComposer()->getRepositories() as $repository) {
             $pool->addRepository($repository);
         }
 
         $request = new Request($pool);
 
-        echo 'Building up request'.PHP_EOL;
+        $output->writeln('Building up request');
 
         // TODO there should be an update flag or dedicated update command
         // TODO check lock file to remove packages that disappeared from the requirements
@@ -78,7 +95,7 @@ class InstallCommand
             }
         }
 
-        echo 'Solving dependencies'.PHP_EOL;
+        $output->writeln('Solving dependencies');
 
         $policy = new DefaultPolicy;
         $solver = new Solver($policy, $pool, $repoInstalled);
@@ -90,7 +107,7 @@ class InstallCommand
             switch ($task['job']) {
             case 'install':
                 $package = $task['package'];
-                echo '> Installing '.$package->getPrettyName().PHP_EOL;
+                $output->writeln('> Installing '.$package->getPrettyName());
                 if ($sourceInstall) {
                     // TODO
                 } else {
@@ -98,14 +115,14 @@ class InstallCommand
                         $downloaderType = $package->getDistType();
                         $type = 'dist';
                     } elseif ($package->getSourceType()) {
-                        echo 'Package '.$package->getPrettyName().' has no dist url, installing from source instead.';
+                        $output->writeln('Package '.$package->getPrettyName().' has no dist url, installing from source instead.');
                         $downloaderType = $package->getSourceType();
                         $type = 'source';
                     } else {
                         throw new \UnexpectedValueException('Package '.$package->getPrettyName().' has no source or dist URL.');
                     }
-                    $downloader = $composer->getDownloader($downloaderType);
+                    $downloader = $this->getComposer()->getDownloader($downloaderType);
-                    $installer = $composer->getInstaller($package->getType());
+                    $installer = $this->getComposer()->getInstaller($package->getType());
                     if (!$installer->install($package, $downloader, $type)) {
                         throw new \LogicException($package->getPrettyName().' could not be installed.');
                     }
@@ -116,9 +133,9 @@ class InstallCommand
                 throw new \UnexpectedValueException('Unhandled job type : '.$task['job']);
             }
         }
-        echo '> Done'.PHP_EOL;
+        $output->writeln('> Done');
 
-        $this->storeLockFile($lock);
+        $this->storeLockFile($lock, $output);
     }
 
     protected function loadConfig()
@@ -153,9 +170,9 @@ class InstallCommand
         return $config;
     }
 
-    protected function storeLockFile(array $content)
+    protected function storeLockFile(array $content, OutputInterface $output)
     {
         file_put_contents('composer.lock', json_encode($content, JSON_FORCE_OBJECT)."\n");
-        echo '> composer.lock dumped'.PHP_EOL;
+        $output->writeln('> composer.lock dumped');
     }
 }

src/Composer/Composer.php

@@ -22,6 +22,8 @@ use Composer\Repository\PearRepository;
  */
 class Composer
 {
+    const VERSION = '1.0.0-DEV';
+
     protected $repositories = array();
     protected $downloaders = array();
     protected $installers = array();

src/Composer/Console/Application.php

@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Console;
+
+use Symfony\Component\Console\Application as BaseApplication;
+use Composer\Composer;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Finder\Finder;
+use Composer\Command\InstallCommand;
+
+/**
+ * The console application that handles the commands
+ *
+ * @author Ryan Weaver <ryan@knplabs.com>
+ */
+class Application extends BaseApplication
+{
+    private $composer;
+
+    public function __construct(Composer $composer)
+    {
+        parent::__construct('Composer', Composer::VERSION);
+
+        $this->composer = $composer;
+    }
+
+    /**
+     * Runs the current application.
+     *
+     * @param InputInterface  $input  An Input instance
+     * @param OutputInterface $output An Output instance
+     *
+     * @return integer 0 if everything went fine, or an error code
+     */
+    public function doRun(InputInterface $input, OutputInterface $output)
+    {
+        $this->registerCommands();
+
+        return parent::doRun($input, $output);
+    }
+
+    /**
+     * @return Composer
+     */
+    public function getComposer()
+    {
+        return $this->composer;
+    }
+
+    /**
+     * Initializes all the composer commands
+     */
+    protected function registerCommands()
+    {
+        $this->add(new InstallCommand());
+    }
+}

src/Symfony/Component/Console

@@ -0,0 +1 @@
+Subproject commit 20df560af4faa32b0925029f46ecf0ecdc435728