Add yum provider support

Author: drexin

Sources/PackageDescription/PackageDescription.swift

@@ -426,9 +426,11 @@ public enum SystemPackageProvider {
   #if PACKAGE_DESCRIPTION_4
     case brewItem([String])
     case aptItem([String])
+    case yumItem([String])
   #else
     case _brewItem([String])
     case _aptItem([String])
+    case _yumItem([String])
   #endif
 
     /// Declare the list of installable packages using the homebrew package
@@ -456,6 +458,19 @@ public enum SystemPackageProvider {
         return ._aptItem(packages)
       #endif
     }
+
+    /// Declare the list of installable packages using the yum package
+    /// manager on RHEL/CentOS to create a system package provider instance.
+    ///
+    /// - Parameters:
+    ///     - packages: The list of package names.
+    public static func yum(_ packages: [String]) -> SystemPackageProvider {
+      #if PACKAGE_DESCRIPTION_4
+        return .yumItem(packages)
+      #else
+        return ._yumItem(packages)
+      #endif
+    }
 }
 
 // MARK: Package JSON serialization
@@ -513,6 +528,7 @@ extension SystemPackageProvider: Encodable {
     private enum Name: String, Encodable {
         case brew
         case apt
+        case yum
     }
 
     public func encode(to encoder: Encoder) throws {
@@ -525,6 +541,9 @@ extension SystemPackageProvider: Encodable {
         case .aptItem(let packages):
             try container.encode(Name.apt, forKey: .name)
             try container.encode(packages, forKey: .values)
+        case .yumItem(let packages):
+            try container.encode(Name.yum, forKey: .name)
+            try container.encode(packages, forKey: .values)
         }
       #else
         switch self {
@@ -534,6 +553,9 @@ extension SystemPackageProvider: Encodable {
         case ._aptItem(let packages):
             try container.encode(Name.apt, forKey: .name)
             try container.encode(packages, forKey: .values)
+        case ._yumItem(let packages):
+            try container.encode(Name.yum, forKey: .name)
+            try container.encode(packages, forKey: .values)
         }
       #endif
     }

Sources/PackageLoading/PackageDescription4Loader.swift

@@ -219,6 +219,8 @@ extension SystemPackageProviderDescription {
             self = .brew(value)
         case "apt":
             self = .apt(value)
+        case "yum":
+            self = .yum(value)
         default:
             fatalError()
         }

Sources/PackageLoading/Target+PkgConfig.swift

@@ -103,6 +103,8 @@ extension SystemPackageProviderDescription {
             return "    brew install \(packages.joined(separator: " "))\n"
         case .apt(let packages):
             return "    apt-get install \(packages.joined(separator: " "))\n"
+        case .yum(let packages):
+            return "    yum install \(packages.joined(separator: " "))\n"
         }
     }
 
@@ -121,6 +123,10 @@ extension SystemPackageProviderDescription {
             if case .android = platform {
                 return true
             }
+        case .yum:
+            if case .linux(.fedora) = platform {
+                return true
+            }
         }
         return false
     }
@@ -149,6 +155,8 @@ extension SystemPackageProviderDescription {
             return packages.map({ AbsolutePath(brewPrefix).appending(components: "opt", $0, "lib", "pkgconfig") })
         case .apt:
             return []
+        case .yum:
+            return []
         }
     }
 

Sources/PackageModel/Manifest.swift

