Skip to content

Commit

Permalink
[gardening] fix typo "Nuumer" → "Numer"
Browse files Browse the repository at this point in the history
  • Loading branch information
@WowbaggersLiquidLunch
WowbaggersLiquidLunch committed Aug 2, 2021
1 parent 4c4689c commit 9feba0d
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
18 changes: 9 additions & 9 deletions Sources/TSCUtility/Version.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,31 +52,31 @@ public enum VersionError: Error, CustomStringConvertible {
/// The version core contains an invalid number of Identifiers.
case invalidVersionCoreIdentifiersCount(_ identifiers: [String])
/// Some or all of the version core identifiers contain non-numerical characters or are empty.
case nonNuumericalOrEmptyVersionCoreIdentifiers(_ identifiers: [String])
case nonNumericalOrEmptyVersionCoreIdentifiers(_ identifiers: [String])
/// Some or all of the pre-release identifiers contain characters other than alpha-numerics and hyphens.
case nonAlphaNuumerHyphenalPrereleaseIdentifiers(_ identifiers: [String])
case nonAlphaNumerHyphenalPrereleaseIdentifiers(_ identifiers: [String])
/// Some or all of the build metadata identifiers contain characters other than alpha-numerics and hyphens.
case nonAlphaNuumerHyphenalBuildMetadataIdentifiers(_ identifiers: [String])
case nonAlphaNumerHyphenalBuildMetadataIdentifiers(_ identifiers: [String])

public var description: String {
switch self {
case let .nonASCIIVersionString(versionString):
return "non-ASCII characters in version string '\(versionString)'"
case let .invalidVersionCoreIdentifiersCount(identifiers):
return "\(identifiers.count < 3 ? "fewer" : "more") than 3 identifiers in version core '\(identifiers.joined(separator: "."))'"
case let .nonNuumericalOrEmptyVersionCoreIdentifiers(identifiers):
case let .nonNumericalOrEmptyVersionCoreIdentifiers(identifiers):
if !identifiers.allSatisfy( { !$0.isEmpty } ) {
return "empty identifiers in version core '\(identifiers.joined(separator: "."))'"
} else {
// Not checking for `.isASCII` here because non-ASCII characters should've already been caught before this.
let nonNumericalIdentifiers = identifiers.filter { !$0.allSatisfy(\.isNumber) }
return "non-numerical characters in version core identifier\(nonNumericalIdentifiers.count > 1 ? "s" : "") \(nonNumericalIdentifiers.map { "'\($0)'" } .joined(separator: ", "))"
}
case let .nonAlphaNuumerHyphenalPrereleaseIdentifiers(identifiers):
case let .nonAlphaNumerHyphenalPrereleaseIdentifiers(identifiers):
// Not checking for `.isASCII` here because non-ASCII characters should've already been caught before this.
let nonAlhpaNumericalIdentifiers = identifiers.filter { !$0.allSatisfy { $0.isLetter || $0.isNumber || $0 == "-" } }
return "characters other than alpha-numerics and hyphens in pre-release identifier\(nonAlhpaNumericalIdentifiers.count > 1 ? "s" : "") \(nonAlhpaNumericalIdentifiers.map { "'\($0)'" } .joined(separator: ", "))"
case let .nonAlphaNuumerHyphenalBuildMetadataIdentifiers(identifiers):
case let .nonAlphaNumerHyphenalBuildMetadataIdentifiers(identifiers):
// Not checking for `.isASCII` here because non-ASCII characters should've already been caught before this.
let nonAlhpaNumericalIdentifiers = identifiers.filter { !$0.allSatisfy { $0.isLetter || $0.isNumber || $0 == "-" } }
return "characters other than alpha-numerics and hyphens in build metadata identifier\(nonAlhpaNumericalIdentifiers.count > 1 ? "s" : "") \(nonAlhpaNumericalIdentifiers.map { "'\($0)'" } .joined(separator: ", "))"
Expand Down Expand Up @@ -118,7 +118,7 @@ extension Version {
let minor = Int(versionCoreIdentifiers[1]),
let patch = Int(versionCoreIdentifiers[2])
else {
throw VersionError.nonNuumericalOrEmptyVersionCoreIdentifiers(versionCoreIdentifiers.map { String($0) })
throw VersionError.nonNumericalOrEmptyVersionCoreIdentifiers(versionCoreIdentifiers.map { String($0) })
}

self.major = major
Expand All @@ -129,7 +129,7 @@ extension Version {
let prereleaseStartIndex = versionString.index(after: prereleaseDelimiterIndex)
let prereleaseIdentifiers = versionString[prereleaseStartIndex..<(metadataDelimiterIndex ?? versionString.endIndex)].split(separator: ".", omittingEmptySubsequences: false)
guard prereleaseIdentifiers.allSatisfy( { $0.allSatisfy { $0.isLetter || $0.isNumber || $0 == "-" } } ) else {
throw VersionError.nonAlphaNuumerHyphenalPrereleaseIdentifiers(prereleaseIdentifiers.map { String($0) })
throw VersionError.nonAlphaNumerHyphenalPrereleaseIdentifiers(prereleaseIdentifiers.map { String($0) })
}
self.prereleaseIdentifiers = prereleaseIdentifiers.map { String($0) }
} else {
Expand All @@ -140,7 +140,7 @@ extension Version {
let metadataStartIndex = versionString.index(after: metadataDelimiterIndex)
let buildMetadataIdentifiers = versionString[metadataStartIndex...].split(separator: ".", omittingEmptySubsequences: false)
guard buildMetadataIdentifiers.allSatisfy( { $0.allSatisfy { $0.isLetter || $0.isNumber || $0 == "-" } } ) else {
throw VersionError.nonAlphaNuumerHyphenalBuildMetadataIdentifiers(buildMetadataIdentifiers.map { String($0) })
throw VersionError.nonAlphaNumerHyphenalBuildMetadataIdentifiers(buildMetadataIdentifiers.map { String($0) })
}
self.buildMetadataIdentifiers = buildMetadataIdentifiers.map { String($0) }
} else {
Expand Down
32 changes: 16 additions & 16 deletions Tests/TSCUtilityTests/VersionTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class VersionTests: XCTestCase {
}

XCTAssertThrowsError(try Version(versionString: "13.21.-34")) { error in
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["13", "21", ""]) = error else {
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["13", "21", ""]) = error else {
XCTFail()
return
}
Expand All @@ -126,15 +126,15 @@ class VersionTests: XCTestCase {
}

XCTAssertThrowsError(try Version(versionString: "0.0.O")) { error in
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["0", "0", "O"]) = error else {
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["0", "0", "O"]) = error else {
XCTFail()
return
}
XCTAssertEqual(error.description, "non-numerical characters in version core identifier 'O'")
}

XCTAssertThrowsError(try Version(versionString: "1.l1.O")) { error in
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["1", "l1", "O"]) = error else {
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["1", "l1", "O"]) = error else {
XCTFail()
return
}
Expand Down Expand Up @@ -190,7 +190,7 @@ class VersionTests: XCTestCase {
// MARK: Well-formed version core, malformed pre-release identifiers

XCTAssertThrowsError(try Version(versionString: "233.377.610-hello world")) { error in
guard let error = error as? VersionError, case .nonAlphaNuumerHyphenalPrereleaseIdentifiers(["hello world"]) = error else {
guard let error = error as? VersionError, case .nonAlphaNumerHyphenalPrereleaseIdentifiers(["hello world"]) = error else {
XCTFail()
return
}
Expand Down Expand Up @@ -248,15 +248,15 @@ class VersionTests: XCTestCase {
}

XCTAssertThrowsError(try Version(versionString: "l.2.3")) { error in
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["l", "2", "3"]) = error else {
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["l", "2", "3"]) = error else {
XCTFail()
return
}
XCTAssertEqual(error.description, "non-numerical characters in version core identifier 'l'")
}

XCTAssertThrowsError(try Version(versionString: "l.b.3")) { error in
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["l", "b", "3"]) = error else {
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["l", "b", "3"]) = error else {
XCTFail()
return
}
Expand Down Expand Up @@ -296,15 +296,15 @@ class VersionTests: XCTestCase {
// MARK: Well-formed version core, malformed build metadata identifiers

XCTAssertThrowsError(try Version(versionString: "17711.28657.46368+hello world.hello-.-world")) { error in
guard let error = error as? VersionError, case .nonAlphaNuumerHyphenalBuildMetadataIdentifiers(["hello world", "hello-", "-world"]) = error else {
guard let error = error as? VersionError, case .nonAlphaNumerHyphenalBuildMetadataIdentifiers(["hello world", "hello-", "-world"]) = error else {
XCTFail()
return
}
XCTAssertEqual(error.description, "characters other than alpha-numerics and hyphens in build metadata identifier 'hello world'")
}

XCTAssertThrowsError(try Version(versionString: "28657.46368.75025+hello+world.hello world")) { error in
guard let error = error as? VersionError, case .nonAlphaNuumerHyphenalBuildMetadataIdentifiers(["hello+world", "hello world"]) = error else {
guard let error = error as? VersionError, case .nonAlphaNumerHyphenalBuildMetadataIdentifiers(["hello+world", "hello world"]) = error else {
XCTFail()
return
}
Expand Down Expand Up @@ -346,15 +346,15 @@ class VersionTests: XCTestCase {
}

XCTAssertThrowsError(try Version(versionString: "196418.317811.83204O+a.whole.lot.of.build.metadata.identifiers")) { error in
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["196418", "317811", "83204O"]) = error else {
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["196418", "317811", "83204O"]) = error else {
XCTFail()
return
}
XCTAssertEqual(error.description, "non-numerical characters in version core identifier '83204O'")
}

XCTAssertThrowsError(try Version(versionString: "abc.def.ghi+a.whole.lot.of.build.metadata.identifiers")) { error in
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["abc", "def", "ghi"]) = error else {
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["abc", "def", "ghi"]) = error else {
XCTFail()
return
}
Expand Down Expand Up @@ -393,7 +393,7 @@ class VersionTests: XCTestCase {
// MARK: Well-formed version core, well-formed pre-release identifiers, malformed build metadata identifiers

XCTAssertThrowsError(try Version(versionString: "514229.832040.1346269-beta1+ ")) { error in
guard let error = error as? VersionError, case .nonAlphaNuumerHyphenalBuildMetadataIdentifiers([" "]) = error else {
guard let error = error as? VersionError, case .nonAlphaNumerHyphenalBuildMetadataIdentifiers([" "]) = error else {
XCTFail()
return
}
Expand All @@ -403,7 +403,7 @@ class VersionTests: XCTestCase {
// MARK: Well-formed version core, malformed pre-release identifiers, well-formed build metadata identifiers

XCTAssertThrowsError(try Version(versionString: "832040.1346269.2178309-beta 1.-+-")) { error in
guard let error = error as? VersionError, case .nonAlphaNuumerHyphenalPrereleaseIdentifiers(["beta 1", "-"]) = error else {
guard let error = error as? VersionError, case .nonAlphaNumerHyphenalPrereleaseIdentifiers(["beta 1", "-"]) = error else {
XCTFail()
return
}
Expand All @@ -414,7 +414,7 @@ class VersionTests: XCTestCase {

// pre-release is diagnosed before build metadata is
XCTAssertThrowsError(try Version(versionString: "1346269.2178309.3524578-beta 1++")) { error in
guard let error = error as? VersionError, case .nonAlphaNuumerHyphenalPrereleaseIdentifiers(["beta 1"]) = error else {
guard let error = error as? VersionError, case .nonAlphaNumerHyphenalPrereleaseIdentifiers(["beta 1"]) = error else {
XCTFail()
return
}
Expand All @@ -424,7 +424,7 @@ class VersionTests: XCTestCase {
// MARK: malformed version core, well-formed pre-release identifiers, well-formed build metadata identifiers

XCTAssertThrowsError(try Version(versionString: " 832040.1346269.3524578-beta1+abc")) { error in
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers([" 832040", "1346269", "3524578"]) = error else {
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers([" 832040", "1346269", "3524578"]) = error else {
XCTFail()
return
}
Expand All @@ -443,7 +443,7 @@ class VersionTests: XCTestCase {

// version core is diagnosed before build metadata is
XCTAssertThrowsError(try Version(versionString: "l346269.abc.OOO-beta1+++.+.+")) { error in
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["l346269", "abc", "OOO"]) = error else {
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["l346269", "abc", "OOO"]) = error else {
XCTFail()
return
}
Expand All @@ -455,7 +455,7 @@ class VersionTests: XCTestCase {
XCTAssertNil(Version("352A578.5702887.9227465-beta!@#$%^&*1+asdfghjkl123456789" as String))
// version core is diagnosed before pre-release is
XCTAssertThrowsError(try Version(versionString: "352A578.5702887.9227465-beta!@#$%^&*1+asdfghjkl123456789")) { error in
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["352A578", "5702887", "9227465"]) = error else {
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["352A578", "5702887", "9227465"]) = error else {
XCTFail()
return
}
Expand Down

0 comments on commit 9feba0d

Please sign in to comment.