Format Rust code using rustfmt

.SRCINFO

@@ -0,0 +1,10 @@
+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,80 +1,140 @@
 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: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    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@v3
+      - uses: actions/checkout@v4
+      
+      - 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 $BUILD_TARGET --release
+          args: cargo build --target ${{ matrix.build_target }} --release
-      - uses: actions/upload-artifact@v2
-        name: Upload artifact
-        with:
-          name: ${{ env.BINARY_NAME }}_x86_64-linux-musl
-          path: target/x86_64-unknown-linux-musl/release/${{ env.BINARY_NAME }}
           
-#  build_arch:
+      - name: Build MacOS
-#    name: Arch Linux package
+        if: matrix.os == 'macos-latest'
-#    runs-on: ubuntu-latest
+        run: cargo build --target ${{ matrix.build_target }} --release
-#    permissions:
+          
-#      contents: write
+      - name: Build Windows
-#    steps:
+        if: matrix.os == 'windows-latest'
-#    - uses: actions/checkout@v3
+        run: cargo build --target ${{ matrix.build_target }} --release
-#    - name: Install latest nightly
+          
-#      uses: actions-rs/toolchain@v1
+      - name: Upload artifact
-#      with:
+        uses: actions/upload-artifact@v4
-#        toolchain: stable
+        with:
-#        override: true
+          name: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}
-#        target: x86_64-unknown-linux-musl
+          path: target/${{ matrix.build_target }}/release/${{ env.BINARY_NAME }}*
-#        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: Release binary
+    name: Create Release Page
-    needs: ["build"]
+    needs: build
     runs-on: ubuntu-latest
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
     permissions:
       contents: write
     steps:
-    - uses: actions/download-artifact@master
+      - uses: actions/checkout@v4
-      id: download_binary
+      - name: Get version
-      with:
+        run: echo "VERSION=$(grep -P '^version = \"\d+\.\d+\.\d+\"' Cargo.toml | awk -F '\"' '{print $2}')" >> $GITHUB_ENV
-        name: ${{ env.BINARY_NAME }}_x86_64-linux-musl
+      - name: Show version
-        path: ${{ env.BINARY_NAME }}_x86_64-linux-musl
+        run: echo ${{ env.VERSION }}
-#    - uses: actions/download-artifact@master
-#      id: download_pkgbuild
-#      with:
-#        name: PKGBUILD
-#        path: PKGBUILD
       - uses: ncipollo/release-action@v1
-      name: Update release page
+        id: create_release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-        artifacts: "${{ steps.download_binary.outputs.download-path }}/*"
           allowUpdates: true
-        body: Static build for x86_64-linux using MUSL
+          body: "Релиз rexec версии ${{ env.VERSION }}. Статические сборки для Linux (x86_64), Windows (x86_64) и MacOS (arm64)."
+
+  upload:
+    name: Upload Release Assets
+    needs: release
+    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,3 +1,7 @@
 target
 pkg
 *zst
+.rustup
+.cargo
+.viminfo
+.bash_history

CHANGELOG.md

@@ -6,6 +6,20 @@ 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 = 3
+version = 4
 
 [[package]]
 name = "aho-corasick"
@@ -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]]
@@ -110,6 +110,12 @@ 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"
@@ -163,7 +169,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
  "ansi_term",
  "atty",
- "bitflags",
+ "bitflags 1.3.2",
  "strsim 0.8.0",
  "textwrap",
  "unicode-width",
@@ -189,7 +195,7 @@ checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636"
 dependencies = [
  "anstream",
  "anstyle",
- "bitflags",
+ "bitflags 1.3.2",
  "clap_lex",
  "strsim 0.10.0",
 ]
