Format Rust code using rustfmt

.SRCINFO

@@ -1,10 +0,0 @@
-pkgbase = rexec
-	pkgdesc = Parallel SSH executor
-	pkgver = 1.0.6
-	pkgrel = 1
-	url = https://github.com/house-of-vanity/rexec
-	arch = x86_64
-	license = WTFPL
-	makedepends = cargo
-
-pkgname = rexec

.github/workflows/release.yml

@@ -1,140 +1,80 @@
 name: Rust static build and publish
-
 on:
   push:
     tags:
-      - 'v*.*.*'
+    - '*'
-
 env:
   CARGO_TERM_COLOR: always
+  BUILD_TARGET: x86_64-unknown-linux-musl
   BINARY_NAME: rexec
-
 jobs:
   build:
     name: Build static binary
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        include:
-          - os: ubuntu-latest
-            build_target: x86_64-unknown-linux-musl
-            platform_name: linux-amd64
-          - os: windows-latest
-            build_target: x86_64-pc-windows-msvc
-            platform_name: windows-amd64
-          - os: macos-latest
-            build_target: aarch64-apple-darwin
-            platform_name: macos-arm64
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
-      
-      - name: Cache Cargo registry
-        uses: actions/cache@v4
-        with:
-          path: ~/.cargo/registry
-          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-cargo-registry-
-      
-      - name: Cache Cargo index
-        uses: actions/cache@v4
-        with:
-          path: ~/.cargo/git
-          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-cargo-index-
-      
-      - name: Cache Cargo build
-        uses: actions/cache@v4
-        with:
-          path: target
-          key: ${{ runner.os }}-cargo-build-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-cargo-build-
-
       - uses: dtolnay/rust-toolchain@stable
-      
       - uses: mbrobbel/rustfmt-check@master
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          
+      - name: Build-musl
-      - name: Install rust targets
-        run: rustup target add ${{ matrix.build_target }}
-        
-      - name: Build Linux MUSL
-        if: matrix.os == 'ubuntu-latest'
         uses: gmiam/rust-musl-action@master
         with:
-          args: cargo build --target ${{ matrix.build_target }} --release
+          args: cargo build --target $BUILD_TARGET --release
-          
+      - uses: actions/upload-artifact@v2
-      - name: Build MacOS
+        name: Upload artifact
-        if: matrix.os == 'macos-latest'
-        run: cargo build --target ${{ matrix.build_target }} --release
-          
-      - name: Build Windows
-        if: matrix.os == 'windows-latest'
-        run: cargo build --target ${{ matrix.build_target }} --release
-          
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}
+          name: ${{ env.BINARY_NAME }}_x86_64-linux-musl
-          path: target/${{ matrix.build_target }}/release/${{ env.BINARY_NAME }}*
+          path: target/x86_64-unknown-linux-musl/release/${{ env.BINARY_NAME }}
+
+#  build_arch:
+#    name: Arch Linux package
+#    runs-on: ubuntu-latest
+#    permissions:
+#      contents: write
+#    steps:
+#    - uses: actions/checkout@v3
+#    - name: Install latest nightly
+#      uses: actions-rs/toolchain@v1
+#      with:
+#        toolchain: stable
+#        override: true
+#        target: x86_64-unknown-linux-musl
+#        components: rustfmt
+#    - name: Install cargo-aur
+#      run: cargo install cargo-aur
+#    - name: Build PKGBUILD
+#      uses: actions-rs/cargo@v1
+#      with:
+#        command: aur
+#    - uses: actions/upload-artifact@v2
+#      name: Upload artifact PKGBUILD
+#      with:
+#          path: PKGBUILD
+#          name: PKGBUILD
 
   release:
-    name: Create Release Page
+    name: Release binary
-    needs: build
+    needs: ["build"]
     runs-on: ubuntu-latest
