Enhance pre-commit hook handling and UX

Integrate Laravel Prompts with new UI enhancements, including color-coded status messages and multi-selection for untracked files. Refactor staged file management and add robust handling for empty commits, user prompts, and commit messages.

Author: nezaboravi

src/Commands/CommitvelCommand.php

@@ -3,40 +3,57 @@
 namespace CodingWisely\Commitvel\Commands;
 
 use Illuminate\Console\Command;
+use Laravel\Prompts\Concerns\Colors;
 use Symfony\Component\Process\Process;
-
 use function Laravel\Prompts\confirm;
+use function Laravel\Prompts\multiSelect;
 use function Laravel\Prompts\spin;
 use function Laravel\Prompts\text;
 
 class CommitvelCommand extends Command
 {
-    protected $signature = 'cw:commitvel';
+    use Colors;
 
-    protected $description = 'Kind of pre-commit hook for running Pint, PHPPest, and managing Git operations.';
+    protected $signature = 'cw:commitvel';
+    protected $description = 'Like a pre-commit hook for running Pint, PHPPest, and managing Git operations written with laravel prompt';
 
     public function handle(): void
     {
-        if (! $this->hasChanges()) {
+        if (!$this->hasChanges()) {
             $this->tellJokeAndExit();
         }
 
         $this->ensurePintInstalled();
         $this->ensurePestIsInstalled();
         $this->runPint();
-
         $this->runTests();
-
         $this->stageFixedFiles();
         $this->commitChanges();
     }
 
     protected function hasChanges(): bool
     {
         $changes = shell_exec('git status --porcelain');
-        $this->info("Initial git status changes: \n".$changes);
+        $statusMessage = "Initial git status changes: \n" . $this->formatGitStatus($changes);
 
-        return ! empty(trim($changes));
+        if (preg_match('/^\?\?/', $changes)) {
+            $this->info($this->red($statusMessage));
+        } else {
+            $this->info($statusMessage);
+        }
+
+        return !empty(trim($changes));
+    }
+
+    protected function formatGitStatus(string $status): string
+    {
+        $lines = array_filter(explode("\n", $status));
+        foreach ($lines as &$line) {
+            if (str_starts_with(trim($line), '??')) {
+                $line = $this->bgRed($this->white('NEW')) . ' ' . ltrim($line, '?? ');
+            }
+        }
+        return implode("\n", $lines);
     }
 
     protected function tellJokeAndExit(): void
@@ -48,14 +65,14 @@ protected function tellJokeAndExit(): void
             'Attempting to commit air? 🌬️ Sadly, our repository isn’t well-ventilated for that! 🚪',
             'Commits need changes, not empty promises! 📜 Maybe the dog really did eat your code this time? 🐕',
             "Trying to commit nothing? That's like sending an empty gift box! 🎁📦",
-            'No changes? Did you just try to send an imaginary friend to the repo? 🧙‍♂️🦄',
+            'No code changes? Did you just try to send an imaginary friend to the repo? 🧙‍♂️🦄',
             'Looks like you’re committing to commitment issues! 💍❌',
             'Did you know? Even black holes have more substance than your commit! 🌌🕳️',
             "Trying to commit empty-handed? That's like bringing a fork to a soup-eating contest! 🍴🍲",
-            'No code changes? Are you sure you’re not just practicing your keystrokes? 🎹⌨️',
+            'No changes? Did you just try to send a love letter to an empty mailbox? 💌📪',
             "Committing nothing? ❌ That's like sending a blank postcard! ✉️📬",
             'You’re so good, you’re committing pure potential! 🚀✨',
-            'Trying to commit zero? That’s like trying to toast invisible bread! 🍞🔍',
+            'Trying to commit zero? That’s like writing a book with invisible ink! 📖✒️',
             'No changes to commit? You just invented the stealth commit! 🕵️‍♀️✨',
             'Trying to commit with zero changes? That’s like writing a book with invisible ink! 📖✒️',
             'No changes to commit? It’s like trying to paint with an empty brush! 🎨🖌️',
@@ -64,11 +81,11 @@ protected function tellJokeAndExit(): void
             'Attempting an empty commit? It’s as productive as a screen door on a submarine! 🛳️🚪',
             'Committing no changes? That’s like trying to tune a guitar with no strings! 🎸❌',
             'No changes? That’s like sending a love letter to an empty mailbox! 💌📪',
-            "Trying to commit nothing? That's as useful as a waterproof teabag! ☕🚫",
+            "Trying to commit nothing? That’s as useful as a waterproof teabag! ☕🚫",
             'No changes to commit? Even ghosts leave more trace! 👻🕵️‍♂️',
             'Attempting an empty commit? That’s like cooking with imaginary ingredients! 🍳🥄',
             'No changes in your commit? That’s like racing in a stationary car! 🚗🛑',
-            "Committing air? That's like showing up to a concert with earplugs in! 🎤👂",
+            "Committing air? That’s like showing up to a concert with earplugs in! 🎤👂",
             'Trying to commit with zero changes? That’s like playing soccer with an invisible ball! ⚽🕵️‍♀️',
         ];
 
@@ -87,9 +104,16 @@ protected function ensurePestIsInstalled(): void
         $this->ensureToolInstalled('vendor/bin/pest', 'PHP Pest is not installed. Would you like to install it?', 'composer require pestphp/pest --dev --with-all-dependencies', 'PHP Pest installed successfully.', 'composer remove phpunit/phpunit', 'Removing PHP Unit...');
     }
 
