Moving to async

.gitignore

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

CHANGELOG.md

@@ -6,12 +6,6 @@ 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.4"
+version = "1.0.3"
 dependencies = [
  "brace-expand",
  "clap 4.3.4",
@@ -1056,6 +1056,7 @@ dependencies = [
  "log",
  "massh",
  "regex",
+ "tokio",
  "whoami",
 ]
 

Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "rexec"
-version = "1.0.4"
+version = "1.0.3"
-readme = "https://github.com/house-of-vanity/rexec#readme"
 edition = "2021"
 description = "Parallel SSH executor"
 repository = "https://github.com/house-of-vanity/rexec"
@@ -13,6 +12,7 @@ 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

@@ -1,25 +0,0 @@
-# Maintainer: AB <gh@hexor.ru>
-pkgname=rexec
-pkgver=1.0.1.r9.g0d95364
-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,13 @@ struct Args {
     #[arg(short, long, default_value_t = whoami::username())]
     username: String,
 
-    #[arg(short, long, help = "Use known_hosts to build servers list instead of string expansion.")]
+    #[arg(short, long, help = "Use known_hosts to build servers list")]
     known_hosts: bool,
 
     #[arg(
         short,
         long,
-        help = "Expression to build server list. List and range expansion are supported. Example: 'web-[1:12]-io-{prod,dev}'"
+        help = "Expression to build server list. List and range expansion available. Example: 'web-[1:12]-io-{prod,dev}'"
     )]
     expression: String,
 
@@ -91,14 +91,8 @@ 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 start = r.find('[').unwrap();
-        let end = match r.find(']') {
+        let end = r.find(']').unwrap();
-            None => {
-                error!("Error parsing host expression. Wrong range expansion '[a:b]'");
-                process::exit(1);
-            }
-            Some(s) => s
-        };
         let colon = r.find(':').unwrap();
         let low = r[start+1..colon].parse::<i32>().unwrap();
         let high = r[colon+1..end].parse::<i32>().unwrap();
@@ -112,13 +106,7 @@ 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 = match r.find('}') {
+        let end = r.find('}').unwrap();
-            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) {
@@ -136,8 +124,8 @@ fn expand_string(s: &str) -> Vec<Host> {
     hosts
 }
 
-
+#[tokio::main]
-fn main() {
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
     env_logger::Builder::from_env(Env::default().default_filter_or("info"))
         .format_timestamp(None)
         .format_target(false)
@@ -171,10 +159,6 @@ 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) {
@@ -258,4 +242,5 @@ fn main() {
     } else {
         warn!("Stopped");
     }
+    Ok(())
 }