-    outputs:
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4
+    - uses: actions/download-artifact@master
-      - name: Get version
+      id: download_binary
-        run: echo "VERSION=$(grep -P '^version = \"\d+\.\d+\.\d+\"' Cargo.toml | awk -F '\"' '{print $2}')" >> $GITHUB_ENV
+      with:
-      - name: Show version
+        name: ${{ env.BINARY_NAME }}_x86_64-linux-musl
-        run: echo ${{ env.VERSION }}
+        path: ${{ env.BINARY_NAME }}_x86_64-linux-musl
-      - uses: ncipollo/release-action@v1
+#    - uses: actions/download-artifact@master
-        id: create_release
+#      id: download_pkgbuild
-        env:
+#      with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        name: PKGBUILD
-        with:
+#        path: PKGBUILD
-          allowUpdates: true
+    - uses: ncipollo/release-action@v1
-          body: "Release rexec ${{ env.VERSION }}. Static build for Linux (x86_64), Windows (x86_64) и MacOS (arm64)."
+      name: Update release page
-
+      with:
-  upload:
+        artifacts: "${{ steps.download_binary.outputs.download-path }}/*"
-    name: Upload Release Assets
+        allowUpdates: true
-    needs: release
+        body: Static build for x86_64-linux using MUSL
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        include:
-          - os: ubuntu-latest
-            platform_name: linux-amd64
-          - os: windows-latest
-            platform_name: windows-amd64
-          - os: macos-latest
-            platform_name: macos-arm64
-    steps:
-      - uses: actions/checkout@v4
-      
-      - uses: actions/download-artifact@v4
-        name: Download ${{ matrix.platform_name }} artifact
-        with:
-          name: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}
-          path: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}
-          
-      - name: Upload Release Asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}/${{ env.BINARY_NAME }}${{ matrix.platform_name == 'windows-amd64' && '.exe' || '' }}
-          asset_name: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}${{ matrix.platform_name == 'windows-amd64' && '.exe' || '' }}
-          asset_content_type: application/octet-stream

.gitignore

@@ -1,7 +1,3 @@
 target
 pkg
 *zst
-.rustup
-.cargo
-.viminfo
-.bash_history

CHANGELOG.md

@@ -6,20 +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.1.0] - 2023-09-13
-
-### Improved
-
-- Logging. Fix bugs 
-
-
-## [1.0.7] - 2023-08-31
-
-### Changed
-
-- Ci 
-
 ## [1.0.4] - 2023-08-14
 
 ### Changed

Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
+version = 3
 
 [[package]]
 name = "aho-corasick"
@@ -110,12 +110,6 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
-[[package]]
-name = "bitflags"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
-
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -169,7 +163,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
  "ansi_term",
  "atty",
- "bitflags 1.3.2",
+ "bitflags",
  "strsim 0.8.0",
  "textwrap",
  "unicode-width",
@@ -195,7 +189,7 @@ checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636"
 dependencies = [
  "anstream",
  "anstyle",
- "bitflags 1.3.2",
+ "bitflags",
  "clap_lex",
  "strsim 0.10.0",
 ]
@@ -244,31 +238,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
-
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -356,21 +325,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.0"
@@ -475,7 +429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584"
 dependencies = [
  "base64 0.13.1",
- "bitflags 1.3.2",
+ "bitflags",
  "bytes",
  "headers-core",
  "http",
@@ -830,50 +784,14 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
-[[package]]
-name = "openssl"
-version = "0.10.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
-dependencies = [
- "bitflags 2.4.0",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.18",
-]
-
-[[package]]
-name = "openssl-src"
-version = "111.27.0+1.1.1v"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "openssl-sys"
-version = "0.9.92"
+version = "0.9.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b"
+checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617"
 dependencies = [
  "cc",
  "libc",
- "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -1054,33 +972,13 @@ dependencies = [
  "getrandom",
 ]
 
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
 ]
 
 [[package]]
@@ -1089,7 +987,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
 ]
 
 [[package]]