-    private function ensureToolInstalled(string $path, string $confirmMessage, string $installCommand, string $successMessage, string $preCommand = '', string $preMessage = ''): void
+    private function ensureToolInstalled(
+        string $path,
+        string $confirmMessage,
+        string $installCommand,
+        string $successMessage,
+        string $preCommand = '',
+        string $preMessage = ''
+    ): void
     {
-        if (! file_exists(base_path($path))) {
+        if (!file_exists(base_path($path))) {
             if (confirm($confirmMessage, true)) {
                 if ($preCommand) {
                     $this->info($preMessage);
@@ -106,20 +130,15 @@ private function ensureToolInstalled(string $path, string $confirmMessage, strin
 
     protected function runPint(): void
     {
-        $outputFiles = $this->runTool('Laravel Pint', './vendor/bin/pint --dirty', '/^\s+✓ (\S+)/m');
+        $outputFiles = $this->runTool('Laravel Pint', './vendor/bin/pint --dirty', '/^\s+√ (\S+)/m');
 
         foreach ($outputFiles as $file) {
-            // Check file permissions
-            if (! is_writable($file)) {
+            if (!is_writable($file)) {
                 $this->warn("File $file is not writable.");
-
                 continue;
             }
 
-            // Stage the file
-            shell_exec('git add '.escapeshellarg($file));
-            $stagedStatus = shell_exec('git status --porcelain '.escapeshellarg($file));
-            $this->info("Staging status for $file: \n".$stagedStatus);
+            $this->stageFile($file);
         }
     }
 
@@ -128,7 +147,13 @@ protected function runTests(): void
         $this->runTool('Pest Tests', './vendor/bin/pest', '', 'Fail', 'Error');
     }
 
-    private function runTool(string $toolName, string $command, string $regexPattern = '', string $errorKeyword1 = 'FAIL', string $errorKeyword2 = 'ERROR'): array
+    private function runTool(
+        string $toolName,
+        string $command,
+        string $regexPattern = '',
+        string $errorKeyword1 = 'FAIL',
+        string $errorKeyword2 = 'ERROR'
+    ): array
     {
         $outputFiles = [];
         if (confirm("Would you like to run $toolName?", true)) {
@@ -158,53 +183,96 @@ function () use ($command, &$outputFiles, $regexPattern, $errorKeyword1, $errorK
 
     protected function stageFixedFiles(): void
     {
-        $this->info('Running git add -u to stage any fixed files.');
+        $untrackedFiles = $this->getUntrackedFiles();
+
+        if (!empty($untrackedFiles)) {
+            $this->info($this->red('Untracked files found:'));
+            foreach ($untrackedFiles as $file) {
+                $this->info($this->red('  ' . $file));
+            }
+
+            array_unshift($untrackedFiles, 'Select All', 'Select None');
+            $selectedFiles = multiSelect('Select files to include in the commit:', $untrackedFiles);
+
+            if (in_array('Select None', $selectedFiles) || empty($selectedFiles)) {
+                $selectedFiles = [];
+            }
+
+            if (in_array('Select All', $selectedFiles)) {
+                $selectedFiles = array_diff($untrackedFiles, ['Select All', 'Select None']);
+            } else {
+                $selectedFiles = array_diff($selectedFiles, ['Select All', 'Select None']);
+            }
+
+            foreach ($selectedFiles as $file) {
+                $this->stageFile($file);
+            }
+
+            $filesToDelete = array_diff($untrackedFiles, $selectedFiles, ['Select All', 'Select None']);
+            if (!empty($filesToDelete) && confirm('Would you like to delete the unselected new files? You can delete it manually if you choose no.', false)) {
+                foreach ($filesToDelete as $file) {
+                    unlink($file);
+                    $this->info("Deleted file: $file");
+                }
+            }
+        }
+
         shell_exec('git add -u');
+
         $stagedFiles = shell_exec('git status --porcelain --untracked-files=no');
-        $this->info("Files after git add -u: \n".$stagedFiles);
 
         if (empty(trim($stagedFiles))) {
-            $this->info('No changes staged for commit.');
+            $this->warn('No changes staged for commit.');
+        }
+    }
+
+    protected function stageFile(string $file): void
+    {
+        shell_exec('git add ' . escapeshellarg($file));
+        $stagedStatus = shell_exec('git status --porcelain ' . escapeshellarg($file));
+        if (!empty($stagedStatus)) {
+            $this->info("Staging status for $file: \n" . $stagedStatus);
         }
     }
 
+    protected function getUntrackedFiles(): array
+    {
+        $output = shell_exec('git ls-files --others --exclude-standard');
+        return array_filter(explode("\n", $output));
+    }
+
     protected function commitChanges(): void
     {
         $stagedFiles = shell_exec('git status --porcelain --untracked-files=no');
-        $this->info("Staged files for commit: \n".$stagedFiles);
 
         if (empty(trim($stagedFiles))) {
-            $this->info('No changes staged for commit.');
-
             return;
         }
 
         $commitMessage = text('Enter the commit message');
-        if (! $commitMessage) {
+        if (!$commitMessage) {
             $this->error('Commit message cannot be empty.');
             exit(1);
         }
 
-        shell_exec('git commit -m '.escapeshellarg($commitMessage));
+        shell_exec('git commit -m ' . escapeshellarg($commitMessage));
         $this->info('Changes committed.');
 
         $currentBranch = $this->getCurrentBranch();
-        $branch = $this->ask('Pushing code to', $currentBranch);
 
-        while (! $branch) {
-            $this->error('Branch name cannot be empty.');
-            $branch = $this->ask('Pushing code to', $currentBranch);
-        }
 
-        $this->info("Pushing code to branch $branch...");
+        if (confirm("We will push this to branch [$currentBranch].", true)) {
+            $this->info("Pushing code to branch $currentBranch...");
 
-        // Spin while pushing the code
-        spin(fn () => $this->pushToBranch($branch), "Pushing code to $branch...");
+            spin(fn() => $this->pushToBranch($currentBranch), "Pushing code to $currentBranch...");
 
-        $commitHash = trim(shell_exec('git log -1 --format="%H"'));
-        $gitUserName = trim(shell_exec('git config user.name'));
-        $this->info("Commit hash: $commitHash");
-        $this->info("Pushed by: $gitUserName");
+            $commitHash = trim(shell_exec('git log -1 --format="%H"'));
+            $gitUserName = trim(shell_exec('git config user.name'));
+            $this->info("Commit hash: $commitHash");
+            $this->info("Pushed by: $gitUserName");
+        } else {
+            $this->info("Exiting. No changes will be pushed to the server, but changes have been committed locally.");
+        }
     }
 
     private function getCurrentBranch(): string