Merge pull request #3 from leafsphp/feat/sprout-rewrite

Feat/sprout rewrite

Author: mychidarko

composer.json

@@ -39,6 +39,7 @@
         "format": "vendor/bin/php-cs-fixer fix --config=.php_cs.dist.php --allow-risky=yes"
     },
 	"require": {
-		"dragonmantank/cron-expression": "^3.4"
+		"dragonmantank/cron-expression": "^3.4",
+		"leafs/sprout": "*"
 	}
 }

src/Queue/Commands/DeleteJobCommand.php

@@ -2,19 +2,15 @@
 
 namespace Leaf\Queue\Commands;
 
-use Aloe\Command;
 use Illuminate\Support\Str;
+use Leaf\Sprout\Command;
 
 class DeleteJobCommand extends Command
 {
-    protected static $defaultName = 'd:job';
-    public $description = 'Delete a job class';
-    public $help = 'Delete a job class';
-
-    protected function config()
-    {
-        $this->setArgument('job', 'required', 'job name');
-    }
+    protected $signature = 'd:job
+        {job : job name}';
+    protected $description = 'Delete a job class';
+    protected $help = 'Delete a job class';
 
     protected function handle()
     {
@@ -24,15 +20,15 @@ protected function handle()
             $job .= 'Job';
         }
 
-        $file = \Aloe\Command\Config::rootpath(AppPaths('jobs') . "/$job.php");
+        $file = getcwd() . DIRECTORY_SEPARATOR . AppPaths('jobs') . "/$job.php";
 
-        if (!file_exists($file)) {
+        if (!\Leaf\FS\File::exists($file)) {
             $this->error("$job doesn't exist");
 
             return 1;
         }
 
-        unlink($file);
+        \Leaf\FS\File::delete($file);
 
         $this->comment("$job deleted successfully");
 

src/Queue/Commands/GenerateJobCommand.php

@@ -2,46 +2,45 @@
 
 namespace Leaf\Queue\Commands;
 
-use Aloe\Command;
 use Illuminate\Support\Str;
+use Leaf\Sprout\Command;
 
 class GenerateJobCommand extends Command
 {
-    protected static $defaultName = 'g:job';
-    public $description = 'Create a job class';
-    public $help = 'Generate a new job class';
-
-    protected function config()
-    {
-        $this->setArgument('job', 'required', 'job name');
-    }
+    protected $signature = 'g:job
+        {job : job name}';
+    protected $description = 'Create a job class';
+    protected $help = 'Generate a new job class';
 
     protected function handle()
     {
+        $rootDir = getcwd();
         $job = Str::studly(Str::singular($this->argument('job')));
 
         if (!strpos($job, 'Job')) {
             $job .= 'Job';
         }
 
-        $file = \Aloe\Command\Config::rootpath(AppPaths('jobs') . "/$job.php");
+        $file = $rootDir . DIRECTORY_SEPARATOR . AppPaths('jobs') . "/$job.php";
 
-        if (!is_dir(\Aloe\Command\Config::rootpath(AppPaths('jobs')))) {
-            mkdir(\Aloe\Command\Config::rootpath(AppPaths('jobs')));
+        if (!\Leaf\FS\Directory::exists($rootDir . DIRECTORY_SEPARATOR . AppPaths('jobs'))) {
+            \Leaf\FS\Directory::create($rootDir . DIRECTORY_SEPARATOR . AppPaths('jobs'), [
+                'recursive' => true,
+            ]);
         }
 
-        if (file_exists($file)) {
+        if (\Leaf\FS\File::exists($file)) {
             $this->error("$job already exists");
 
             return 1;
         }
 
-        touch($file);
-
-        $fileContent = \file_get_contents(__DIR__ . '/stubs/job.stub');
-        $fileContent = str_replace('ClassName', $job, $fileContent);
+        \Leaf\FS\File::create($file, function () use ($job) {
+            $fileContent = \file_get_contents(__DIR__ . '/stubs/job.stub');
+            $fileContent = str_replace('ClassName', $job, $fileContent);
 
-        file_put_contents($file, $fileContent);
+            return $fileContent;
+        });
 
         $this->comment("$job generated successfully");
 

src/Queue/Commands/QueueWorkCommand.php

@@ -2,25 +2,22 @@
 
 namespace Leaf\Queue\Commands;
 
-use Aloe\Command;
+use Leaf\Sprout\Command;
 
 class QueueWorkCommand extends Command
 {
     protected $queueConfig;
 
-    protected static $defaultName = 'queue:work';
-    public $description = 'Start your queue worker';
-    public $help = 'Start your queue worker';
-
-    protected function config()
-    {
-        $this->queueConfig = MvcConfig('queue');
-        $this->setOption('queue', 'queue', 'optional', 'The queue you want to run', $this->queueConfig['default']);
-    }
+    protected $signature = 'queue:work
+        {--queue? : The queue you want to run}';
+    protected $description = 'Start your queue worker';
+    protected $help = 'Start your queue worker';
 
     protected function handle()
     {
-        $queue = $this->option('queue');
+        $queue = $this->option('queue')
+            ?? $this->queueConfig = MvcConfig('queue')['default']
+            ?? null;
 
         $this->writeln("Queue worker started for queue '$queue'...");
 
@@ -33,14 +30,13 @@ protected function handle()
                 \Leaf\FS\File::copy(__DIR__ . '/stubs/schema.yml', DatabasePath("{$this->queueConfig['connections'][$queue]['table']}.yml"));
                 \Leaf\FS\File::copy(__DIR__ . '/stubs/schedules.yml', DatabasePath("{$this->queueConfig['connections'][$queue]['schedules.table']}.yml"));
 
-                \Aloe\Core::run(
-                    "php leaf db:migrate {$this->queueConfig['connections'][$queue]['table']}",
-                    $this->output
-                );
-                \Aloe\Core::run(
-                    "php leaf db:migrate {$this->queueConfig['connections'][$queue]['schedules.table']}",
-                    $this->output
-                );
+                sprout()
+                    ->process("php leaf db:migrate {$this->queueConfig['connections'][$queue]['table']}")
+                    ->run();
+
+                sprout()
+                    ->process("php leaf db:migrate {$this->queueConfig['connections'][$queue]['schedules.table']}")
+                    ->run();
             }
         } else {
             $this->writeln('> Using redis connection for queue...');