@@ -485,6 +485,7 @@ public struct ProductDescription: Equatable, Codable {
 public enum SystemPackageProviderDescription: Equatable {
     case brew([String])
     case apt([String])
+    case yum([String])
 }
 
 /// Represents a package dependency.

Sources/PackageModel/PackageModel+Codable.swift

@@ -49,7 +49,7 @@ extension ProductType: Codable {
 
 extension SystemPackageProviderDescription: Codable {
     private enum CodingKeys: String, CodingKey {
-        case brew, apt
+        case brew, apt, yum
     }
 
     public func encode(to encoder: Encoder) throws {
@@ -61,6 +61,9 @@ extension SystemPackageProviderDescription: Codable {
         case let .apt(a1):
             var unkeyedContainer = container.nestedUnkeyedContainer(forKey: .apt)
             try unkeyedContainer.encode(a1)
+        case let .yum(a1):
+            var unkeyedContainer = container.nestedUnkeyedContainer(forKey: .yum)
+            try unkeyedContainer.encode(a1)
         }
     }
 
@@ -78,6 +81,10 @@ extension SystemPackageProviderDescription: Codable {
             var unkeyedValues = try values.nestedUnkeyedContainer(forKey: key)
             let a1 = try unkeyedValues.decode([String].self)
             self = .apt(a1)
+        case .yum:
+            var unkeyedValues = try values.nestedUnkeyedContainer(forKey: key)
+            let a1 = try unkeyedValues.decode([String].self)
+            self = .yum(a1)
         }
     }
 }

Tests/BuildTests/BuildPlanTests.swift

@@ -1412,6 +1412,7 @@ final class BuildPlanTests: XCTestCase {
                             providers: [
                                 .brew(["BTarget"]),
                                 .apt(["BTarget"]),
+                                .yum(["BTarget"]),
                             ]
                         )
                     ]),

Tests/PackageLoadingTests/PD4LoadingTests.swift

@@ -202,6 +202,7 @@ class PackageDescription4LoadingTests: PackageDescriptionLoadingTests {
                providers: [
                    .brew(["openssl"]),
                    .apt(["openssl", "libssl-dev"]),
+                   .yum(["openssl", "libssl-devel"]),
                ]
             )
             """
@@ -211,6 +212,7 @@ class PackageDescription4LoadingTests: PackageDescriptionLoadingTests {
             XCTAssertEqual(manifest.providers, [
                 .brew(["openssl"]),
                 .apt(["openssl", "libssl-dev"]),
+                .yum(["openssl", "libssl-devel"]),
             ])
         }
     }

Tests/PackageLoadingTests/PD4_2LoadingTests.swift

@@ -299,6 +299,7 @@ class PackageDescription4_2LoadingTests: PackageDescriptionLoadingTests {
                         providers: [
                             .brew(["libgit"]),
                             .apt(["a", "b"]),
+                            .yum(["c", "d"]),
                         ]),
                 ]
             )
@@ -314,7 +315,7 @@ class PackageDescription4_2LoadingTests: PackageDescriptionLoadingTests {
             XCTAssertEqual(bar.name, "bar")
             XCTAssertEqual(bar.type, .system)
             XCTAssertEqual(bar.pkgConfig, "libbar")
-            XCTAssertEqual(bar.providers, [.brew(["libgit"]), .apt(["a", "b"])])
+            XCTAssertEqual(bar.providers, [.brew(["libgit"]), .apt(["a", "b"]), .yum(["c", "d"])])
         }
     }
 

Tests/PackageLoadingTests/PkgConfigTests.swift

@@ -45,6 +45,7 @@ class PkgConfigTests: XCTestCase {
                 providers: [
                     .brew(["libFoo"]),
                     .apt(["libFoo-dev"]),
+                    .yum(["libFoo-devel"])
                 ]
             )
             let result = pkgConfigArgs(for: target, diagnostics: diagnostics)!
@@ -56,6 +57,8 @@ class PkgConfigTests: XCTestCase {
                 XCTAssertEqual(names, ["libFoo"])
             case .apt(let names)?:
                 XCTAssertEqual(names, ["libFoo-dev"])
+            case .yum(let names)?:
+                XCTAssertEqual(names, ["libFoo-devel"])
             case nil:
                 XCTFail("Expected a provider here")
             }

swift-tools-support-core/Sources/TSCUtility/Platform.swift

@@ -20,6 +20,7 @@ public enum Platform {
     /// Recognized flavors of linux.
     public enum LinuxFlavor {
         case debian
+        case fedora
     }
 
     /// Lazily checked current platform.
@@ -38,6 +39,11 @@ public enum Platform {
                localFileSystem.isFile(AbsolutePath("/system/bin/toybox")) {
                 return .android
             }
+            if localFileSystem.isFile(AbsolutePath("/etc/redhat-release")) ||
+               localFileSystem.isFile(AbsolutePath("/etc/centos-release")) ||
+               localFileSystem.isFile(AbsolutePath("/etc/fedora-release")) {
+                return .linux(.fedora)
+            }
         default:
             return nil
         }