Merge pull request #16945 in MA/avito-ios from MBS-9685_install_xcode to develop

Automatically merge pull request #16945 in MA/avito-ios from MBS-9685_install_xcode to develop

* commit 'a02e316822b252618e3de52769a1cd4a7a40912b':
  MBS-9685: expose some shared modules

GitOrigin-RevId: da80f89755313a4f9e6e55d34dcdf1c80e21eb6c

Author: Teamcity Account

Package.swift

@@ -11,27 +11,168 @@ let package = Package(
         .library(
             name: "CommandLineToolkit",
             targets: [
+                "DateProvider",
+                "FileSystem",
+                "PathLib",
+                "PlistLib",
+                "Tmp",
                 "Types",
+                "XcodeLocator",
+                "XcodeLocatorModels",
+            ]
+        ),
+        .library(
+            name: "CommandLineToolkitTestHelpers",
+            targets: [
+                "DateProviderTestHelpers",
+                "FileSystemTestHelpers",
+                "TestHelpers",
+                "TmpTestHelpers",
             ]
         ),
     ],
     dependencies: [
     ],
     targets: [
         .target(
-            // MARK: Types
+            name: "DateProvider",
+            dependencies: [
+            ],
+            path: "Sources/DateProvider"
+        ),
+        .target(
+            name: "DateProviderTestHelpers",
+            dependencies: [
+                "DateProvider",
+            ],
+            path: "Tests/DateProviderTestHelpers"
+        ),
+        .target(
+            name: "FileSystem",
+            dependencies: [
+                "PathLib",
+            ],
+            path: "Sources/FileSystem"
+        ),
+        .target(
+            name: "FileSystemTestHelpers",
+            dependencies: [
+                "FileSystem",
+                "PathLib",
+            ],
+            path: "Tests/FileSystemTestHelpers"
+        ),
+        .testTarget(
+            name: "FileSystemTests",
+            dependencies: [
+                "DateProvider",
+                "FileSystem",
+                "PathLib",
+                "TestHelpers",
+                "Tmp",
+                "TmpTestHelpers",
+            ],
+            path: "Tests/FileSystemTests"
+        ),
+        .target(
+            name: "PathLib",
+            dependencies: [
+            ],
+            path: "Sources/PathLib"
+        ),
+        .testTarget(
+            name: "PathLibTests",
+            dependencies: [
+                "PathLib",
+            ],
+            path: "Tests/PathLibTests"
+        ),
+        .target(
+            name: "PlistLib",
+            dependencies: [
+            ],
+            path: "Sources/PlistLib"
+        ),
+        .testTarget(
+            name: "PlistLibTests",
+            dependencies: [
+                "PlistLib",
+                "TestHelpers",
+            ],
+            path: "Tests/PlistLibTests"
+        ),
+        .testTarget(
+            name: "TemporaryStuffTests",
+            dependencies: [
+                "PathLib",
+                "TestHelpers",
+                "Tmp",
+            ],
+            path: "Tests/TemporaryStuffTests"
+        ),
+        .target(
+            name: "TestHelpers",
+            dependencies: [
+            ],
+            path: "Tests/TestHelpers"
+        ),
+        .target(
+            name: "Tmp",
+            dependencies: [
+                "PathLib",
+            ],
+            path: "Sources/Tmp"
+        ),
+        .target(
+            name: "TmpTestHelpers",
+            dependencies: [
+                "TestHelpers",
+                "Tmp",
+            ],
+            path: "Tests/TmpTestHelpers"
+        ),
+        .target(
             name: "Types",
             dependencies: [
             ],
             path: "Sources/Types"
         ),
         .testTarget(
-            // MARK: TypesTests
             name: "TypesTests",
             dependencies: [
                 "Types",
             ],
             path: "Tests/TypesTests"
         ),
+        .target(
+            name: "XcodeLocator",
+            dependencies: [
+                "FileSystem",
+                "PathLib",
+                "PlistLib",
+                "XcodeLocatorModels",
+            ],
+            path: "Sources/XcodeLocator"
+        ),
+        .target(
+            name: "XcodeLocatorModels",
+            dependencies: [
+                "PathLib",
+            ],
+            path: "Sources/XcodeLocatorModels"
+        ),
+        .testTarget(
+            name: "XcodeLocatorTests",
+            dependencies: [
+                "FileSystem",
+                "FileSystemTestHelpers",
+                "PlistLib",
+                "TestHelpers",
+                "TmpTestHelpers",
+                "XcodeLocator",
+                "XcodeLocatorModels",
+            ],
+            path: "Tests/XcodeLocatorTests"
+        ),
     ]
 )

