Skip to content
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

Handle parsing a PackageId that is a raw registry url into a Crate #758

Merged
merged 10 commits into from
Jan 14, 2025
Merged

Handle parsing a PackageId that is a raw registry url into a Crate #758

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
17618e9
add new package id test
Skgland Dec 18, 2024
cc54858
handle pkg ids that are raw registry urls
Skgland Dec 18, 2024
db87bed
add more tests for parting Crate from PackageId
Skgland Dec 30, 2024
1ea7352
use url::Url for parsing the Cargo Package ID Spc URL format
Skgland Jan 10, 2025
fa7e6a4
use `cargo-util-schemas` to parse package id schema
Skgland Jan 10, 2025
eb0bb74
don't replace a missing version with unknown
Skgland Jan 12, 2025
4775398
use repo name for github crates instead of crate name
Skgland Jan 12, 2025
8f8182e
don't cram tags and branches and non commit hash revs into the sha field
Skgland Jan 12, 2025
a3b18eb
handle sufix .git in repo url
Skgland Jan 12, 2025
ce3de91
bless minicrater full expectations
Skgland Jan 12, 2025
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
Prev Previous commit
Next Next commit
use repo name for github crates instead of crate name
  • Loading branch information
@Skgland
Skgland committed Jan 12, 2025
commit 47753985f599dca91120bffe599509b1fe7a0cd9
54 changes: 35 additions & 19 deletions src/crates/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,23 @@ impl TryFrom<&'_ PackageId> for Crate {
Some(SourceKind::Git(rev)) => {
if let Some(url) = package_id.url() {
if url.domain() == Some("github.com") {
Ok(Crate::GitHub(GitHubRepo {
org: url
.path_segments()
.and_then(|mut path| path.next())
.unwrap_or_default()
.to_string(),
name: package_id.name().to_string(),
sha: rev.pretty_ref(false).map(|rev| rev.to_string()),
}))
if let Some(mut path) = url.path_segments() {
let Some(org) = path.next() else {
bail!("Github URL path is too short")
};

let Some(repo_name) = path.next() else {
bail!("Github URL path is too short")
};

Ok(Crate::GitHub(GitHubRepo {
org: org.to_string(),
name: repo_name.to_string(),
sha: rev.pretty_ref(false).map(|rev| rev.to_string()),
}))
} else {
bail!("Github Git URL doesn't have a valid path")
}
} else {
Ok(Crate::Git(GitRepo {
url: url.to_string(),
Expand Down Expand Up @@ -179,15 +187,23 @@ impl TryFrom<&'_ PackageId> for Crate {
Some(url) => match url.scheme() {
"http" | "https" | "git" | "ssh" => {
if url.domain() == Some("github.com") {
Ok(Crate::GitHub(GitHubRepo {
org: url
.path_segments()
.and_then(|mut path| path.next())
.unwrap_or_default()
.to_string(),
name: package_id.name().to_string(),
sha: None,
}))
if let Some(mut path) = url.path_segments() {
let Some(org) = path.next() else {
bail!("Github URL path is too short")
};

let Some(repo_name) = path.next() else {
bail!("Github URL path is too short")
};

Ok(Crate::GitHub(GitHubRepo {
org: org.to_string(),
name: repo_name.to_string(),
sha: None,
}))
} else {
bail!("Github Git URL doesn't have a valid path")
}
} else {
Ok(Crate::Git(GitRepo {
url: url.to_string(),
Expand Down Expand Up @@ -359,7 +375,7 @@ mod tests {
}),
"https://github.com/rust-lang/cargo#[email protected]" => Crate::GitHub(GitHubRepo {
org: "rust-lang".to_string(),
name: "cargo-platform".to_string(),
name: "cargo".to_string(), // repo name not crate name
sha: None
}),
"ssh://[email protected]/rust-lang/regex.git#[email protected]" => Crate::GitHub(GitHubRepo {
Expand Down