Merge pull request #171 from blg-nb/single-page-with-version-numbers

Adds --add-version-numbers option to --single-page option
mono0926 · Dec 16, 2021 · 0e00fee · 0e00fee
2 parents 41e6649 + 3a12bb0
commit 0e00fee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Sources/LicensePlistCore/Entity/LicensePlistHolder.swift b/Sources/LicensePlistCore/Entity/LicensePlistHolder.swift
@@ -38,13 +38,13 @@ struct LicensePlistHolder {
         return LicensePlistHolder(root: root, items: items)
     }
 
-    static func loadAllToRoot(licenses: [LicenseInfo]) -> LicensePlistHolder {
+    static func loadAllToRoot(licenses: [LicenseInfo], options: Options) -> LicensePlistHolder {
         let rootItem: [[String: String]] = {
             guard !licenses.isEmpty else { return [] }
             let body = licenses
                 .compactMap { lincense in
                     return ["Type": "PSGroupSpecifier",
-                            "Title": lincense.name,
+                            "Title": lincense.name(withVersion: options.config.addVersionNumbers),
                             "FooterText": lincense.body
                             ]
                 }

diff --git a/Sources/LicensePlistCore/Entity/PlistInfo.swift b/Sources/LicensePlistCore/Entity/PlistInfo.swift
@@ -119,7 +119,7 @@ struct PlistInfo {
         Log.info("Directory created: \(outputPath)")
 
         let holder = options.config.singlePage ?
-            LicensePlistHolder.loadAllToRoot(licenses: licenses) :
+            LicensePlistHolder.loadAllToRoot(licenses: licenses, options: options) :
             LicensePlistHolder.load(licenses: licenses, options: options)
         holder.write(to: outputPath.appendingPathComponent("\(options.prefix).plist"), itemsPath: itemsPath)
 

diff --git a/Tests/LicensePlistTests/Entity/LicensePlistHolderTests.swift b/Tests/LicensePlistTests/Entity/LicensePlistHolderTests.swift
@@ -36,7 +36,7 @@ class LicensePlistHolderTests: XCTestCase {
     func testLoad_allToRoot() throws {
         let pods = CocoaPods(name: "name", nameSpecified: nil, version: nil)
         let podsLicense = CocoaPodsLicense(library: pods, body: "'<body>")
-        let result = LicensePlistHolder.loadAllToRoot(licenses: [podsLicense])
+        let result = LicensePlistHolder.loadAllToRoot(licenses: [podsLicense], options: Options.empty)
         let (root, items) = result.deserialized()
         let rootItems = try XCTUnwrap(root["PreferenceSpecifiers"])
         XCTAssertEqual(rootItems.count, 1)