Implemented the Open subcommand. (#9)
This PR contains the work done to implement the `Open` subcommand to the `colibri` executable, which open a *Hummingbird* project with either Visual Studio Code or Xcode. Reviewed-on: #9 Co-authored-by: Javier Cicchelli <javier@rock-n-code.com> Co-committed-by: Javier Cicchelli <javier@rock-n-code.com>
This commit is contained in:
parent
ced12d509e
commit
fce5a23734
@ -11,6 +11,7 @@ struct Colibri: AsyncParsableCommand {
|
||||
Build.self,
|
||||
Clean.self,
|
||||
Create.self,
|
||||
Open.self,
|
||||
Outdated.self,
|
||||
Update.self
|
||||
],
|
||||
|
29
Executable/Sources/Commands/OpenCommand.swift
Normal file
29
Executable/Sources/Commands/OpenCommand.swift
Normal file
@ -0,0 +1,29 @@
|
||||
import ArgumentParser
|
||||
import ColibriLibrary
|
||||
|
||||
extension Colibri {
|
||||
struct Open: AsyncParsableCommand {
|
||||
|
||||
// MARK: Properties
|
||||
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "open-project",
|
||||
abstract: "Open a Hummingbird app",
|
||||
helpNames: .shortAndLong,
|
||||
aliases: ["open"]
|
||||
)
|
||||
|
||||
@OptionGroup var options: Options
|
||||
|
||||
// MARK: Functions
|
||||
|
||||
mutating func run() async throws {
|
||||
let terminalService = TerminalService()
|
||||
|
||||
let openProject = OpenProjectTask(terminalService: terminalService)
|
||||
|
||||
try await openProject(with: options.ide, at: options.locationURL)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
6
Executable/Sources/Extensions/IDE+Conformances.swift
Normal file
6
Executable/Sources/Extensions/IDE+Conformances.swift
Normal file
@ -0,0 +1,6 @@
|
||||
import ArgumentParser
|
||||
import ColibriLibrary
|
||||
|
||||
// MARK: - ExpressibleByArgument
|
||||
|
||||
extension IDE: ExpressibleByArgument {}
|
16
Executable/Sources/Options/OpenOptions.swift
Normal file
16
Executable/Sources/Options/OpenOptions.swift
Normal file
@ -0,0 +1,16 @@
|
||||
import ArgumentParser
|
||||
import ColibriLibrary
|
||||
|
||||
extension Colibri.Open {
|
||||
struct Options: ParsableArguments, Locationable {
|
||||
|
||||
// MARK: Properties
|
||||
|
||||
@Option(name: .shortAndLong)
|
||||
var ide: IDE = .xcode
|
||||
|
||||
@Option(name: .shortAndLong)
|
||||
var location: String?
|
||||
|
||||
}
|
||||
}
|
20
Library/Sources/Public/Enumerations/IDE.swift
Normal file
20
Library/Sources/Public/Enumerations/IDE.swift
Normal file
@ -0,0 +1,20 @@
|
||||
public enum IDE: String {
|
||||
case vscode
|
||||
case xcode
|
||||
}
|
||||
|
||||
// MARK: - Extension
|
||||
|
||||
extension IDE {
|
||||
|
||||
// MARK: Functions
|
||||
|
||||
static func random() -> IDE {
|
||||
.allCases.randomElement() ?? .xcode
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// MARK: - CaseIterable
|
||||
|
||||
extension IDE: CaseIterable {}
|
44
Library/Sources/Public/Tasks/OpenProjectTask.swift
Normal file
44
Library/Sources/Public/Tasks/OpenProjectTask.swift
Normal file
@ -0,0 +1,44 @@
|
||||
import Foundation
|
||||
|
||||
public struct OpenProjectTask {
|
||||
|
||||
// MARK: Properties
|
||||
|
||||
private let terminalService: TerminalServicing
|
||||
|
||||
// MARK: Initialisers
|
||||
|
||||
public init(terminalService: TerminalServicing) {
|
||||
self.terminalService = terminalService
|
||||
}
|
||||
|
||||
// MARK: Functions
|
||||
|
||||
public func callAsFunction(with ide: IDE, at location: URL? = nil) async throws (TerminalServiceError) {
|
||||
let executableURL: URL = switch ide {
|
||||
case .vscode: .init(at: "/usr/local/bin/code")
|
||||
case .xcode: .init(at: "/usr/bin/open")
|
||||
}
|
||||
|
||||
let locationPath = switch ide {
|
||||
case .vscode: location?.pathString ?? "."
|
||||
case .xcode: location?.appendingPath(.Path.package).pathString ?? .Path.package
|
||||
}
|
||||
|
||||
let arguments: [String] = switch ide {
|
||||
case .vscode: [locationPath]
|
||||
case .xcode: ["-a", "Xcode", locationPath]
|
||||
}
|
||||
|
||||
try await terminalService.run(executableURL, arguments: arguments)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// MARK: - String+Constants
|
||||
|
||||
private extension String {
|
||||
enum Path {
|
||||
static let package = "Package.swift"
|
||||
}
|
||||
}
|
56
Test/Sources/Cases/Public/Tasks/OpenProjectTaskTests.swift
Normal file
56
Test/Sources/Cases/Public/Tasks/OpenProjectTaskTests.swift
Normal file
@ -0,0 +1,56 @@
|
||||
import Foundation
|
||||
import Testing
|
||||
|
||||
@testable import ColibriLibrary
|
||||
|
||||
struct OpenProjectTaskTests {
|
||||
|
||||
@Test(arguments: [nil, URL.someCurrentFolder])
|
||||
func taskWithVSCodeIDE(at location: URL?) async throws {
|
||||
// GIVEN
|
||||
let terminalService = TerminalServiceSpy()
|
||||
let task = OpenProjectTask(terminalService: terminalService)
|
||||
|
||||
// WHEN
|
||||
try await task(with: .vscode, at: location)
|
||||
|
||||
// THEN
|
||||
let executableURL = URL(at: "/usr/local/bin/code")
|
||||
let arguments = [location?.pathString ?? "."]
|
||||
|
||||
#expect(terminalService.actions.count == 1)
|
||||
#expect(terminalService.actions[0] == .ran(executableURL, arguments))
|
||||
}
|
||||
|
||||
@Test(arguments: [nil, URL.someCurrentFolder])
|
||||
func taskWithXcodeIDE(at location: URL?) async throws {
|
||||
// GIVEN
|
||||
let terminalService = TerminalServiceSpy()
|
||||
let task = OpenProjectTask(terminalService: terminalService)
|
||||
|
||||
// WHEN
|
||||
try await task(with: .xcode, at: location)
|
||||
|
||||
// THEN
|
||||
let locationPath = location?.appendingPath("Package.swift").pathString ?? "Package.swift"
|
||||
let executableURL = URL(at: "/usr/bin/open")
|
||||
let arguments = ["-a", "Xcode", locationPath]
|
||||
|
||||
#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 = OpenProjectTask(terminalService: terminalService)
|
||||
|
||||
// WHEN
|
||||
// THEN
|
||||
await #expect(throws: error) {
|
||||
try await task(with: .random(), at: location)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user