Added multiple -e

Improve readability
Fix logging
2025-07-08 09:14:08 +00:00 · 2023-09-07 17:40:37 +03:00 · 2023-09-07 16:05:38 +03:00 · 2023-09-07 15:34:13 +03:00 · 2023-09-07 15:33:15 +03:00 · 2023-09-07 15:06:24 +03:00
9 changed files with 411 additions and 268 deletions
--- a/.SRCINFO
+++ b/.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
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -23,58 +23,76 @@ jobs:
        uses: gmiam/rust-musl-action@master
        with:
          args: cargo build --target $BUILD_TARGET --release
-      - uses: actions/upload-artifact@v2
+      - name: Get version
+        run: echo "VERSION=$(grep -P '^version = \"\d+\.\d+\.\d+\"' Cargo.toml | awk -F '\"' '{print $2}')" >> $GITHUB_ENV
+      - name: Show version
+        run:  echo ${{ env.VERSION }}
+      - uses: actions/upload-artifact@v3.1.2
        name: Upload artifact
        with:
-          name: ${{ env.BINARY_NAME }}_x86_64-linux-musl
-          path: target/x86_64-unknown-linux-musl/release/${{ env.BINARY_NAME }}
+          name: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}
+          path: target/${{ env.BUILD_TARGET }}/release/${{ env.BINARY_NAME }}
+  build_arch:
+    name: Arch Linux package
+    runs-on: ubuntu-latest
+    needs: ["build"]
+    container:
+      image: archlinux:base-devel
+      options: --user 1001
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v3
+      - name: Get version
+        run: echo "VERSION=$(grep -P '^version = \"\d+\.\d+\.\d+\"' Cargo.toml | awk -F '\"' '{print $2}')" >> $GITHUB_ENV
+      - uses: actions/download-artifact@master
+        name: Download
+        id: download_binary
+        with:
+          name: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}
+          path: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}
+      - name: Prepare build env
+        run: |
+          mkdir -p target/${{ env.BUILD_TARGET }}/release/
+          mv ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}/rexec target/${{ env.BUILD_TARGET }}/release/
+          sed -i -e "s/some_ver/${{ env.VERSION }}/" PKGBUILD
+      - name: Build ZST package
+        run: |
+          makepkg -f
+      - uses: actions/upload-artifact@v3.1.2
+        name: Upload artifact
+        with:
+          name: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}.zst
+          path: ${{ github.workspace }}/*zst

-#  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: Release binary
-    needs: ["build"]
+    name: Making New Release ^_^
+    needs:
+      - build
+      - build_arch
    runs-on: ubuntu-latest
    permissions:
      contents: write
    steps:
+    - uses: actions/checkout@v3
+    - name: Get version
+      run: echo "VERSION=$(grep -P '^version = \"\d+\.\d+\.\d+\"' Cargo.toml | awk -F '\"' '{print $2}')" >> $GITHUB_ENV
    - uses: actions/download-artifact@master
+      name: Download binary
      id: download_binary
      with:
-        name: ${{ env.BINARY_NAME }}_x86_64-linux-musl
-        path: ${{ env.BINARY_NAME }}_x86_64-linux-musl
-#    - uses: actions/download-artifact@master
-#      id: download_pkgbuild
-#      with:
-#        name: PKGBUILD
-#        path: PKGBUILD
+        name: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}
+        path: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}
+    - uses: actions/download-artifact@master
+      id: download_pkg
+      name: Download ZST package
+      with:
+        name: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}.zst
+        path: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}.zst
    - uses: ncipollo/release-action@v1
      name: Update release page
      with:
-        artifacts: "${{ steps.download_binary.outputs.download-path }}/*"
+        artifacts: "${{ steps.download_binary.outputs.download-path }}/*,${{ steps.download_pkg.outputs.download-path }}/*"
        allowUpdates: true
-        body: Static build for x86_64-linux using MUSL
+        body: Static musl build for x86_64-linux and Arch Linux package
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,7 @@
 target
+pkg
+*zst
+.rustup
+.cargo
+.viminfo
+.bash_history
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,6 +6,18 @@ 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.7] - 2023-08-31
+
+### Changed
+
+- Ci 
+
+## [1.0.4] - 2023-08-14
+
+### Changed
+
+- Expansion host strings.
+
 ## [1.0.1] - 2023-06-20

 ### Changed
--- a/Cargo.lock
+++ b/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]]
@ -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"
@ -261,18 +254,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 +273,7 @@ dependencies = [
 "cfg-if",
 "libc",
 "socket2 0.5.3",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]

 [[package]]
@ -301,12 +282,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 +312,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
 dependencies = [
 "errno-dragonfly",
 "libc",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]

 [[package]]
@ -350,21 +325,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 +450,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 +608,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
 "hermit-abi 0.3.1",
 "libc",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]

 [[package]]
@ -639,7 +620,7 @@ dependencies = [
 "hermit-abi 0.3.1",
 "io-lifetimes",
 "rustix",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]

 [[package]]
@ -787,7 +768,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
 "libc",
 "wasi",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]

 [[package]]
@ -825,13 +806,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"

 [[package]]
-name = "openssl-sys"
-version = "0.9.88"
+name = "openssl"
+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 +898,7 @@ dependencies = [
 "libc",
 "redox_syscall 0.3.5",
 "smallvec",
- "windows-targets 0.48.0",
+ "windows-targets",
 ]

 [[package]]
@ -967,6 +984,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"
@ -1012,7 +1035,7 @@ 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 +1044,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 +1066,19 @@ checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"

 [[package]]
 name = "rexec"
-version = "1.0.1"
+version = "1.0.9"
 dependencies = [
 "brace-expand",
 "clap 4.3.4",
 "colored",
- "dialoguer",
 "dns-lookup",
 "env_logger",
 "itertools",
 "lazy-st",
 "log",
 "massh",
+ "openssl",
+ "question",
 "regex",
 "whoami",
 ]
@ -1065,12 +1089,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 +1190,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 +1231,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 +1246,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 +1310,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 +1388,7 @@ dependencies = [
 "signal-hook-registry",
 "socket2 0.4.9",
 "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]

 [[package]]
@ -1727,37 +1731,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",
-]
-
-[[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",
+ "windows-targets",
 ]

 [[package]]
@ -1766,93 +1746,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_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "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 +1805,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"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,6 +1,7 @@
 [package]
 name = "rexec"
-version = "1.0.1"
+version = "1.0.9"
+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,8 @@ 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"
+openssl = { version = "0.10", features = ["vendored"] }
--- a/14
+++ b/14
@ -0,0 +1,14 @@
+# Maintainer: AB <gh@hexor.ru>
+pkgname=rexec
+pkgver=some_ver
+pkgrel=1
+pkgdesc="Parallel SSH executor"
+url="https://github.com/house-of-vanity/rexec"
+license=("WTFPL")
+arch=("x86_64")
+
+package() {
+  install -Dm755 "$startdir/target/x86_64-unknown-linux-musl/release/rexec" "$pkgdir/usr/bin/rexec"
+}
+
+
--- a/README.md
+++ b/README.md
@ -1,14 +1,20 @@
 # rexec
-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`
+**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-[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,9 +30,44 @@ Options:
  -h, --help                     Print help
  -V, --version                  Print version
 ```
+---
+
+## Examples
+```shell
+[ab@test]$ rexec -e 'cassandra-gce-sc-[1:3].bbs-prod.*' -u ab -c 'df -h /srv/cassandra'
+[INFO ] Using string expansion to build server list.
+[INFO ] Matched hosts:
+[INFO ] cassandra-gce-sc-1.bbs-prod.* [35.221.18.35]
+[INFO ] cassandra-gce-sc-2.bbs-prod.* [35.212.13.174]
+[INFO ] cassandra-gce-sc-3.bbs-prod.* [35.211.213.123]
+Continue on following 3 servers? y
+[INFO ] 
+    
+[INFO ] Run command on 3 servers.
+[INFO ] 
+    
+[INFO ] cassandra-gce-sc-2.bbs-prod.*
+Code 0
+STDOUT:
+Filesystem                     Size  Used Avail Use% Mounted on
+/dev/mapper/storage-cassandra  1.0T  613G  411G  60% /srv/cassandra
+
+[INFO ] cassandra-gce-sc-1.bbs-prod.*
+Code 0
+STDOUT:
+Filesystem                     Size  Used Avail Use% Mounted on
+/dev/mapper/storage-cassandra  1.0T  594G  430G  59% /srv/cassandra
+
+[INFO ] cassandra-gce-sc-3.bbs-prod.*
+Code 0
+STDOUT:
+Filesystem                     Size  Used Avail Use% Mounted on
+/dev/mapper/storage-cassandra  1.0T  523G  502G  52% /srv/cassandra
+```
+---

 ```shell
-[ab@test debug]$ ./rexec -u ab -k -c uptime -e admin.* -f
+[ab@test]$ ./rexec -u ab -k -c uptime -e admin.* -f
 [INFO ] Matched hosts:
 [INFO ] admin-gce-sc-1.lca-prod.** [35.211.27.195]
 [INFO ] admin-gce-sc-1.mmk-prod.** [35.211.79.202]
@ -36,27 +77,18 @@ Options:
    
 [INFO ] Run command on 3 servers.

-
 [INFO ] admin.gnb-prod.**
 Code 0 
 STDOUT:                                                    
 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
 ```
--- a/src/main.rs
+++ b/src/main.rs
@ -1,23 +1,21 @@
-use brace_expand::brace_expand;
+#[macro_use]
+extern crate log;
+
+use std::collections::HashMap;
+use std::fs::read_to_string;
+use std::hash::Hash;
+use std::net::IpAddr;
+use std::process;
+
+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 regex::Regex;
-use std::collections::HashMap;
-use std::fs::read_to_string;
-use std::hash::Hash;
-use std::net::IpAddr;
-
-use std::process;
-
-#[macro_use]
-extern crate log;
-
-use clap::Parser;

 // Define args
 #[derive(Parser, Debug)]
@ -26,11 +24,20 @@ 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")]
-    expression: String,
+    #[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>,

    #[arg(short, long, help = "Command to execute on servers")]
    command: String,
@ -75,16 +82,69 @@ fn read_known_hosts() -> Vec<Host> {
    result
 }

-fn expand_expression(expr: &str) -> Vec<Host> {
-    let mut result: Vec<Host> = Vec::new();
+fn expand_range(start: i32, end: i32) -> Vec<String> {
+    (start..=end).map(|i| i.to_string()).collect()
+}

-    for hostname in brace_expand(expr) {
-        result.push(Host {
+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()];
+
+    while let Some(r) = result.iter().find(|s| s.contains('[')) {
+        let r = r.clone();
+        let start = r.find('[').unwrap();
+        let end = match r[start..].find(']') {
+            None => {
+                error!("Error parsing host expression. Wrong range expansion '[a:b]'");
+                process::exit(1);
+            }
+            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);
+        }
+    }
+
+    while let Some(r) = result.iter().find(|s| s.contains('{')) {
+        let r = r.clone();
+        let start = r.find('{').unwrap();
+        let end = match r.find('}') {
+            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) {
+            let new_str = format!("{}{}{}", &r[..start], val, &r[end + 1..]);
+            result.push(new_str);
+        }
+    }
+
+    for hostname in result {
+        hosts.push(Host {
            name: hostname.to_string(),
            ip: None,
        })
    }
-    result
+    hosts
 }

 fn main() {
@ -97,22 +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();
-        // Build regex
-        let re = match Regex::new(&args.expression) {
-            Ok(result) => result,
-            Err(e) => {
-                error!("Error parsing regex. {}", e);
-                process::exit(1);
-            }
-        };
-        // match hostnames from known_hosts to regex
-        known_hosts
-            .into_iter()
-            .filter(|r| re.is_match(&r.name.clone()))
-            .collect()
+        let mut all_hosts = Vec::new();
+        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);
+                }
+            };
+            let matched: Vec<Host> = known_hosts
+                .clone()
+                .into_iter()
+                .filter(|r| re.is_match(&r.name.clone()))
+                .collect();
+            all_hosts.extend(matched);
+        }
+        all_hosts
    } else {
        info!("Using string expansion to build server list.");
-        expand_expression(&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
@ -121,6 +189,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) {
@ -151,18 +229,20 @@ fn main() {
    let massh = MasshClient::from(&config);

    // Ask for confirmation
-    if args.noconfirm == true
-        || Confirm::new()
-            .with_prompt(format!(
+    if config.hosts.len() != 0
+        && (args.noconfirm == true
+            || match Question::new(&*format!(
                "Continue on following {} servers?",
                &config.hosts.len()
            ))
-            .interact()
-            .unwrap()
+            .confirm()
+            {
+                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.
@ -174,8 +254,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())
@ -191,14 +271,50 @@ fn main() {
                    continue;
                }
            };
-            if output.exit_status == 0 {
-                println!("Code {}", output.exit_status);
+            let code_string = if output.exit_status == 0 {
+                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());
-                println!("STDERR:\n{}", String::from_utf8(output.stderr).unwrap());
+                match String::from_utf8(output.stdout) {
+                    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 {
Author	SHA1	Message	Date
Alexandr Bogomyakov	1eb9c5c17d	Added multiple -e	2023-09-07 17:40:37 +03:00
Alexandr Bogomyakov	70136e9074	Improve readability	2023-09-07 16:05:38 +03:00
Alexandr Bogomyakov	2334c1a8f3	Fix logging	2023-09-07 15:34:13 +03:00
Alexandr Bogomyakov	da6ae2ce37	Improve readability	2023-09-07 15:33:15 +03:00
Alexandr Bogomyakov	e2cc36adf1	Drop ARM build	2023-09-07 15:06:24 +03:00
Alexandr Bogomyakov	080ce8984a	Improve readability	2023-09-07 15:04:51 +03:00
Alexandr Bogomyakov	b360e29666	Improve readability	2023-09-07 14:58:29 +03:00
Alexandr Bogomyakov	1d26a9c6be	ARM build	2023-09-01 00:22:15 +03:00
Alexandr Bogomyakov	48e7e2a4e4	ARM build	2023-09-01 00:20:43 +03:00
Alexandr Bogomyakov	aa0a4e8bd2	ARM build	2023-09-01 00:15:46 +03:00
Alexandr Bogomyakov	554b68b51e	ARM build	2023-09-01 00:09:38 +03:00
Alexandr Bogomyakov	c206ddaef2	ARM build	2023-09-01 00:08:55 +03:00
Alexandr Bogomyakov	e620348834	ARM build	2023-09-01 00:01:58 +03:00
Alexandr Bogomyakov	dc1a67fe01	ARM build	2023-08-31 23:59:47 +03:00
Alexandr Bogomyakov	1d208149f5	ARM build	2023-08-31 23:51:25 +03:00
Alexandr Bogomyakov	093157b6ef	ARM build	2023-08-31 23:49:32 +03:00
House of Vanity	04da0fb97c	Update README.md	2023-08-31 23:34:02 +03:00
House of Vanity	967d9c0e7d	Update README.md	2023-08-31 23:31:44 +03:00
House of Vanity	eb0fd40d9f	Update README.md	2023-08-31 23:31:10 +03:00
House of Vanity	d0bbb29078	Update README.md	2023-08-31 23:30:37 +03:00
House of Vanity	5a388853c5	Update README.md	2023-08-31 23:25:16 +03:00
House of Vanity	41bf46c408	Update README.md	2023-08-31 23:19:26 +03:00
Alexandr Bogomyakov	a2b05a7fa6	Fix	2023-08-31 23:15:26 +03:00
Alexandr Bogomyakov	d71e05116d	Make Arch build	2023-08-31 23:08:48 +03:00
Alexandr Bogomyakov	5e71c45333	Make Arch build	2023-08-31 23:07:52 +03:00
Alexandr Bogomyakov	2831080df8	Make Arch build	2023-08-31 23:07:05 +03:00
Alexandr Bogomyakov	32299e2fb7	Make Arch build	2023-08-31 22:59:11 +03:00
Alexandr Bogomyakov	4640733950	Make Arch build	2023-08-31 22:51:03 +03:00
Alexandr Bogomyakov	f56ad72e4c	Fix	2023-08-31 22:35:07 +03:00
Alexandr Bogomyakov	6f771c430a	Fix	2023-08-31 22:31:04 +03:00
Alexandr Bogomyakov	01d84f9c6f	Fix	2023-08-31 22:30:28 +03:00
Alexandr Bogomyakov	f5df314095	Fix	2023-08-31 22:29:20 +03:00
Alexandr Bogomyakov	b885d494fd	Fix	2023-08-31 21:54:27 +03:00
Alexandr Bogomyakov	ca0e7d960b	Fix	2023-08-31 21:51:41 +03:00
Alexandr Bogomyakov	65dd6ee75f	Fix	2023-08-31 21:46:47 +03:00
Alexandr Bogomyakov	2def401b09	Fix	2023-08-31 21:44:45 +03:00
Alexandr Bogomyakov	e2eb5f9092	Fix	2023-08-31 21:37:19 +03:00
Alexandr Bogomyakov	e8778cb130	Fix	2023-08-31 21:31:16 +03:00
Alexandr Bogomyakov	6b27fb2d67	Fix	2023-08-31 21:28:37 +03:00
Alexandr Bogomyakov	100cdd9ab9	Fix	2023-08-31 21:27:36 +03:00
Alexandr Bogomyakov	4cec9d9904	Fix	2023-08-31 21:25:45 +03:00
Alexandr Bogomyakov	e62a682da0	Fix	2023-08-31 21:21:53 +03:00
github-actions[bot]	7307c83cfa	Format Rust code using rustfmt	2023-08-31 18:15:17 +00:00
Alexandr Bogomyakov	86c4e6def8	Fix	2023-08-31 21:14:15 +03:00
Alexandr Bogomyakov	fe9fa483a3	Fix	2023-08-31 21:13:12 +03:00
Alexandr Bogomyakov	e6c1a63382	Fix	2023-08-31 21:11:45 +03:00
Alexandr Bogomyakov	5ce837d28b	123	2023-08-31 21:10:51 +03:00
Alexandr Bogomyakov	0de6d20ca5	Fix	2023-08-31 21:07:33 +03:00
Alexandr Bogomyakov	a040881cfa	Fix	2023-08-31 21:07:02 +03:00
Alexandr Bogomyakov	5a4bf1f784	Fix	2023-08-31 20:03:34 +03:00
Alexandr Bogomyakov	a77a7cd089	Fix	2023-08-31 19:55:59 +03:00
Alexandr Bogomyakov	fcf91e3f89	Fix	2023-08-31 19:50:22 +03:00
Alexandr Bogomyakov	76a3bc9f55	Fix	2023-08-31 19:43:02 +03:00
Alexandr Bogomyakov	bd324ea0c5	Fix	2023-08-31 19:38:34 +03:00
Alexandr Bogomyakov	93b38e60c5	Fix	2023-08-31 19:37:10 +03:00
Alexandr Bogomyakov	86ebbf3a9e	Fix	2023-08-31 19:33:02 +03:00
Alexandr Bogomyakov	697fba1935	Fix	2023-08-31 19:30:19 +03:00
Alexandr Bogomyakov	9b92477a4e	Fix	2023-08-31 19:03:24 +03:00
Alexandr Bogomyakov	8f8aa85e82	Fix	2023-08-31 19:02:01 +03:00
Alexandr Bogomyakov	95842d81d0	Fix yes/no dialogue.	2023-08-28 16:37:34 +03:00
Alexandr Bogomyakov	f67342de1a	Bump version	2023-08-23 21:33:56 +03:00
Alexandr Bogomyakov	98c48af331	Fixed brace expansion	2023-08-23 21:33:14 +03:00
Alexandr Bogomyakov	3cf1e79883	Added pkgbuild	2023-08-14 19:19:00 +03:00
Alexandr Bogomyakov	0d95364e50	Added pkgbuild	2023-08-14 19:10:34 +03:00
Alexandr Bogomyakov	48635fc091	Added PKGBUILD	2023-08-14 18:23:12 +03:00
Alexandr Bogomyakov	5ed62d9323	Fix some error handling	2023-08-02 16:29:37 +03:00
Alexandr Bogomyakov	c635ed0dd0	Fix some error handling	2023-07-31 12:10:36 +03:00
Alexandr Bogomyakov	ad2d36bb35	Fixed string expansion	2023-07-25 19:18:45 +03:00
Alexandr Bogomyakov	4f1657c37c	Fixed string expansion	2023-07-25 19:17:32 +03:00
Alexandr Bogomyakov	a28d1a3a38	WIP	2023-07-03 18:51:06 +03:00
Alexandr Bogomyakov	502d206dc7	Cleanup	2023-07-03 15:52:55 +03:00
Alexandr Bogomyakov	e661349034	add string expanshions	2023-07-03 15:19:29 +03:00