Fixes site install and improve init (#59)

* Fix load site install services file. * Remove site-path message on generated files. * Auto-detect web-root directory.
hechoendrupal · Sep 30, 2016 · 7672acf · 7672acf
1 parent 98b6d48
commit 7672acf
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 16 deletions.
diff --git a/src/Bootstrap/DrupalConsoleCore.php b/src/Bootstrap/DrupalConsoleCore.php
@@ -37,9 +37,9 @@ public function boot()
             $loader->load('services.yml');
         }
 
-        if (file_exists($this->root.DRUPAL_CONSOLE.'/services-drupal-install')) {
+        if (file_exists($this->root.DRUPAL_CONSOLE.'/services-drupal-install.yml')) {
             $loader->load(
-                $this->root . DRUPAL_CONSOLE . '/services-drupal-install'
+                $this->root . DRUPAL_CONSOLE . '/services-drupal-install.yml'
             );
         }
 

diff --git a/src/Command/InitCommand.php b/src/Command/InitCommand.php
@@ -50,6 +50,11 @@ class InitCommand extends Command
         'generate_chain' => false
     ];
 
+    private $webRootDirectories = [
+        'web',
+        'docroot'
+    ];
+
     /**
      * InitCommand constructor.
      * @param ShowFile             $showFile
@@ -107,7 +112,13 @@ protected function interact(InputInterface $input, OutputInterface $output)
         }
 
         if ($local) {
-            $this->configParameters['root'] = $io->askEmpty(
+            $root = null;
+            foreach($this->webRootDirectories as $webRootDirectory) {
+                if (!$root && is_dir(getcwd().'/'.$webRootDirectory)) {
+                    $root = $webRootDirectory;
+                }
+            }
+            $this->configParameters['root'] = $root?:$io->askEmpty(
                 $this->trans('commands.init.questions.root')
             );
         }
@@ -178,7 +189,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         if ($copiedFiles) {
-            $this->showFile->copiedFiles($io, $copiedFiles);
+            $this->showFile->copiedFiles($io, $copiedFiles, false);
             $io->newLine();
         }
 

diff --git a/src/EventSubscriber/ShowGeneratedFilesListener.php b/src/EventSubscriber/ShowGeneratedFilesListener.php
@@ -60,7 +60,7 @@ public function showGeneratedFiles(ConsoleTerminateEvent $event)
 
         $files = $this->fileQueue->getFiles();
         if ($files) {
-            $this->showFile->generatedFiles($io, $files);
+            $this->showFile->generatedFiles($io, $files, false);
         }
     }
 

diff --git a/src/Utils/ShowFile.php b/src/Utils/ShowFile.php
@@ -34,30 +34,44 @@ public function __construct(
     /**
      * @param DrupalStyle $io
      * @param string      $files
+     * @param boolean     $showPath
      */
-    public function generatedFiles($io, $files)
+    public function generatedFiles($io, $files, $showPath = true)
     {
+        $pathKey = null;
+        $path = null;
+        if ($showPath){
+            $pathKey = 'application.user.messages.path';
+            $path = $this->root;
+        }
         $this->showFiles(
             $io,
             $files,
             'application.messages.files.generated',
-            'application.site.messages.path',
-            $this->root
+            $pathKey,
+            $path
         );
     }
 
     /**
      * @param DrupalStyle $io
      * @param string      $files
+     * @param boolean     $showPath
      */
-    public function copiedFiles($io, $files)
+    public function copiedFiles($io, $files, $showPath = true)
     {
+        $pathKey = null;
+        $path = null;
+        if ($showPath){
+            $pathKey = 'application.user.messages.path';
+            $path = rtrim(getenv('HOME') ?: getenv('USERPROFILE'), '/\\').'/.console/';
+        }
         $this->showFiles(
             $io,
             $files,
             'application.messages.files.copied',
-            'application.user.messages.path',
-            rtrim(getenv('HOME') ?: getenv('USERPROFILE'), '/\\').'/.console/'
+            $pathKey,
+            $path
         );
     }
 
@@ -76,11 +90,15 @@ private function showFiles($io, $files, $headerKey, $pathKey, $path)
 
         $io->writeln($this->translator->trans($headerKey));
 
-        $io->info(
-            sprintf('%s:', $this->translator->trans($pathKey)),
-            false
-        );
-        $io->comment($path, false);
+        if ($pathKey) {
+            $io->info(
+                sprintf('%s:', $this->translator->trans($pathKey)),
+                false
+            );
+        }
+        if ($path) {
+            $io->comment($path, false);
+        }
         $io->newLine();
 
         $index = 1;