Merge pull request #37 from nikolainobadi/update-shell-kit

Update shell kit

Author: nikolainobadi

Package.resolved

@@ -25,10 +25,10 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/JohnSundell/Files", from: "4.0.0"),
         .package(url: "https://github.com/nikolainobadi/NnGitKit.git", from: "0.6.0"),
-        .package(url: "https://github.com/nikolainobadi/NnShellKit.git", from: "2.0.0"),
-        .package(url: "https://github.com/nikolainobadi/NnSwiftDataKit", from: "0.5.0"),
+        .package(url: "https://github.com/nikolainobadi/NnShellKit.git", from: "2.2.0"),
+        .package(url: "https://github.com/nikolainobadi/NnSwiftDataKit", exact: "0.5.0"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.5.0"),
-        .package(url: "https://github.com/nikolainobadi/SwiftPickerKit.git", from: "0.5.0")
+        .package(url: "https://github.com/nikolainobadi/SwiftPickerKit.git", exact: "0.6.0")
     ],
     targets: [
         .executableTarget(
@@ -59,7 +59,8 @@ let package = Package(
         .target(
             name: "NnexSharedTestHelpers",
             dependencies: [
-                "NnexKit"
+                "NnexKit",
+                .product(name: "NnShellTesting", package: "NnShellKit"),
             ]
         ),
         .testTarget(

Package.swift

@@ -6,12 +6,11 @@
 //
 
 import Foundation
-import NnShellKit
 
 public struct BinaryArchiver {
-    private let shell: any Shell
+    private let shell: any NnexShell
 
-    public init(shell: any Shell) {
+    public init(shell: any NnexShell) {
         self.shell = shell
     }
 }
@@ -37,7 +36,7 @@ public extension BinaryArchiver {
 
             if fileName.hasSuffix(".tar.gz") {
                 let removeCmd = "rm -f \"\(archived.archivePath)\""
-                _ = try shell.bash(removeCmd)
+                try shell.runAndPrint(bash: removeCmd)
             }
         }
     }
@@ -55,15 +54,11 @@ private extension BinaryArchiver {
         let archivePath = "\(directory)/\(archiveName)"
 
         let tarCmd = "cd \"\(directory)\" && tar -czf \"\(archiveName)\" \"\(fileName)\""
-        _ = try shell.bash(tarCmd)
+        try shell.runAndPrint(bash: tarCmd)
 
         let sha256 = try calculateSHA256(for: archivePath)
 
-        return ArchivedBinary(
-            originalPath: binaryPath,
-            archivePath: archivePath,
-            sha256: sha256
-        )
+        return .init(originalPath: binaryPath, archivePath: archivePath, sha256: sha256)
     }
 
     func determineArchiveName(for binaryPath: String, fileName: String) -> String {
@@ -85,7 +80,10 @@ private extension BinaryArchiver {
             let raw = try? shell.bash("shasum -a 256 \"\(filePath)\""),
             let sha = raw.components(separatedBy: " ").first,
             !sha.isEmpty
-        else { throw NnexError.missingSha256 }
+        else {
+            throw NnexError.missingSha256
+        }
+        
         return sha
     }
 }

Sources/NnexKit/Archive/BinaryArchiver.swift

@@ -6,12 +6,11 @@
 //
 
 import Files
-import NnShellKit
 
 public struct BinaryCopyUtility {
-    private let shell: any Shell
+    private let shell: any NnexShell
 
-    public init(shell: any Shell) {
+    public init(shell: any NnexShell) {
         self.shell = shell
     }
 }
@@ -42,14 +41,14 @@ private extension BinaryCopyUtility {
         switch binaryOutput {
         case .single(let binaryInfo):
             let finalPath = destinationPath + "/" + executableName
-            _ = try shell.bash("cp \"\(binaryInfo.path)\" \"\(finalPath)\"")
+            try shell.runAndPrint(bash: "cp \"\(binaryInfo.path)\" \"\(finalPath)\"")
             return .single(.init(path: finalPath))
 
         case .multiple(let binaries):
             var results: [ReleaseArchitecture: BinaryInfo] = [:]
             for (arch, binaryInfo) in binaries {
                 let finalPath = destinationPath + "/" + executableName + "-\(arch.name)"
-                _ = try shell.bash("cp \"\(binaryInfo.path)\" \"\(finalPath)\"")
+                try shell.runAndPrint(bash: "cp \"\(binaryInfo.path)\" \"\(finalPath)\"")
                 results[arch] = .init(path: finalPath)
             }
             return .multiple(results)

Sources/NnexKit/Building/BinaryCopyUtility.swift

@@ -5,14 +5,9 @@
 //  Created by Nikolai Nobadi on 3/20/25.
 //
 
-/// Represents information about a binary file.
 public struct BinaryInfo {
-    /// The file path to the binary.
     public let path: String
 
-    /// Initializes a new instance of BinaryInfo.
-    /// - Parameters:
-    ///   - path: The file path to the binary.
     public init(path: String) {
         self.path = path
     }

Sources/NnexKit/Building/BinaryInfo.swift

@@ -5,17 +5,11 @@
 //  Created by Nikolai Nobadi on 3/25/25.
 //
 
-/// Represents the configuration for building a project.
 public struct BuildConfig: Sendable {
-    /// The name of the project to build.
     public let projectName: String
-    /// The file path to the project directory.
     public let projectPath: String
-    /// The type of build to perform (e.g., universal, arm64, x86_64).
     public let buildType: BuildType
-    /// Additional arguments to pass to the build command.
     public let extraBuildArgs: [String]
-    /// Indicates whether the project should be cleaned before building.
     public let skipClean: Bool
     public let testCommand: TestCommand?
 

Sources/NnexKit/Building/BuildConfig.swift

@@ -5,14 +5,8 @@
 //  Created by Nikolai Nobadi on 3/22/25.
 //
 
-/// Represents the build type for a project, specifying the target architecture.
 public enum BuildType: String, CaseIterable, Sendable {
-    /// Universal build, targeting both ARM and Intel architectures.
     case universal
-
-    /// ARM64 architecture.
     case arm64
-
-    /// x86_64 architecture.
     case x86_64
 }

Sources/NnexKit/Building/BuildType.swift

@@ -1,12 +1,19 @@
-import NnShellKit
+//
+//  ProjectBuilder.swift
+//  nnex
+//
+//  Created by Nikolai Nobadi on 3/21/25.
+//
+
 import Foundation
+import NnShellKit
 
 public struct ProjectBuilder {
-    private let shell: any Shell
+    private let shell: any NnexShell
     private let config: BuildConfig
     private let progressDelegate: (any BuildProgressDelegate)?
 
-    public init(shell: any Shell, config: BuildConfig, progressDelegate: (any BuildProgressDelegate)? = nil) {
+    public init(shell: any NnexShell, config: BuildConfig, progressDelegate: (any BuildProgressDelegate)? = nil) {
         self.shell = shell
         self.config = config
         self.progressDelegate = progressDelegate
@@ -61,8 +68,7 @@ private extension ProjectBuilder {
 
     func cleanProject() throws {
         log("🧹 Cleaning the project...")
-        let output = try shell.bash("swift package clean --package-path \(config.projectPath)")
-        if !output.isEmpty { print(output) }
+        try shell.runAndPrint(bash: "swift package clean --package-path \(config.projectPath)")
         log("✅ Project cleaned.")
     }
 
@@ -86,8 +92,7 @@ private extension ProjectBuilder {
             log("🧪 Running tests: \(testCommand)")
 
             do {
-                let output = try shell.bash(testCommand)
-                if !output.isEmpty { print(output) }
+                try shell.runAndPrint(bash: testCommand)
                 log("✅ Tests completed successfully.")
             } catch let shellError as ShellError {
                 // Extract test output from the shell error
@@ -113,9 +118,8 @@ private extension ProjectBuilder {
         log("🔨 Building for \(arch.name)...")
         let extra = config.extraBuildArgs.joined(separator: " ")
         let cmd = "swift build -c release --arch \(arch.name) -Xswiftc -Osize -Xswiftc -wmo -Xswiftc -gnone -Xswiftc -cross-module-optimization -Xlinker -dead_strip_dylibs --package-path \(config.projectPath) \(extra)"
-        let output = try shell.bash(cmd)
-        if !output.isEmpty { print(output) }
 
+        try shell.runAndPrint(bash: cmd)
         try stripBinary(for: arch)
     }
 
@@ -127,13 +131,14 @@ private extension ProjectBuilder {
         log("✂️ Stripping binary for \(arch.name)...")
         let binaryPath = binaryPath(for: arch)
         let stripCmd = "strip -x \"\(binaryPath)\""
-        let output = try shell.bash(stripCmd)
-        if !output.isEmpty { print(output) }
+        
+        try shell.runAndPrint(bash: stripCmd)
         log("✅ Binary stripped for \(arch.name).")
     }
-
 }
 
+
+// MARK: - Dependencies
 public enum BinaryOutput {
     case single(BinaryInfo)
     case multiple([ReleaseArchitecture: BinaryInfo])
@@ -156,12 +161,17 @@ public struct TestFailureError: Error, LocalizedError {
     }
 }
 
+
+// MARK: - Extension Dependencies
 private extension BuildType {
     var archs: [ReleaseArchitecture] {
         switch self {
-        case .arm64: return [.arm]
-        case .x86_64: return [.intel]
-        case .universal: return [.arm, .intel]
+        case .arm64:
+            return [.arm]
+        case .x86_64:
+            return [.intel]
+        case .universal:
+            return [.arm, .intel]
         }
     }
 }

Sources/NnexKit/Building/ProjectBuilder.swift

@@ -7,7 +7,6 @@
 
 import Files
 import Foundation
-import NnShellKit
 
 public enum PublishUtilities {
     /// Builds the binary for the given project and formula.
@@ -18,7 +17,7 @@ public enum PublishUtilities {
     ///   - shell: The shell instance to use for building.
     /// - Returns: The binary output including path(s) and hash(es).
     /// - Throws: An error if the build process fails.
-    public static func buildBinary(formula: SwiftDataFormula, buildType: BuildType, skipTesting: Bool, shell: any Shell) throws -> BinaryOutput {
+    public static func buildBinary(formula: SwiftDataFormula, buildType: BuildType, skipTesting: Bool, shell: any NnexShell) throws -> BinaryOutput {
         let testCommand = skipTesting ? nil : formula.testCommand
         let config = BuildConfig(projectName: formula.name, projectPath: formula.localProjectPath, buildType: buildType, extraBuildArgs: formula.extraBuildArgs, skipClean: false, testCommand: testCommand)
         let builder = ProjectBuilder(shell: shell, config: config)
@@ -32,7 +31,7 @@ public enum PublishUtilities {
     ///   - shell: The shell instance to use for archiving.
     /// - Returns: An array of archived binaries.
     /// - Throws: An error if archive creation fails.
-    public static func createArchives(from binaryOutput: BinaryOutput, shell: any Shell) throws -> [ArchivedBinary] {
+    public static func createArchives(from binaryOutput: BinaryOutput, shell: any NnexShell) throws -> [ArchivedBinary] {
         let archiver = BinaryArchiver(shell: shell)
 
         switch binaryOutput {

Sources/NnexKit/Formula/PublishUtilities.swift

@@ -7,18 +7,12 @@
 
 import Foundation
 import GitShellKit
-import NnShellKit
 
-/// Default implementation of the GitHandler protocol, providing Git-related operations.
 public struct DefaultGitHandler {
-    private let shell: any Shell
-    private let gitShell: any GitShell
+    private let shell: any NnexShell
 
-    /// Initializes a new instance of DefaultGitHandler with the specified shell.
-    /// - Parameter shell: The shell used to execute commands.
-    public init(shell: any Shell) {
+    public init(shell: any NnexShell) {
         self.shell = shell
-        self.gitShell = GitShellAdapter(shell: shell)
     }
 }
 
@@ -30,16 +24,16 @@ extension DefaultGitHandler: GitHandler {
     ///   - message: The commit message describing the changes.
     ///   - path: The file path of the repository.
     public func commitAndPush(message: String, path: String) throws {
-        _ = try shell.bash(makeGitCommand(.addAll, path: path))
-        _ = try shell.bash(makeGitCommand(.commit(message: message), path: path))
-        _ = try shell.bash(makeGitCommand(.push, path: path))
+        try shell.runAndPrint(bash: makeGitCommand(.addAll, path: path))
+        try shell.runAndPrint(bash: makeGitCommand(.commit(message: message), path: path))
+        try shell.runAndPrint(bash: makeGitCommand(.push, path: path))
     }
 
     /// Retrieves the remote URL of the repository located at the given path.
     /// - Parameter path: The file path of the repository.
     /// - Returns: A string representing the remote URL.
     public func getRemoteURL(path: String) throws -> String {
-        return try gitShell.getGitHubURL(at: path)
+        return try shell.getGitHubURL(at: path)
     }
 
     /// Retrieves the previous release version from the repository at the given path.
@@ -52,7 +46,7 @@ extension DefaultGitHandler: GitHandler {
     /// Initializes a new Git repository at the given path.
     /// - Parameter path: The file path where the repository should be initialized.
     public func gitInit(path: String) throws {
-        try GitStarter(path: path, shell: gitShell).gitInit()
+        try GitStarter(path: path, shell: shell).gitInit()
     }
 
     /// Initializes a new remote repository on GitHub with specified details and returns the repository URL.
@@ -64,7 +58,7 @@ extension DefaultGitHandler: GitHandler {
     /// - Returns: A string representing the repository URL.
     public func remoteRepoInit(tapName: String, path: String, projectDetails: String, visibility: RepoVisibility) throws -> String {
         let info = RepoInfo(name: tapName, details: projectDetails, visibility: visibility, canUploadFromNonMainBranch: false)
-        return try GitHubRepoStarter(path: path, shell: gitShell, repoInfo: info).repoInit()
+        return try GitHubRepoStarter(path: path, shell: shell, repoInfo: info).repoInit()
     }
 
     /// Creates a new release with one or more archived binaries and returns all asset URLs.
@@ -102,7 +96,7 @@ private extension DefaultGitHandler {
         // Create the release and upload all archives at once
         let quotedArchivePaths = archivedBinaries.map { "\"\($0.archivePath)\"" }.joined(separator: " ")
         let createCmd = "cd \"\(path)\" && gh release create \(version) \(quotedArchivePaths) --title \"\(version)\" \(notesParam)"
-        _ = try shell.bash(createCmd)
+        try shell.runAndPrint(bash: createCmd)
 
         // Clean up archive files after upload
         let archiver = BinaryArchiver(shell: shell)