Skip to content

Commit

Permalink
Merge pull request #43 from jenkinsci/feature/JENKINS-40232
Browse files Browse the repository at this point in the history 
Feature/jenkins 40232
  • Loading branch information
@klimas7
klimas7 committed Jan 28, 2017
2 parents 8119869 + 28398d4 commit 1fb81a9
Show file tree
Hide file tree
Showing 4 changed files with 107 additions and 30 deletions.
113 changes: 84 additions & 29 deletions src/main/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinition.java
View file
Expand Up @@ -6,6 +6,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
Expand All @@ -27,7 +28,7 @@
import hudson.model.Run;
import hudson.model.TaskListener;
import hudson.model.TopLevelItem;
import hudson.plugins.git.Branch;
import hudson.plugins.git.GitException;
import hudson.plugins.git.GitSCM;
import hudson.util.FormValidation;
import hudson.util.ListBoxModel;
Expand All @@ -39,6 +40,7 @@
import net.uaznia.lukanus.hudson.plugins.gitparameter.scms.RepoSCM;
import net.uaznia.lukanus.hudson.plugins.gitparameter.scms.SCMFactory;
import org.apache.commons.lang.StringUtils;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.transport.RemoteConfig;
import org.eclipse.jgit.transport.URIish;
import org.jenkinsci.plugins.gitclient.FetchCommand;
Expand All @@ -51,12 +53,15 @@
public class GitParameterDefinition extends ParameterDefinition implements Comparable<GitParameterDefinition> {
private static final long serialVersionUID = 9157832967140868122L;

private static final String DEFAULT_REMOTE = "origin";
private static final String REFS_TAGS_PATTERN = ".*refs/tags/";

public static final String PARAMETER_TYPE_TAG = "PT_TAG";
public static final String PARAMETER_TYPE_REVISION = "PT_REVISION";
public static final String PARAMETER_TYPE_BRANCH = "PT_BRANCH";
public static final String PARAMETER_TYPE_TAG_BRANCH = "PT_BRANCH_TAG";
public static final String TEMPORARY_DIRECTORY_PREFIX = "git_parameter_";

public static final String TEMPORARY_DIRECTORY_PREFIX = "git_parameter_";
private static final Logger LOGGER = Logger.getLogger(GitParameterDefinition.class.getName());

private final UUID uuid;
Expand Down Expand Up @@ -257,29 +262,25 @@ public Map<String, String> generateContents(JobWrapper jobWrapper, GitSCM git) {
try {
EnvVars environment = getEnvironment(jobWrapper);
for (RemoteConfig repository : git.getRepositories()) {
boolean isRepoScm = RepoSCM.isRepoSCM(repository.getName());
synchronized (GitParameterDefinition.class) {
FilePathWrapper workspace = getWorkspace(jobWrapper, isRepoScm);
GitClient gitClient = getGitClient(jobWrapper, workspace, git, environment);
for (URIish remoteURL : repository.getURIs()) {
initWorkspace(workspace, gitClient, remoteURL);
GitClient gitClient = getGitClient(jobWrapper, null, git, environment);
String gitUrl = remoteURL.toPrivateASCIIString();

FetchCommand fetch = gitClient.fetch_().prune().from(remoteURL, repository.getFetchRefSpecs());
fetch.execute();

if (type.equalsIgnoreCase(PARAMETER_TYPE_REVISION)) {
getRevision(paramList, gitClient);
}
if (type.equalsIgnoreCase(PARAMETER_TYPE_TAG) || type.equalsIgnoreCase(PARAMETER_TYPE_TAG_BRANCH)) {
Set<String> tagSet = gitClient.getTagNames(tagFilter);
if (isTagType()) {
Set<String> tagSet = getTag(gitClient, gitUrl);
sortAndPutToParam(tagSet, paramList);
}
if (type.equalsIgnoreCase(PARAMETER_TYPE_BRANCH) || type.equalsIgnoreCase(PARAMETER_TYPE_TAG_BRANCH)) {
Set<String> branchSet = getBranch(gitClient);

if (isBranchType()) {
Set<String> branchSet = getBranch(gitClient, gitUrl);
sortAndPutToParam(branchSet, paramList);
}

if (isRevisionType()) {
getRevision(jobWrapper, git, paramList, environment, repository, remoteURL);
}
}
workspace.delete();
break;
}
}
Expand All @@ -292,17 +293,40 @@ public Map<String, String> generateContents(JobWrapper jobWrapper, GitSCM git) {
return paramList;
}

private Set<String> getBranch(GitClient gitClient) throws InterruptedException {
Set<String> branchSet = new HashSet<String>();
Pattern branchFilterPattern;

private boolean isRevisionType() {
return type.equalsIgnoreCase(PARAMETER_TYPE_REVISION);
}

private boolean isBranchType() {
return type.equalsIgnoreCase(PARAMETER_TYPE_BRANCH) || type.equalsIgnoreCase(PARAMETER_TYPE_TAG_BRANCH);
}

private boolean isTagType() {
return type.equalsIgnoreCase(PARAMETER_TYPE_TAG) || type.equalsIgnoreCase(PARAMETER_TYPE_TAG_BRANCH);
}

private Set<String> getTag(GitClient gitClient, String gitUrl) throws InterruptedException {
Set<String> tagSet = new HashSet<String>();
try {
branchFilterPattern = Pattern.compile(branchFilter);
} catch (Exception e) {
LOGGER.log(Level.INFO, Messages.GitParameterDefinition_branchFilterNotValid(), e.getMessage());
branchFilterPattern = Pattern.compile(".*");
Map<String, ObjectId> tags = gitClient.getRemoteReferences(gitUrl, tagFilter, false, true);
for (String tagName : tags.keySet()) {
tagSet.add(tagName.replaceFirst(REFS_TAGS_PATTERN, ""));
}
} catch (GitException e) {
LOGGER.log(Level.WARNING,Messages.GitParameterDefinition_getTag(), e);
}
for (Branch branch : gitClient.getRemoteBranches()) {
String branchName = branch.getName();
return tagSet;
}

private Set<String> getBranch(GitClient gitClient, String gitUrl) throws InterruptedException {
Set<String> branchSet = new HashSet<String>();
Pattern branchFilterPattern = compileBranchFilterPattern();

Map<String, ObjectId> branches = gitClient.getRemoteReferences(gitUrl, null, true, false);
Iterator<String> remoteBranchesName = branches.keySet().iterator();
while (remoteBranchesName.hasNext()) {
String branchName = strip(remoteBranchesName.next(), DEFAULT_REMOTE);
Matcher matcher = branchFilterPattern.matcher(branchName);
if (matcher.matches()) {
if (matcher.groupCount() == 1) {
Expand All @@ -315,15 +339,46 @@ private Set<String> getBranch(GitClient gitClient) throws InterruptedException {
return branchSet;
}

private void getRevision(Map<String, String> paramList, GitClient gitClient) throws InterruptedException {
private Pattern compileBranchFilterPattern() {
Pattern branchFilterPattern;
try {
branchFilterPattern = Pattern.compile(branchFilter);
} catch (Exception e) {
LOGGER.log(Level.INFO, Messages.GitParameterDefinition_branchFilterNotValid(), e.getMessage());
branchFilterPattern = Pattern.compile(".*");
}
return branchFilterPattern;
}

//hudson.plugins.git.Branch.strip
private String strip(String name, String remote) {
return remote + "/" + name.substring(name.indexOf('/', 5) + 1);
}

/**
*Unfortunately, to get the revisions should do fetch
*/
private void getRevision(JobWrapper jobWrapper, GitSCM git, Map<String, String> paramList, EnvVars environment, RemoteConfig repository, URIish remoteURL) throws IOException, InterruptedException {
boolean isRepoScm = RepoSCM.isRepoSCM(repository.getName());
FilePathWrapper workspace = getWorkspace(jobWrapper, isRepoScm);

GitClient gitClient = getGitClient(jobWrapper, workspace, git, environment);
initWorkspace(workspace, gitClient, remoteURL);
FetchCommand fetch = gitClient.fetch_().prune().from(remoteURL, repository.getFetchRefSpecs());
fetch.execute();

RevisionInfoFactory revisionInfoFactory = new RevisionInfoFactory(gitClient, branch);
List<RevisionInfo> revisions = revisionInfoFactory.getRevisions();

for (RevisionInfo revision : revisions) {
paramList.put(revision.getSha1(), revision.getRevisionInfo());
}

workspace.delete();
}



private void sortAndPutToParam(Set<String> setElement, Map<String, String> paramList) {
List<String> sorted = sort(setElement);

Expand Down Expand Up @@ -384,7 +439,7 @@ private EnvVars getEnvironment(JobWrapper jobWrapper) throws IOException, Interr
private void initWorkspace(FilePathWrapper workspace, GitClient gitClient, URIish remoteURL) throws IOException, InterruptedException {
if (isEmptyWorkspace(workspace.getFilePath())) {
gitClient.init();
gitClient.clone(remoteURL.toASCIIString(), "origin", false, null);
gitClient.clone(remoteURL.toASCIIString(), DEFAULT_REMOTE, false, null);
LOGGER.log(Level.INFO, Messages.GitParameterDefinition_genContentsCloneDone());
}
}
Expand All @@ -397,7 +452,7 @@ private GitClient getGitClient(final JobWrapper jobWrapper, FilePathWrapper work
int nextBuildNumber = jobWrapper.getNextBuildNumber();

GitClient gitClient = git.createClient(TaskListener.NULL, environment, new Run(jobWrapper.getJob()) {
}, workspace.getFilePath());
}, workspace != null ? workspace.getFilePath() : null);

jobWrapper.updateNextBuildNumber(nextBuildNumber);
return gitClient;
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/net/uaznia/lukanus/hudson/plugins/gitparameter/Messages.properties
View file
Expand Up @@ -7,3 +7,4 @@ GitParameterDefinition.branchFilterNotValid=Specified branchFilter is not a vali
GitParameterDefinition.genContentsCloneDone=generateContents clone done
GitParameterDefinition.notFindAuthorPattern=Did not find author pattern {0}
GitParameterDefinition.invalidUseRepositoryPattern=The pattern {0} does not appear to be valid.
GitParameterDefinition.getTag=Download tags from the repository failed
1 change: 1 addition & 0 deletions src/main/resources/net/uaznia/lukanus/hudson/plugins/gitparameter/Messages_pl.properties
View file
Expand Up @@ -7,3 +7,4 @@ GitParameterDefinition.branchFilterNotValid=Ustawienie branchFilter nie jest pra
GitParameterDefinition.genContentsCloneDone=Klonowanie wykonane
GitParameterDefinition.notFindAuthorPattern=Nie znaleziono wzorca autora
GitParameterDefinition.invalidUseRepositoryPattern=Wzorzec {0} nie jest prawid\u0142owym wyra\u017Ceniem regularnym.
GitParameterDefinition.getTag=Pobranie tag\u00F3w z repozytorium zako\u0144czone niepowodzeniem.
22 changes: 21 additions & 1 deletion src/test/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinitionTest.java
View file
Expand Up @@ -434,7 +434,7 @@ public void testDoFillValueItems_listBranches() throws Exception {
}

@Test
public void tesListBranchesWrongBrancheFilter() throws Exception {
public void tesListBranchesWrongBranchFilter() throws Exception {
project = jenkins.createFreeStyleProject("testListTags");
project.getBuildersList().add(new Shell("echo test"));
setupGit();
Expand Down Expand Up @@ -496,6 +496,26 @@ public void testSortAscendingTag() throws Exception {
assertEquals("0.1", items.get(0).value);
}

@Test
public void testWrongTagFilter() throws Exception {
project = jenkins.createFreeStyleProject("testListTags");
project.getBuildersList().add(new Shell("echo test"));
setupGit();

GitParameterDefinition def = new GitParameterDefinition("testName",
"PT_TAG",
"testDefaultValue",
"testDescription",
null,
".*",
"wrongTagFilter",
SortMode.ASCENDING, SelectedValue.NONE, null, false);
project.addProperty(new ParametersDefinitionProperty(def));

ListBoxModel items = def.getDescriptor().doFillValueItems(project, def.getName());
assertTrue(items.isEmpty());
}

@Test
public void testSortDescendingTag() throws Exception {
project = jenkins.createFreeStyleProject("testListTags");
Expand Down

0 comments on commit 1fb81a9

Please sign in to comment.