michael/swift-bump-version
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat: Updates configuration, uses json for configuration files and drops toml support.

Browse Source
This commit is contained in:
Michael Housh
2024-12-24 09:02:38 -05:00
parent 7d23172c71
commit f2a2374c4f
14 changed files with 127 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/CliVersionTests/CliClientTests.swift
View File

@@ -21,7 +21,7 @@ struct CliClientTests {
@Dependency(\.cliClient) var client
let output = try await client.build(.testOptions(
target: target,
versionStrategy: .init(semvar: .init(requireExistingFile: false))
versionStrategy: .semvar(requireExistingFile: false)
))
#expect(output == "/baz/Sources/bar/Version.swift")
}
@@ -66,7 +66,7 @@ struct CliClientTests {
@Dependency(\.cliClient) var client
let output = try await client.build(.testOptions(
target: target,
versionStrategy: .init(semvar: .init(requireExistingFile: false))
versionStrategy: .semvar(requireExistingFile: false)
))
#expect(output == "/baz/Sources/bar/Version.swift")
}
@@ -131,7 +131,7 @@ extension CliClient.SharedOptions {
dryRun: Bool = false,
target: String = "bar",
logLevel: Logger.Level = .trace,
versionStrategy: Configuration.VersionStrategy = .init(semvar: .init())
versionStrategy: Configuration.VersionStrategy = .semvar(.init())
) -> Self {
.init(
dryRun: dryRun,

39
Tests/ConfigurationClientTests/ConfigurationClientTests.swift
View File

@@ -3,7 +3,6 @@ import Dependencies
import Foundation
import Testing
import TestSupport
import TOMLKit
@Suite("ConfigurationClientTests")
struct ConfigurationClientTests {
@@ -19,28 +18,6 @@ struct ConfigurationClientTests {
let decoded = try coders.jsonDecoder().decode(Configuration.self, from: encoded)
#expect(decoded == configuration)
let tomlEncoded = try coders.tomlEncoder().encode(configuration)
let tomlDecoded = try coders.tomlDecoder().decode(
Configuration.self,
from: tomlEncoded
)
#expect(tomlDecoded == configuration)
}
}
@Test(arguments: ["foo", ".foo"])
func configurationFile(fileName: String) {
for ext in ["toml", "json", "bar"] {
let file = ConfigurationFile(url: URL(filePath: "\(fileName).\(ext)"))
switch ext {
case "toml":
#expect(file == .toml(URL(filePath: "\(fileName).toml")))
case "json":
#expect(file == .json(URL(filePath: "\(fileName).json")))
default:
#expect(file == nil)
}
}
}
@@ -50,16 +27,15 @@ struct ConfigurationClientTests {
try await run {
@Dependency(\.configurationClient) var configurationClient
for ext in ["toml", "json"] {
for ext in ["json"] {
let fileUrl = url.appending(path: "test.\(ext)")
let configuration = Configuration.mock
let configurationFile = ConfigurationFile(url: fileUrl)!
try await configurationClient.write(configuration, configurationFile)
let loaded = try await configurationClient.load(configurationFile)
try await configurationClient.write(configuration, fileUrl)
let loaded = try await configurationClient.load(fileUrl)
#expect(loaded == configuration)
let findAndLoaded = try await configurationClient.findAndLoad(configurationFile.url)
let findAndLoaded = try await configurationClient.findAndLoad(fileUrl)
#expect(findAndLoaded == configuration)
try FileManager.default.removeItem(at: fileUrl)
@@ -84,13 +60,12 @@ struct ConfigurationClientTests {
#expect(Bool(true))
}
for ext in ["toml", "json"] {
for ext in ["json"] {
let fileUrl = url.appending(path: ".bump-version.\(ext)")
let configuration = Configuration.mock
let configurationFile = ConfigurationFile(url: fileUrl)!
try await configurationClient.write(configuration, configurationFile)
let loaded = try await configurationClient.findAndLoad(url)
try await configurationClient.write(configuration, fileUrl)
let loaded = try await configurationClient.findAndLoad(fileUrl)
#expect(loaded == configuration)
try FileManager.default.removeItem(at: fileUrl)