-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
22 changed files
with
702 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
gradle-plugin/src/main/java/org/dmfs/gradle/gver/tasks/TagPreReleaseTask.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package org.dmfs.gradle.gver.tasks; | ||
|
|
||
| import org.dmfs.gradle.gver.utils.ProjectRepositoryFunction; | ||
| import org.dmfs.gver.dsl.GitVersionConfig; | ||
| import org.dmfs.gver.dsl.procedure.CreateTag; | ||
| import org.dmfs.semver.StrictParser; | ||
| import org.eclipse.jgit.lib.Repository; | ||
| import org.gradle.api.DefaultTask; | ||
| import org.gradle.api.Task; | ||
| import org.gradle.api.tasks.TaskAction; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static org.dmfs.gver.dsl.ReleaseType.PRERELEASE; | ||
|
|
||
|
|
||
| /** | ||
| * A Gradle {@link Task} that tags the current HEAD with a new pre-release version. | ||
| * <p> | ||
| * This task will throw an {@link IllegalStateException} when the current HEAD is not on a pre-release branch. | ||
| */ | ||
| public class TagPreReleaseTask extends DefaultTask | ||
| { | ||
| public TagPreReleaseTask() | ||
| { | ||
| setGroup("gver"); | ||
| setDescription("Tags the HEAD commit with a new pre-release version."); | ||
| } | ||
|
|
||
| @TaskAction | ||
| public void perform() throws IOException | ||
| { | ||
| try (Repository repository = ProjectRepositoryFunction.INSTANCE.value(getProject())) | ||
| { | ||
| new CreateTag( | ||
| getLogger()::lifecycle, | ||
| PRERELEASE::equals, | ||
| (GitVersionConfig) getProject().getExtensions().getByName("gver"), | ||
| new StrictParser().parse(getProject().getVersion().toString())) | ||
| .process(repository); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
gradle-plugin/src/test/java/org/dmfs/gradle/gver/tasks/TagPreReleaseTaskTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package org.dmfs.gradle.gver.tasks; | ||
|
|
||
| import org.dmfs.gradle.gver.utils.HasTagListThat; | ||
| import org.dmfs.gradle.gver.utils.Repo; | ||
| import org.dmfs.gradle.gver.utils.TestProject; | ||
| import org.dmfs.gver.dsl.Strategy; | ||
| import org.dmfs.gver.git.changetypefacories.condition.CommitMessage; | ||
| import org.dmfs.gver.git.predicates.Contains; | ||
| import org.gradle.api.Project; | ||
| import org.saynotobugs.confidence.description.Text; | ||
| import org.saynotobugs.confidence.junit5.engine.Assertion; | ||
| import org.saynotobugs.confidence.junit5.engine.Confidence; | ||
| import org.saynotobugs.confidence.junit5.engine.Resource; | ||
| import org.saynotobugs.confidence.junit5.engine.resource.TempDir; | ||
|
|
||
| import java.io.File; | ||
|
|
||
| import static org.dmfs.gver.git.ChangeType.*; | ||
| import static org.dmfs.jems2.confidence.Jems2.procedureThatAffects; | ||
| import static org.eclipse.jgit.lib.Constants.R_TAGS; | ||
| import static org.saynotobugs.confidence.junit5.engine.ConfidenceEngine.assertionThat; | ||
| import static org.saynotobugs.confidence.junit5.engine.ConfidenceEngine.withResources; | ||
| import static org.saynotobugs.confidence.quality.Core.*; | ||
|
|
||
|
|
||
| @Confidence | ||
| class TagPreReleaseTaskTest | ||
| { | ||
| Resource<File> repoDir = new TempDir(); | ||
| Resource<File> homeDir = new TempDir(); | ||
|
|
||
| Resource<Project> testProject = new TestProject(repoDir, | ||
| new Strategy( | ||
| NONE.when(new CommitMessage(new Contains("#none"))), | ||
| MAJOR.when(new CommitMessage(new Contains("#major"))), | ||
| MINOR.when(new CommitMessage(new Contains("#minor"))), | ||
| PATCH.when(new CommitMessage(new Contains("#patch"))), | ||
| UNKNOWN.when(((repository1, commit, branches) -> true))), | ||
| homeDir); | ||
|
|
||
| Assertion gitTagPreRelease_adds_a_next_patch_tag = | ||
| withResources(new Repo("0.0.2-alpha.1.bundle", "main", repoDir), testProject, | ||
|
|
||
| (repo, project) -> assertionThat( | ||
| repository -> ((TagPreReleaseTask) project.getTasks().getByName("gitTagPreRelease")).perform(), | ||
| is(procedureThatAffects( | ||
| new Text("alters repository"), | ||
| () -> repo, | ||
| soIt(new HasTagListThat(iteratesInAnyOrder(R_TAGS + "0.0.1", R_TAGS + "0.0.2-alpha.1.20220116T202206Z-SNAPSHOT"))))))); | ||
|
|
||
|
|
||
| Assertion gitTagPreRelease_no_tag_on_feature_branch = | ||
| withResources(new Repo("0.2.0-alpha.1.feature.bundle", "feature", repoDir), testProject, | ||
|
|
||
| (repo, project) -> assertionThat( | ||
| repository -> ((TagPreReleaseTask) project.getTasks().getByName("gitTagPreRelease")).perform(), | ||
| is(procedureThatAffects( | ||
| new Text("preserves repository"), | ||
| () -> repo, | ||
| soIt(new HasTagListThat(iteratesInAnyOrder(R_TAGS + "0.0.1", R_TAGS + "0.1.0"))), | ||
| when(throwing(IllegalStateException.class)))))); | ||
|
|
||
|
|
||
| Assertion gitTagPreRelease_skips_existing_tag = | ||
| withResources(new Repo("0.2.0-trivial-change.bundle", "main", repoDir), testProject, | ||
|
|
||
| (repo, project) -> assertionThat( | ||
| repository -> ((TagPreReleaseTask) project.getTasks().getByName("gitTagPreRelease")).perform(), | ||
| is(procedureThatAffects( | ||
| new Text("alters repository"), | ||
| () -> repo, | ||
| soIt(new HasTagListThat(iteratesInAnyOrder(R_TAGS + "0.0.1", R_TAGS + "0.1.0", R_TAGS + "0.2.0"))))))); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.