Use project name as executable target name (#152)

* Use project name as executable target name

* Fix dynamic test file naming in manifest.yml

---------

Co-authored-by: Tim Condon <[email protected]>

Author: fpseverino

Dockerfile

@@ -26,15 +26,15 @@ COPY . .
 # Build the application, with optimizations, with static linking, and using jemalloc
 # N.B.: The static version of jemalloc is incompatible with the static Swift runtime.
 RUN swift build -c release \
-        --product App \
+        --product {{name}} \
         --static-swift-stdlib \
         -Xlinker -ljemalloc
 
 # Switch to the staging area
 WORKDIR /staging
 
 # Copy main executable to staging area
-RUN cp "$(swift build --package-path /build -c release --show-bin-path)/App" ./
+RUN cp "$(swift build --package-path /build -c release --show-bin-path)/{{name}}" ./
 
 # Copy static swift backtracer binary to staging area
 RUN cp "/usr/libexec/swift/linux/swift-backtrace-static" ./
@@ -85,5 +85,5 @@ USER vapor:vapor
 EXPOSE 8080
 
 # Start the Vapor service when the image is run, default to listening on 8080 in production environment
-ENTRYPOINT ["./App"]
+ENTRYPOINT ["./{{name}}"]
 CMD ["serve", "--env", "production", "--hostname", "0.0.0.0", "--port", "8080"]

Package.swift

@@ -20,7 +20,7 @@ let package = Package(
     ],
     targets: [
         .executableTarget(
-            name: "App",
+            name: "{{name}}",
             dependencies: [{{#fluent}}
                 .product(name: "Fluent", package: "fluent"),
                 .product(name: "Fluent{{fluent.db.module}}Driver", package: "fluent-{{fluent.db.url}}-driver"),{{/fluent}}{{#leaf}}
@@ -32,9 +32,9 @@ let package = Package(
             swiftSettings: swiftSettings
         ),
         .testTarget(
-            name: "AppTests",
+            name: "{{name}}Tests",
             dependencies: [
-                .target(name: "App"),
+                .target(name: "{{name}}"),
                 .product(name: "VaporTesting", package: "vapor"),
             ],
             swiftSettings: swiftSettings

Tests/AppTests/AppTests.swift

@@ -1,4 +1,4 @@
-@testable import App
+@testable import {{name}}
 import VaporTesting
 import Testing
 {{#fluent}}import Fluent
@@ -7,7 +7,7 @@ import Testing
 {{#fluent}}@Suite("App Tests with DB", .serialized)
 {{/fluent}}{{^fluent}}@Suite("App Tests")
 {{/fluent}}
-struct AppTests {
+struct {{name}}Tests {
     private func withApp(_ test: (Application) async throws -> ()) async throws {
         let app = try await Application.make(.testing)
         do {

manifest.yml

@@ -44,6 +44,7 @@ files:
   - folder: Sources
     files:
       - folder: App
+        dynamic_name: "{{name}}"
         files:
           - file: entrypoint.swift
           - file: configure.swift
@@ -70,8 +71,10 @@ files:
   - folder: Tests
     files:
       - folder: AppTests
+        dynamic_name: "{{name}}Tests"
         files:
           - file: AppTests.swift
+            dynamic_name: "{{name}}Tests.swift"
             dynamic: true
   - folder: Resources
     if: leaf