Fixed not great cloning directory

Author: marcingrzejszczak

src/main/java/io/micrometer/release/train/Git.java

@@ -14,12 +14,11 @@
 package io.micrometer.release.train;
 
 import io.micrometer.release.common.ProcessRunner;
-
-import java.io.File;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+
 class Git {
 
     private static final Logger log = LoggerFactory.getLogger(Git.class);
@@ -37,13 +36,15 @@ void changeTag(String tag) {
     }
 
     File cloneRepo(String branch, String orgRepository) {
-        log.info("Cloning out {} branch to folder {}", branch, branch);
-        processRunner.run("gh", "repo", "clone", orgRepository, branch, "--", "-b", branch, "--single-branch");
-        return clonedDir(branch);
+        // micrometer-metrics/micrometer -> micrometer-metrics_micrometer
+        String folderToCloneTo = orgRepository.replace("/", "_");
+        log.info("Cloning out {} branch to folder {}", branch, folderToCloneTo);
+        processRunner.run("gh", "repo", "clone", orgRepository, folderToCloneTo, "--", "-b", branch, "--single-branch");
+        return clonedDir(folderToCloneTo);
     }
 
-    File clonedDir(String branch) {
-        return new File(branch);
+    File clonedDir(String subfolder) {
+        return new File(subfolder);
     }
 
 }

src/main/java/io/micrometer/release/train/TrainOptions.java

@@ -171,9 +171,9 @@ private static boolean hasText(String contextPropagationVersions) {
 
     enum ProjectDefinition {
 
-        TEST("gh-actions-test", "micrometer-bom"), CONTEXT_PROPAGATION("context-propagation", "context-propagation"),
-        MICROMETER("micrometer", "micrometer-bom"), TRACING("tracing", "micrometer-tracing-bom"),
-        DOC_GEN("micrometer-docs-generator", "micrometer-docs-generator");
+        TEST("gh-actions-test", "micrometer-bom"), TRACING_TEST("gh-actions-test2", "micrometer-tracing-bom"),
+        CONTEXT_PROPAGATION("context-propagation", "context-propagation"), MICROMETER("micrometer", "micrometer-bom"),
+        TRACING("tracing", "micrometer-tracing-bom"), DOC_GEN("micrometer-docs-generator", "micrometer-docs-generator");
 
         private final String groupId = "io.micrometer";
 
@@ -182,7 +182,7 @@ enum ProjectDefinition {
         private final String artifactId;
 
         ProjectDefinition(String repository, String artifactId) {
-            this.orgRepo = repository.equals("gh-actions-test") ? "marcingrzejszczak/" + repository
+            this.orgRepo = repository.contains("gh-actions-test") ? "marcingrzejszczak/" + repository
                     : "micrometer-metrics/" + repository;
             this.artifactId = artifactId;
         }

src/test/java/io/micrometer/release/train/GitTests.java

@@ -33,4 +33,15 @@ void should_checkout_tag() {
         then(processRunner).should().run("git", "checkout", "FETCH_HEAD");
     }
 
+    @Test
+    void should_clone_a_repo() {
+        Git git = new Git(processRunner);
+
+        git.cloneRepo("foo", "micrometer-metrics/micrometer");
+
+        then(processRunner).should()
+            .run("gh", "repo", "clone", "micrometer-metrics/micrometer", "micrometer-metrics_micrometer", "--", "-b",
+                    "foo", "--single-branch");
+    }
+
 }