Format Rust code using rustfmt

.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

@@ -56,7 +56,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -66,7 +66,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
 dependencies = [
  "anstyle",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -229,19 +229,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "console"
-version = "0.15.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "unicode-width",
- "windows-sys 0.45.0",
-]
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.7"
@@ -261,18 +248,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "dialoguer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87"
-dependencies = [
- "console",
- "shell-words",
- "tempfile",
- "zeroize",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -292,7 +267,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "socket2 0.5.3",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -301,12 +276,6 @@ version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
 [[package]]
 name = "encoding_rs"
 version = "0.8.32"
@@ -337,7 +306,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
 dependencies = [
  "errno-dragonfly",
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -350,15 +319,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -627,7 +587,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
  "hermit-abi 0.3.1",
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -639,7 +599,7 @@ dependencies = [
  "hermit-abi 0.3.1",
  "io-lifetimes",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -787,7 +747,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
  "wasi",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -881,7 +841,7 @@ dependencies = [
  "libc",
  "redox_syscall 0.3.5",
  "smallvec",
- "windows-targets 0.48.0",
+ "windows-targets",
 ]
 
 [[package]]
@@ -967,6 +927,12 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "question"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbb3ede7a8f9a8ab89e714637f2cf40001b58f21340d4242b2f11533e65fa8d"
+
 [[package]]
 name = "quote"
 version = "1.0.28"
@@ -1043,18 +1009,18 @@ checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "rexec"
-version = "1.0.2"
+version = "1.0.5"
 dependencies = [
-    "brace-expand",
+ "brace-expand",
-    "clap 4.3.4",
+ "clap 4.3.4",
-    "colored",
+ "colored",
-    "dialoguer",
+ "dns-lookup",
-    "dns-lookup",
+ "env_logger",
-    "env_logger",
+ "itertools",
-    "itertools",
+ "lazy-st",
-    "lazy-st",
+ "log",
-    "log",
  "massh",
+ "question",
  "regex",
  "whoami",
 ]
@@ -1070,7 +1036,7 @@ dependencies = [
  "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1166,12 +1132,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "shell-words"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.1"
@@ -1213,7 +1173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1292,20 +1252,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "tempfile"
-version = "3.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
-dependencies = [
- "autocfg",
- "cfg-if",
- "fastrand",
- "redox_syscall 0.3.5",
- "rustix",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "termcolor"
 version = "1.2.0"
@@ -1384,7 +1330,7 @@ dependencies = [
  "signal-hook-registry",
  "socket2 0.4.9",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1727,37 +1673,13 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
 ]
 
 [[package]]
@@ -1766,93 +1688,51 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.48.0",
+ "windows_aarch64_msvc",
- "windows_i686_gnu 0.48.0",
+ "windows_i686_gnu",
- "windows_i686_msvc 0.48.0",
+ "windows_i686_msvc",
- "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnu",
- "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.48.0",
+ "windows_x86_64_msvc",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.0"
@@ -1867,9 +1747,3 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
 dependencies = [
  "linked-hash-map",
 ]
-
-[[package]]
-name = "zeroize"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"

Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "rexec"
-version = "1.0.2"
+version = "1.0.6"
+readme = "https://github.com/house-of-vanity/rexec#readme"
 edition = "2021"
 description = "Parallel SSH executor"
 repository = "https://github.com/house-of-vanity/rexec"
@@ -21,6 +22,7 @@ lazy-st = "0.2.2"
 regex = "1"
 clap = { version = "4.3.4", features = ["derive"] }
 colored = "2.0.0"
-dialoguer = "0.10.4"
+#dialoguer = "0.10.4"
 itertools = "0.10.5"
 brace-expand = "0.1.0"
+question = "0.2.2"

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

@@ -9,12 +9,13 @@ use std::process;
 
 use clap::Parser;
 use colored::*;
-use dialoguer::Confirm;
+//use dialoguer::Confirm;
 use dns_lookup::lookup_host;
 use env_logger::Env;
 use itertools::Itertools;
 use log::{error, info};
 use massh::{MasshClient, MasshConfig, MasshHostConfig, SshAuth};
+use question::{Answer, Question};
 use regex::Regex;
 
 // Define args
@@ -24,13 +25,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 +82,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 +172,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 +181,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) {
@@ -195,14 +221,18 @@ fn main() {
     let massh = MasshClient::from(&config);
 
     // Ask for confirmation
-    if args.noconfirm == true
+    if config.hosts.len() != 0
-        || Confirm::new()
+        && (args.noconfirm == true
-            .with_prompt(format!(
+            || match Question::new(&*format!(
                 "Continue on following {} servers?",
                 &config.hosts.len()
             ))
-            .interact()
+            .confirm()
-            .unwrap()
+            {
+                Answer::YES => true,
+                Answer::NO => false,
+                _ => unreachable!(),
+            })
     {
         info!("\n");
         info!("Run command on {} servers.", &config.hosts.len());