Merge pull request #49 from mono0926/use-property-list-api

Use property list api

Sources/LicensePlistCore/Consts.swift

@@ -6,6 +6,6 @@ public struct Consts {
     public static let prefix = "com.mono0926.LicensePlist"
     public static let outputPath = "\(prefix).Output"
     public static let configPath = "license_plist.yml"
-    public static let version = "1.3.2"
+    public static let version = "1.3.5"
     public static let encoding = String.Encoding.utf8
 }

Sources/LicensePlistCore/Entity/LicensePlistHolder.swift

@@ -0,0 +1,43 @@
+import Foundation
+import LoggerAPI
+
+struct LicensePlistHolder {
+    let root: Data
+    let items: [(LicenseInfo, Data)]
+    static func load(licenses: [LicenseInfo], config: Config) -> LicensePlistHolder {
+        let rootItems: [[String: String]] = licenses.map { license in
+            return ["Type": "PSChildPaneSpecifier",
+                    "Title": license.name(withVersion: config.addVersionNumbers),
+                    "File": "\(Consts.prefix)/\(license.name)"]
+        }
+        let root = try! PropertyListSerialization.data(fromPropertyList: ["PreferenceSpecifiers": rootItems],
+                                                       format: .xml,
+                                                       options: 0)
+        let items: [(LicenseInfo, Data)] = licenses.map { license in
+            let item = ["PreferenceSpecifiers": [["Type": "PSGroupSpecifier", "FooterText": license.body]]]
+            let value = try! PropertyListSerialization.data(fromPropertyList: item, format: .xml, options: 0)
+            return (license, value)
+        }
+        return LicensePlistHolder(root: root, items: items)
+    }
+
+    func deserialized() -> (root: [String: [[String: String]]], items: [(LicenseInfo, [String: [[String: String]]])]) {
+        let root = try! PropertyListSerialization.propertyList(from: self.root, options: [], format: nil) as! [String: [[String: String]]]
+        let items: [(LicenseInfo, [String: [[String: String]]])] = self.items.map { license, data in
+            let value = try! PropertyListSerialization.propertyList(from: data, options: [], format: nil) as! [String: [[String: String]]]
+            return (license, value)
+        }
+        return (root: root, items: items)
+    }
+    func write(to rootPath: URL, itemsPath: URL) {
+        do {
+            try root.write(to: rootPath)
+            try items.forEach {
+                try $0.1.write(to: itemsPath.appendingPathComponent("\($0.0.name).plist"))
+            }
+        } catch let e {
+            Log.error("Failed to write to (rootPath: \(rootPath), itemsPath: \(itemsPath)).\nerror: \(e)")
+        }
+
+    }
+}

Sources/LicensePlistCore/Entity/PlistInfo.swift

@@ -73,28 +73,16 @@ struct PlistInfo {
 
     func outputPlist() {
         guard let licenses = licenses else { preconditionFailure() }
-
-        let tm = TemplateManager.shared
-
         let outputPath = options.outputPath
-        let plistPath = outputPath.appendingPathComponent(Consts.prefix)
-        if plistPath.lp.deleteIfExits() {
+        let itemsPath = outputPath.appendingPathComponent(Consts.prefix)
+        if itemsPath.lp.deleteIfExits() {
             Log.info("Deleted exiting plist within \(Consts.prefix)")
         }
-        plistPath.lp.createDirectory()
+        itemsPath.lp.createDirectory()
         Log.info("Directory created: \(outputPath)")
 
-        let licensListItems = licenses.map {
-            return tm.licenseListItem.applied(["Title": $0.name(withVersion: options.config.addVersionNumbers),
-                                               "FileName": "\(Consts.prefix)/\($0.name)"])
-        }
-        let licenseListPlist = tm.licenseList.applied(["Item": licensListItems.joined(separator: "\n")])
-        outputPath.appendingPathComponent("\(Consts.prefix).plist").lp.write(content: licenseListPlist)
-
-        licenses.forEach {
-            plistPath.appendingPathComponent("\($0.name).plist")
-                .lp.write(content: tm.license.applied(["Body": $0.bodyEscaped]))
-        }
+        let holder = LicensePlistHolder.load(licenses: licenses, config: options.config)
+        holder.write(to: outputPath.appendingPathComponent("\(Consts.prefix).plist"), itemsPath: itemsPath)
     }
 
     func reportMissings() {

Tests/LicensePlistTests/Entity/LicensePlistHolderTests.swift

@@ -0,0 +1,32 @@
+import Foundation
+import XCTest
+@testable import LicensePlistCore
+
+class LicensePlistHolderTests: XCTestCase {
+    func testLoad_empty() {
+        let result = LicensePlistHolder.load(licenses: [], config: Config.empty)
+        let (root, items) = result.deserialized()
+        let rootItems = root["PreferenceSpecifiers"]!
+        XCTAssertTrue(rootItems.isEmpty)
+        XCTAssertTrue(items.isEmpty)
+    }
+    func testLoad_one() {
+        let pods = CocoaPods(name: "name", nameSpecified: nil, version: nil)
+        let podsLicense = CocoaPodsLicense(library: pods, body: "'<body>")
+        let result = LicensePlistHolder.load(licenses: [podsLicense], config: Config.empty)
+        let (root, items) = result.deserialized()
+        let rootItems = root["PreferenceSpecifiers"]!
+        XCTAssertEqual(rootItems.count, 1)
+        XCTAssertEqual(items.count, 1)
+
+        let rootItems1 = rootItems.first!
+        XCTAssertEqual(rootItems1["Type"], "PSChildPaneSpecifier")
+        XCTAssertEqual(rootItems1["Title"], "name")
+        XCTAssertEqual(rootItems1["File"], "com.mono0926.LicensePlist/name")
+
+        let item1 = items.first!.1
+        let item1_1 = item1["PreferenceSpecifiers"]!.first!
+        XCTAssertEqual(item1_1["Type"], "PSGroupSpecifier")
+        XCTAssertEqual(item1_1["FooterText"], "\'<body>")
+    }
+}

Tests/LicensePlistTests/Entity/PlistInfoTests.swift

@@ -76,7 +76,7 @@ class PlistInfoTests: XCTestCase {
         target.compareWithLatestSummary()
 
         XCTAssertEqual(target.summary,
-                       "add-version-numbers: false\n\nLicensePlist Version: 1.3.2")
+                       "add-version-numbers: false\n\nLicensePlist Version: 1.3.5")
         XCTAssertNotNil(target.summaryPath)
     }