Allow releases based on relative versions

It’s now possible to use ‘major’ instead of 2.0 (when 1.0 or 1.5 exists)
hupkit · Feb 11, 2017 · 3aeaca3 · 3aeaca3
1 parent 0ad43b2
commit 3aeaca3
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 3 deletions.
diff --git a/src/Cli/Handler/ReleaseHandler.php b/src/Cli/Handler/ReleaseHandler.php
@@ -109,7 +109,11 @@ private function validateBranchCompatibility(string $branch, Version $version)
 
     private function validateVersion(string $version): Version
     {
-        $version = Version::fromString($version);
+        if (in_array(strtolower($version), ['alpha', 'beta', 'rc', 'stable', 'major', 'minor', 'patch'], true)) {
+            $version = Version::fromString($this->git->getLastTagOnBranch())->increase(strtolower($version));
+        } else {
+            $version = Version::fromString($version);
+        }
 
         if (!$this->io->isInteractive()) {
             return $version;

diff --git a/src/Cli/HubKitApplicationConfig.php b/src/Cli/HubKitApplicationConfig.php
@@ -225,7 +225,7 @@ function (PreHandleEvent $event) {
 
             ->beginCommand('release')
                 ->setDescription('Make a new release for the current branch')
-                ->addArgument('version', Argument::REQUIRED | Argument::STRING, 'Version to make')
+                ->addArgument('version', Argument::REQUIRED | Argument::STRING, 'Version to make (supports relative, eg. minor, alpha, ...)')
                 ->addOption('all-categories', null, Option::NO_VALUE | Option::BOOLEAN, 'Show all categories (including empty)')
                 ->addOption('no-edit', null, Option::NO_VALUE | Option::BOOLEAN, 'Don\'t open the editor for editing the release page')
                 ->addOption('pre-release', null, Option::NO_VALUE | Option::BOOLEAN, 'Mark as pre-release (not production ready)')

diff --git a/src/Helper/Version.php b/src/Helper/Version.php
@@ -203,7 +203,12 @@ public function increase(string $stability): Version
                 return $this->increaseStable();
 
             default:
-                throw new \InvalidArgumentException('Unknown or unsupported stability provided: '.$stability);
+                throw new \InvalidArgumentException(
+                    sprintf(
+                        'Unknown stability "%s", accepts "%s" '.$stability,
+                        implode('", "', ['alpha', 'beta', 'rc', 'stable', 'major', 'minor', 'patch'])
+                    )
+                );
         }
     }
 

diff --git a/tests/Handler/ReleaseHandlerTest.php b/tests/Handler/ReleaseHandlerTest.php
@@ -259,6 +259,32 @@ public function it_asks_confirmation_when_target_branch_has_a_mismatch_and_abort
         $this->executeHandler($args); // default answer is no
     }
 
+    /** @test */
+    public function it_creates_a_new_release_with_a_relative_version()
+    {
+        $this->expectTags(['0.1.0', '1.0.0', '2.0.0']);
+        $this->git->getLastTagOnBranch()->willReturn('2.5.0');
+        $this->expectMatchingVersionBranchNotExists('3.0');
+
+        $this->git->getLogBetweenCommits('2.5.0', 'master')->willReturn(self::COMMITS);
+
+        $this->expectEditorReturns("### Added\n- Introduce a new API for ValuesBag", 'Drop support for older PHP versions');
+
+        $url = $this->expectTagAndGitHubRelease('3.0.0', 'Drop support for older PHP versions');
+
+        $args = $this->getArgs('major');
+        $this->executeHandler($args);
+
+        $this->assertOutputMatches(
+            [
+                'Preparing release 3.0.0 (target branch master)',
+                'Please wait...',
+                'Successfully released 3.0.0',
+                $url,
+            ]
+        );
+    }
+
     private function getArgs(string $version): Args
     {
         $format = ArgsFormat::build()