From d6edf38af38d0d629a80f3245ba82c2a66c1b9f4 Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Mon, 30 Dec 2024 15:52:45 -0800 Subject: [PATCH 1/3] bump to v0.9.2 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bd210e72..9416e16f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2280,7 +2280,7 @@ dependencies = [ [[package]] name = "kit" -version = "0.9.1" +version = "0.9.2" dependencies = [ "alloy", "alloy-sol-macro", diff --git a/Cargo.toml b/Cargo.toml index 53f0b9a9..8e9f4fa4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "kit" authors = ["Sybil Technologies AG"] -version = "0.9.1" +version = "0.9.2" edition = "2021" description = "Development toolkit for Kinode" homepage = "https://kinode.org" From 3d329a85aa5d8b661f7cca06f13be614ef7e4082 Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Mon, 30 Dec 2024 15:57:25 -0800 Subject: [PATCH 2/3] properly enforce kimap-safety: no caps! --- src/main.rs | 6 +++--- src/new/mod.rs | 10 +++++----- src/start_package/mod.rs | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main.rs b/src/main.rs index be189931..1fea31d8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1019,20 +1019,20 @@ async fn make_app(current_dir: &std::ffi::OsString) -> Result { .visible_alias("n") .arg(Arg::new("DIR") .action(ArgAction::Set) - .help("Path to create template directory at (must contain only a-z, A-Z, 0-9, `-`)") + .help("Path to create template directory at (must contain only a-z, 0-9, `-`)") .required(true) ) .arg(Arg::new("PACKAGE") .action(ArgAction::Set) .short('a') .long("package") - .help("Name of the package (must contain only a-z, A-Z, 0-9, `-`) [default: DIR]") + .help("Name of the package (must contain only a-z, 0-9, `-`) [default: DIR]") ) .arg(Arg::new("PUBLISHER") .action(ArgAction::Set) .short('u') .long("publisher") - .help("Name of the publisher (must contain only a-z, A-Z, 0-9, `-`, `.`)") + .help("Name of the publisher (must contain only a-z, 0-9, `-`, `.`)") .default_value("template.os") ) .arg(Arg::new("LANGUAGE") diff --git a/src/new/mod.rs b/src/new/mod.rs index 60226f47..a3c62a21 100644 --- a/src/new/mod.rs +++ b/src/new/mod.rs @@ -237,9 +237,9 @@ fn replace_vars( pub fn is_kimap_safe(input: &str, is_publisher: bool) -> bool { let expression = if is_publisher { - r"^[a-zA-Z0-9\-.]+$" + r"^[a-z0-9\-.]+$" } else { - r"^[a-zA-Z0-9\-]+$" + r"^[a-z0-9\-]+$" }; let re = regex::Regex::new(expression).unwrap(); re.is_match(input) @@ -283,12 +283,12 @@ pub fn execute( if !is_kimap_safe(&package_name, false) { let error = if !is_from_dir { eyre!( - "`package_name` '{}' must be Kimap safe (a-z, A-Z, 0-9, - allowed).", + "`package_name` '{}' must be Kimap safe (a-z, 0-9, - allowed).", package_name ) } else { eyre!( - "`package_name` (derived from given directory {:?}) '{}' must be Kimap safe (a-z, A-Z, 0-9, - allowed).", + "`package_name` (derived from given directory {:?}) '{}' must be Kimap safe (a-z, 0-9, - allowed).", new_dir, package_name, ) @@ -297,7 +297,7 @@ pub fn execute( } if !is_kimap_safe(&publisher, true) { return Err(eyre!( - "`publisher` '{}' must be Kimap safe (a-z, A-Z, 0-9, -, . allowed).", + "`publisher` '{}' must be Kimap safe (a-z, 0-9, -, . allowed).", publisher )); } diff --git a/src/start_package/mod.rs b/src/start_package/mod.rs index 7718c33b..1297d1e5 100644 --- a/src/start_package/mod.rs +++ b/src/start_package/mod.rs @@ -106,11 +106,11 @@ fn check_manifest(pkg_dir: &Path, manifest_file_name: &str) -> Result<()> { ) })?; if !is_kimap_safe(file_name, false) { - return Err(eyre!("{manifest_json} file name '{file_name}' must be Kimap safe (a-z, A-Z, 0-9, - allowed)")); + return Err(eyre!("{manifest_json} file name '{file_name}' must be Kimap safe (a-z, 0-9, - allowed)")); } if !is_kimap_safe(file_path, false) { return Err(eyre!( - "{manifest_json} file path {:?} must be Kimap safe (a-z, A-Z, 0-9, - allowed)", + "{manifest_json} file path {:?} must be Kimap safe (a-z, 0-9, - allowed)", entry.process_wasm_path, )); } From 0b13b247c706215aa86da7e9c63078ba5fa7841b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 23:57:50 +0000 Subject: [PATCH 3/3] Format Rust code using rustfmt --- src/start_package/mod.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/start_package/mod.rs b/src/start_package/mod.rs index 1297d1e5..b93eb27c 100644 --- a/src/start_package/mod.rs +++ b/src/start_package/mod.rs @@ -106,7 +106,9 @@ fn check_manifest(pkg_dir: &Path, manifest_file_name: &str) -> Result<()> { ) })?; if !is_kimap_safe(file_name, false) { - return Err(eyre!("{manifest_json} file name '{file_name}' must be Kimap safe (a-z, 0-9, - allowed)")); + return Err(eyre!( + "{manifest_json} file name '{file_name}' must be Kimap safe (a-z, 0-9, - allowed)" + )); } if !is_kimap_safe(file_path, false) { return Err(eyre!(