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,17 +1043,17 @@ checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "rexec"
-version = "1.0.2"
+version = "1.0.4"
 dependencies = [
-    "brace-expand",
+ "brace-expand",
-    "clap 4.3.4",
+ "clap 4.3.4",
-    "colored",
+ "colored",
-    "dialoguer",
+ "dialoguer",
-    "dns-lookup",
+ "dns-lookup",
-    "env_logger",
+ "env_logger",
-    "itertools",
+ "itertools",
-    "lazy-st",
+ "lazy-st",
-    "log",
+ "log",
  "massh",
  "regex",
  "whoami",

Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "rexec"
-version = "1.0.2"
+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"

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,
 
@@ -77,48 +81,59 @@ fn read_known_hosts() -> Vec<Host> {
     result
 }
 
-fn expand_string(string: String) -> Vec<Host> {
+fn expand_range(start: i32, end: i32) -> Vec<String> {
-    let mut result: Vec<String> = Vec::new();
+    (start..=end).map(|i| i.to_string()).collect()
-    let mut _result: Vec<String> = Vec::new();
+}
+
+fn expand_list(list: &str) -> Vec<String> {
+    list.split(',').map(|s| s.to_string()).collect()
+}
+
+fn expand_string(s: &str) -> Vec<Host> {
     let mut hosts: Vec<Host> = Vec::new();
+    let mut result = vec![s.to_string()];
 
-    if let Some(open_bracket_index) = string.find('[') {
+    while let Some(r) = result.iter().find(|s| s.contains('[')) {
-        if let Some(close_bracket_index) = string.find(']') {
+        let r = r.clone();
-            let prefix = &string[..open_bracket_index];
+        let start = r.find('[').unwrap();
-            let range = &string[open_bracket_index + 1..close_bracket_index];
+        let end = match r[start..].find(']') {
-            let postfix = &string[close_bracket_index + 1..];
+            None => {
-
+                error!("Error parsing host expression. Wrong range expansion '[a:b]'");
-            let parts: Vec<&str> = range.split(':').collect();
+                process::exit(1);
-
-            if parts.len() == 2 {
-                if let Ok(start) = parts[0].parse::<u32>() {
-                    if let Ok(end) = parts[1].parse::<u32>() {
-                        for num in start..=end {
-                            _result.push(format!("{}{}{}", prefix, num, postfix));
-                        }
-                    }
-                }
             }
+            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..]);
+            result.push(new_str);
         }
-    } else {
-        _result.push(String::from(string));
     }
 
-    for string in _result {
+    while let Some(r) = result.iter().find(|s| s.contains('{')) {
-        if let Some(open_brace_index) = string.find('{') {
+        let r = r.clone();
-            if let Some(close_brace_index) = string.find('}') {
+        let start = r.find('{').unwrap();
-                let prefix = &string[..open_brace_index];
+        let end = match r.find('}') {
-                let list = &string[open_brace_index + 1..close_brace_index];
+            None => {
-                let postfix = &string[close_brace_index + 1..];
+                error!("Error parsing host expression. Wrong range expansion '{{one,two}}'");
-
+                process::exit(1);
-                let items: Vec<&str> = list.split(',').collect();
-
-                for item in items {
-                    result.push(format!("{}{}{}", prefix, item, postfix));
-                }
             }
-        } else {
+            Some(s) => s,
-            result.push(String::from(string));
+        };
+        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..]);
+            result.push(new_str);
         }
     }
 
@@ -156,7 +171,7 @@ fn main() {
             .collect()
     } else {
         info!("Using string expansion to build server list.");
-        expand_string(args.expression)
+        expand_string(&args.expression)
     };
 
     // Dedup hosts from known_hosts file
@@ -165,6 +180,16 @@ fn main() {
     // 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) {