@@ -1111,7 +1009,7 @@ checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "rexec"
-version = "1.2.1"
+version = "1.0.5"
 dependencies = [
  "brace-expand",
  "clap 4.3.4",
@@ -1122,9 +1020,7 @@ dependencies = [
  "lazy-st",
  "log",
  "massh",
- "openssl",
  "question",
- "rayon",
  "regex",
  "whoami",
 ]
@@ -1135,7 +1031,7 @@ version = "0.37.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
  "errno",
  "io-lifetimes",
  "libc",
@@ -1292,7 +1188,7 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7fe461910559f6d5604c3731d00d2aafc4a83d1665922e280f42f9a168d5455"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
  "libc",
  "libssh2-sys",
  "parking_lot 0.11.2",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rexec"
-version = "1.2.1"
+version = "1.0.6"
 readme = "https://github.com/house-of-vanity/rexec#readme"
 edition = "2021"
 description = "Parallel SSH executor"
@@ -14,7 +14,6 @@ authors = ["AB <gh@hexor.ru>"]
 
 [dependencies]
 dns-lookup = "2.0.2"
-rayon = "1.10"
 log = "0.4.0"
 env_logger = "0.10.0"
 massh = "0.6.3"
@@ -23,7 +22,7 @@ lazy-st = "0.2.2"
 regex = "1"
 clap = { version = "4.3.4", features = ["derive"] }
 colored = "2.0.0"
+#dialoguer = "0.10.4"
 itertools = "0.10.5"
 brace-expand = "0.1.0"
 question = "0.2.2"
-openssl = { version = "0.10", features = ["vendored"] }

PKGBUILD

@@ -1,14 +1,25 @@
 # Maintainer: AB <gh@hexor.ru>
 pkgname=rexec
-pkgver=some_ver
+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")
 
-package() {
+pkgver() {
-  install -Dm755 "$startdir/target/x86_64-unknown-linux-musl/release/rexec" "$pkgdir/usr/bin/rexec"
+    (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"
+}
 

README.md

@@ -1,20 +1,14 @@
 # rexec
-**Parallel SSH executor** in Rust with static binary. It can read servers from `~/.ssh/known_hosts`
+Parallel SSH executor in Rust. It can read servers from `~/.ssh/known_hosts`
+
+or even expand servers from bash expanshion line `cassandra.{prod,dev}.example.com`
 
-or even expand servers from bash expanshion line `cassandra-[1:5].{prod,dev}.example.com`
 
 [![Rust-static-build](https://github.com/house-of-vanity/rexec/actions/workflows/release.yml/badge.svg)](https://github.com/house-of-vanity/rexec/actions/workflows/release.yml)
----
 
-## Usage
+
 ```shell
-            _|_|_|_|   _|      _|   _|_|_|_|     _|_|_|  
+[ab@test]$ ./rexec -k admin-gce-sc.* --help
- _|  _|_|   _|           _|  _|     _|         _|        
- _|_|       _|_|_|         _|       _|_|_|     _|        
- _|         _|           _|  _|     _|         _|        
- _|         _|_|_|_|   _|      _|   _|_|_|_|     _|_|_|  
-                                                        
-
 Parallel SSH executor in Rust
 
 Usage: rexec [OPTIONS] --expression <EXPRESSION> --command <COMMAND>
@@ -30,33 +24,39 @@ Options:
   -h, --help                     Print help
   -V, --version                  Print version
 ```
----
 
-![image](https://github.com/house-of-vanity/rexec/assets/4666566/4c52915d-2bc1-46b9-9833-b0d7c0527f2d)
-
-
-## Examples
 ```shell
-$ rexec -f \
+[ab@test debug]$ ./rexec -u ab -k -c uptime -e admin.* -f
-    -e 'cassandra-gce-or-[1:2]' \
-    -u ab \
-    -c 'uname -r; date'
-[INFO ] Using string expansion to build server list.
 [INFO ] Matched hosts:
-[INFO ] cassandra-gce-or-1.prod.example.com [2.22.123.79]
+[INFO ] admin-gce-sc-1.lca-prod.** [35.211.27.195]
-[INFO ] cassandra-gce-or-2.prod.example.com [2.22.123.158]
+[INFO ] admin-gce-sc-1.mmk-prod.** [35.211.79.202]
-Continue on following 2 servers? y
+[ERROR] admin-gce-sc-1.led-prod.** couldn't be resolved.
-[INFO ] Run command on 2 servers.
+[INFO ] admin-gce-sc-1.msq-dev.** [35.211.0.24]
+[ERROR] admin-gce-sc-1.hui-dev.** couldn't be resolved.
     
-cassandra-gce-or-1.prod.example.com
+[INFO ] Run command on 3 servers.
-Exit code [0] / stdout 45 bytes / stderr 0 bytes
-STDOUT
-║ 5.15.0-1040-gcp
-║ Thu Sep  7 13:44:40 UTC 2023
 
-cassandra-gce-or-2.prod.example.com
+
-Exit code [0] / stdout 45 bytes / stderr 0 bytes
+[INFO ] admin.gnb-prod.**
-STDOUT
+Code 0 
-║ 5.15.0-1040-gcp
+STDOUT:                                                    
-║ Thu Sep  7 13:44:40 UTC 2023
+ 23:31:21 up 294 days, 14:14,  0 users,  load average: 0.53, 0.64, 0.52
+
+STDERR:
+                                                                                                                       
+[INFO ] admin.abe-prod.**
+Code 0 
+STDOUT:                                                    
+ 23:31:22 up 154 days,  9:24,  0 users,  load average: 0.31, 0.25, 0.18
+                                                           
+STDERR:
+
+[INFO ] admin-gce-be-1.toy-prod.**
+Code 0                                                     
+STDOUT:
+ 23:31:22 up 98 days,  6:20,  0 users,  load average: 0.88, 0.74, 0.80
+                             
+STDERR:
+no server running on /tmp/tmux-1019/default                                                                            
+open terminal failed: not a terminal
 ```

src/main.rs

@@ -6,17 +6,16 @@ use std::fs::read_to_string;
 use std::hash::Hash;
 use std::net::IpAddr;
 use std::process;
-use std::sync::{Arc, Mutex};
 
 use clap::Parser;
 use colored::*;
+//use dialoguer::Confirm;
 use dns_lookup::lookup_host;
 use env_logger::Env;
 use itertools::Itertools;
-use log::{error, info, warn};
+use log::{error, info};
 use massh::{MasshClient, MasshConfig, MasshHostConfig, SshAuth};
 use question::{Answer, Question};
-use rayon::prelude::*;
 use regex::Regex;
 
 // Define args
@@ -36,10 +35,9 @@ struct Args {
     #[arg(
         short,
         long,
-        num_args = 1..,
         help = "Expression to build server list. List and range expansion are supported. Example: 'web-[1:12]-io-{prod,dev}'"
     )]
-    expression: Vec<String>,
+    expression: String,
 
     #[arg(short, long, help = "Command to execute on servers")]
     command: String,
@@ -159,36 +157,30 @@ fn main() {
     let hosts = if args.known_hosts {
         info!("Using ~/.ssh/known_hosts to build server list.");
         let known_hosts = read_known_hosts();
-        let mut all_hosts = Vec::new();
+        // Build regex
-        for expression in args.expression.iter() {
+        let re = match Regex::new(&args.expression) {
-            let re = match Regex::new(expression) {
+            Ok(result) => result,
-                Ok(result) => result,
+            Err(e) => {
-                Err(e) => {
+                error!("Error parsing regex. {}", e);
-                    error!("Error parsing regex. {}", e);
+                process::exit(1);
-                    process::exit(1);
+            }
-                }
+        };
-            };
+        // match hostnames from known_hosts to regex
-            let matched: Vec<Host> = known_hosts
+        known_hosts
-                .clone()
+            .into_iter()
-                .into_iter()
+            .filter(|r| re.is_match(&r.name.clone()))
-                .filter(|r| re.is_match(&r.name.clone()))
+            .collect()
-                .collect();
-            all_hosts.extend(matched);
-        }
-        all_hosts
     } else {
         info!("Using string expansion to build server list.");
-        let mut all_hosts = Vec::new();
+        expand_string(&args.expression)
-        for expression in args.expression.iter() {
-            all_hosts.extend(expand_string(expression));
-        }
-        all_hosts
     };
 
-    // Dedup hosts from known_hosts file but preserve original order
+    // Dedup hosts from known_hosts file
     let matched_hosts: Vec<_> = hosts.into_iter().unique().collect();
 
     // 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 {
@@ -199,82 +191,41 @@ fn main() {
         });
     }
 
-    // Store hosts with their indices to preserve order
-    let mut host_with_indices: Vec<(Host, usize)> = Vec::new();
-    for (idx, host) in matched_hosts.iter().enumerate() {
-        host_with_indices.push((host.clone(), idx));
-    }
-
     info!("Matched hosts:");
-
+    for host in matched_hosts.iter() {
-    // Do DNS resolution in parallel but store results for ordered display later
+        let ip = match lookup_host(&host.name) {
-    let resolved_ips_with_indices = Arc::new(Mutex::new(Vec::<(String, IpAddr, usize)>::new()));
+            Ok(ip) => ip[0],
-
-    host_with_indices
-        .par_iter()
-        .for_each(|(host, idx)| match lookup_host(&host.name) {
-            Ok(ips) if !ips.is_empty() => {
-                let ip = ips[0];
-                let mut results = resolved_ips_with_indices.lock().unwrap();
-                results.push((host.name.clone(), ip, *idx));
-            }
-            Ok(_) => {
-                let mut results = resolved_ips_with_indices.lock().unwrap();
-                results.push((
-                    host.name.clone(),
-                    IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)),
-                    *idx,
-                ));
-            }
             Err(_) => {
-                let mut results = resolved_ips_with_indices.lock().unwrap();
+                error!("{} couldn't be resolved.", &host.name.red());
-                results.push((
+                continue;
-                    host.name.clone(),
-                    IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)),
-                    *idx,
-                ));
             }
-        });
+        };
-
+        info!("{} [{}]", &host.name, ip);
-    // Sort by original index to ensure hosts are displayed in order
+        hosts_and_ips.insert(ip, host.name.clone());
-    let mut resolved_hosts = resolved_ips_with_indices.lock().unwrap().clone();
+        massh_hosts.push(MasshHostConfig {
-    resolved_hosts.sort_by_key(|(_, _, idx)| *idx);
+            addr: ip,
-
+            auth: None,
-    // Now print the hosts in the correct order
+            port: None,
-    for (hostname, ip, _) in &resolved_hosts {
+            user: None,
-        if ip.is_unspecified() {
+        })
-            error!("DNS resolve failed: {}", hostname.red());
-        } else {
-            info!("{} [{}]", hostname, ip);
-        }
     }
-
+    // Build MasshConfig using massh_hosts vector
-    // Create massh_hosts in the correct order
+    let config = MasshConfig {
-    let mut hosts_and_ips: HashMap<IpAddr, (String, usize)> = HashMap::new();
+        default_auth: SshAuth::Agent,
-    let mut massh_hosts: Vec<MasshHostConfig> = Vec::new();
+        default_port: 22,
-
+        default_user: args.username,
-    for (hostname, ip, idx) in resolved_hosts {
+        threads: args.parallel as u64,
-        // Skip hosts that couldn't be resolved
+        timeout: 0,
-        if !ip.is_unspecified() {
+        hosts: massh_hosts,
-            hosts_and_ips.insert(ip, (hostname.clone(), idx));
+    };
-            massh_hosts.push(MasshHostConfig {
+    let massh = MasshClient::from(&config);
-                addr: ip,
-                auth: None,
-                port: None,
-                user: None,
-            });
-        }
-    }
-
-    // Process hosts in batches to maintain order
-    let batch_size = args.parallel as usize;
 
     // Ask for confirmation
-    if !massh_hosts.is_empty()
+    if config.hosts.len() != 0
-        && (args.noconfirm
+        && (args.noconfirm == true
             || match Question::new(&*format!(
                 "Continue on following {} servers?",
-                &massh_hosts.len()
+                &config.hosts.len()
             ))
             .confirm()
             {
@@ -283,120 +234,46 @@ fn main() {
                 _ => unreachable!(),
             })
     {
-        info!("Run command on {} servers.", &massh_hosts.len());
+        info!("\n");
+        info!("Run command on {} servers.", &config.hosts.len());
+        info!("\n");
 
-        let mut processed = 0;
+        // Run a command on all the configured hosts.
+        // Receive the result of the command for each host and print its output.
+        let rx = massh.execute(args.command);
 
-        while processed < massh_hosts.len() {
+        while let Ok((host, result)) = rx.recv() {
-            let end = std::cmp::min(processed + batch_size, massh_hosts.len());
+            let ip: String = host.split('@').collect::<Vec<_>>()[1]
-
+                .split(':')
-            // Create a new config and vector for this batch
+                .collect::<Vec<_>>()[0]
-            let mut batch_hosts = Vec::new();
+                .to_string();
-            for host in &massh_hosts[processed..end] {
+            let ip = ip.parse::<IpAddr>().unwrap();
-                batch_hosts.push(MasshHostConfig {
+            info!(
-                    addr: host.addr,
+                "{}",
-                    auth: None,
+                hosts_and_ips
-                    port: None,
+                    .get(&ip)
-                    user: None,
+                    .unwrap_or(&"Couldn't parse IP".to_string())
-                });
+                    .to_string()
-            }
+                    .yellow()
-
-            // Create a new MasshClient for this batch
-            let batch_config = MasshConfig {
-                default_auth: SshAuth::Agent,
-                default_port: 22,
-                default_user: args.username.clone(),
-                threads: batch_hosts.len() as u64,
-                timeout: 0,
-                hosts: batch_hosts,
-            };
-
-            let batch_massh = MasshClient::from(&batch_config);
-
-            // Run commands on this batch
-            let rx = batch_massh.execute(args.command.clone());
-
-            // Collect all results from this batch before moving to the next
-            let mut batch_results = Vec::new();
-
-            while let Ok((host, result)) = rx.recv() {
-                let ip: String = host.split('@').collect::<Vec<_>>()[1]
-                    .split(':')
-                    .collect::<Vec<_>>()[0]
-                    .to_string();
-                let ip = ip.parse::<IpAddr>().unwrap();
-
-                if let Some((hostname, idx)) = hosts_and_ips.get(&ip) {
-                    batch_results.push((hostname.clone(), ip, result, *idx));
-                } else {
-                    error!("Unexpected IP address in result: {}", ip);
-                }
-            }
-
-            // Sort the batch results by index to ensure they're displayed in order
-            batch_results.sort_by_key(|(_, _, _, idx)| *idx);
-
-            // Display the results
-            for (hostname, _ip, result, _) in batch_results {
-                println!("\n{}", hostname.yellow().bold().to_string());
-
-                let output = match result {
-                    Ok(output) => output,
-                    Err(e) => {
-                        error!("Can't access server: {}", e);
-                        continue;
-                    }
-                };
-
-                let code_string = if output.exit_status == 0 {
-                    format!("{}", output.exit_status.to_string().green())
-                } else {
-                    format!("{}", output.exit_status.to_string().red())
-                };
-
-                println!(
-                    "{}",
-                    format!(
-                        "Exit code [{}] / stdout {} bytes / stderr {} bytes",
-                        code_string,
-                        output.stdout.len(),
-                        output.stderr.len()
-                    )
                     .bold()
-                );
+                    .to_string()
-
+            );
-                if !args.code {
+            let output = match result {
-                    match String::from_utf8(output.stdout) {
+                Ok(output) => output,
-                        Ok(stdout) => match stdout.as_str() {
+                Err(e) => {
-                            "" => {}
+                    error!("Can't access server: {}", e);
-                            _ => {
+                    continue;
-                                let prefix = if output.exit_status != 0 {
-                                    format!("{}", "│".cyan())
-                                } else {
-                                    format!("{}", "│".green())
-                                };
-                                for line in stdout.lines() {
-                                    println!("{} {}", prefix, line);
-                                }
-                            }
-                        },
-                        Err(_) => {}
-                    }
-                    match String::from_utf8(output.stderr) {
-                        Ok(stderr) => match stderr.as_str() {
-                            "" => {}
-                            _ => {
-                                for line in stderr.lines() {
-                                    println!("{} {}", "║".red(), line);
-                                }
-                            }
-                        },
-                        Err(_) => {}
-                    }
                 }
+            };
+            if output.exit_status == 0 {
+                println!("Code {}", output.exit_status);
+            } else {
+                error!("Code {}", output.exit_status);
+            };
+            if !args.code {
+                println!("STDOUT:\n{}", String::from_utf8(output.stdout).unwrap());
+                println!("STDERR:\n{}", String::from_utf8(output.stderr).unwrap());
             }
-
-            processed = end;
         }
     } else {
         warn!("Stopped");