From 2c4c22bb2158b4acfac6e9a4d58fe1f33a57f00e Mon Sep 17 00:00:00 2001 From: Franco Meloni Date: Fri, 19 Apr 2019 10:08:57 +0100 Subject: [PATCH 1/3] Fix rocket steps decoding --- Package.resolved | 4 ++-- Sources/Rocket/main.swift | 4 ++-- Sources/RocketLib/CurrentVersionProvider.swift | 2 +- Tests/RocketTests/StepsParserTests.swift | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Package.resolved b/Package.resolved index db22be3..de8b02b 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/orta/Komondor.git", "state": { "branch": null, - "revision": "265fd04de2316edc72d9065d2ef5118b20a71187", - "version": "1.0.2" + "revision": "3cd6d76887816ead5931ddbfb249c2935f518e17", + "version": "1.0.4" } }, { diff --git a/Sources/Rocket/main.swift b/Sources/Rocket/main.swift index 443ee4b..2935bff 100644 --- a/Sources/Rocket/main.swift +++ b/Sources/Rocket/main.swift @@ -31,8 +31,8 @@ if let rocketYamlPath = RocketFileFinder.rocketFilePath() { } stepsDictionary = loadedDictionary -} else if let rocketConfig = try? PackageConfiguration.load() { - stepsDictionary = rocketConfig.configuration +} else if let rocketConfig = try? PackageConfiguration.load().configuration["rocket"] as? [String: Any] { + stepsDictionary = rocketConfig } else { stepsDictionary = [:] } diff --git a/Sources/RocketLib/CurrentVersionProvider.swift b/Sources/RocketLib/CurrentVersionProvider.swift index 18461c2..d632236 100644 --- a/Sources/RocketLib/CurrentVersionProvider.swift +++ b/Sources/RocketLib/CurrentVersionProvider.swift @@ -16,7 +16,7 @@ struct CurrentVersionProvider: CurrentVersionProviding { } func currentVersion() throws -> String { - let tags = try scriptLauncher.launchScript(withContent: "git tag --sort=-v:refname", version: nil).split(separator: "\n").lazy.map({ String($0) }) + let tags = try scriptLauncher.launchScript(withContent: "git tag --sort=-v:refname", version: nil).split(separator: "\n").lazy.map { String($0) } let regex = try NSRegularExpression(pattern: "\\d.\\d.\\d", options: .caseInsensitive) diff --git a/Tests/RocketTests/StepsParserTests.swift b/Tests/RocketTests/StepsParserTests.swift index 66cd2d1..95ea3fc 100644 --- a/Tests/RocketTests/StepsParserTests.swift +++ b/Tests/RocketTests/StepsParserTests.swift @@ -27,7 +27,7 @@ final class StepsParserTests: XCTestCase { ["push": ["remote": "testRemote", "branch": "testBranch"]], ["hide_dev_dependencies": ["package_path": "testPackage.swift"]], "unhide_dev_dependencies", - ]] + ]] let steps = StepsParser.parseSteps(fromDictionary: dictionary, logger: logger) @@ -49,7 +49,7 @@ final class StepsParserTests: XCTestCase { [], ["commit": ["message": "message"]], "push", - ]] + ]] let steps = StepsParser.parseSteps(fromDictionary: dictionary, logger: logger) @@ -67,7 +67,7 @@ final class StepsParserTests: XCTestCase { "Scripts/script", ["commit": ["message": "message"]], "push", - ]] + ]] let steps = StepsParser.parseSteps(fromDictionary: dictionary, logger: logger) From 0f5c9760996a667c0a5abeae3efbe3f0cf9845e8 Mon Sep 17 00:00:00 2001 From: Franco Meloni Date: Fri, 19 Apr 2019 10:11:56 +0100 Subject: [PATCH 2/3] Bump minumum required PackageConfig required version --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index e387904..9a12105 100644 --- a/Package.swift +++ b/Package.swift @@ -17,7 +17,7 @@ let package = Package( .package(url: "https://github.com/jpsim/Yams", from: "1.0.0"), .package(url: "https://github.com/f-meloni/Logger", from: "0.2.2"), .package(url: "https://github.com/kareman/SwiftShell", from: "4.1.0"), - .package(url: "https://github.com/orta/PackageConfig.git", from: "0.0.1"), + .package(url: "https://github.com/orta/PackageConfig.git", from: "0.10.0"), // Dev Dependencies for testing.setup .package(url: "https://github.com/Quick/Nimble", from: "7.3.1"), // dev .package(url: "https://github.com/f-meloni/TestSpy", from: "0.3.1"), // dev From 8ef6ce1843bec60cc601c18ea9e0a14c055bbf73 Mon Sep 17 00:00:00 2001 From: Franco Meloni Date: Fri, 19 Apr 2019 10:13:28 +0100 Subject: [PATCH 3/3] Use shibapm link --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 9a12105..ff288c7 100644 --- a/Package.swift +++ b/Package.swift @@ -17,11 +17,11 @@ let package = Package( .package(url: "https://github.com/jpsim/Yams", from: "1.0.0"), .package(url: "https://github.com/f-meloni/Logger", from: "0.2.2"), .package(url: "https://github.com/kareman/SwiftShell", from: "4.1.0"), - .package(url: "https://github.com/orta/PackageConfig.git", from: "0.10.0"), + .package(url: "https://github.com/shibapm/PackageConfig.git", from: "0.10.0"), // Dev Dependencies for testing.setup .package(url: "https://github.com/Quick/Nimble", from: "7.3.1"), // dev .package(url: "https://github.com/f-meloni/TestSpy", from: "0.3.1"), // dev - .package(url: "https://github.com/orta/Komondor.git", from: "1.0.0"), // dev + .package(url: "https://github.com/shibapm/Komondor.git", from: "1.0.0"), // dev .package(url: "https://github.com/nicklockwood/SwiftFormat.git", from: "0.35.8"), // dev ], targets: [