Merge branch '8-scheduled-job' into github-summary

Author: leogdion

LINTING_PROGRESS.md

@@ -36,17 +36,17 @@ internal enum ExportCommand {
   // MARK: - Export Types
 
   private struct ExportData: Codable {
-    internal let restoreImages: [RecordExport]
-    internal let xcodeVersions: [RecordExport]
-    internal let swiftVersions: [RecordExport]
+    let restoreImages: [RecordExport]
+    let xcodeVersions: [RecordExport]
+    let swiftVersions: [RecordExport]
   }
 
   private struct RecordExport: Codable {
-    internal let recordName: String
-    internal let recordType: String
-    internal let fields: [String: String]
+    let recordName: String
+    let recordType: String
+    let fields: [String: String]
 
-    internal init(from recordInfo: RecordInfo) {
+    init(from recordInfo: RecordInfo) {
       self.recordName = recordInfo.recordName
       self.recordType = recordInfo.recordType
       self.fields = recordInfo.fields.mapValues { fieldValue in
@@ -193,5 +193,4 @@ internal enum ExportCommand {
     print("   • Ensure data has been synced to CloudKit")
     print("   • Run 'bushel-cloud sync' first if needed")
   }
-
 }

Sources/BushelCloudCLI/Commands/ExportCommand.swift

@@ -49,8 +49,6 @@ public import MistKit
 public struct BushelCloudKitService: Sendable, RecordManaging, CloudKitRecordCollection {
   public typealias RecordTypeSetType = RecordTypeSet
 
-  private let service: CloudKitService
-
   // MARK: - CloudKitRecordCollection
 
   /// All CloudKit record types managed by this service (using variadic generics)
@@ -61,6 +59,8 @@ public struct BushelCloudKitService: Sendable, RecordManaging, CloudKitRecordCol
     DataSourceMetadata.self
   )
 
+  private let service: CloudKitService
+
   // MARK: - Initialization
 
   /// Initialize CloudKit service with Server-to-Server authentication
@@ -180,7 +180,9 @@ public struct BushelCloudKitService: Sendable, RecordManaging, CloudKitRecordCol
   ) async throws {
     // Create empty classification (no tracking)
     let classification = OperationClassification(proposedRecords: [], existingRecords: [])
-    _ = try await executeBatchOperations(operations, recordType: recordType, classification: classification)
+    _ = try await executeBatchOperations(
+      operations, recordType: recordType, classification: classification
+    )
   }
 
   /// Execute operations in batches with detailed create/update tracking
@@ -203,7 +205,10 @@ public struct BushelCloudKitService: Sendable, RecordManaging, CloudKitRecordCol
 
     ConsoleOutput.print("Syncing \(operations.count) \(recordType) record(s) in \(batches.count) batch(es)...")
     Self.logger.debug(
-      "CloudKit batch limit: 200 operations/request. Using \(batches.count) batch(es) for \(operations.count) records."
+      """
+      CloudKit batch limit: 200 operations/request. \
+      Using \(batches.count) batch(es) for \(operations.count) records.
+      """
     )
     Self.logger.debug(
       "Classification: \(classification.creates.count) creates, \(classification.updates.count) updates"

Sources/BushelCloudKit/CloudKit/BushelCloudKitService.swift

@@ -30,7 +30,7 @@
 import Foundation
 
 /// Validates PEM format for CloudKit Server-to-Server private keys
-enum PEMValidator {
+internal enum PEMValidator {
   /// Validates a PEM string has proper structure and encoding
   ///
   /// **Checks performed:**
@@ -46,24 +46,28 @@ enum PEMValidator {
   ///
   /// - Parameter pemString: The PEM-formatted private key string
   /// - Throws: BushelCloudKitError.invalidPEMFormat with specific reason and recovery suggestion
-  static func validate(_ pemString: String) throws {
+  internal static func validate(_ pemString: String) throws {
     let trimmed = pemString.trimmingCharacters(in: .whitespacesAndNewlines)
 
     // Check for BEGIN header
     guard trimmed.contains("-----BEGIN") && trimmed.contains("PRIVATE KEY-----") else {
       throw BushelCloudKitError.invalidPEMFormat(
         reason: "Missing '-----BEGIN PRIVATE KEY-----' header",
-        suggestion:
-          "Ensure you copied the entire PEM file including the header line. Re-download from CloudKit Dashboard if needed."
+        suggestion: """
+          Ensure you copied the entire PEM file including the header line. \
+          Re-download from CloudKit Dashboard if needed.
+          """
       )
     }
 
     // Check for END footer
     guard trimmed.contains("-----END") && trimmed.contains("PRIVATE KEY-----") else {
       throw BushelCloudKitError.invalidPEMFormat(
         reason: "Missing '-----END PRIVATE KEY-----' footer",
-        suggestion:
-          "The PEM file may have been truncated during copy/paste. Ensure you copied the entire file including the footer line."
+        suggestion: """
+          The PEM file may have been truncated during copy/paste. \
+          Ensure you copied the entire file including the footer line.
+          """
       )
     }
 
@@ -85,8 +89,10 @@ enum PEMValidator {
     guard Data(base64Encoded: base64Content) != nil else {
       throw BushelCloudKitError.invalidPEMFormat(
         reason: "PEM content is not valid base64 encoding",
-        suggestion:
-          "The key file may be corrupted. Ensure you used a text editor (not binary editor) and the file is UTF-8 encoded."
+        suggestion: """
+          The key file may be corrupted. \
+          Ensure you used a text editor (not binary editor) and the file is UTF-8 encoded.
+          """
       )
     }
   }

Sources/BushelCloudKit/CloudKit/PEMValidator.swift

@@ -39,6 +39,22 @@ public import MistKit
 // MARK: - Export Operations
 
 extension SyncEngine {
+  // MARK: - Export Result Type
+
+  public struct ExportResult {
+    public let restoreImages: [RecordInfo]
+    public let xcodeVersions: [RecordInfo]
+    public let swiftVersions: [RecordInfo]
+
+    public init(
+      restoreImages: [RecordInfo], xcodeVersions: [RecordInfo], swiftVersions: [RecordInfo]
+    ) {
+      self.restoreImages = restoreImages
+      self.xcodeVersions = xcodeVersions
+      self.swiftVersions = swiftVersions
+    }
+  }
+
   /// Export all records from CloudKit to a structured format
   public func export() async throws -> ExportResult {
     ConsoleOutput.print("\n" + String(repeating: "=", count: 60))
@@ -83,7 +99,10 @@ extension SyncEngine {
     ConsoleOutput.print("   • \(swiftVersions.count) Swift versions")
 
     Self.logger.debug(
-      "MistKit returns RecordInfo structs with record metadata. Use .fields to access CloudKit field values."
+      """
+      MistKit returns RecordInfo structs with record metadata. \
+      Use .fields to access CloudKit field values.
+      """
     )
 
     return ExportResult(
@@ -92,20 +111,4 @@ extension SyncEngine {
       swiftVersions: swiftVersions
     )
   }
-
-  // MARK: - Export Result Type
-
-  public struct ExportResult {
-    public let restoreImages: [RecordInfo]
-    public let xcodeVersions: [RecordInfo]
-    public let swiftVersions: [RecordInfo]
-
-    public init(
-      restoreImages: [RecordInfo], xcodeVersions: [RecordInfo], swiftVersions: [RecordInfo]
-    ) {
-      self.restoreImages = restoreImages
-      self.xcodeVersions = xcodeVersions
-      self.swiftVersions = swiftVersions
-    }
-  }
 }

Sources/BushelCloudKit/CloudKit/SyncEngine+Export.swift

@@ -375,7 +375,6 @@ public struct SyncEngine: Sendable {
     ConsoleOutput.print(String(repeating: "=", count: 60))
     Self.logger.info("Clear completed successfully")
   }
-
 }
 
 // MARK: - Loggable Conformance

Sources/BushelCloudKit/CloudKit/SyncEngine.swift

@@ -107,7 +107,10 @@ public struct ValidatedCloudKitConfiguration: Sendable {
 
     guard let parsedEnvironment = MistKit.Environment(rawValue: environmentString) else {
       throw ConfigurationError(
-        "Invalid CLOUDKIT_ENVIRONMENT: '\(config.environment ?? "")'. Must be 'development' or 'production'",
+        """
+        Invalid CLOUDKIT_ENVIRONMENT: '\(config.environment ?? "")'. \
+        Must be 'development' or 'production'
+        """,
         key: "cloudkit.environment"
       )
     }

Sources/BushelCloudKit/Configuration/CloudKitConfiguration.swift

@@ -98,7 +98,8 @@ internal enum ConfigurationKeys {
   internal enum Sync {
     internal static let dryRun = ConfigKey<Bool>(bushelPrefixed: "sync.dry_run")
     internal static let restoreImagesOnly = ConfigKey<Bool>(
-      bushelPrefixed: "sync.restore_images_only")
+      bushelPrefixed: "sync.restore_images_only"
+    )
     internal static let xcodeOnly = ConfigKey<Bool>(bushelPrefixed: "sync.xcode_only")
     internal static let swiftOnly = ConfigKey<Bool>(bushelPrefixed: "sync.swift_only")
     internal static let noBetas = ConfigKey<Bool>(bushelPrefixed: "sync.no_betas")

Sources/BushelCloudKit/Configuration/ConfigurationKeys.swift

@@ -71,20 +71,20 @@ public actor ConfigurationLoader {
   // MARK: - Helper Methods
 
   /// Read a string value from configuration
-  func readString(forKey key: String) -> String? {
+  internal func readString(forKey key: String) -> String? {
     configReader.string(forKey: ConfigKey(key))
   }
 
   /// Read an integer value from configuration
-  func readInt(forKey key: String) -> Int? {
+  internal func readInt(forKey key: String) -> Int? {
     guard let stringValue = configReader.string(forKey: ConfigKey(key)) else {
       return nil
     }
     return Int(stringValue)
   }
 
   /// Read a double value from configuration
-  func readDouble(forKey key: String) -> Double? {
+  internal func readDouble(forKey key: String) -> Double? {
     guard let stringValue = configReader.string(forKey: ConfigKey(key)) else {
       return nil
     }
@@ -95,7 +95,7 @@ public actor ConfigurationLoader {
 
   /// Read a string value with automatic CLI → ENV → default fallback
   /// Returns non-optional since ConfigKey has a required default
-  func read(_ key: ConfigKeyKit.ConfigKey<String>) -> String {
+  internal func read(_ key: ConfigKeyKit.ConfigKey<String>) -> String {
     for source in ConfigKeySource.allCases {
       guard let keyString = key.key(for: source) else { continue }
       if let value = readString(forKey: keyString) {
@@ -116,7 +116,7 @@ public actor ConfigurationLoader {
   ///
   /// - Parameter key: Configuration key with boolean type
   /// - Returns: Boolean value from CLI/ENV or the key's default
-  func read(_ key: ConfigKeyKit.ConfigKey<Bool>) -> Bool {
+  internal func read(_ key: ConfigKeyKit.ConfigKey<Bool>) -> Bool {
     // Try CLI first (presence-based for flags)
     if let cliKey = key.key(for: .commandLine),
       configReader.string(forKey: ConfigKey(cliKey)) != nil
@@ -140,7 +140,7 @@ public actor ConfigurationLoader {
 
   /// Read a string value with automatic CLI → ENV fallback
   /// Returns optional since OptionalConfigKey has no default
-  func read(_ key: ConfigKeyKit.OptionalConfigKey<String>) -> String? {
+  internal func read(_ key: ConfigKeyKit.OptionalConfigKey<String>) -> String? {
     for source in ConfigKeySource.allCases {
       guard let keyString = key.key(for: source) else { continue }
       if let value = readString(forKey: keyString) {
@@ -152,7 +152,7 @@ public actor ConfigurationLoader {
 
   /// Read an integer value with automatic CLI → ENV fallback
   /// Returns optional since OptionalConfigKey has no default
-  func read(_ key: ConfigKeyKit.OptionalConfigKey<Int>) -> Int? {
+  internal func read(_ key: ConfigKeyKit.OptionalConfigKey<Int>) -> Int? {
     for source in ConfigKeySource.allCases {
       guard let keyString = key.key(for: source) else { continue }
       if let value = readInt(forKey: keyString) {
@@ -164,7 +164,7 @@ public actor ConfigurationLoader {
 
   /// Read a double value with automatic CLI → ENV fallback
   /// Returns optional since OptionalConfigKey has no default
-  func read(_ key: ConfigKeyKit.OptionalConfigKey<Double>) -> Double? {
+  internal func read(_ key: ConfigKeyKit.OptionalConfigKey<Double>) -> Double? {
     for source in ConfigKeySource.allCases {
       guard let keyString = key.key(for: source) else { continue }
       if let value = readDouble(forKey: keyString) {

Sources/BushelCloudKit/Configuration/ConfigurationLoader.swift

@@ -30,21 +30,21 @@
 import Foundation
 
 /// Represents a single macOS build entry from AppleDB
-struct AppleDBEntry: Codable {
-  let version: String
-  let build: String?  // Some entries may not have a build number
-  let released: String  // ISO date or empty string
-  let beta: Bool?
-  let rc: Bool?
-  let `internal`: Bool?
-  let deviceMap: [String]
-  let signed: SignedStatus
-  let sources: [AppleDBSource]?
-
-  enum CodingKeys: String, CodingKey {
+internal struct AppleDBEntry: Codable {
+  internal enum CodingKeys: String, CodingKey {
     case version, build, released
     case beta, rc
     case `internal` = "internal"
     case deviceMap, signed, sources
   }
+
+  internal let version: String
+  internal let build: String?  // Some entries may not have a build number
+  internal let released: String  // ISO date or empty string
+  internal let beta: Bool?
+  internal let rc: Bool?
+  internal let `internal`: Bool?
+  internal let deviceMap: [String]
+  internal let signed: SignedStatus
+  internal let sources: [AppleDBSource]?
 }