ask user for executable name and use it everywhere (#6)

EstevanBR · Aug 9, 2024 · 1e13426 · 1e13426
1 parent 19689a7
commit 1e13426
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/Sources/CreateProject/CreateProject.swift b/Sources/CreateProject/CreateProject.swift
@@ -30,6 +30,8 @@ private struct CreateProject {
                 exit(1)
             }
 
+            let executableName: String = try UserChoice.get(message: "Please enter the name of the executable: ")
+
             guard try UserChoice.getBool(message: "Project will be created at: \(fileManager.currentDirectoryPath + "/Package.swift, would you like to proceed?")") else {
                 do {
                     print("Removing \(fileManager.currentDirectoryPath)")
@@ -46,13 +48,13 @@ private struct CreateProject {
                 default: try UserChoice.get(message: Color.yellow + "GODOT not set\n" + "Please enter the full path to the Godot 4.2 executable: ")
             }
 
-            print(color: .green, "Created \(try FileFactory.createPackageFile(projectName: projectName))")
+            print(color: .green, "Created \(try FileFactory.createPackageFile(projectName: projectName, executableName: executableName))")
             print(color: .green, "Created \(try FileFactory.copyReadmeFile())")
             print(color: .green, "Created \(try FileFactory.copyGitIgnoreFile())")
-            print(color: .green, "Created \(try FileFactory.createEnvFile(projectName: projectName, godotPath: godotPath))")
+            print(color: .green, "Created \(try FileFactory.createEnvFile(projectName: projectName, executableName: executableName, godotPath: godotPath))")
             print(color: .green, "Created \(try FileFactory.createSourcesDirectory())")
             print(color: .green, "Created \(try FileFactory.createLibraryTarget(projectName: projectName))")
-            print(color: .green, "Created \(try FileFactory.createExecutableTarget(projectName: projectName))")
+            print(color: .green, "Created \(try FileFactory.createExecutableTarget(projectName: projectName, executableName: executableName))")
             print(color: .green, "Created \(try FileFactory.copyGDDFile())")
             print(color: .green, "Created \(try FileFactory.copyGodotDirectory())")
             print(color: .green, "Created \(try FileFactory.createGodotProjectFile(projectName: projectName))")

diff --git a/Sources/CreateProject/DataFactory.swift b/Sources/CreateProject/DataFactory.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 enum DataFactory {
-    static func makeEnvFileData(projectName: String, godotPath: String) throws -> Data {
+    static func makeEnvFileData(projectName: String, executableName: String, godotPath: String) throws -> Data {
         let directory = FileManager().currentDirectoryPath
         let godotProjectDirectory = directory + "/godot"
         return try
@@ -13,13 +13,13 @@ enum DataFactory {
         export GODOT_BIN_PATH=$(GODOT_PROJECT_DIRECTORY)/bin
         export BUILD_PATH=./.build
         export LIBRARY_NAME=$(PROJECT_NAME)
-        export EXECUTABLE_NAME=$(PROJECT_NAME)Game
+        export EXECUTABLE_NAME=\(executableName)
 
         """
         .utf8Data
     }
 
-    static func makePackageFileData(projectName: String) throws -> Data {
+    static func makePackageFileData(projectName: String, executableName: String) throws -> Data {
         try
         """
         // swift-tools-version: 5.9
@@ -31,8 +31,8 @@ enum DataFactory {
             platforms: [.macOS(.v13)],
             products: [
                 .executable(
-                    name: "\(projectName)Game",
-                    targets: ["\(projectName)Game"]),
+                    name: "\(executableName)",
+                    targets: ["\(executableName)"]),
                 .library(
                     name: "\(projectName)",
                     type: .dynamic,
@@ -44,7 +44,7 @@ enum DataFactory {
             ],
             targets: [
                 .executableTarget(
-                    name: "\(projectName)Game",
+                    name: "\(executableName)",
                     dependencies: [
                         "\(projectName)",
                         .product(name: "SwiftGodotKit", package: "SwiftGodotKit")
@@ -275,7 +275,7 @@ enum DataFactory {
         	@echo "Going to open Godot to ensure all resources are imported."
         	-$(GODOT) $(GODOT_PROJECT_FILE_PATH) --headless --quit
         	@echo "Exporting the .pck file"
-        	$(GODOT) --headless --path $(GODOT_PROJECT_DIRECTORY) --export-pack Packer ../Sources/$(LIBRARY_NAME)Game/Resources/$(LIBRARY_NAME).pck
+        	$(GODOT) --headless --path $(GODOT_PROJECT_DIRECTORY) --export-pack Packer ../Sources/$(EXECUTABLE_NAME)/Resources/$(LIBRARY_NAME).pck
 
         """
         .utf8Data

diff --git a/Sources/CreateProject/FileFactory.swift b/Sources/CreateProject/FileFactory.swift
@@ -23,9 +23,9 @@ enum FileFactory {
 
     }
 
-    static func createEnvFile(projectName: String, godotPath: String) throws -> String {
+    static func createEnvFile(projectName: String, executableName: String, godotPath: String) throws -> String {
         let directory = fileManager.currentDirectoryPath
-        let data = try DataFactory.makeEnvFileData(projectName: projectName, godotPath: godotPath)
+        let data = try DataFactory.makeEnvFileData(projectName: projectName, executableName: executableName, godotPath: godotPath)
         let path = directory + "/.env"
         fileManager.createFile(atPath: path, contents: data)
         return path
@@ -48,8 +48,7 @@ enum FileFactory {
         return librarySourceFile
     }
 
-    static func createExecutableTarget(projectName: String) throws -> String {
-        let executableName = projectName + "Game"
+    static func createExecutableTarget(projectName: String, executableName: String) throws -> String {
         let directory = fileManager.currentDirectoryPath
         let executableTargetDirectory = directory + "/Sources/\(executableName)"
 
@@ -64,10 +63,10 @@ enum FileFactory {
         return mainPath
     }
 
-    static func createPackageFile(projectName: String) throws -> String {
+    static func createPackageFile(projectName: String, executableName: String) throws -> String {
         let directory = fileManager.currentDirectoryPath
         let path = directory + "/Package.swift"
-        let data = try DataFactory.makePackageFileData(projectName: projectName)
+        let data = try DataFactory.makePackageFileData(projectName: projectName, executableName: executableName)
         guard fileManager.createFile(atPath: path, contents: data) else {
             throw Error.couldNotCreateFile(path: path)
         }