Move code to more appropriate files.

Partial #533

Signed-off-by: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>

Sources/mas/Commands/Uninstall.swift

@@ -32,12 +32,12 @@ extension MAS {
                 throw MASError.macOSUserMustBeRoot
             }
 
-            guard let username = getSudoUsername() else {
+            guard let username = ProcessInfo.processInfo.sudoUsername else {
                 throw MASError.runtimeError("Could not determine the original username")
             }
 
             guard
-                let uid = getSudoUID(),
+                let uid = ProcessInfo.processInfo.sudoUID,
                 seteuid(uid) == 0
             else {
                 throw MASError.runtimeError("Failed to switch effective user from 'root' to '\(username)'")

Sources/mas/Controllers/SoftwareMapAppLibrary.swift

@@ -43,24 +43,6 @@ class SoftwareMapAppLibrary: AppLibrary {
     }
 }
 
-func getSudoUsername() -> String? {
-    ProcessInfo.processInfo.environment["SUDO_USER"]
-}
-
-func getSudoUID() -> uid_t? {
-    guard let uid = ProcessInfo.processInfo.environment["SUDO_UID"] else {
-        return nil
-    }
-    return uid_t(uid)
-}
-
-func getSudoGID() -> gid_t? {
-    guard let gid = ProcessInfo.processInfo.environment["SUDO_GID"] else {
-        return nil
-    }
-    return gid_t(gid)
-}
-
 private func getOwnerAndGroupOfItem(atPath path: String) throws -> (uid_t, gid_t) {
     do {
         let attributes = try FileManager.default.attributesOfItem(atPath: path)
@@ -75,11 +57,11 @@ private func getOwnerAndGroupOfItem(atPath path: String) throws -> (uid_t, gid_t
 }
 
 private func chown(paths: [String]) throws -> [String: (uid_t, gid_t)] {
-    guard let sudoUID = getSudoUID() else {
+    guard let sudoUID = ProcessInfo.processInfo.sudoUID else {
         throw MASError.runtimeError("Failed to get original uid")
     }
 
-    guard let sudoGID = getSudoGID() else {
+    guard let sudoGID = ProcessInfo.processInfo.sudoGID else {
         throw MASError.runtimeError("Failed to get original gid")
     }
 

Sources/mas/MAS.swift

@@ -7,7 +7,6 @@
 //
 
 import ArgumentParser
-import Foundation
 import PromiseKit
 
 @main
@@ -55,11 +54,3 @@ struct MAS: ParsableCommand {
         Self.initialize()
     }
 }
-
-typealias AppID = UInt64
-
-extension NSNumber {
-    var appIDValue: AppID {
-        uint64Value
-    }
-}

Sources/mas/Models/AppID.swift

@@ -0,0 +1,17 @@
+//
+//  AppID.swift
+//  mas
+//
+//  Created by Ross Goldberg on 2024-10-29.
+//  Copyright © 2024 mas-cli. All rights reserved.
+//
+
+import Foundation
+
+typealias AppID = UInt64
+
+extension NSNumber {
+    var appIDValue: AppID {
+        uint64Value
+    }
+}

Sources/mas/Utilities/ProcessInfo.swift

@@ -0,0 +1,29 @@
+//
+//  ProcessInfo.swift
+//  mas
+//
+//  Created by Ross Goldberg on 2024-10-29.
+//  Copyright © 2024 mas-cli. All rights reserved.
+//
+
+import Foundation
+
+extension ProcessInfo {
+    var sudoUsername: String? {
+        environment["SUDO_USER"]
+    }
+
+    var sudoUID: uid_t? {
+        guard let uid = environment["SUDO_UID"] else {
+            return nil
+        }
+        return uid_t(uid)
+    }
+
+    var sudoGID: gid_t? {
+        guard let gid = environment["SUDO_GID"] else {
+            return nil
+        }
+        return gid_t(gid)
+    }
+}