Skip to content

Installer cannot resolve gitPath using shortened GitHub repo name if repo has a period in its name #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yonaskolb merged 3 commits into from
Jan 5, 2020
Merged

Installer cannot resolve gitPath using shortened GitHub repo name if repo has a period in its name #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6e3a60
Update PackageReference.gitPath computation to support Git Repository…
liamnichols Dec 24, 2019
9f4e2a6
Add tests to verify bug with PackageReference.name property and resolve
liamnichols Dec 24, 2019
bd16976
Update CHANGELOG.md
liamnichols Jan 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

## Master

## 0.14.0

#### Fixed
- Fixed a bug that prevented the `Mintfile` from resolving a GitHub repository where the name contains a period [#153](https://github.com/yonaskolb/Mint/pull/153) @liamnichols

[Commits](https://github.com/yonaskolb/Mint/compare/0.13.0...0.14.0)

## 0.13.0

#### Added
Expand Down
4 changes: 2 additions & 2 deletions Sources/MintKit/PackageReference.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public class PackageReference {
}

public var name: String {
return repo.components(separatedBy: "/").last!.components(separatedBy: ".").first!
return repo.components(separatedBy: "/").last!.replacingOccurrences(of: ".git", with: "")
}

public var gitPath: String {
Expand All @@ -53,7 +53,7 @@ public class PackageReference {
return repo
} else if repo.contains("github.com") {
return "https://\(repo).git"
} else if repo.contains(".") {
} else if repo.components(separatedBy: "/").first!.contains(".") {
return "https://\(repo)"
} else {
return "https://github.com/\(repo).git"
Expand Down
24 changes: 24 additions & 0 deletions Tests/MintTests/PackageTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,37 @@ class PackageTests: XCTestCase {
"https://mycustomdomain.com/package": "https://mycustomdomain.com/package",
"https://mycustomdomain.com/package.git": "https://mycustomdomain.com/package.git",
"[email protected]:yonaskolb/Mint.git": "[email protected]:yonaskolb/Mint.git",
"mac-cain13/R.swift": "https://github.com/mac-cain13/R.swift.git",
]

for (url, expected) in urls {
XCTAssertEqual(PackageReference(repo: url).gitPath, expected)
}
}

func testPackageNames() {

let urls: [String: String] = [
"yonaskolb/mint": "mint",
"github.com/yonaskolb/mint": "mint",
"https://github.com/yonaskolb/mint": "mint",
"https://github.com/yonaskolb/mint.git": "mint",
"mycustomdomain.com/package": "package",
"mycustomdomain.com/package.git": "package",
"https://mycustomdomain.com/package": "package",
"https://mycustomdomain.com/package.git": "package",
"[email protected]:yonaskolb/Mint.git": "Mint",
"mac-cain13/R.swift": "R.swift",
"github.com/mac-cain13/R.swift": "R.swift",
"https://github.com/mac-cain13/R.swift.git": "R.swift",
"[email protected]:mac-cain13/R.swift.git": "R.swift",
]

for (url, expected) in urls {
XCTAssertEqual(PackageReference(repo: url).name, expected)
}
}

func testPackageReferenceInfo() {

XCTAssertEqual(PackageReference(package: "yonaskolb/mint"), PackageReference(repo: "yonaskolb/mint"))
Expand Down