@@ -229,19 +235,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"
@@ -251,6 +244,31 @@ 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"
@@ -261,18 +279,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 +298,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "socket2 0.5.3",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -301,12 +307,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 +337,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
 dependencies = [
  "errno-dragonfly",
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -350,21 +350,27 @@ 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"
 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"
@@ -469,7 +475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584"
 dependencies = [
  "base64 0.13.1",
- "bitflags",
+ "bitflags 1.3.2",
  "bytes",
  "headers-core",
  "http",
@@ -627,7 +633,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
  "hermit-abi 0.3.1",
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -639,7 +645,7 @@ dependencies = [
  "hermit-abi 0.3.1",
  "io-lifetimes",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -787,7 +793,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
  "wasi",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -825,13 +831,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
-name = "openssl-sys"
+name = "openssl"
-version = "0.9.88"
+version = "0.10.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617"
+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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b"
 dependencies = [
  "cc",
  "libc",
+ "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -881,7 +923,7 @@ dependencies = [
  "libc",
  "redox_syscall 0.3.5",
  "smallvec",
- "windows-targets 0.48.0",
+ "windows-targets",
 ]
 
 [[package]]
@@ -967,6 +1009,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"
@@ -1006,13 +1054,33 @@ 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",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -1021,7 +1089,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -1043,18 +1111,20 @@ checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "rexec"
-version = "1.0.4"
+version = "1.1.0"
 dependencies = [
  "brace-expand",
  "clap 4.3.4",
  "colored",
- "dialoguer",
  "dns-lookup",
  "env_logger",
  "itertools",
  "lazy-st",
  "log",
  "massh",
+ "openssl",
+ "question",
+ "rayon",
  "regex",
  "whoami",
 ]
@@ -1065,12 +1135,12 @@ version = "0.37.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "errno",
  "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1166,12 +1236,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 +1277,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1228,7 +1292,7 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7fe461910559f6d5604c3731d00d2aafc4a83d1665922e280f42f9a168d5455"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "libc",
  "libssh2-sys",
  "parking_lot 0.11.2",
@@ -1292,20 +1356,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 +1434,7 @@ dependencies = [
  "signal-hook-registry",
  "socket2 0.4.9",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1727,37 +1777,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 +1792,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 +1851,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,6 @@
 [package]
 name = "rexec"
-version = "1.0.4"
+version = "1.2.0"
 readme = "https://github.com/house-of-vanity/rexec#readme"
 edition = "2021"
 description = "Parallel SSH executor"
@@ -14,6 +14,7 @@ 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"
@@ -22,6 +23,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,25 +1,14 @@
 # Maintainer: AB <gh@hexor.ru>
 pkgname=rexec
-pkgver=1.0.1.r9.g0d95364
+pkgver=some_ver
 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 ..
+  install -Dm755 "$startdir/target/x86_64-unknown-linux-musl/release/rexec" "$pkgdir/usr/bin/rexec"
-    usrdir="$pkgdir/usr"
-    mkdir -p $usrdir
-    cargo install --no-track --path . --root "$usrdir"
 }
 
+

README.md

@@ -1,14 +1,20 @@
 # rexec
-Parallel SSH executor in Rust. It can read servers from `~/.ssh/known_hosts`
+**Parallel SSH executor** in Rust with static binary. 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>
@@ -24,39 +30,33 @@ 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
-[ab@test debug]$ ./rexec -u ab -k -c uptime -e admin.* -f
+$ rexec -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 ] admin-gce-sc-1.lca-prod.** [35.211.27.195]
+[INFO ] cassandra-gce-or-1.prod.example.com [2.22.123.79]
-[INFO ] admin-gce-sc-1.mmk-prod.** [35.211.79.202]
+[INFO ] cassandra-gce-or-2.prod.example.com [2.22.123.158]
-[ERROR] admin-gce-sc-1.led-prod.** couldn't be resolved.
+Continue on following 2 servers? y
-[INFO ] admin-gce-sc-1.msq-dev.** [35.211.0.24]
+[INFO ] Run command on 2 servers.
-[ERROR] admin-gce-sc-1.hui-dev.** couldn't be resolved.
 
-[INFO ] Run command on 3 servers.
+cassandra-gce-or-1.prod.example.com
+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
-[INFO ] admin.gnb-prod.**
+Exit code [0] / stdout 45 bytes / stderr 0 bytes
-Code 0 
+STDOUT
-STDOUT:                                                    
+║ 5.15.0-1040-gcp
- 23:31:21 up 294 days, 14:14,  0 users,  load average: 0.53, 0.64, 0.52
+║ Thu Sep  7 13:44:40 UTC 2023
-
-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,15 +6,17 @@ 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};
 use massh::{MasshClient, MasshConfig, MasshHostConfig, SshAuth};
+use question::{Answer, Question};
+use rayon::prelude::*;
 use regex::Regex;
 
 // Define args
@@ -24,15 +26,20 @@ 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 instead of string expansion."
+    )]
     known_hosts: bool,
 
     #[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: String,
+    expression: Vec<String>,
 
     #[arg(short, long, help = "Command to execute on servers")]
     command: String,
@@ -91,15 +98,21 @@ 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 = match r[start..].find(']') {
             None => {
                 error!("Error parsing host expression. Wrong range expansion '[a:b]'");
                 process::exit(1);
             }
-            Some(s) => s
+            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 colon = r.find(':').unwrap();
         let low = r[start + 1..colon].parse::<i32>().unwrap();
         let high = r[colon + 1..end].parse::<i32>().unwrap();
         result.retain(|s| s != &r);
@@ -117,7 +130,7 @@ fn expand_string(s: &str) -> Vec<Host> {
                 error!("Error parsing host expression. Wrong range expansion '{{one,two}}'");
                 process::exit(1);
             }
-            Some(s) => s
+            Some(s) => s,
         };
         let list = &r[start + 1..end];
         result.retain(|s| s != &r);
