Removed obsolete code and moved classes.

README.md

@@ -21,9 +21,6 @@
 
 ---
 
->[!NOTE]
-> Version `0.7` will be a standalone CLI application and will no longer require Robo to run.
-
 ## What is it?
 
 A tool to assemble a code artifact from your codebase, remove unnecessary files,

src/Commands/ArtifactCommand.php

@@ -4,11 +4,11 @@
 
 namespace DrevOps\GitArtifact\Commands;
 
-use DrevOps\GitArtifact\FilesystemTrait;
-use DrevOps\GitArtifact\GitArtifactGit;
-use DrevOps\GitArtifact\GitArtifactGitRepository;
-use DrevOps\GitArtifact\LogTrait;
-use DrevOps\GitArtifact\TokenTrait;
+use DrevOps\GitArtifact\Git\ArtifactGit;
+use DrevOps\GitArtifact\Git\ArtifactGitRepository;
+use DrevOps\GitArtifact\Traits\FilesystemTrait;
+use DrevOps\GitArtifact\Traits\LogTrait;
+use DrevOps\GitArtifact\Traits\TokenTrait;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -36,7 +36,7 @@ class ArtifactCommand extends Command {
   /**
    * Represent to current repository.
    */
-  protected GitArtifactGitRepository $gitRepository;
+  protected ArtifactGitRepository $gitRepository;
 
   /**
    * Source path of git repository.
@@ -125,26 +125,26 @@ class ArtifactCommand extends Command {
   /**
    * Git wrapper.
    */
-  protected GitArtifactGit $git;
+  protected ArtifactGit $git;
 
   /**
    * Artifact constructor.
    *
-   * @param \DrevOps\GitArtifact\GitArtifactGit $gitWrapper
+   * @param \DrevOps\GitArtifact\Git\ArtifactGit $gitWrapper
    *   Git wrapper.
    * @param \Symfony\Component\Filesystem\Filesystem $fsFileSystem
    *   File system.
    * @param string|null $name
    *   Command name.
    */
   public function __construct(
-    GitArtifactGit $gitWrapper = NULL,
+    ArtifactGit $gitWrapper = NULL,
     Filesystem $fsFileSystem = NULL,
     ?string $name = NULL
   ) {
     parent::__construct($name);
     $this->fsFileSystem = is_null($fsFileSystem) ? new Filesystem() : $fsFileSystem;
-    $this->git = is_null($gitWrapper) ? new GitArtifactGit() : $gitWrapper;
+    $this->git = is_null($gitWrapper) ? new ArtifactGit() : $gitWrapper;
   }
 
   /**
@@ -528,13 +528,13 @@ protected function resolveOptions(string $remote, array $options): void {
    * @param string $sourcePath
    *   Source path.
    *
-   * @return \DrevOps\GitArtifact\GitArtifactGitRepository
+   * @return \DrevOps\GitArtifact\Git\ArtifactGitRepository
    *   Current git repository.
    *
    * @throws \CzProject\GitPhp\GitException
    * @throws \Exception
    */
-  protected function initGitRepository(string $sourcePath): GitArtifactGitRepository {
+  protected function initGitRepository(string $sourcePath): ArtifactGitRepository {
     $this->gitRepository = $this->git->open($sourcePath);
 
     return $this->gitRepository;
@@ -666,7 +666,7 @@ protected function resolveOriginalBranch(): string {
   protected function setDstBranch(string $branch): void {
     $branch = (string) $this->tokenProcess($branch);
 
-    if (!GitArtifactGitRepository::isValidBranchName($branch)) {
+    if (!ArtifactGitRepository::isValidBranchName($branch)) {
       throw new \RuntimeException(sprintf('Incorrect value "%s" specified for git remote branch', $branch));
     }
     $this->destinationBranch = $branch;
@@ -970,7 +970,7 @@ protected function writeln(string $text): void {
   protected function setupRemoteForRepository(): void {
     $remoteName = $this->remoteName;
     $remoteUrl = $this->remoteUrl;
-    if (!GitArtifactGitRepository::isValidRemoteUrl($remoteUrl)) {
+    if (!ArtifactGitRepository::isValidRemoteUrl($remoteUrl)) {
       throw new \Exception(sprintf('Invalid remote URL: %s', $remoteUrl));
     }
 

src/Git/ArtifactGit.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DrevOps\GitArtifact\Git;
+
+use CzProject\GitPhp\Git;
+
+/**
+ * Artifact git class.
+ */
+class ArtifactGit extends Git {
+
+  /**
+   * Open directory.
+   *
+   * @throws \CzProject\GitPhp\GitException
+   */
+  public function open($directory): ArtifactGitRepository {
+    return new ArtifactGitRepository($directory, $this->runner);
+  }
+
+}

src/GitArtifactGitRepository.php → src/Git/ArtifactGitRepository.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace DrevOps\GitArtifact;
+namespace DrevOps\GitArtifact\Git;
 
 use CzProject\GitPhp\GitRepository;
 use CzProject\GitPhp\RunnerResult;
@@ -14,7 +14,7 @@
  *
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
  */
-class GitArtifactGitRepository extends GitRepository {
+class ArtifactGitRepository extends GitRepository {
 
   /**
    * Filesystem.
@@ -34,12 +34,12 @@ class GitArtifactGitRepository extends GitRepository {
    * @param string $refSpec
    *   Specify what destination ref to update with what source object.
    *
-   * @return GitArtifactGitRepository
+   * @return ArtifactGitRepository
    *   Git repo.
    *
    * @throws \CzProject\GitPhp\GitException
    */
-  public function pushForce(string $remote, string $refSpec): GitArtifactGitRepository {
+  public function pushForce(string $remote, string $refSpec): ArtifactGitRepository {
     return parent::push([$remote, $refSpec], ['--force']);
   }
 
@@ -110,7 +110,7 @@ public function getCommits(string $format = '%s'): array {
    *
    * @throws \CzProject\GitPhp\GitException
    */
-  public function resetHard(): GitArtifactGitRepository {
+  public function resetHard(): ArtifactGitRepository {
     $this->run('reset', ['--hard']);
 
     return $this;
@@ -124,7 +124,7 @@ public function resetHard(): GitArtifactGitRepository {
    *
    * @throws \CzProject\GitPhp\GitException
    */
-  public function cleanForce(): GitArtifactGitRepository {
+  public function cleanForce(): ArtifactGitRepository {
     $this->run('clean', ['-dfx']);
 
     return $this;
@@ -138,12 +138,12 @@ public function cleanForce(): GitArtifactGitRepository {
    * @param bool $createNew
    *   Optional flag to also create a branch before switching. Default false.
    *
-   * @return GitArtifactGitRepository
+   * @return ArtifactGitRepository
    *   The git repository.
    *
    * @throws \CzProject\GitPhp\GitException
    */
-  public function switchToBranch(string $branchName, bool $createNew = FALSE): GitArtifactGitRepository {
+  public function switchToBranch(string $branchName, bool $createNew = FALSE): ArtifactGitRepository {
     if (!$createNew) {
       return $this->checkout($branchName);
     }
@@ -159,12 +159,12 @@ public function switchToBranch(string $branchName, bool $createNew = FALSE): Git
    * @param bool $force
    *   Force remove or not.
    *
-   * @return GitArtifactGitRepository
+   * @return ArtifactGitRepository
    *   Git repository
    *
    * @throws \CzProject\GitPhp\GitException
    */
-  public function removeBranch($name, bool $force = FALSE): GitArtifactGitRepository {
+  public function removeBranch($name, bool $force = FALSE): ArtifactGitRepository {
     if (empty($name)) {
       return $this;
     }
@@ -231,7 +231,7 @@ public function listCommittedFiles(): array {
    *
    * @throws \CzProject\GitPhp\GitException
    */
-  public function setConfigReceiveDenyCurrentBranchIgnore(): GitArtifactGitRepository {
+  public function setConfigReceiveDenyCurrentBranchIgnore(): ArtifactGitRepository {
     $this->extractFromCommand(['config', ['receive.denyCurrentBranch', 'ignore']]);
 
     return $this;
@@ -250,7 +250,7 @@ public function setConfigReceiveDenyCurrentBranchIgnore(): GitArtifactGitReposit
    *
    * @throws \CzProject\GitPhp\GitException
    */
-  public function createAnnotatedTag(string $name, string $message): GitArtifactGitRepository {
+  public function createAnnotatedTag(string $name, string $message): ArtifactGitRepository {
     $this->createTag($name, [
       '--message=' . $message,
       '-a',
@@ -270,7 +270,7 @@ public function createAnnotatedTag(string $name, string $message): GitArtifactGi
    *
    * @throws \CzProject\GitPhp\GitException
    */
-  public function createLightweightTag(string $name): GitArtifactGitRepository {
+  public function createLightweightTag(string $name): ArtifactGitRepository {
     $this->createTag($name);
 
     return $this;
@@ -284,12 +284,12 @@ public function createLightweightTag(string $name): GitArtifactGitRepository {
    * @param string $name
    *   Remote name.
    *
-   * @return GitArtifactGitRepository
+   * @return ArtifactGitRepository
    *   Git repo.
    *
    * @throws \CzProject\GitPhp\GitException
    */
-  public function removeRemote($name): GitArtifactGitRepository {
+  public function removeRemote($name): ArtifactGitRepository {
     if ($this->isRemoteExists($name)) {
       $this->run('remote', 'remove', $name);
     }