Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2,013 changes: 1,123 additions & 890 deletions Cargo.lock

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,37 +14,37 @@ build = "build.rs"
# https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
clap = { version = "4.5.13", features = ["derive", "wrap_help"] }
clap_complete = { version = "4.5.61", features = ["unstable-dynamic"] }
console = { version = "0.16.3" }
env_logger = { version = "0.11.5" }
log = { version = "0.4.22" }
openssl = { version = "0.10.75", optional = true }
clap = { version = "4.6.6", features = ["derive", "wrap_help"] }
clap_complete = { version = "4.6.9", features = ["unstable-dynamic"] }
console = { version = "0.16.4" }
env_logger = { version = "0.11.11" }
log = { version = "0.4.34" }
openssl = { version = "0.10.81", optional = true }
rand = { version = "0.10" }
reqwest = { version = "0.12", default-features = false, features = [
"json",
"multipart",
"stream",
] }
serde = { version = "1.0.210", features = ["derive"] }
serde_json = "1.0.128"
snafu = { version = "0.9.1" }
serde = { version = "1.0.229", features = ["derive"] }
serde_json = "1.0.151"
snafu = { version = "0.9.2" }
tokio = { version = "1", features = ["full"] }
tokio-util = { version = "0.7", features = ["codec"] }
walkdir = "2"
tabled = "0.21.0"
chrono = "0.4.43"
chrono = "0.4.45"
futures = { version = "0.3" }
regex = { version = "1.12.3" }
regex = { version = "1.13.1" }
regex-macro = { version = "0.3.0" }
iso8601-timestamp = { version = "0.4" }
toml = { version = "1.1.2" }
toml = { version = "1.1.5" }
git2 = { version = "0.21.0", default-features = false, features = [
"vendored-libgit2",
"https",
"ssh",
] }
url = { version = "2.5.1" }
url = { version = "2.5.8" }
openidconnect = { version = "4.0.1", default-features = false, features = [
"reqwest",
] }
Expand All @@ -53,32 +53,32 @@ comrak = { version = "0.28.0", optional = true }
clap-verbosity-flag = "3.0.4"
color-eyre = "0.6.5"
better-panic = "0.3.0"
human-panic = "2.0.6"
libc = "0.2.183"
self_update = { version = "0.44.0", features = [
human-panic = "2.0.8"
libc = "0.2.189"
self_update = { version = "1.3.0", features = [
"archive-tar",
"archive-zip",
"compression-flate2",
"compression-tar-gz",
] }
md5 = "0.8.0"
ulid = "1.2.1"
md5 = "0.8.1"
ulid = "3.0.0"
keyring-core = {version = "1.0.0", features = ["sample"]}
whoami = "2.1.2"
whoami = "2.1.3"

[target.'cfg(target_os = "windows")'.dependencies]
windows-native-keyring-store = "1.1.0"

[target.'cfg(not(any(target_os = "ios", target_os = "android")))'.dependencies]
db-keystore = { version = "0.4.3" }
db-keystore = { version = "0.5.2" }

[target.'cfg(target_os = "macos")'.dependencies]
apple-native-keyring-store = { version = "1.0.0", features = ["keychain"] }
apple-native-keyring-store = { version = "1.0.2", features = ["keychain"] }

[target.'cfg(target_os = "linux")'.dependencies]
linux-keyutils-keyring-store = { version = "1.0.0" }

[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
zbus-secret-service-keyring-store = { version = "1.0.0", features = ["crypto-rust"] }
zbus-secret-service-keyring-store = { version = "1.0.1", features = ["crypto-rust"] }



Expand All @@ -96,11 +96,11 @@ vendored-zlib = [
user-doc = ["dep:comrak"]

[dev-dependencies]
assert_cmd = "2.0.16"
predicates = "3.1.2"
assert_cmd = "2.2.2"
predicates = "3.1.4"

[build-dependencies]
vergen-gix = { version = "10.0.1", features = [
vergen-gix = { version = "10.0.3", features = [
"build",
"cargo",
"rustc",
Expand Down
1 change: 1 addition & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
allow = [
"MIT",
"Apache-2.0",
"CDLA-Permissive-2.0",
"Unicode-3.0",
"BSD-3-Clause",
"MPL-2.0",
Expand Down
24 changes: 12 additions & 12 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/cli/cmd/project/clone.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ impl Input {
"Cloning {} ({}) into {}...",
details.slug,
details.id,
&target.display()
target.display()
),
})
.await
Expand All @@ -98,7 +98,7 @@ impl Input {
ctx.write_result(&details).await.context(WriteResultSnafu)?;
} else {
ctx.write_err(&SimpleMessage {
message: format!("Project '{}' doesn't exist.", &self.project_ref),
message: format!("Project '{}' doesn't exist.", self.project_ref),
})
.await
.context(WriteResultSnafu)?;
Expand Down
4 changes: 2 additions & 2 deletions src/cli/cmd/update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ fn update() -> Result<UpdateResult, Error> {
match result {
Ok(status) => {
let version = status.version().to_owned();
if status.updated() {
if status.is_updated() {
Ok(UpdateResult::Updated(version))
} else {
Ok(UpdateResult::AlreadyUpToDate(version))
}
}
Err(SelfUpdateError::Update(msg)) if msg == "Update aborted" => Ok(UpdateResult::Aborted),
Err(SelfUpdateError::Aborted) => Ok(UpdateResult::Aborted),
Err(e) => Err(Error::Update { source: e }),
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/cli/cmd/userdoc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,13 @@ async fn process_markdown_file(
let node_data = node.data.borrow();
if let NodeValue::CodeBlock(ref cc) = node_data.value {
let command = &cc.literal;
log::debug!("Process code block: {}", &cc.info);
log::debug!("Process code block: {}", cc.info);
match parse_fence_info(&cc.info) {
None => {
log::debug!("Code block not processed: {}", &cc.info);
log::debug!("Code block not processed: {}", cc.info);
}
Some(FenceModifier::Default) => {
log::debug!("Run code block and insert result for: {}", &cc.info);
log::debug!("Run code block and insert result for: {}", cc.info);
let cli_out = run_cli_command(cli_binary, command)?;
let nn = src_nodes.alloc(AstNode::new(RefCell::new(Ast::new(
make_code_block(result_marker, cli_out),
Expand All @@ -245,7 +245,7 @@ async fn process_markdown_file(
node.insert_after(nn);
}
Some(FenceModifier::Silent) => {
log::debug!("Run code block and ignore result for: {}", &cc.info);
log::debug!("Run code block and ignore result for: {}", cc.info);
run_cli_command(cli_binary, command)?;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/cli/complete.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ async fn make_job_name_completion_candidate(
help.push_str(&session.launcher_id);
help.push_str("/");
help.push_str(session.status.state.to_str());
eprintln!("Cannot get launcher for {}", &session.launcher_id);
eprintln!("Cannot get launcher for {}", session.launcher_id);
}

let Ok(Some(project)) = client.get_project_by_id(&session.project_id).await else {
Expand Down
4 changes: 2 additions & 2 deletions src/httpclient.rs
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ impl Client {
base.set_path("");
let base_url = RenkuUrl::new(base);

log::debug!("Get project by url: {}", &url);
log::debug!("Get project by url: {}", url);
// there are different urls identifying the project
// /v2/projects/<id> (ui)
// /v2/projects/<namespace>/<slug> (ui)
Expand All @@ -341,7 +341,7 @@ impl Client {
.unwrap();
let captures = project_path_regex.captures(url.path()).unwrap();

log::debug!("Create temporary client for {}", &base_url);
log::debug!("Create temporary client for {}", base_url);
let client = Client::new(
base_url,
self.settings.proxy.clone(),
Expand Down
2 changes: 1 addition & 1 deletion src/httpclient/auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ pub async fn get_user_code(
.await
.unwrap();

log::debug!("DeviceAuthResponse: {:?}", &details);
log::debug!("DeviceAuthResponse: {:?}", details);

let verify_url_str = details
.verification_uri_complete()
Expand Down
Loading