PackageGenerator.swift

@@ -16,6 +16,7 @@ let knownImportsToIgnore = [
 
 let packageNameForDependency = [
     "ArgumentParser": "swift-argument-parser",
+    "AtomicModels": "GraphiteClient",
 ]
 
 let jsonEncoder = JSONEncoder()
@@ -30,7 +31,8 @@ struct ModuleDescription {
     let name: String
     let deps: [String]
     let path: String
-    let isTest: Bool
+    let isTestTarget: Bool
+    let isTestHelper: Bool
 }
 
 func generate(at url: URL, isTestTarget: Bool) throws -> [ModuleDescription] {
@@ -85,20 +87,32 @@ func generate(at url: URL, isTestTarget: Bool) throws -> [ModuleDescription] {
         let isTestHelper = moduleFolderUrl.path.hasSuffix("TestHelpers")
 
         result.append(
-            ModuleDescription(name: moduleName, deps: dependencies, path: String(path), isTest: isTestTarget && !isTestHelper)
+            ModuleDescription(name: moduleName, deps: dependencies, path: String(path), isTestTarget: isTestTarget, isTestHelper: isTestHelper)
         )
     }
 
     return result
 }
 
-func generatePackageSwift(raplacementForTargets: [String]) throws {
+func generatePackageSwift(
+    raplacementForTargets: [String],
+    replacementForTargetNames: [String],
+    replacementForTestHelpers: [String]
+) throws {
     log("Loading template")
     var templateContents = try String(contentsOf: URL(fileURLWithPath: "PackageTemplate.swift.txt"))
     templateContents = templateContents.replacingOccurrences(
         of: "<__TARGETS__>",
         with: raplacementForTargets.map { "        \($0)" }.joined(separator: "\n")
     )
+    templateContents = templateContents.replacingOccurrences(
+        of: "<__TARGET_NAMES__>",
+        with: replacementForTargetNames.map { "                \"\($0)\"," }.joined(separator: "\n")
+    )
+    templateContents = templateContents.replacingOccurrences(
+        of: "<__TEST_HELPER_NAMES__>",
+        with: replacementForTestHelpers.map { "                \"\($0)\"," }.joined(separator: "\n")
+    )
 
     let packageSwiftPath = URL(fileURLWithPath: "Package.swift")
 
@@ -127,8 +141,7 @@ func main() throws {
     var generatedTargetStatements = [String]()
     let sortedModuleDescriptions: [ModuleDescription] = moduleDescriptions.sorted { $0.name < $1.name }
     for moduleDescription in sortedModuleDescriptions {
-        generatedTargetStatements.append(".\(!moduleDescription.isTest ? "target" : "testTarget")(")
-        generatedTargetStatements.append("    // MARK: \(moduleDescription.name)")
+        generatedTargetStatements.append(".\(!(moduleDescription.isTestTarget && !moduleDescription.isTestHelper) ? "target" : "testTarget")(")
         generatedTargetStatements.append("    name: " + "\"\(moduleDescription.name)\"" + ",")
         generatedTargetStatements.append("    dependencies: [")
         for dependency in moduleDescription.deps {
@@ -142,7 +155,11 @@ func main() throws {
         generatedTargetStatements.append("    path: " + "\"" + moduleDescription.path + "\"")
         generatedTargetStatements.append("),")
     }
-    try generatePackageSwift(raplacementForTargets: generatedTargetStatements)
+    try generatePackageSwift(
+        raplacementForTargets: generatedTargetStatements,
+        replacementForTargetNames: sortedModuleDescriptions.filter { !$0.isTestTarget }.map { $0.name },
+        replacementForTestHelpers: sortedModuleDescriptions.filter { $0.isTestHelper }.map { $0.name }
+    )
 }
 
 try main()

PackageTemplate.swift.txt

@@ -11,7 +11,13 @@ let package = Package(
         .library(
             name: "CommandLineToolkit",
             targets: [
-                "Types",
+<__TARGET_NAMES__>
+            ]
+        ),
+        .library(
+            name: "CommandLineToolkitTestHelpers",
+            targets: [
+<__TEST_HELPER_NAMES__>
             ]
         ),
     ],

Sources/DateProvider/DateProvider.swift

@@ -0,0 +1,5 @@
+import Foundation
+
+public protocol DateProvider {
+    func currentDate() -> Date
+}

Sources/DateProvider/DefaultDateProvider.swift

@@ -0,0 +1,9 @@
+import Foundation
+
+public final class SystemDateProvider: DateProvider {
+    public init() {}
+    
+    public func currentDate() -> Date {
+        return Date()
+    }
+}

Sources/FileSystem/CommonlyUsedPathsProvider.swift

@@ -0,0 +1,15 @@
+import Foundation
+import PathLib
+
+public enum SearchDomain {
+    case user
+    case local
+    case network
+    case system
+}
+
+public protocol CommonlyUsedPathsProvider {
+    func applications(inDomain: SearchDomain, create: Bool) throws -> AbsolutePath
+    func caches(inDomain: SearchDomain, create: Bool) throws -> AbsolutePath
+    func library(inDomain: SearchDomain, create: Bool) throws -> AbsolutePath
+}

Sources/FileSystem/DeepFileSystemEnumerator.swift

@@ -0,0 +1,30 @@
+import Foundation
+import PathLib
+
+public final class DeepFileSystemEnumerator: FileSystemEnumerator {
+    private let path: AbsolutePath
+    private let fileManager: FileManager
+    
+    public enum EnumerationError: Error {
+        case enumeratorFailure
+    }
+    
+    public init(
+        fileManager: FileManager,
+        path: AbsolutePath
+    ) {
+        self.fileManager = fileManager
+        self.path = path
+    }
+    
+    public func each(iterator: (AbsolutePath) throws -> ()) throws {
+        guard let enumerator = fileManager.enumerator(at: path.fileUrl, includingPropertiesForKeys: nil) else {
+            throw EnumerationError.enumeratorFailure
+        }
+        
+        for case let fileURL as URL in enumerator {
+            let absolutePath = AbsolutePath(fileURL)
+            try iterator(absolutePath)
+        }
+    }
+}

Sources/FileSystem/DefaultCommonlyUsedPathsProvider.swift

@@ -0,0 +1,58 @@
+import Foundation
+import PathLib
+
+public final class DefaultCommonlyUsedPathsProvider: CommonlyUsedPathsProvider {
+    private let fileManager: FileManager
+    
+    public init(fileManager: FileManager) {
+        self.fileManager = fileManager
+    }
+    
+    public func applications(inDomain domain: SearchDomain, create: Bool) throws -> AbsolutePath {
+        return AbsolutePath(
+            try fileManager.url(
+                for: .applicationDirectory,
+                in: domain.mask,
+                appropriateFor: nil,
+                create: create
+            )
+        )
+    }
+    
+    public func caches(inDomain domain: SearchDomain, create: Bool) throws -> AbsolutePath {
+        return AbsolutePath(
+            try fileManager.url(
+                for: .cachesDirectory,
+                in: domain.mask,
+                appropriateFor: nil,
+                create: create
+            )
+        )
+    }
+    
+    public func library(inDomain domain: SearchDomain, create: Bool) throws -> AbsolutePath {
+        return AbsolutePath(
+            try fileManager.url(
+                for: .libraryDirectory,
+                in: domain.mask,
+                appropriateFor: nil,
+                create: create
+            )
+        )
+    }
+}
+
+extension SearchDomain {
+    var mask: FileManager.SearchPathDomainMask {
+        switch self {
+        case .local:
+            return .localDomainMask
+        case .user:
+            return .userDomainMask
+        case .network:
+            return .networkDomainMask
+        case .system:
+            return .systemDomainMask
+        }
+    }
+}