@@ -136,7 +149,6 @@ fn expand_string(s: &str) -> Vec<Host> {
     hosts
 }
 
-
 fn main() {
     env_logger::Builder::from_env(Env::default().default_filter_or("info"))
         .format_timestamp(None)
@@ -147,52 +159,83 @@ fn main() {
     let hosts = if args.known_hosts {
         info!("Using ~/.ssh/known_hosts to build server list.");
         let known_hosts = read_known_hosts();
-        // Build regex
+        let mut all_hosts = Vec::new();
-        let re = match Regex::new(&args.expression) {
+        for expression in args.expression.iter() {
+            let re = match Regex::new(expression) {
                 Ok(result) => result,
                 Err(e) => {
                     error!("Error parsing regex. {}", e);
                     process::exit(1);
                 }
             };
-        // match hostnames from known_hosts to regex
+            let matched: Vec<Host> = known_hosts
-        known_hosts
+                .clone()
                 .into_iter()
                 .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.");
-        expand_string(&args.expression)
+        let mut all_hosts = Vec::new();
+        for expression in args.expression.iter() {
+            all_hosts.extend(expand_string(expression));
+        }
+        all_hosts
     };
 
     // 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 {"s."} else {"."}});
+        warn!("Parallelism: {} thread{}", &args.parallel, {
+            if args.parallel != 1 {
+                "s."
+            } else {
+                "."
+            }
+        });
     }
 
     info!("Matched hosts:");
-    for host in matched_hosts.iter() {
+    let resolved_ips = Arc::new(Mutex::new(Vec::<(String, IpAddr)>::new()));
-        let ip = match lookup_host(&host.name) {
+
-            Ok(ip) => ip[0],
+    matched_hosts
-            Err(_) => {
+        .par_iter()
-                error!("{} couldn't be resolved.", &host.name.red());
+        .for_each(|host| match lookup_host(&host.name) {
-                continue;
+            Ok(ips) if !ips.is_empty() => {
-            }
+                let ip = ips[0];
-        };
+
                 info!("{} [{}]", &host.name, ip);
-        hosts_and_ips.insert(ip, host.name.clone());
+
+                let mut results = resolved_ips.lock().unwrap();
+                results.push((host.name.clone(), ip));
+            }
+            Ok(_) => {
+                error!("DNS resolved, but IP not found: {}", &host.name.red());
+            }
+            Err(_) => {
+                error!("DNS resolve failed: {}", &host.name.red());
+            }
+        });
+
+    let mut hosts_and_ips: HashMap<IpAddr, String> = HashMap::new();
+    let mut massh_hosts: Vec<MasshHostConfig> = Vec::new();
+
+    if let Ok(results) = resolved_ips.lock() {
+        for (hostname, ip) in results.iter() {
+            hosts_and_ips.insert(*ip, hostname.clone());
             massh_hosts.push(MasshHostConfig {
-            addr: ip,
+                addr: *ip,
                 auth: None,
                 port: None,
                 user: None,
-        })
+            });
         }
+    }
+
     // Build MasshConfig using massh_hosts vector
     let config = MasshConfig {
         default_auth: SshAuth::Agent,
@@ -205,18 +248,20 @@ 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());
-        info!("\n");
 
         // Run a command on all the configured hosts.
         // Receive the result of the command for each host and print its output.
@@ -228,8 +273,8 @@ fn main() {
                 .collect::<Vec<_>>()[0]
                 .to_string();
             let ip = ip.parse::<IpAddr>().unwrap();
-            info!(
+            println!(
-                "{}",
+                "\n{}",
                 hosts_and_ips
                     .get(&ip)
                     .unwrap_or(&"Couldn't parse IP".to_string())
@@ -245,14 +290,50 @@ fn main() {
                     continue;
                 }
             };
-            if output.exit_status == 0 {
+            let code_string = if output.exit_status == 0 {
-                println!("Code {}", output.exit_status);
+                format!("{}", output.exit_status.to_string().green())
             } else {
-                error!("Code {}", output.exit_status);
+                format!("{}", output.exit_status.to_string().red())
             };
+            println!(
+                "{}",
+                format!(
+                    "Exit code [{}] | std out/err [{}/{}] bytes",
+                    code_string,
+                    output.stdout.len(),
+                    output.stderr.len()
+                )
+                .bold()
+            );
+
             if !args.code {
-                println!("STDOUT:\n{}", String::from_utf8(output.stdout).unwrap());
+                match String::from_utf8(output.stdout) {
-                println!("STDERR:\n{}", String::from_utf8(output.stderr).unwrap());
+                    Ok(stdout) => match stdout.as_str() {
+                        "" => {}
+                        _ => {
+                            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(_) => {}
+                }
             }
         }
     } else {