Make interactive mode work

Author: mwthinker

src/main/java/se/mwthinker/CMake.java

@@ -8,7 +8,7 @@
 import java.io.IOException;
 
 abstract class CMake {
-    static private boolean VERBOSE = false;
+    private static boolean VERBOSE = false;
 
     public static void setVerbose(boolean verbose) {
         CMake.VERBOSE = verbose;

src/main/java/se/mwthinker/CMakeBuilder.java

@@ -13,8 +13,10 @@ enum LicenseType {
 
 public class CMakeBuilder {
 
-    private record ExternalProject(String name, String gitUrl, String gitTag) {}
-    private record SourceFile(String file, String namespace) {}
+    // Must be public for Freemarker template access
+    public record ExternalProject(String name, String gitUrl, String gitTag) {}
+    // Must be public for Freemarker template access
+    public record SourceFile(String file, String namespace) {}
 
     private boolean testProject;
     private final FileSystem fileSystem;
@@ -108,7 +110,7 @@ public void buildFiles() {
         }
 
         for (var source : sources) {
-            fileSystem.saveFileFromTemplate(Map.of("source", source), source.file() + ".ftl", source.file());
+            fileSystem.copyResourceTo(source.file());
         }
 
         addExtraFile("CMakePresets.json");

src/main/java/se/mwthinker/FileSystem.java

@@ -13,7 +13,6 @@
 import java.nio.file.Path;
 import java.util.Comparator;
 import java.util.Map;
-import java.util.Objects;
 
 public class FileSystem {
     private final File projectDir;

src/main/java/se/mwthinker/GeneratorCli.java

@@ -157,14 +157,14 @@ private void interactivePrompt(ConsolePrompt prompt, PromptBuilder builder) {
             throw new RuntimeException(e);
         }
 
-        projectDir = new File(result.get("projectName").toString());
-        description = result.get("description").toString();
-        gui = result.get("gui").toString().equalsIgnoreCase("yes");
-        test = result.get("test").toString().equalsIgnoreCase("yes");
-        licenseAuthor = result.get("licenseAuthor").toString();
-        cmake = result.get("cmake").toString().equalsIgnoreCase("yes");
-        open = result.get("open").toString().equalsIgnoreCase("yes");
-        verbose = result.get("verbose").toString().equalsIgnoreCase("yes");
+        projectDir = new File(result.get("projectName").getResult());
+        description = result.get("description").getResult();
+        gui = result.get("gui").getResult().equalsIgnoreCase("yes");
+        test = result.get("test").getResult().equalsIgnoreCase("yes");
+        licenseAuthor = result.get("licenseAuthor").getResult();
+        cmake = result.get("cmake").getResult().equalsIgnoreCase("yes");
+        open = result.get("open").getResult().equalsIgnoreCase("yes");
+        verbose = result.get("verbose").getResult().equalsIgnoreCase("yes");
     }
 
     private int executeGeneratorLogic() {
@@ -248,7 +248,7 @@ public void close() throws IOException {
     }
 
     @Override
-    public void flush() throws IOException {
+    public void flush() {
         terminal.flush();
     }
 

src/main/java/se/mwthinker/ResourceHandler.java

@@ -16,7 +16,7 @@ public class ResourceHandler {
     public ResourceHandler(String templateDir) {
         this.templateDir = templateDir;
 
-        cfg = new Configuration(Configuration.VERSION_2_3_32);
+        cfg = new Configuration(Configuration.VERSION_2_3_34);
         cfg.setDefaultEncoding("UTF-8");
         cfg.setTemplateLoader(new ClassTemplateLoader(ResourceHandler.class, "/templates/"));
     }

src/main/resources/templates/CMakeLists.ftl

@@ -15,7 +15,7 @@ file(COPY data/. DESTINATION ${r"${CMAKE_CURRENT_BINARY_DIR}"})
 
 set(SOURCES
 <#list sources as source>
-	${source}
+	${source.file()}
 </#list>
 <#if extraFiles?has_content>
 

src/test/java/se/mwthinker/CMakeBuilderTest.java

@@ -7,6 +7,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
@@ -15,7 +16,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-public class CMakeBuilderTest {
+class CMakeBuilderTest {
 
     private CMakeBuilder cmakeBuilder;
 
@@ -25,33 +26,32 @@ public class CMakeBuilderTest {
     private Github github;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         cmakeBuilder = new CMakeBuilder(fileSystem, github);
     }
 
     @Test
-    public void buildMustHaveAtLeastOneSourceFile() {
+    void buildMustHaveAtLeastOneSourceFile() {
         // Given
         when(fileSystem.getProjectName()).thenReturn("MyProject");
 
-        // When
-        cmakeBuilder
-                .addSource("main.cpp")
-                .buildFiles();
-
-        // Then
-        // No exception
+        // When/Then
+        assertThatCode(() ->
+            cmakeBuilder
+                    .addSource("main.cpp")
+                    .buildFiles()
+        ).doesNotThrowAnyException();
     }
 
     @Test
-    public void buildMissingSourceFile() {
+    void buildMissingSourceFile() {
         assertThatThrownBy(() -> cmakeBuilder
                 .buildFiles())
                 .isInstanceOf(RuntimeException.class);
     }
 
     @Test
-    public void buildDefaultFiles() {
+    void buildDefaultFiles() {
         // Given
         when(fileSystem.getProjectName()).thenReturn("MyProject");
 
@@ -71,14 +71,14 @@ public void buildDefaultFiles() {
         verify(fileSystem).copyResourceTo("src/main.cpp");
 
         verify(fileSystem, times(2)).copyResourceTo(any(), any());
-        verify(fileSystem, times(2)).copyResourceTo(any());
+        verify(fileSystem, times(3)).copyResourceTo(any());
         verify(fileSystem, times(2)).saveFileFromTemplate(any(), any());
         verify(fileSystem, times(1)).saveToFile(any(VcpkgObject.class), eq("vcpkg.json"));
         verify(fileSystem, times(1)).saveToFile(any(VcpkgConfigurationObject.class), eq("vcpkg-configuration.json"));
     }
 
     @Test
-    public void buildProjectWithDependency() {
+    void buildProjectWithDependency() {
         // Given
         when(fileSystem.getProjectName()).thenReturn("MyProject");
         when(github.fetchLatestCommitSHA("microsoft", "vcpkg"))
@@ -112,7 +112,7 @@ public void buildProjectWithDependency() {
     }
 
     @Test
-    public void buildTestProject() {
+    void buildTestProject() {
         // Given
         when(fileSystem.getProjectName()).thenReturn("MyProject");
 
@@ -128,7 +128,7 @@ public void buildTestProject() {
     }
 
     @Test
-    public void buildWithLicenseFile() {
+    void buildWithLicenseFile() {
         // Given
         when(fileSystem.getProjectName()).thenReturn("MyProject");