-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(common,git): Replace versioning tag check with task-based tag check
Closes GH-139
- Loading branch information
Showing
9 changed files
with
156 additions
and
117 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| /* | ||
| * This file is part of indra, licensed under the MIT License. | ||
| * | ||
| * Copyright (c) 2020-2022 KyoriPowered | ||
| * Copyright (c) 2020-2023 KyoriPowered | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
|
|
@@ -23,21 +23,13 @@ | |
| */ | ||
| package net.kyori.indra.util; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.stream.Stream; | ||
| import net.kyori.indra.git.GitPlugin; | ||
| import net.kyori.indra.test.IndraTesting; | ||
| import org.eclipse.jgit.api.Git; | ||
| import org.eclipse.jgit.api.errors.GitAPIException; | ||
| import org.gradle.api.JavaVersion; | ||
| import org.gradle.api.Project; | ||
| import org.junit.jupiter.api.DynamicNode; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.TestFactory; | ||
| import org.junit.jupiter.api.io.TempDir; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.ValueSource; | ||
|
|
||
|
|
@@ -104,7 +96,7 @@ void testIsReleaseDoesNotMatch(final String version) { | |
| } | ||
|
|
||
| @TestFactory | ||
| Stream<DynamicNode> testIsReleaseMatches(@TempDir final Path tempDir) { | ||
| Stream<DynamicNode> testIsReleaseMatches() { | ||
| return Stream.of( | ||
| "1.0.0", | ||
| "1.0.0-KITTENS", | ||
|
|
@@ -113,72 +105,9 @@ Stream<DynamicNode> testIsReleaseMatches(@TempDir final Path tempDir) { | |
| ).flatMap(version -> Stream.of( | ||
| dynamicTest(version + " - matches, no repo", () -> { | ||
| final Project project = IndraTesting.project(); | ||
| project.getPlugins().apply(GitPlugin.class); | ||
| project.setVersion(version); | ||
| assertTrue(Versioning.isRelease(project)); | ||
| }), | ||
| dynamicTest(version + " - matches, on tag (non-annotated)", () -> { | ||
| final Path testPath = tempDir.resolve(version + "-ontag"); | ||
| Files.createDirectories(testPath); | ||
| final Git repo = initRepoWithCommit(testPath); | ||
|
|
||
| repo.tag() | ||
| .setName("v" + version) | ||
| .call(); | ||
|
|
||
| final Project project = IndraTesting.project(b -> b.withProjectDir(testPath.toFile())); | ||
| project.getPlugins().apply(GitPlugin.class); | ||
| project.setVersion(version); | ||
| assertTrue(Versioning.isRelease(project)); | ||
| }), | ||
| dynamicTest(version + " - matches, on tag (annotated)", () -> { | ||
| final Path testPath = tempDir.resolve(version + "-onannotatedtag"); | ||
| Files.createDirectories(testPath); | ||
| final Git repo = initRepoWithCommit(testPath); | ||
|
|
||
| repo.tag() | ||
| .setName("v" + version) | ||
| .setAnnotated(true) | ||
| .setMessage("Release " + version) | ||
| .call(); | ||
|
|
||
| final Project project = IndraTesting.project(b -> b.withProjectDir(testPath.toFile())); | ||
| project.getPlugins().apply(GitPlugin.class); | ||
| project.setVersion(version); | ||
| assertTrue(Versioning.isRelease(project)); | ||
| }), | ||
| dynamicTest(version + " - does not match, with repo no tag", () -> { | ||
| final Path testPath = tempDir.resolve(version + "-untagged"); | ||
| Files.createDirectories(testPath); | ||
| initRepoWithCommit(testPath); | ||
|
|
||
| final Project project = IndraTesting.project(b -> b.withProjectDir(testPath.toFile())); | ||
| project.getPlugins().apply(GitPlugin.class); | ||
| project.setVersion(version); | ||
| assertFalse(Versioning.isRelease(project)); | ||
| }) | ||
| )); | ||
| } | ||
|
|
||
| private static Git initRepoWithCommit(final Path repoDir) throws IOException, GitAPIException { | ||
| Files.createDirectories(repoDir); | ||
| final Git repo = Git.init() | ||
| .setDirectory(repoDir.toFile()) | ||
| .setInitialBranch("trunk") | ||
| .call(); | ||
|
|
||
| Files.write(repoDir.resolve("gradle.properties"), "filler=test".getBytes(StandardCharsets.UTF_8)); | ||
| repo.commit() | ||
| .setAuthor("CI", "[email protected]") | ||
| .setCommitter("CI", "[email protected]") | ||
| .setAll(true) | ||
| .setMessage("Initial commit") | ||
| .call(); | ||
|
|
||
| return repo; | ||
| } | ||
|
|
||
| // release matches non-git checkout content | ||
|
|
||
|
|
||
| } | ||
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
64 changes: 64 additions & 0 deletions
64
indra-git/src/main/java/net/kyori/indra/git/task/RepositoryTask.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,64 @@ | ||
| /* | ||
| * This file is part of indra, licensed under the MIT License. | ||
| * | ||
| * Copyright (c) 2023 KyoriPowered | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
| package net.kyori.indra.git.task; | ||
|
|
||
| import net.kyori.indra.git.internal.IndraGitService; | ||
| import org.eclipse.jgit.api.Git; | ||
| import org.gradle.api.DefaultTask; | ||
| import org.gradle.api.file.DirectoryProperty; | ||
| import org.gradle.api.provider.Property; | ||
| import org.gradle.api.services.ServiceReference; | ||
| import org.gradle.api.tasks.Internal; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| /** | ||
| * Base class for tasks that work with a {@link Git} repository. | ||
| * | ||
| * @since 4.0.0 | ||
| */ | ||
| public abstract class RepositoryTask extends DefaultTask { | ||
| @Internal | ||
| @ServiceReference(IndraGitService.SERVICE_NAME) | ||
| public abstract Property<IndraGitService> getGit(); | ||
|
|
||
| @Internal | ||
| protected abstract DirectoryProperty getProjectDirectory(); | ||
|
|
||
| @Internal | ||
| protected abstract Property<String> getProjectDisplayName(); | ||
|
|
||
| public RepositoryTask() { | ||
| this.getProjectDirectory().fileValue(this.getProject().getProjectDir()); | ||
| this.getProjectDisplayName().convention(this.getProject().getDisplayName()); | ||
| } | ||
|
|
||
| /** | ||
| * Get the actual repo. | ||
| * | ||
| * @return the repo | ||
| */ | ||
| protected @Nullable Git repo() { | ||
| return this.getGit().get().git(this.getProjectDirectory().get().getAsFile(), this.getProjectDisplayName().get()); | ||
| } | ||
| } |
Oops, something went wrong.