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

Cloning the repos to subfolders instead of directly to destination dir

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-06-28 19:11:19 +02:00
parent ccc881f764
commit 443a811b3d
5 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GitRepo.java
View File

@@ -97,7 +97,8 @@ class GitRepo {
*/
File cloneProject(URIish projectUri) {
try {
log.info("Cloning repo from [{}] to [{}]", projectUri, this.basedir);
log.info("Cloning repo from [{}] to [{}]", projectUri,
humanishDestination(projectUri, this.basedir));
Git git = cloneToBasedir(projectUri, this.basedir);
if (git != null) {
git.close();
@@ -247,7 +248,8 @@ class GitRepo {
private Git cloneToBasedir(URIish projectUrl, File destinationFolder)
throws GitAPIException {
CloneCommand command = this.gitFactory.getCloneCommandByCloneRepository()
.setURI(projectUrl.toString() + ".git").setDirectory(destinationFolder);
.setURI(projectUrl.toString() + ".git").setDirectory(
humanishDestination(projectUrl, destinationFolder));
try {
return command.call();
}
@@ -257,6 +259,10 @@ class GitRepo {
}
}
private File humanishDestination(URIish projectUrl, File destinationFolder) {
return new File(destinationFolder, projectUrl.getHumanishName());
}
private Ref checkoutBranch(File projectDir, String branch)
throws GitAPIException {
Git git = this.gitFactory.open(projectDir);

21
spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/git/GitRepoTests.java
View File

@@ -47,9 +47,10 @@ public class GitRepoTests {
@Test
public void should_clone_the_project_from_a_given_location() throws IOException {
this.gitRepo.cloneProject(new URIish(this.springCloudReleaseProject.toURI().toURL()));
URIish uri = new URIish(this.springCloudReleaseProject.toURI().toURL());
this.gitRepo.cloneProject(uri);
then(new File(this.tmpFolder, ".git")).exists();
then(new File(new File(this.tmpFolder, uri.getHumanishName()), ".git")).exists();
}
@Test
@@ -71,22 +72,24 @@ public class GitRepoTests {
@Test
public void should_check_out_a_branch_on_cloned_repo() throws IOException {
URIish uri = new URIish(this.springCloudReleaseProject.toURI().toURL());
File project = this.gitRepo
.cloneProject(new URIish(this.springCloudReleaseProject.toURI().toURL()));
.cloneProject(uri);
new GitRepo(project).checkout("vCamden.SR3");
File pom = new File(this.tmpFolder, "pom.xml");
File pom = new File(new File(this.tmpFolder, uri.getHumanishName()), "pom.xml");
then(pom).exists();
then(Files.lines(pom.toPath()).anyMatch(s -> s.contains("<version>Camden.SR3</version>"))).isTrue();
}
@Test
public void should_check_out_a_branch_on_cloned_repo2() throws IOException {
URIish uri = new URIish(this.springCloudReleaseProject.toURI().toURL());
File project = this.gitRepo
.cloneProject(new URIish(this.springCloudReleaseProject.toURI().toURL()));
.cloneProject(uri);
new GitRepo(project).checkout("Camden.x");
File pom = new File(this.tmpFolder, "pom.xml");
File pom = new File(new File(this.tmpFolder, uri.getHumanishName()), "pom.xml");
then(pom).exists();
then(Files.lines(pom.toPath()).anyMatch(s -> s.contains("<version>Camden.BUILD-SNAPSHOT</version>"))).isTrue();
}
@@ -121,8 +124,8 @@ public class GitRepoTests {
@Test
public void should_commit_changes() throws Exception {
File project = new GitRepo(this.tmpFolder)
.cloneProject(new URIish(this.springCloudReleaseProject.toURI().toURL()));
URIish uri = new URIish(this.springCloudReleaseProject.toURI().toURL());
File project = new GitRepo(this.tmpFolder).cloneProject(uri);
createNewFile(project);
new GitRepo(project).commit("some message");
@@ -241,7 +244,7 @@ public class GitRepoTests {
}
private void createNewFile(File project) throws Exception {
File newFile = new File(this.tmpFolder, "newFile");
File newFile = new File(project, "newFile");
newFile.createNewFile();
try (PrintStream out = new PrintStream(new FileOutputStream(newFile))) {
out.print("foo");

3
spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/git/GitTestUtils.java
View File

@@ -35,7 +35,6 @@ public class GitTestUtils {
public static File clonedProject(File baseDir, File projectToClone) throws IOException {
GitRepo projectRepo = new GitRepo(baseDir);
projectRepo.cloneProject(new URIish(projectToClone.toURI().toURL()));
return baseDir;
return projectRepo.cloneProject(new URIish(projectToClone.toURI().toURL()));
}
}

4
spring-cloud-release-tools-spring/src/main/resources/application.yml
View File

@@ -1 +1,3 @@
spring.main.web-environment: false
spring:
main:
web-application-type: none

3
spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/git/GitTestUtils.java
View File

@@ -35,7 +35,6 @@ public class GitTestUtils {
public static File clonedProject(File baseDir, File projectToClone) throws IOException {
GitRepo projectRepo = new GitRepo(baseDir);
projectRepo.cloneProject(new URIish(projectToClone.toURI().toURL()));
return baseDir;
return projectRepo.cloneProject(new URIish(projectToClone.toURI().toURL()));
}
}