Clean up task()

  Add a clearLine() method
  Intelligently check for existence of assets in `scripts/` or `js/` and set the default accordingly
  Remove error() method override as its no longer needed
  Add exceptions to properly bail

Author: Log1x

src/Console/Commands/Command.php

@@ -7,21 +7,6 @@
 
 class Command extends CommandBase
 {
-    /**
-     * Write a string as error output.
-     *
-     * @param  string  $string
-     * @param  int|string|null  $verbosity
-     * @return false
-     */
-    public function error($string, $verbosity = null)
-    {
-        $this->line('');
-        $this->line($string, 'error', $verbosity);
-        $this->line('');
-        return false;
-    }
-
     /**
      * Execute a process and return the status to console.
      *
@@ -62,26 +47,36 @@ protected function task($title, $task = null, $status = '...')
         $this->output->write("$title: <comment>{$status}</comment>");
 
         try {
-            $status = $task() === false ? false : true;
+            $status = $task() !== false;
         } catch (\Exception $e) {
-            $status = false;
-        }
+            $this->clearLine()->line(
+                $title . ': ' . ($status ? '<info>✔</info>' : '<red>x</red>')
+            );
 
-        if ($this->output->isDecorated()) {
-            $this->output->write("\x0D");
-            $this->output->write("\x1B[2K");
-        } else {
-            $this->output->writeln('');
+            throw $e;
         }
 
-        $this->output->writeln(
+        $this->clearLine()->line(
             $title . ': ' . ($status ? '<info>✔</info>' : '<red>x</red>')
         );
+    }
 
-        if (! $status) {
-            exit;
+    /**
+     * Clear the current line in console.
+     *
+     * @return mixed
+     */
+    public function clearLine()
+    {
+        if (! $this->output->isDecorated()) {
+            $this->output->writeln('');
+
+            return $this;
         }
 
-        return $status;
+        $this->output->write("\x0D");
+        $this->output->write("\x1B[2K");
+
+        return $this;
     }
 }

src/Console/Commands/EjectBlocksCommand.php

@@ -2,11 +2,13 @@
 
 namespace Log1x\EjectBlocks\Console\Commands;
 
+use Exception;
 use WP_Filesystem_Base;
 use Illuminate\Support\Str;
 use Illuminate\Filesystem\Filesystem;
 
 use function Roots\asset;
+use function Roots\public_path;
 
 class EjectBlocksCommand extends Command
 {
@@ -62,9 +64,12 @@ class EjectBlocksCommand extends Command
     /**
      * The plugin assets location.
      *
-     * @var string
+     * @var string|array
      */
-    protected $js = 'scripts/';
+    protected $js = [
+        'scripts',
+        'js',
+    ];
 
     /**
      * The plugin assets.
@@ -113,7 +118,7 @@ public function handle()
 
         $this->task('Setting up plugin', function () {
             $this->label = $this->anticipate('Plugin name?', [], $this->label);
-            $this->js = Str::finish($this->anticipate('Plugin assets location?', [], $this->js), '/');
+            $this->js = Str::finish($this->anticipate('Plugin assets location?', [], $this->findAssets()), '/');
             $this->assets = explode(
                 ', ',
                 $this->anticipate('Plugin assets?', [], implode(', ', $this->assets))
@@ -122,7 +127,7 @@ public function handle()
 
         $this->task('Verifying permissions', function () {
             if (! $this->verifyPermissions()) {
-                return $this->error('Unable to write to ' . $this->plugins);
+                throw new Exception('Unable to write to ' . $this->plugins);
             }
         });
 
@@ -132,24 +137,26 @@ public function handle()
 
         $this->task('Verifying editor assets', function () {
             if (! $this->verifyAssets()) {
-                return $this->error('Editor assets missing: ' . $this->assets->implode(', '));
+                throw new Exception('Editor assets missing: ' . $this->assets->implode(', '));
             }
         });
 
         $this->task('Verifying editor manifest', function () {
             if (! $this->verifyManifest()) {
-                return $this->error('Asset manifest missing: ' . $this->manifest);
+                throw new Exception('Asset manifest missing: ' . $this->manifest);
             }
         });
 
         $this->task('Checking for webpack manifest', function () {
             if (! $this->verifyManifestJs()) {
-                return;
+                return false;
             }
         });
 
         $this->task('Creating plugin directory', function () {
-            return $this->createDirectory();
+            if (! $this->createDirectory()) {
+                throw new Exception('The operation has been canceled.');
+            }
         });
 
         $this->task('Generating plugin loader', function () {
@@ -174,10 +181,24 @@ public function handle()
             return $this->exec('wp plugin activate ' . $this->label);
         }, 'using WP-CLI...');
 
-
         return $this->summary();
     }
 
+    /**
+     * Return existing asset directories.
+     *
+     * @return void
+     */
+    public function findAssets()
+    {
+        return collect($this->js)
+            ->map(function ($directory) {
+                if ($this->files->exists(public_path($directory))) {
+                    return Str::finish($directory, '/');
+                }
+            })->implode('') ?? 'scripts/';
+    }
+
     /**
      * Check that we have permission to create a directory.
      *
@@ -248,7 +269,7 @@ public function createDirectory()
             $this->files->isDirectory($this->path) &&
             ! $this->confirm('A plugin containing block assets already exists. Do you wish to overwrite it?')
         ) {
-                return false;
+            return false;
         }
 
         $this->files->deleteDirectory($this->path);