feature #155 Added support for a specific directory in demo command (lyrixx)

This PR was merged into the 1.0-dev branch.

Discussion
----------

Added support for a specific directory in demo command

fixes #154

Commits
-------

8a9c43b Added support for a specific directory in demo command

Author: javiereguiluz

src/Symfony/Installer/DemoCommand.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Installer;
 
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -21,15 +22,14 @@
  */
 class DemoCommand extends DownloadCommand
 {
-    protected $projectName;
-    protected $projectDir;
     protected $downloadedFilePath;
     protected $requirementsErrors = array();
 
     protected function configure()
     {
         $this
             ->setName('demo')
+            ->addArgument('directory', InputArgument::OPTIONAL, 'Directory where the new project will be created.', 'symfony_demo')
             ->setDescription('Creates a demo Symfony project.')
         ;
     }
@@ -38,22 +38,29 @@ protected function initialize(InputInterface $input, OutputInterface $output)
     {
         parent::initialize($input, $output);
 
-        $this->projectDir = getcwd();
+        if (!$input->getArgument('directory')) {
+            $this->projectDir = getcwd();
 
-        $i = 1;
-        $projectName = 'symfony_demo';
-        while (file_exists($this->projectDir.DIRECTORY_SEPARATOR.$projectName)) {
-            $projectName = 'symfony_demo_'.(++$i);
-        }
+            $i = 1;
+            $projectName = 'symfony_demo';
+            while (file_exists($this->projectDir.DIRECTORY_SEPARATOR.$projectName)) {
+                $projectName = 'symfony_demo_'.(++$i);
+            }
 
-        $this->projectName = $projectName;
-        $this->projectDir = $this->projectDir.DIRECTORY_SEPARATOR.$projectName;
+            $this->projectName = $projectName;
+            $this->projectDir = $this->projectDir.DIRECTORY_SEPARATOR.$projectName;
+        } else {
+            $directory = rtrim(trim($input->getArgument('directory')), DIRECTORY_SEPARATOR);
+            $this->projectDir = $this->fs->isAbsolutePath($directory) ? $directory : getcwd().DIRECTORY_SEPARATOR.$directory;
+            $this->projectName = basename($directory);
+        }
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         try {
             $this
+                ->checkProjectName()
                 ->download()
                 ->extract()
                 ->cleanUp()

src/Symfony/Installer/DownloadCommand.php

@@ -38,6 +38,8 @@ abstract class DownloadCommand extends Command
     protected $fs;
     /** @var OutputInterface */
     protected $output;
+    protected $projectName;
+    protected $projectDir;
 
     /**
      * Returns the type of the downloaded application in a human readable format.
@@ -150,6 +152,19 @@ protected function download()
         return $this;
     }
 
+    protected function checkProjectName()
+    {
+        if (is_dir($this->projectDir) && !$this->isEmptyDirectory($this->projectDir)) {
+            throw new \RuntimeException(sprintf(
+                "There is already a '%s' project in this directory (%s).\n".
+                'Change your project name or create it in another directory.',
+                $this->projectName, $this->projectDir
+            ));
+        }
+
+        return $this;
+    }
+
     /**
      * Returns the Guzzle client configured according to the system environment
      * (e.g. it takes into account whether it should use a proxy server or not).

src/Symfony/Installer/NewCommand.php

@@ -23,8 +23,6 @@
  */
 class NewCommand extends DownloadCommand
 {
-    protected $projectName;
-    protected $projectDir;
     protected $version;
     protected $downloadedFilePath;
     protected $requirementsErrors = array();
@@ -84,7 +82,7 @@ protected function checkProjectName()
         if (is_dir($this->projectDir) && !$this->isEmptyDirectory($this->projectDir)) {
             throw new \RuntimeException(sprintf(
                 "There is already a '%s' project in this directory (%s).\n".
-                "Change your project name or create it in another directory.",
+                'Change your project name or create it in another directory.',
                 $this->projectName, $this->projectDir
             ));
         }
@@ -155,7 +153,7 @@ protected function checkSymfonyVersionIsInstallable()
                 "The selected version (%s) cannot be installed because it belongs\n".
                 "to an unmaintained Symfony branch which is not compatible with this installer.\n".
                 "To solve this issue install Symfony manually executing the following command:\n\n".
-                "composer create-project symfony/framework-standard-edition %s %s",
+                'composer create-project symfony/framework-standard-edition %s %s',
                 $this->version, $this->projectDir, $this->version
             ));
         }
@@ -166,7 +164,7 @@ protected function checkSymfonyVersionIsInstallable()
                 "The selected version (%s) cannot be installed because this installer\n".
                 "is compatible with Symfony 2.3 versions starting from 2.3.21.\n".
                 "To solve this issue install Symfony manually executing the following command:\n\n".
-                "composer create-project symfony/framework-standard-edition %s %s",
+                'composer create-project symfony/framework-standard-edition %s %s',
                 $this->version, $this->projectDir, $this->version
             ));
         }
@@ -177,7 +175,7 @@ protected function checkSymfonyVersionIsInstallable()
                 "The selected version (%s) cannot be installed because this installer\n".
                 "is compatible with Symfony 2.5 versions starting from 2.5.6.\n".
                 "To solve this issue install Symfony manually executing the following command:\n\n".
-                "composer create-project symfony/framework-standard-edition %s %s",
+                'composer create-project symfony/framework-standard-edition %s %s',
                 $this->version, $this->projectDir, $this->version
             ));
         }