Renamed the BuildProjectTask in the library target as BuildArtifactTask and added support for building Swift executables and Docker images.
This commit is contained in:
parent
613444ccde
commit
40d5451447
40
Library/Sources/Public/Tasks/BuildArtifactTask.swift
Normal file
40
Library/Sources/Public/Tasks/BuildArtifactTask.swift
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
import Foundation
|
||||||
|
|
||||||
|
public struct BuildArtifactTask {
|
||||||
|
|
||||||
|
// MARK: Properties
|
||||||
|
|
||||||
|
private let terminalService: TerminalServicing
|
||||||
|
|
||||||
|
// MARK: Initialisers
|
||||||
|
|
||||||
|
public init(terminalService: TerminalServicing) {
|
||||||
|
self.terminalService = terminalService
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: Functions
|
||||||
|
|
||||||
|
public func callAsFunction(_ artifact: Artifact, at location: URL? = nil) async throws (TerminalServiceError) {
|
||||||
|
let executableURL: URL = switch artifact {
|
||||||
|
case .executable: .init(at: "/usr/bin/swift")
|
||||||
|
case .image: .init(at: "/usr/local/bin/docker")
|
||||||
|
}
|
||||||
|
|
||||||
|
var arguments: [String] = switch artifact {
|
||||||
|
case .executable: ["build"]
|
||||||
|
case .image: ["compose", "build"]
|
||||||
|
}
|
||||||
|
|
||||||
|
if let location {
|
||||||
|
if case .executable = artifact {
|
||||||
|
arguments.append(contentsOf: ["--package-path", location.pathString])
|
||||||
|
} else if case .image = artifact {
|
||||||
|
arguments.insert(contentsOf: ["--project-directory", location.pathString], at: 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try await terminalService.run(executableURL, arguments: arguments)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -1,29 +0,0 @@
|
|||||||
import Foundation
|
|
||||||
|
|
||||||
public struct BuildProjectTask {
|
|
||||||
|
|
||||||
// MARK: Properties
|
|
||||||
|
|
||||||
private let terminalService: TerminalServicing
|
|
||||||
|
|
||||||
// MARK: Initialisers
|
|
||||||
|
|
||||||
public init(terminalService: TerminalServicing) {
|
|
||||||
self.terminalService = terminalService
|
|
||||||
}
|
|
||||||
|
|
||||||
// MARK: Functions
|
|
||||||
|
|
||||||
public func callAsFunction(at location: URL? = nil) async throws (TerminalServiceError) {
|
|
||||||
let executableURL = URL(at: "/usr/bin/swift")
|
|
||||||
|
|
||||||
var arguments: [String] = ["build"]
|
|
||||||
|
|
||||||
if let location {
|
|
||||||
arguments.append(contentsOf: ["--package-path", location.pathString])
|
|
||||||
}
|
|
||||||
|
|
||||||
try await terminalService.run(executableURL, arguments: arguments)
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
63
Test/Sources/Cases/Public/Tasks/BuildArtifactTaskTests.swift
Normal file
63
Test/Sources/Cases/Public/Tasks/BuildArtifactTaskTests.swift
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
import Foundation
|
||||||
|
import Testing
|
||||||
|
|
||||||
|
@testable import ColibriLibrary
|
||||||
|
|
||||||
|
struct BuildArtifactTaskTests {
|
||||||
|
|
||||||
|
@Test(arguments: [nil, URL.someCurrentFolder])
|
||||||
|
func taskForExecutable(at location: URL?) async throws {
|
||||||
|
// GIVEN
|
||||||
|
let terminalService = TerminalServiceSpy()
|
||||||
|
let task = BuildArtifactTask(terminalService: terminalService)
|
||||||
|
|
||||||
|
// WHEN
|
||||||
|
try await task(.executable, at: location)
|
||||||
|
|
||||||
|
// THEN
|
||||||
|
let executableURL = URL(at: "/usr/bin/swift")
|
||||||
|
let arguments = if let location {
|
||||||
|
["build", "--package-path", location.pathString]
|
||||||
|
} else {
|
||||||
|
["build"]
|
||||||
|
}
|
||||||
|
|
||||||
|
#expect(terminalService.actions.count == 1)
|
||||||
|
#expect(terminalService.actions[0] == .ran(executableURL, arguments))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test(arguments: [nil, URL.someCurrentFolder])
|
||||||
|
func taskForImage(at location: URL?) async throws {
|
||||||
|
// GIVEN
|
||||||
|
let terminalService = TerminalServiceSpy()
|
||||||
|
let task = BuildArtifactTask(terminalService: terminalService)
|
||||||
|
|
||||||
|
// WHEN
|
||||||
|
try await task(.image, at: location)
|
||||||
|
|
||||||
|
// THEN
|
||||||
|
let executableURL = URL(at: "/usr/local/bin/docker")
|
||||||
|
let arguments = if let location {
|
||||||
|
["compose", "--project-directory", location.pathString, "build"]
|
||||||
|
} else {
|
||||||
|
["compose", "build"]
|
||||||
|
}
|
||||||
|
|
||||||
|
#expect(terminalService.actions.count == 1)
|
||||||
|
#expect(terminalService.actions[0] == .ran(executableURL, arguments))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test(arguments: [nil, URL.someCurrentFolder], [TerminalServiceError.unexpected, .output(""), .captured("")])
|
||||||
|
func taskForArtifact(at location: URL?, throws error: TerminalServiceError) async throws {
|
||||||
|
// GIVEN
|
||||||
|
let terminalService = TerminalServiceMock(action: .error(error))
|
||||||
|
let task = BuildArtifactTask(terminalService: terminalService)
|
||||||
|
|
||||||
|
// WHEN
|
||||||
|
// THEN
|
||||||
|
await #expect(throws: error) {
|
||||||
|
try await task(.random(), at: location)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -1,42 +0,0 @@
|
|||||||
import Foundation
|
|
||||||
import Testing
|
|
||||||
|
|
||||||
@testable import ColibriLibrary
|
|
||||||
|
|
||||||
struct BuildProjectTaskTests {
|
|
||||||
|
|
||||||
@Test(arguments: [nil, URL.someCurrentFolder])
|
|
||||||
func task(at location: URL?) async throws {
|
|
||||||
// GIVEN
|
|
||||||
let terminalService = TerminalServiceSpy()
|
|
||||||
let task = BuildProjectTask(terminalService: terminalService)
|
|
||||||
|
|
||||||
// WHEN
|
|
||||||
try await task(at: location)
|
|
||||||
|
|
||||||
// THEN
|
|
||||||
let executableURL = URL(at: "/usr/bin/swift")
|
|
||||||
let arguments = if let location {
|
|
||||||
["build", "--package-path", location.pathString]
|
|
||||||
} else {
|
|
||||||
["build"]
|
|
||||||
}
|
|
||||||
|
|
||||||
#expect(terminalService.actions.count == 1)
|
|
||||||
#expect(terminalService.actions[0] == .ran(executableURL, arguments))
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test(arguments: [nil, URL.someCurrentFolder], [TerminalServiceError.unexpected, .output(""), .captured("")])
|
|
||||||
func task(at location: URL?, throws error: TerminalServiceError) async throws {
|
|
||||||
// GIVEN
|
|
||||||
let terminalService = TerminalServiceMock(action: .error(error))
|
|
||||||
let task = BuildProjectTask(terminalService: terminalService)
|
|
||||||
|
|
||||||
// WHEN
|
|
||||||
// THEN
|
|
||||||
await #expect(throws: error) {
|
|
||||||
try await task(at: location)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user