SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed manual going back to snapshots & bump version

Browse Source 
without this change when the step was executed manually the version wasn't bumped
with this change we analyze the project's version after reverting the commit (if applicable)

fixes #38
This commit is contained in:
Marcin Grzejszczak
2017-08-07 13:01:41 +02:00
parent 681852e3a0
commit 87915190f5
3 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java
View File

@@ -61,12 +61,14 @@ public class Releaser {
log.info("\nThe docs were published successfully");
}
public void rollbackReleaseVersion(File project, ProjectVersion originalVersion, ProjectVersion scReleaseVersion) {
public void rollbackReleaseVersion(File project, ProjectVersion scReleaseVersion) {
if (scReleaseVersion.isSnapshot()) {
log.info("\nWon't rollback a snapshot version");
return;
}
this.projectGitUpdater.revertChangesIfApplicable(project, scReleaseVersion);
ProjectVersion originalVersion = originalVersion(project);
log.info("Original project version is [{}]", originalVersion);
if ((scReleaseVersion.isRelease() || scReleaseVersion.isServiceRelease()) && originalVersion.isSnapshot()) {
this.projectBuilder.bumpVersions(originalVersion.bumpedVersion());
this.projectGitUpdater.commitAfterBumpingVersions(project, originalVersion);
@@ -76,6 +78,10 @@ public class Releaser {
}
}
ProjectVersion originalVersion(File project) {
return new ProjectVersion(project);
}
public void pushCurrentBranch(File project) {
this.projectGitUpdater.pushCurrentBranch(project);
log.info("\nSuccessfully pushed current branch");

38
spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/ReleaserTests.java
View File

@@ -3,6 +3,8 @@ package org.springframework.cloud.release.internal;
import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.function.Consumer;
import java.util.function.Supplier;
import org.junit.Before;
import org.junit.Test;
@@ -31,7 +33,6 @@ public class ReleaserTests {
@Mock ProjectBuilder projectBuilder;
@Mock ProjectGitUpdater projectGitUpdater;
@Mock TemplateGenerator templateGenerator;
@InjectMocks Releaser releaser;
File pom;
@Before
@@ -40,10 +41,24 @@ public class ReleaserTests {
this.pom = new File(pomUri);
}
Releaser releaser(Supplier<ProjectVersion> originalVersionSupplier) {
return new Releaser(this.projectPomUpdater, this.projectBuilder,
this.projectGitUpdater, this.templateGenerator) {
@Override ProjectVersion originalVersion(File project) {
return originalVersionSupplier.get();
}
};
}
Releaser releaser() {
return new Releaser(this.projectPomUpdater, this.projectBuilder,
this.projectGitUpdater, this.templateGenerator);
}
@Test
public void should_not_bump_versions_for_original_release_project() throws Exception {
this.releaser.rollbackReleaseVersion(this.pom,
new ProjectVersion("original", "1.0.0.RELEASE"),
releaser(() -> new ProjectVersion("original", "1.0.0.RELEASE"))
.rollbackReleaseVersion(this.pom,
new ProjectVersion("changed", "1.0.0.RELEASE"));
then(this.projectBuilder).should(never()).bumpVersions(anyString());
@@ -51,8 +66,8 @@ public class ReleaserTests {
@Test
public void should_not_bump_versions_for_original_snapshot_project_and_current_snapshot() throws Exception {
this.releaser.rollbackReleaseVersion(this.pom,
new ProjectVersion("original", "1.0.0.BUILD-SNAPSHOT"),
releaser(() -> new ProjectVersion("original", "1.0.0.BUILD-SNAPSHOT"))
.rollbackReleaseVersion(this.pom,
new ProjectVersion("changed", "1.0.0.BUILD-SNAPSHOT"));
then(this.projectBuilder).should(never()).bumpVersions(anyString());
@@ -60,8 +75,8 @@ public class ReleaserTests {
@Test
public void should_bump_versions_for_original_snapshot_project() throws Exception {
this.releaser.rollbackReleaseVersion(this.pom,
new ProjectVersion("original", "1.0.0.BUILD-SNAPSHOT"),
releaser(() -> new ProjectVersion("original", "1.0.0.BUILD-SNAPSHOT"))
.rollbackReleaseVersion(this.pom,
new ProjectVersion("changed", "1.0.0.RELEASE"));
then(this.projectBuilder).should().bumpVersions(anyString());
@@ -69,28 +84,29 @@ public class ReleaserTests {
@Test
public void should_not_generate_email_for_snapshot_version() throws Exception {
this.releaser.createEmail(new ProjectVersion("original", "1.0.0.BUILD-SNAPSHOT"));
releaser().createEmail(new ProjectVersion("original", "1.0.0.BUILD-SNAPSHOT"));
then(this.templateGenerator).should(never()).email();
}
@Test
public void should_generate_email_for_release_version() throws Exception {
this.releaser.createEmail(new ProjectVersion("original", "1.0.0.RELEASE"));
releaser().createEmail(new ProjectVersion("original", "1.0.0.RELEASE"));
then(this.templateGenerator).should().email();
}
@Test
public void should_not_close_milestone_for_snapshots() throws Exception {
this.releaser.closeMilestone(new ProjectVersion("original", "1.0.0.BUILD-SNAPSHOT"));
releaser().closeMilestone(new ProjectVersion("original", "1.0.0.BUILD-SNAPSHOT"));
then(this.projectGitUpdater).should(never()).closeMilestone(any(ProjectVersion.class));
}
@Test
public void should_not_rollback_for_snapshots() throws Exception {
this.releaser.rollbackReleaseVersion(null, null, new ProjectVersion("original", "1.0.0.BUILD-SNAPSHOT"));
releaser(() -> new ProjectVersion("original", "1.0.0.BUILD-SNAPSHOT"))
.rollbackReleaseVersion(null, new ProjectVersion("original", "1.0.0.BUILD-SNAPSHOT"));
then(this.projectGitUpdater).should(never()).revertChangesIfApplicable(any(File.class), any(ProjectVersion.class));
}

2
spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java
View File

@@ -50,7 +50,7 @@ public class SpringReleaser {
args -> args.releaser.publishDocs(args.versionFromScRelease)),
task("REVERTING CHANGES & BUMPING VERSION (RELEASE ONLY)",
"Go back to snapshots and bump originalVersion by patch",
args -> args.releaser.rollbackReleaseVersion(args.project, args.originalVersion, args.versionFromScRelease)),
args -> args.releaser.rollbackReleaseVersion(args.project, args.versionFromScRelease)),
task("PUSHING CHANGES",
"Push the commits",
args -> args.releaser.pushCurrentBranch(args.project)),