Merge pull request #76 from mono0926/refactor

Refactor
mono0926 · Oct 5, 2017 · d5f7894 · d5f7894
2 parents ccf5d5b + 6642ccd
commit d5f7894
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 15 deletions.
diff --git a/Package.pins b/Package.pins
@@ -17,25 +17,25 @@
       "package": "HeliumLogger",
       "reason": null,
       "repositoryURL": "https://github.com/IBM-Swift/HeliumLogger.git",
-      "version": "1.7.0"
+      "version": "1.7.1"
     },
     {
       "package": "Himotoki",
       "reason": null,
       "repositoryURL": "https://github.com/ikesyo/Himotoki.git",
-      "version": "3.0.1"
+      "version": "3.1.0"
     },
     {
       "package": "LoggerAPI",
       "reason": null,
       "repositoryURL": "https://github.com/IBM-Swift/LoggerAPI.git",
-      "version": "1.7.0"
+      "version": "1.7.1"
     },
     {
       "package": "Result",
       "reason": null,
       "repositoryURL": "https://github.com/antitypical/Result.git",
-      "version": "3.2.1"
+      "version": "3.2.4"
     },
     {
       "package": "Spectre",

diff --git a/Sources/LicensePlistCore/Consts.swift b/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.4.5"
+    public static let version = "1.7.0"
     public static let encoding = String.Encoding.utf8
 }
diff --git a/Sources/LicensePlistCore/Entity/Config.swift b/Sources/LicensePlistCore/Entity/Config.swift
@@ -42,7 +42,7 @@ public struct Config {
                           owner: owner,
                           version: dictionary["version"]?.string)
             }.flatMap { $0 } ?? []
-        self = Config(githubs: githubsVersion + gitHubList, manuals: manualList,  excludes: excludes, renames: renames)
+        self = Config(githubs: githubsVersion + gitHubList, manuals: manualList, excludes: excludes, renames: renames)
     }
 
     init(githubs: [GitHub], manuals: [Manual], excludes: [String], renames: [String: String]) {

diff --git a/Sources/LicensePlistCore/Entity/Manual.swift b/Sources/LicensePlistCore/Entity/Manual.swift
@@ -45,16 +45,12 @@ extension Manual {
                 switch valuePair.key.string ?? "" {
                 case "source":
                     source = valuePair.value.string ?? ""
-                    break
                 case "name":
                     name = valuePair.value.string ?? ""
-                    break
                 case "version":
                     version = valuePair.value.string ?? ""
-                    break
                 case "body":
                     body = valuePair.value.string ?? ""
-                    break
                 default:
                     Log.warning("Tried to parse an unknown YAML key")
                 }

diff --git a/Sources/LicensePlistCore/Entity/ManualLicense.swift b/Sources/LicensePlistCore/Entity/ManualLicense.swift
@@ -12,7 +12,12 @@ public struct ManualLicense: License, Equatable {
 
 extension ManualLicense: CustomStringConvertible {
     public var description: String {
-        return "name: \(library.name), nameSpecified: \(library.nameSpecified ?? ""), version: \(library.version ?? "")\nbody: \(String(body.characters.prefix(20)))…"
+        return [["name: \(library.name)",
+            "nameSpecified: \(library.nameSpecified ?? "")",
+            "version: \(library.version ?? "")"]
+        .joined(separator: ", "),
+                "body: \(String(body.characters.prefix(20)))…"]
+        .joined(separator: "\n")
     }
 }
 

diff --git a/Sources/LicensePlistCore/GitHubClient/GitHubRequest.swift b/Sources/LicensePlistCore/GitHubClient/GitHubRequest.swift
@@ -12,7 +12,7 @@ class GitHubAuthorization {
 
 extension GitHubRequest {
     var baseURL: URL { return URL(string: "https://api.github.com/")! }
-    var headerFields: [String : String] {
+    var headerFields: [String: String] {
         var header = ["Accept": "application/vnd.github.drax-preview+json"]
         if let token = GitHubAuthorization.shared.token {
             header["Authorization"] = "Token \(token)"

diff --git a/Tests/LicensePlistTests/Entity/ConfigTests.swift b/Tests/LicensePlistTests/Entity/ConfigTests.swift
@@ -12,7 +12,10 @@ class ConfigTests: XCTestCase {
         XCTAssertEqual(Config(yaml: URL(string: path)!.lp.download().resultSync().value!),
                        Config(githubs: [GitHub(name: "LicensePlist", nameSpecified: "License Plist", owner: "mono0926", version: "1.2.0"),
                                         GitHub(name: "NativePopup", nameSpecified: nil, owner: "mono0926", version: nil)],
-                              manuals: [Manual(name: "WebRTC", source: "https://webrtc.googlesource.com/src", nameSpecified: "Web RTC", version: "M61")],
+                              manuals: [Manual(name: "WebRTC",
+                                               source: "https://webrtc.googlesource.com/src",
+                                               nameSpecified: "Web RTC",
+                                               version: "M61")],
                               excludes: ["RxSwift", "ios-license-generator", "/^Core.*$/"],
                               renames: ["LicensePlist": "License Plist", "WebRTC": "Web RTC"]))
     }
@@ -43,7 +46,7 @@ class ConfigTests: XCTestCase {
     }
 
     func testApply_githubs() {
-        let github1 = GitHub(name: "github1",  nameSpecified: nil, owner: "g1", version: nil)
+        let github1 = GitHub(name: "github1", nameSpecified: nil, owner: "g1", version: nil)
         let config = Config(githubs: [github1], manuals: [], excludes: ["lib2"], renames: [:])
         let shouldBeIncluded = GitHub(name: "lib1", nameSpecified: nil, owner: "o1", version: nil)
         let result = config.apply(githubs: [shouldBeIncluded, GitHub(name: "lib2", nameSpecified: nil, owner: "o2", version: nil)])

diff --git a/Tests/LicensePlistTests/Entity/PlistInfoTests.swift b/Tests/LicensePlistTests/Entity/PlistInfoTests.swift
@@ -78,7 +78,7 @@ class PlistInfoTests: XCTestCase {
         target.compareWithLatestSummary()
 
         XCTAssertEqual(target.summary,
-                       "add-version-numbers: false\n\nLicensePlist Version: 1.4.5")
+                       "add-version-numbers: false\n\nLicensePlist Version: 1.7.0")
         XCTAssertNotNil(target.summaryPath)
     }