feat: move version check inside validateSwiftly

Author: louisunlimited

Sources/Swiftly/Install.swift

@@ -77,15 +77,9 @@ struct Install: SwiftlyCommand {
     }
 
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
-
-        let swiftlyRelease = try await ctx.httpClient.getCurrentSwiftlyRelease()
-        let shouldUpdateSwiftly = try swiftlyRelease.swiftlyVersion > SwiftlyCore.version
+        let versionUpdateReminder = try await validateSwiftly(ctx)
         defer {
-            if shouldUpdateSwiftly {
-                ctx.print("A new release of swiftly is available")
-                ctx.print("Please run `swiftly self-update` to update.")
-            }
+            versionUpdateReminder()
         }
 
         var config = try Config.load(ctx)

Sources/Swiftly/List.swift

@@ -38,15 +38,9 @@ struct List: SwiftlyCommand {
     }
 
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
-
-        let swiftlyRelease = try await ctx.httpClient.getCurrentSwiftlyRelease()
-        let shouldUpdateSwiftly = try swiftlyRelease.swiftlyVersion > SwiftlyCore.version
+        let versionUpdateReminder = try await validateSwiftly(ctx)
         defer {
-            if shouldUpdateSwiftly {
-                ctx.print("A new release of swiftly is available")
-                ctx.print("Please run `swiftly self-update` to update.")
-            }
+            versionUpdateReminder()
         }
 
         let selector = try self.toolchainSelector.map { input in

Sources/Swiftly/ListAvailable.swift

@@ -44,15 +44,9 @@ struct ListAvailable: SwiftlyCommand {
     }
 
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
-
-        let swiftlyRelease = try await ctx.httpClient.getCurrentSwiftlyRelease()
-        let shouldUpdateSwiftly = try swiftlyRelease.swiftlyVersion > SwiftlyCore.version
+        let versionUpdateReminder = try await validateSwiftly(ctx)
         defer {
-            if shouldUpdateSwiftly {
-                ctx.print("A new release of swiftly is available")
-                ctx.print("Please run `swiftly self-update` to update.")
-            }
+            versionUpdateReminder()
         }
 
         let selector = try self.toolchainSelector.map { input in

Sources/Swiftly/Run.swift

@@ -58,15 +58,9 @@ struct Run: SwiftlyCommand {
     }
 
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
-
-        let swiftlyRelease = try await ctx.httpClient.getCurrentSwiftlyRelease()
-        let shouldUpdateSwiftly = try swiftlyRelease.swiftlyVersion > SwiftlyCore.version
+        let versionUpdateReminder = try await validateSwiftly(ctx)
         defer {
-            if shouldUpdateSwiftly {
-                ctx.print("A new release of swiftly is available")
-                ctx.print("Please run `swiftly self-update` to update.")
-            }
+            versionUpdateReminder()
         }
 
         // Handle the specific case where help is requested of the run subcommand

Sources/Swiftly/SelfUpdate.swift

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

Sources/Swiftly/Swiftly.swift

@@ -80,7 +80,7 @@ extension Data {
 }
 
 extension SwiftlyCommand {
-    public mutating func validateSwiftly(_ ctx: SwiftlyCoreContext) throws {
+    public mutating func validateSwiftly(_ ctx: SwiftlyCoreContext) async throws -> () -> Void {
         for requiredDir in Swiftly.requiredDirectories(ctx) {
             guard requiredDir.fileExists() else {
                 do {
@@ -94,5 +94,16 @@ extension SwiftlyCommand {
 
         // Verify that the configuration exists and can be loaded
         _ = try Config.load(ctx)
+
+        let swiftlyRelease = try await ctx.httpClient.getCurrentSwiftlyRelease()
+        let shouldUpdateSwiftly = try swiftlyRelease.swiftlyVersion > SwiftlyCore.version
+        
+        return {
+            if shouldUpdateSwiftly {
+                ctx.print("----------------------------")
+                ctx.print("A new release of swiftly is available")
+                ctx.print("Please run `swiftly self-update` to update.")
+            }
+        }
     }
 }

Sources/Swiftly/Uninstall.swift

@@ -48,15 +48,9 @@ struct Uninstall: SwiftlyCommand {
     }
 
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
-
-        let swiftlyRelease = try await ctx.httpClient.getCurrentSwiftlyRelease()
-        let shouldUpdateSwiftly = try swiftlyRelease.swiftlyVersion > SwiftlyCore.version
+        let versionUpdateReminder = try await validateSwiftly(ctx)
         defer {
-            if shouldUpdateSwiftly {
-                ctx.print("A new release of swiftly is available")
-                ctx.print("Please run `swiftly self-update` to update.")
-            }
+            versionUpdateReminder()
         }
 
         let startingConfig = try Config.load(ctx)

Sources/Swiftly/Update.swift

@@ -82,15 +82,9 @@ struct Update: SwiftlyCommand {
     }
 
     public mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
-
-        let swiftlyRelease = try await ctx.httpClient.getCurrentSwiftlyRelease()
-        let shouldUpdateSwiftly = try swiftlyRelease.swiftlyVersion > SwiftlyCore.version
+        let versionUpdateReminder = try await validateSwiftly(ctx)
         defer {
-            if shouldUpdateSwiftly {
-                ctx.print("A new release of swiftly is available")
-                ctx.print("Please run `swiftly self-update` to update.")
-            }
+            versionUpdateReminder()
         }
 
         var config = try Config.load(ctx)

Sources/Swiftly/Use.swift

@@ -59,15 +59,9 @@ struct Use: SwiftlyCommand {
     }
 
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        try validateSwiftly(ctx)
-
-        let swiftlyRelease = try await ctx.httpClient.getCurrentSwiftlyRelease()
-        let shouldUpdateSwiftly = try swiftlyRelease.swiftlyVersion > SwiftlyCore.version
+        let versionUpdateReminder = try await validateSwiftly(ctx)
         defer {
-            if shouldUpdateSwiftly {
-                ctx.print("A new release of swiftly is available")
-                ctx.print("Please run `swiftly self-update` to update.")
-            }
+            versionUpdateReminder()
         }
 
         var config = try Config.load(ctx)