Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for Issue-147 Pattern PATCH_PLUS_COMMIT_DISTANCE #148

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for Issue-147 Pattern PATCH_PLUS_COMMIT_DISTANCE #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions src/main/java/fr/brouillard/oss/jgitver/impl/ConfigurableVersionStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,14 @@
*/
package fr.brouillard.oss.jgitver.impl;

import java.util.List;
import java.util.Optional;
import java.util.*;

import fr.brouillard.oss.jgitver.Features;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.lib.*;
import org.eclipse.jgit.revwalk.*;

import fr.brouillard.oss.jgitver.Version;
import fr.brouillard.oss.jgitver.metadata.MetadataRegistrar;
import fr.brouillard.oss.jgitver.metadata.Metadatas;
import fr.brouillard.oss.jgitver.*;
import fr.brouillard.oss.jgitver.metadata.*;

public class ConfigurableVersionStrategy extends VersionStrategy<ConfigurableVersionStrategy> {
private boolean autoIncrementPatch = false;
Expand Down Expand Up @@ -105,6 +100,7 @@ public Version build(Commit head, List<Commit> parents) throws VersionCalculatio


getRegistrar().registerMetadata(Metadatas.COMMIT_DISTANCE, "" + headDistance);
getRegistrar().registerMetadata(Metadatas.PATCH_PLUS_COMMIT_DISTANCE, "" + (baseVersion.getPatch()+headDistance));

if (Features.DISTANCE_TO_ROOT.isActive()) {
int headToRootDistance = GitUtils.distanceToRoot(getRepository(), head.getGitObject());
Expand Down
24 changes: 9 additions & 15 deletions src/main/java/fr/brouillard/oss/jgitver/impl/PatternVersionStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,19 @@
*/
package fr.brouillard.oss.jgitver.impl;

import java.util.List;
import java.util.Optional;
import static java.util.Optional.empty;

import java.util.*;
import java.util.function.Function;

import fr.brouillard.oss.jgitver.Features;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.lib.*;
import org.eclipse.jgit.revwalk.*;
import org.petitparser.context.Result;

import fr.brouillard.oss.jgitver.Version;
import fr.brouillard.oss.jgitver.impl.pattern.VersionGrammarParser;
import fr.brouillard.oss.jgitver.impl.pattern.VersionPatternGrammarDefinition;
import fr.brouillard.oss.jgitver.metadata.MetadataProvider;
import fr.brouillard.oss.jgitver.metadata.MetadataRegistrar;
import fr.brouillard.oss.jgitver.metadata.Metadatas;

import static java.util.Optional.empty;
import fr.brouillard.oss.jgitver.*;
import fr.brouillard.oss.jgitver.impl.pattern.*;
import fr.brouillard.oss.jgitver.metadata.*;

public class PatternVersionStrategy extends VersionStrategy<PatternVersionStrategy> {
public static final String DEFAULT_VERSION_PATTERN = "${v}${<meta.QUALIFIED_BRANCH_NAME}${<meta.COMMIT_DISTANCE}";
Expand Down Expand Up @@ -75,6 +68,7 @@ public Version build(Commit head, List<Commit> parents) throws VersionCalculatio

int headDistance = base.getHeadDistance();
getRegistrar().registerMetadata(Metadatas.COMMIT_DISTANCE, "" + headDistance);
getRegistrar().registerMetadata(Metadatas.PATCH_PLUS_COMMIT_DISTANCE, "" + (baseVersion.getPatch()+headDistance));

if (Features.DISTANCE_TO_ROOT.isActive()) {
int headToRootDistance = GitUtils.distanceToRoot(getRepository(), head.getGitObject());
Expand Down
40 changes: 11 additions & 29 deletions src/main/java/fr/brouillard/oss/jgitver/impl/ScriptVersionStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,17 @@
*/
package fr.brouillard.oss.jgitver.impl;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.BufferedReader;
import java.io.InputStream;

import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.io.*;
import java.util.*;
import java.util.function.Function;

import org.apache.maven.shared.scriptinterpreter.ProjectBeanShellScriptInterpreter;
import org.apache.maven.shared.scriptinterpreter.ProjectGroovyScriptInterpreter;
import org.apache.maven.shared.scriptinterpreter.ScriptRunner;
import org.apache.maven.shared.scriptinterpreter.*;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.lib.*;
import org.eclipse.jgit.revwalk.*;

import org.apache.maven.shared.scriptinterpreter.ScriptInterpreter;

import fr.brouillard.oss.jgitver.Features;
import fr.brouillard.oss.jgitver.ScriptType;
import fr.brouillard.oss.jgitver.Version;

import fr.brouillard.oss.jgitver.metadata.MetadataProvider;
import fr.brouillard.oss.jgitver.metadata.MetadataRegistrar;
import fr.brouillard.oss.jgitver.metadata.Metadatas;
import fr.brouillard.oss.jgitver.*;
import fr.brouillard.oss.jgitver.metadata.*;

/**
* Executes the given script (according its {@link ScriptType},
Expand Down Expand Up @@ -95,9 +76,9 @@ public Version build(Commit head, List<Commit> parents) throws VersionCalculatio

final HashMap<String, Object> metaProps = new HashMap<String, Object>();

registrar.registerMetadata(Metadatas.COMMIT_DISTANCE,
"" + base.getHeadDistance());

registrar.registerMetadata(Metadatas.COMMIT_DISTANCE, "" + base.getHeadDistance());
registrar.registerMetadata(Metadatas.PATCH_PLUS_COMMIT_DISTANCE, "" + (baseVersion.getPatch()+base.getHeadDistance()));
if (Features.DISTANCE_TO_ROOT.isActive()) {
final int dtr = GitUtils.
distanceToRoot(getRepository(), head.getGitObject());
Expand Down Expand Up @@ -270,6 +251,7 @@ public ScriptVersionStrategy setScript(String script) {
case CURRENT_VERSION_MINOR:
case CURRENT_VERSION_PATCH:
case COMMIT_DISTANCE:
case PATCH_PLUS_COMMIT_DISTANCE:
case COMMIT_DISTANCE_TO_ROOT:
return TO_INTEGER;
case DIRTY:
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/fr/brouillard/oss/jgitver/metadata/Metadatas.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ public enum Metadatas {
* Exposes the commit distance from the base tag used for the version computation.
*/
COMMIT_DISTANCE,
/**
* Exposes the patch version of the computed version, ie the Z in X.Y.Z, plus the commit distance from the base tag used for the version computation.
*/
PATCH_PLUS_COMMIT_DISTANCE,
/**
* Exposes the distance from HEAD to the root ancestor.
*
Expand Down
14 changes: 11 additions & 3 deletions .../java/fr/brouillard/oss/jgitver/strategy/pattern/others/Scenario14WithMaxVersionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@
import org.eclipse.jgit.lib.ObjectId;
import org.junit.jupiter.api.Test;

import fr.brouillard.oss.jgitver.Scenarios;
import fr.brouillard.oss.jgitver.Strategies;
import fr.brouillard.oss.jgitver.*;
import fr.brouillard.oss.jgitver.metadata.Metadatas;
import fr.brouillard.oss.jgitver.ScenarioTest;

public class Scenario14WithMaxVersionTest extends ScenarioTest {

Expand All @@ -44,6 +42,8 @@ public void version_of_B_commit() {
// checkout the commit in scenario
unchecked(() -> git.checkout().setName(cCommit.name()).call());
assertThat(versionCalculator.getVersion(), is("1.0.0-0"));
assertThat(versionCalculator.meta(Metadatas.PATCH_PLUS_COMMIT_DISTANCE).isPresent(), is(true));
assertThat(versionCalculator.meta(Metadatas.PATCH_PLUS_COMMIT_DISTANCE).get(), is("0"));
}

@Test
Expand All @@ -53,6 +53,8 @@ public void version_of_C_commit() {
// checkout the commit in scenario
unchecked(() -> git.checkout().setName(cCommit.name()).call());
assertThat(versionCalculator.getVersion(), is("1.0.0-1"));
assertThat(versionCalculator.meta(Metadatas.PATCH_PLUS_COMMIT_DISTANCE).isPresent(), is(true));
assertThat(versionCalculator.meta(Metadatas.PATCH_PLUS_COMMIT_DISTANCE).get(), is("1"));
}

@Test
Expand All @@ -62,14 +64,20 @@ public void version_of_E_commit() {
// checkout the commit in scenario
unchecked(() -> git.checkout().setName(cCommit.name()).call());
assertThat(versionCalculator.getVersion(), is("1.1.1-1"));
assertThat(versionCalculator.meta(Metadatas.PATCH_PLUS_COMMIT_DISTANCE).isPresent(), is(true));
assertThat(versionCalculator.meta(Metadatas.PATCH_PLUS_COMMIT_DISTANCE).get(), is("2"));
}


@Test
public void version_of_master() {
// checkout the commit in scenario
unchecked(() -> git.checkout().setName("master").call());
assertThat(versionCalculator.getVersion(), is("1.1.1-2"));

assertThat(versionCalculator.meta(Metadatas.PATCH_PLUS_COMMIT_DISTANCE).isPresent(), is(true));
assertThat(versionCalculator.meta(Metadatas.PATCH_PLUS_COMMIT_DISTANCE).get(), is("3"));

assertThat(versionCalculator.meta(Metadatas.NEXT_MAJOR_VERSION).get(), is("2.0.0"));
assertThat(versionCalculator.meta(Metadatas.NEXT_MINOR_VERSION).get(), is("1.2.0"));
assertThat(versionCalculator.meta(Metadatas.NEXT_PATCH_VERSION).get(), is("1.1.2"));
Expand Down