Refactor config loading, use in use toolchain when linking

Author: plemarquand

Sources/Swiftly/Install.swift

@@ -81,9 +81,7 @@ struct Install: SwiftlyCommand {
     }
 
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
-
-        var config = try Config.load(ctx)
+        var config = try validatedConfig(ctx)
         let toolchainVersion = try await Self.determineToolchainVersion(ctx, version: self.version, config: &config)
 
         let (postInstallScript, pathChanged) = try await Self.execute(

Sources/Swiftly/Link.swift

@@ -23,12 +23,10 @@ struct Link: SwiftlyCommand {
     }
 
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
-
-        var config = try Config.load(ctx)
+        var config = try validatedConfig(ctx)
         let toolchainVersion = try await Install.determineToolchainVersion(
             ctx,
-            version: nil,
+            version: config.inUse?.name,
             config: &config
         )
 
@@ -40,7 +38,11 @@ struct Link: SwiftlyCommand {
         )
 
         if pathChanged {
-            await ctx.print(Messages.refreshShell)
+            await ctx.print("""
+            Linked swiftly to \(toolchainVersion.name).
+
+            \(Messages.refreshShell)
+            """)
         }
     }
 }

Sources/Swiftly/List.swift

@@ -38,13 +38,11 @@ struct List: SwiftlyCommand {
     }
 
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
+        var config = try validatedConfig(ctx)
         let selector = try self.toolchainSelector.map { input in
             try ToolchainSelector(parsing: input)
         }
 
-        var config = try Config.load(ctx)
-
         let toolchains = config.listInstalledToolchains(selector: selector).sorted { $0 > $1 }
         let (inUse, _) = try await selectToolchain(ctx, config: &config)
 

Sources/Swiftly/ListAvailable.swift

@@ -44,13 +44,11 @@ struct ListAvailable: SwiftlyCommand {
     }
 
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
+        let config = try validatedConfig(ctx)
         let selector = try self.toolchainSelector.map { input in
             try ToolchainSelector(parsing: input)
         }
 
-        let config = try Config.load(ctx)
-
         let tc: [ToolchainVersion]
 
         switch selector {

Sources/Swiftly/Run.swift

@@ -58,15 +58,13 @@ struct Run: SwiftlyCommand {
     }
 
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
+        var config = try validatedConfig(ctx)
 
         // Handle the specific case where help is requested of the run subcommand
         if command == ["--help"] {
             throw CleanExit.helpRequest(self)
         }
 
-        var config = try Config.load(ctx)
-
         let (command, selector) = try Self.extractProxyArguments(command: self.command)
 
         let toolchain: ToolchainVersion?

Sources/Swiftly/SelfUpdate.swift

@@ -21,7 +21,7 @@ struct SelfUpdate: SwiftlyCommand {
     }
 
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
+        try validatedConfig(ctx)
 
         let swiftlyBin = Swiftly.currentPlatform.swiftlyBinDir(ctx).appendingPathComponent("swiftly")
         guard FileManager.default.fileExists(atPath: swiftlyBin.path) else {

Sources/Swiftly/Swiftly.swift

@@ -82,7 +82,8 @@ extension Data {
 }
 
 extension SwiftlyCommand {
-    public mutating func validateSwiftly(_ ctx: SwiftlyCoreContext) throws {
+    @discardableResult
+    public mutating func validatedConfig(_ ctx: SwiftlyCoreContext) throws -> Config {
         for requiredDir in Swiftly.requiredDirectories(ctx) {
             guard requiredDir.fileExists() else {
                 do {
@@ -94,7 +95,7 @@ extension SwiftlyCommand {
             }
         }
 
-        // Verify that the configuration exists and can be loaded
-        _ = try Config.load(ctx)
+        // Verifies that the configuration exists and can be loaded
+        return try Config.load(ctx)
     }
 }

Sources/Swiftly/Uninstall.swift

@@ -48,8 +48,7 @@ struct Uninstall: SwiftlyCommand {
     }
 
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
-        let startingConfig = try Config.load(ctx)
+        let startingConfig = try validatedConfig(ctx)
 
         let toolchains: [ToolchainVersion]
         if self.toolchain == "all" {

Sources/Swiftly/Unlink.swift

@@ -25,7 +25,7 @@ struct Unlink: SwiftlyCommand {
     }
 
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
+        try validatedConfig(ctx)
 
         var pathChanged = false
         if let proxyTo = try? Swiftly.currentPlatform.findSwiftlyBin(ctx) {

Sources/Swiftly/Update.swift

@@ -82,8 +82,7 @@ struct Update: SwiftlyCommand {
     }
 
     public mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
-        var config = try Config.load(ctx)
+        var config = try validatedConfig(ctx)
 
         guard let parameters = try await self.resolveUpdateParameters(ctx, &config) else {
             if let toolchain = self.toolchain {