Skip to content

Commit

Permalink
Add a "latest minor" semver selector. We have them for major versions…
Browse files Browse the repository at this point in the history
… and patch versions might as well have minor, too.
  • Loading branch information
sambsnyd committed Dec 18, 2024
1 parent 372246c commit 65c9cf1
Show file tree
Hide file tree
Showing 4 changed files with 100 additions and 1 deletion.
60 changes: 60 additions & 0 deletions rewrite-core/src/main/java/org/openrewrite/semver/LatestMinor.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
* Copyright 2021 the original author or authors.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* https://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.openrewrite.semver;

import lombok.Value;
import org.jspecify.annotations.Nullable;
import org.openrewrite.Validated;

@Value
public class LatestMinor implements VersionComparator {
@Nullable
String metadataPattern;

@Override
public boolean isValid(@Nullable String currentVersion, String version) {
Validated<? extends VersionComparator> validated = currentVersion == null ?
LatestRelease.buildLatestRelease("latest.release", metadataPattern) :
TildeRange.build("~" + Semver.majorVersion(currentVersion), metadataPattern);

if (validated.isValid()) {
VersionComparator comparator = validated.getValue();
if (comparator != null) {
return comparator.isValid(currentVersion, version);
}
}
return false;
}

@Override
public int compare(@Nullable String currentVersion, String v1, String v2) {
if(currentVersion == null) {
return new LatestRelease(null)
.compare(null, v1, v2);
}

//noinspection ConstantConditions
return TildeRange.build("~" + Semver.majorVersion(currentVersion) + "." + Semver.minorVersion(currentVersion), metadataPattern)
.getValue()
.compare(currentVersion, v1, v2);
}

public static Validated<LatestMinor> build(String toVersion, @Nullable String metadataPattern) {
return "latest.minor".equalsIgnoreCase(toVersion) ?
Validated.valid("latestMinor", new LatestMinor(metadataPattern)) :
Validated.invalid("latestMinor", toVersion, "not latest release");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public int compare(@Nullable String currentVersion, String v1, String v2) {
}

public static Validated<LatestRelease> buildLatestRelease(String toVersion, @Nullable String metadataPattern) {
return "latest.release".equalsIgnoreCase(toVersion) ?
return "latest.release".equalsIgnoreCase(toVersion) || "latest.major".equalsIgnoreCase(toVersion) ?
Validated.valid("latestRelease", new LatestRelease(metadataPattern)) :
Validated.invalid("latestRelease", toVersion, "not latest release");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public static Validated<VersionComparator> validate(String toVersion, @Nullable
).and(Validated.<VersionComparator>none()
.or(LatestRelease.buildLatestRelease(toVersion, metadataPattern))
.or(LatestIntegration.build(toVersion, metadataPattern))
.or(LatestMinor.build(toVersion, metadataPattern))
.or(LatestPatch.build(toVersion, metadataPattern))
.or(HyphenRange.build(toVersion, metadataPattern))
.or(XRange.build(toVersion, metadataPattern))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
* Copyright 2024 the original author or authors.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* https://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.openrewrite.semver;

import org.junit.jupiter.api.Test;

import static org.assertj.core.api.Assertions.assertThat;

public class LatestMinorTest {
private final LatestMinor latestMinor = new LatestMinor(null);

@Test
void isValidWhenCurrentIsNull() {
assertThat(latestMinor.isValid(null, "1.0.0")).isTrue();
}
@Test
void isValid() {
assertThat(latestMinor.isValid("1.0.0", "1.0.0")).isTrue();
assertThat(latestMinor.isValid("1.0.0", "1.0.0.1")).isTrue();
assertThat(latestMinor.isValid("1.0.0", "1.0.1")).isTrue();
assertThat(latestMinor.isValid("1.0", "1.0.1")).isTrue();
assertThat(latestMinor.isValid("1.0.0", "1.1.0")).isTrue();
assertThat(latestMinor.isValid("1.0.0", "2.0.0")).isFalse();
}
}

0 comments on commit 65c9cf1

Please sign in to comment.