refactor delete commands

Author: harris21

lucid

@@ -11,8 +11,11 @@ $laravel = require __DIR__.'/../../../bootstrap/app.php';
 
 $commands = [
     new Lucid\Console\Commands\JobMakeCommand(),
+    new Lucid\Console\Commands\JobDeleteCommand(),
     new Lucid\Console\Commands\ServiceMakeCommand(),
+    new Lucid\Console\Commands\ServiceDeleteCommand(),
     new Lucid\Console\Commands\FeatureMakeCommand(),
+    new Lucid\Console\Commands\FeatureDeleteCommand(),
     new Lucid\Console\Commands\ControllerMakeCommand(),
     new Lucid\Console\Commands\ServicesListCommand(),
     new Lucid\Console\Commands\FeaturesListCommand(),

src/Commands/FeatureDeleteCommand.php

@@ -11,18 +11,20 @@
 
 namespace Lucid\Console\Commands;
 
-use Illuminate\Console\GeneratorCommand;
-use Lucid\Console\Filesystem;
-use Lucid\Console\Finder;
 use Lucid\Console\Str;
+use Lucid\Console\Finder;
+use Lucid\Console\Command;
+use Lucid\Console\Filesystem;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Command\Command as SymfonyCommand;
 
 /**
  * @author Charalampos Raftopoulos <[email protected]>
  */
-class FeatureDeleteCommand extends GeneratorCommand
+class FeatureDeleteCommand extends SymfonyCommand
 {
     use Finder;
+    use Command;
     use Filesystem;
 
     /**

src/Commands/JobDeleteCommand.php

@@ -11,18 +11,20 @@
 
 namespace Lucid\Console\Commands;
 
-use Illuminate\Console\GeneratorCommand;
-use Lucid\Console\Filesystem;
-use Lucid\Console\Finder;
 use Lucid\Console\Str;
+use Lucid\Console\Finder;
+use Lucid\Console\Command;
+use Lucid\Console\Filesystem;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Command\Command as SymfonyCommand;
 
 /**
  * @author Charalampos Raftopoulos <[email protected]>
  */
-class JobDeleteCommand extends GeneratorCommand
+class JobDeleteCommand extends SymfonyCommand
 {
     use Finder;
+    use Command;
     use Filesystem;
 
     /**
@@ -56,15 +58,14 @@ public function fire()
         try {
             $domain = studly_case($this->argument('domain'));
             $title = $this->parseName($this->argument('job'));
-            $domainPath = $this->findDomainPath($domain).'/Jobs';
 
             if (!file_exists($job = $this->findJobPath($domain, $title))) {
                 $this->error('Job class '.$title.' cannot be found.');
             } else {
                 $this->deleteFile($job);
 
-                if (count($this->checkDirectories($domainPath)) === 0) {
-                    $this->deleteDirectory($domainPath);
+                if (count($this->listJobs($domain)->first()) === 0) {
+                    $this->deleteDirectory($this->findDomainPath($domain));
                 }
 
                 $this->info('Job class <comment>'.$title.'</comment> deleted successfully.');

src/Commands/ServiceDeleteCommand.php

@@ -12,15 +12,18 @@
 namespace Lucid\Console\Commands;
 
 use Lucid\Console\Finder;
+use Lucid\Console\Command;
 use Lucid\Console\Filesystem;
-use Illuminate\Console\GeneratorCommand;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Command\Command as SymfonyCommand;
 
 /**
  * @author Charalampos Raftopoulos <[email protected]>
  */
-class ServiceDeleteCommand extends GeneratorCommand
+class ServiceDeleteCommand extends SymfonyCommand
 {
     use Finder;
+    use Command;
     use Filesystem;
 
     /**
@@ -69,7 +72,7 @@ protected function getStub()
     public function fire()
     {
         try {
-            $name = $this->getNameInput();
+            $name = ucfirst($this->argument('name'));
 
             $this->deleteDirectory($this->findServicePath($name));
 
@@ -80,4 +83,11 @@ public function fire()
             dd($e->getMessage(), $e->getFile(), $e->getLine());
         }
     }
+
+    public function getArguments()
+    {
+        return [
+            ['name', InputArgument::REQUIRED, 'The service name.'],
+        ];
+    }
 }

src/Filesystem.php

@@ -70,7 +70,22 @@ public function createDirectory($path, $mode = 0755, $recursive = true, $force =
      */
     public function deleteDirectory($path)
     {
-        return $this->files->deleteDirectory($path, false);
+        if ($handle = opendir($path)) {
+            while (false !== ($file = readdir($handle))) {
+                if ($file != '.' && $file != '..') {
+                    if (is_dir($path.'/'.$file)) {
+                        if (!@rmdir($path.'/'.$file)) {
+                            $this->deleteDirectory($path.'/'.$file.'/');
+                        }
+                    } else {
+                        @unlink($path.'/'.$file);
+                    }
+                }
+            }
+            closedir($handle);
+
+            return @rmdir($path);
+        }
     }
 
     /**
@@ -82,18 +97,6 @@ public function deleteDirectory($path)
      */
     public function deleteFile($path)
     {
-        return $this->files->delete($path);
-    }
-
-    /**
-     * Check if a directory is empty.
-     *
-     * @param string $directory
-     *
-     * @return array
-     */
-    public function checkDirectories($directory)
-    {
-        return $this->files->allFiles($directory);
+        return @unlink($path);
     }
 }