Bump version

.gitignore

@@ -1 +1,3 @@
 target
+pkg
+*zst

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [1.0.4] - 2023-08-14
+
+### Changed
+
+- Expansion host strings.
+
 ## [1.0.1] - 2023-06-20
 
 ### Changed

Cargo.lock

@@ -1043,7 +1043,7 @@ checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "rexec"
-version = "1.0.3"
+version = "1.0.4"
 dependencies = [
  "brace-expand",
  "clap 4.3.4",
@@ -1056,7 +1056,6 @@ dependencies = [
  "log",
  "massh",
  "regex",
- "tokio",
  "whoami",
 ]
 

Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "rexec"
-version = "1.0.3"
+version = "1.0.5"
+readme = "https://github.com/house-of-vanity/rexec#readme"
 edition = "2021"
 description = "Parallel SSH executor"
 repository = "https://github.com/house-of-vanity/rexec"
@@ -12,7 +13,6 @@ authors = ["AB <gh@hexor.ru>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tokio = { version = "1", features = ["full"] }
 dns-lookup = "2.0.2"
 log = "0.4.0"
 env_logger = "0.10.0"

PKGBUILD

@@ -0,0 +1,25 @@
+# Maintainer: AB <gh@hexor.ru>
+pkgname=rexec
+pkgver=1.0.4.r0.g3cf1e79
+pkgrel=1
+pkgdesc="Parallel SSH executor"
+url="https://github.com/house-of-vanity/rexec"
+license=("WTFPL")
+arch=("x86_64")
+makedepends=("cargo")
+
+pkgver() {
+    (git describe --long --tags || echo "$pkgver") | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+build() {
+    return 0
+}
+
+package() {
+    cd ..
+    usrdir="$pkgdir/usr"
+    mkdir -p $usrdir
+    cargo install --no-track --path . --root "$usrdir"
+}
+

src/main.rs

@@ -24,13 +24,17 @@ struct Args {
     #[arg(short, long, default_value_t = whoami::username())]
     username: String,
 
-    #[arg(short, long, help = "Use known_hosts to build servers list")]
+    #[arg(
+        short,
+        long,
+        help = "Use known_hosts to build servers list instead of string expansion."
+    )]
     known_hosts: bool,
 
     #[arg(
         short,
         long,
-        help = "Expression to build server list. List and range expansion available. Example: 'web-[1:12]-io-{prod,dev}'"
+        help = "Expression to build server list. List and range expansion are supported. Example: 'web-[1:12]-io-{prod,dev}'"
     )]
     expression: String,
 
@@ -92,13 +96,25 @@ fn expand_string(s: &str) -> Vec<Host> {
     while let Some(r) = result.iter().find(|s| s.contains('[')) {
         let r = r.clone();
         let start = r.find('[').unwrap();
-        let end = r.find(']').unwrap();
-        let colon = r.find(':').unwrap();
-        let low = r[start+1..colon].parse::<i32>().unwrap();
-        let high = r[colon+1..end].parse::<i32>().unwrap();
+        let end = match r[start..].find(']') {
+            None => {
+                error!("Error parsing host expression. Wrong range expansion '[a:b]'");
+                process::exit(1);
+            }
+            Some(s) => s + start,
+        };
+        let colon = match r[start..end].find(':') {
+            None => {
+                error!("Error parsing host expression. Missing colon in range expansion '[a:b]'");
+                process::exit(1);
+            }
+            Some(c) => c + start,
+        };
+        let low = r[start + 1..colon].parse::<i32>().unwrap();
+        let high = r[colon + 1..end].parse::<i32>().unwrap();
         result.retain(|s| s != &r);
         for val in expand_range(low, high) {
-            let new_str = format!("{}{}{}", &r[..start], val, &r[end+1..]);
+            let new_str = format!("{}{}{}", &r[..start], val, &r[end + 1..]);
             result.push(new_str);
         }
     }
@@ -106,11 +122,17 @@ fn expand_string(s: &str) -> Vec<Host> {
     while let Some(r) = result.iter().find(|s| s.contains('{')) {
         let r = r.clone();
         let start = r.find('{').unwrap();
-        let end = r.find('}').unwrap();
-        let list = &r[start+1..end];
+        let end = match r.find('}') {
+            None => {
+                error!("Error parsing host expression. Wrong range expansion '{{one,two}}'");
+                process::exit(1);
+            }
+            Some(s) => s,
+        };
+        let list = &r[start + 1..end];
         result.retain(|s| s != &r);
         for val in expand_list(list) {
-            let new_str = format!("{}{}{}", &r[..start], val, &r[end+1..]);
+            let new_str = format!("{}{}{}", &r[..start], val, &r[end + 1..]);
             result.push(new_str);
         }
     }
@@ -124,8 +146,7 @@ fn expand_string(s: &str) -> Vec<Host> {
     hosts
 }
 
-#[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
+fn main() {
     env_logger::Builder::from_env(Env::default().default_filter_or("info"))
         .format_timestamp(None)
         .format_target(false)
@@ -159,6 +180,16 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     // Build MasshHostConfig hostnames list
     let mut massh_hosts: Vec<MasshHostConfig> = vec![];
     let mut hosts_and_ips: HashMap<IpAddr, String> = HashMap::new();
+    if args.parallel != 100 {
+        warn!("Parallelism: {} thread{}", &args.parallel, {
+            if args.parallel != 1 {
+                "s."
+            } else {
+                "."
+            }
+        });
+    }
+
     info!("Matched hosts:");
     for host in matched_hosts.iter() {
         let ip = match lookup_host(&host.name) {
@@ -242,5 +273,4 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     } else {
         warn!("Stopped");
     }
-    Ok(())
 }