Merge pull request #40 from TheDragonCode/2.x

Add the ability to automatically generate a file name when creating

Author: Andrey Helldar

src/Concerns/Argumentable.php

@@ -2,13 +2,27 @@
 
 namespace DragonCode\LaravelActions\Concerns;
 
+use DragonCode\LaravelActions\Facades\Git;
+
 /** @mixin \Illuminate\Console\Command */
 trait Argumentable
 {
     protected function argumentName(): string
     {
-        $value = (string) $this->argument('name');
+        if ($name = (string) $this->argument('name')) {
+            return trim($name);
+        }
+
+        return $this->getNamePrefix() . '_' . time();
+    }
 
-        return trim($value);
+    protected function getNamePrefix(): string
+    {
+        return $this->getGitBranchName() ?: 'auto';
+    }
+
+    protected function getGitBranchName(): ?string
+    {
+        return Git::currentBranch(base_path('.git'));
     }
 }

src/Console/Make.php

@@ -23,7 +23,7 @@ class Make extends BaseCommand
      * @var string
      */
     protected $signature = Names::MAKE
-    . ' {name : The name of the action}';
+    . ' {name? : The name of the action}';
 
     /**
      * The console command description.

src/Facades/Git.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DragonCode\LaravelActions\Facades;
+
+use DragonCode\LaravelActions\Support\Git as Support;
+use Illuminate\Support\Facades\Facade;
+
+/**
+ * @method static string|null currentBranch(?string $path)
+ */
+class Git extends Facade
+{
+    protected static function getFacadeAccessor(): string
+    {
+        return Support::class;
+    }
+}

src/Support/Git.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DragonCode\LaravelActions\Support;
+
+use Illuminate\Support\Str;
+
+class Git
+{
+    public function currentBranch(?string $path): ?string
+    {
+        if ($path = $this->getGitPath($path)) {
+            return $this->exec($path, 'rev-parse --abbrev-ref HEAD');
+        }
+
+        return null;
+    }
+
+    protected function exec(string $path, string $command): ?string
+    {
+        return exec(sprintf('git --git-dir %s %s', $path, $command));
+    }
+
+    protected function resolvePath(string $path): ?string
+    {
+        return realpath($path) ?: null;
+    }
+
+    protected function getGitPath(?string $path): ?string
+    {
+        if ($path = $this->resolvePath($path)) {
+            if ($this->isGitDir($path)) {
+                return $path;
+            }
+        }
+
+        return null;
+    }
+
+    protected function isGitDir(?string $path): bool
+    {
+        if ($path = rtrim($path, '/\\')) {
+            return Str::endsWith($path, '.git');
+        }
+
+        return false;
+    }
+}

tests/Commands/MakeTest.php

@@ -26,4 +26,17 @@ public function testMakingFiles()
 
         $this->assertEquals(file_get_contents($expected), file_get_contents($path));
     }
+
+    public function testAutoName()
+    {
+        $filename = date('Y_m_d_His') . '_auto_' . time() . '.php';
+
+        $path = database_path('actions/' . $filename);
+
+        $this->assertFileDoesNotExist($path);
+
+        $this->artisan('make:migration:action')->run();
+
+        $this->assertFileExists($path);
+    }
 }

tests/Services/GitTest.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Services;
+
+use DragonCode\LaravelActions\Facades\Git;
+use Illuminate\Support\Str;
+use Tests\TestCase;
+
+class GitTest extends TestCase
+{
+    public function testCurrentBranchNull()
+    {
+        $this->assertNull(Git::currentBranch(__DIR__));
+    }
+
+    public function testCurrentBranch()
+    {
+        $branch = Git::currentBranch(__DIR__ . '/../../.git');
+
+        $this->assertTrue(Str::contains($branch, ['main', '2.x']));
+    }
+}