Implement absolute and relative path on plugin and theme commands (#31)

Author: hjuarez20

composer.json

@@ -42,7 +42,8 @@
         "anolilab/wordpress-salt-generator": "^1.2",
         "twig/twig": "^1.31",
         "doctrine/annotations": "^1.4",
-        "fzaninotto/faker": "^1.6"
+        "fzaninotto/faker": "^1.6",
+        "webmozart/path-util": "^2.3"
     },
     "bin": ["bin/wp-console"],
     "config": {

composer.lock

@@ -18,6 +18,8 @@
 use WP\Console\Utils\Validator;
 use WP\Console\Core\Utils\StringConverter;
 use WP\Console\Utils\Site;
+use Webmozart\PathUtil\Path;
+
 
 class PluginCommand extends Command
 {
@@ -169,7 +171,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $plugin = $this->validator->validatePluginName($input->getOption('plugin'));
 
-        $pluginPath = $this->appRoot . $input->getOption('plugin-path');
+        // Get the plugin path and define it if it is null
+        // Check that it is an absolute path or otherwise create an absolute path using appRoot
+        $pluginPath = $input->getOption('plugin-path');
+        $pluginPath = $pluginPath == null ? basename(WP_CONTENT_DIR) . DIRECTORY_SEPARATOR . 'plugins' : $pluginPath;
+        $pluginPath = Path::isAbsolute($pluginPath) ? $pluginPath : Path::makeAbsolute($pluginPath, $this->appRoot);
         $pluginPath = $this->validator->validatePluginPath($pluginPath, true);
 
         $machineName = $this->validator->validateMachineName($input->getOption('machine-name'));
@@ -253,13 +259,12 @@ function ($machine_name) use ($validator) {
 
         $pluginPath = $input->getOption('plugin-path');
         if (!$pluginPath) {
-            $wordpressRoot = $this->appRoot;
             $pluginPath = $io->ask(
                 $this->trans('commands.generate.plugin.questions.plugin-path'),
-                basename(WP_CONTENT_DIR) . DIRECTORY_SEPARATOR . 'plugins' . DIRECTORY_SEPARATOR . $machineName,
-                function ($pluginPath) use ($wordpressRoot, $machineName) {
-                    $pluginPath = ($pluginPath[0] != '/' ? '/' : '').$pluginPath;
-                    $fullPath = $wordpressRoot.$pluginPath.'/'.$machineName;
+                basename(WP_CONTENT_DIR) . DIRECTORY_SEPARATOR . 'plugins',
+                function ($pluginPath) use ($machineName) {
+                    $fullPath = Path::isAbsolute($pluginPath) ? $pluginPath : Path::makeAbsolute($pluginPath, $this->appRoot);
+                    $fullPath = $fullPath.'/'.$machineName;
                     if (file_exists($fullPath)) {
                         throw new \InvalidArgumentException(
                             sprintf(

src/Command/Generate/PluginCommand.php

@@ -11,6 +11,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Webmozart\PathUtil\Path;
 use WP\Console\Command\Shared\ConfirmationTrait;
 use WP\Console\Core\Command\Command;
 use WP\Console\Generator\ThemeGenerator;
@@ -162,8 +163,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $theme = $this->validator->validatePluginName($input->getOption('theme'));
-        
-        $themePath = $this->appRoot . $input->getOption('theme-path');
+
+        // Get the theme path and define it, if it is null
+        // Check that it is an absolute path or otherwise create an absolute path using appRoot
+        $themePath = $input->getOption('theme-path');
+        $themePath = $themePath == null ? basename(WP_CONTENT_DIR) . DIRECTORY_SEPARATOR . 'themes' : $themePath;
+        $themePath = Path::isAbsolute($themePath) ? $themePath : Path::makeAbsolute($themePath, $this->appRoot);
         $themePath = $this->validator->validatePluginPath($themePath, true);
 
         $machineName = $this->validator->validateMachineName($input->getOption('machine-name'));
@@ -248,13 +253,12 @@ function ($machine_name) use ($validator) {
         // --theme path
         $themePath = $input->getOption('theme-path');
         if (!$themePath) {
-            $wordpressRoot = $this->appRoot;
             $themePath = $io->ask(
                 $this->trans('commands.generate.theme.questions.theme-path'),
-                basename(WP_CONTENT_DIR) . DIRECTORY_SEPARATOR . 'themes' . DIRECTORY_SEPARATOR . $machineName,
-                function ($themePath) use ($wordpressRoot, $machineName) {
-                    $themePath = ($themePath[0] != '/' ? '/' : '').$themePath;
-                    $fullPath = $wordpressRoot.$themePath.'/'.$machineName;
+                basename(WP_CONTENT_DIR) . DIRECTORY_SEPARATOR . 'themes',
+                function ($themePath) use ($machineName) {
+                    $fullPath = Path::isAbsolute($themePath) ? $themePath : Path::makeAbsolute($themePath, $this->appRoot);
+                    $fullPath = $fullPath.'/'.$machineName;
                     if (file_exists($fullPath)) {
                         throw new \InvalidArgumentException(
                             sprintf(
@@ -263,7 +267,6 @@ function ($themePath) use ($wordpressRoot, $machineName) {
                             )
                         );
                     }
-                    
                     return $themePath;
                 }
             );

src/Command/Generate/ThemeCommand.php

@@ -72,7 +72,14 @@ protected function renderFile(
         $flag = null
     ) {
         if (!is_dir(dirname($target))) {
-            mkdir(dirname($target), 0777, true);
+            if(!mkdir(dirname($target), 0777, true)){
+                throw new \InvalidArgumentException(
+                    sprintf(
+                        'Path "%s" is invalid. You need to provide a valid path.',
+                        dirname($target)
+                    )
+                );
+            }
         }
 
         //Count the code lines if the file exist

src/Core/Generator/Generator.php

@@ -40,6 +40,7 @@ public function generate(
         $deactivate,
         $uninstall
     ) {
+        $dir = ($dir == "/" ? '': $dir).'/'.$machineName;
         if (file_exists($dir)) {
             if (!is_dir($dir)) {
                 throw new \RuntimeException(

src/Generator/PluginGenerator.php

@@ -42,6 +42,7 @@ public function generate(
         $package,
         $test
     ) {
+        $dir = ($dir == "/" ? '': $dir).'/'.$machineName;
         if (file_exists($dir)) {
             if (!is_dir($dir)) {
                 throw new \RuntimeException(

src/Generator/ThemeGenerator.php

@@ -104,20 +104,26 @@ public function validateMachineName($machine_name)
 
     public function validatePluginPath($pluginPath, $create = false)
     {
-        if (!is_dir($pluginPath)) {
-            if ($create && mkdir($pluginPath, 0755, true)) {
-                return $pluginPath;
-            }
 
-            throw new \InvalidArgumentException(
-                sprintf(
-                    'plugin path "%s" is invalid. You need to provide a valid path.',
-                    $pluginPath
-                )
-            );
+        if (strlen($pluginPath) > 1 && $pluginPath[strlen($pluginPath)-1] == "/") {
+            $pluginPath = substr($pluginPath, 0, -1);
+        }
+
+        if (is_dir($pluginPath)) {
+            return $pluginPath;
+        }
+
+        if ($create && mkdir($pluginPath, 0755, true)) {
+            chmod($pluginPath, 0755);
+            return $pluginPath;
         }
 
-        return $pluginPath;
+        throw new \InvalidArgumentException(
+            sprintf(
+                'Path "%s" is invalid. You need to provide a valid path.',
+                $pluginPath
+            )
+        );
     }
 
     /*public function validatePluginDependencies($dependencies)