feat: Allow new command in non-empty dirs #14

Author: flydev-fr

src/Commands/Common/NewCommand.php

@@ -66,7 +66,7 @@ class NewCommand extends PWConnector {
     'userpass' => '',
     'userpass_confirm' => '',
     'useremail' => '',
-    'color' => 'classic',
+    'color' => 'classic'
   );
 
   /**
@@ -82,6 +82,7 @@ protected function configure() {
       ->setName('new')
       ->setDescription('Creates a new ProcessWire project')
       ->addArgument('directory', InputArgument::OPTIONAL, 'Directory where the new project will be created')
+      ->addOption('force', null, InputOption::VALUE_NONE, 'Force installation in an non empty directory')
       ->addOption('dbUser', null, InputOption::VALUE_REQUIRED, 'Database user')
       ->addOption('dbPass', null, InputOption::VALUE_OPTIONAL, 'Database password')
       ->addOption('dbName', null, InputOption::VALUE_REQUIRED, 'Database name')
@@ -410,9 +411,10 @@ private function download($branch) {
    * @throws \RuntimeException if the downloaded archive could not be extracted
    */
   private function extract() {
+    $forceInstall = $this->input->getOption('force');
     $this->tools->writeBlockBasic('Preparing project...');
     $cfp = $this->src ? $this->src : $this->compressedFilePath;
-    $this->downloader->extract($cfp, $this->projectDir, $this->getName());
+    $this->downloader->extract($cfp, $this->projectDir, $this->getName(), $forceInstall);
 
     return $this;
   }

src/Helpers/Downloader.php

@@ -154,7 +154,7 @@ public function download($uri, $prefix = 'pw') {
    * @param string $to
    * @param string $name
    */
-  public function extract($from, $to, $name = '') {
+  public function extract($from, $to, $name = '', $force = false) {
     //var_dump($from, $to, $name);exit;
     $source = $name ? 'ProcessWire' : 'the module';
 
@@ -164,12 +164,18 @@ public function extract($from, $to, $name = '') {
     }
 
     // check for empty directory
-    $filesInsideDir = new \FilesystemIterator($to, \FilesystemIterator::SKIP_DOTS);
-    if (iterator_count($filesInsideDir) > 1) {
-      throw new \RuntimeException(sprintf(
-        "ProcessWire can't be installed because the target folder `%s` is not empty.\n" .
-        "Use an empty directory or provide an argument where the new project will be created like `wire-cli new <dirname>`",
-        $to));
+    if (!$force) {
+      $filesInsideDir = new \FilesystemIterator($to, \FilesystemIterator::SKIP_DOTS);
+      if (iterator_count($filesInsideDir) > 1) {
+        throw new \RuntimeException(sprintf(
+          "ProcessWire can't be installed because the target folder `%s` is not empty.\n" .
+          "Use an empty directory or provide an argument where the new project will be created like `wire-cli new <dirname>`.\n" .
+          "Use option --force to proceed the installation in a non empty directory.",
+          $to));
+      }
+    }
+    else {
+      $this->tools->writeWarning("ProcessWire will be installed in a non-empty dir (--force found on command-line).\n");    
     }
 
     try {