Fix CI

.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

@@ -23,58 +23,95 @@ 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
+
+  dispatch:
+    name: Notify my Arch Repo
+    needs:
+      - build
+      - build_arch
+      - release
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: Dispatch to workflows
+        run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.ACTIONS_KEY }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/house-of-vanity/arch_repo/dispatches \
+            -d '{"event_type":"new_package","client_payload":{}}'

.github/workflows/update_repo.yml

@@ -0,0 +1,15 @@
+name: Dispatcher
+on: ["push"]
+
+jobs:
+  dispatch:
+    name: Dispatch
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: Dispatch to workflows
+        run: |
+            curl -H "Accept: application/vnd.github.everest-preview+json" \
+            -H "Authorization: token ${{ secrets.ACTIONS_KEY }}" \
+            --request POST \
+            --data '{"event_type": "some_event", "client_payload": { "foo": "bar" }}' https://api.github.com/repos/house-of-vanity/arch_repo/dispatches

.gitignore

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

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [1.0.7] - 2023-08-31
+
+### Changed
+
+- Ci 
+
 ## [1.0.4] - 2023-08-14
 
 ### Changed

Cargo.lock

@@ -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",
 ]
@@ -325,6 +331,21 @@ 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"
@@ -429,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",
@@ -785,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",
 ]
@@ -978,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]]
@@ -987,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]]
@@ -1009,7 +1066,7 @@ checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "rexec"
-version = "1.0.5"
+version = "1.0.9"
 dependencies = [
  "brace-expand",
  "clap 4.3.4",
@@ -1020,6 +1077,7 @@ dependencies = [
  "lazy-st",
  "log",
  "massh",
+ "openssl",
  "question",
  "regex",
  "whoami",
@@ -1031,7 +1089,7 @@ 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",
@@ -1188,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",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rexec"
-version = "1.0.6"
+version = "1.1.0"
 readme = "https://github.com/house-of-vanity/rexec#readme"
 edition = "2021"
 description = "Parallel SSH executor"
@@ -22,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,25 +1,14 @@
 # Maintainer: AB <gh@hexor.ru>
 pkgname=rexec
-pkgver=1.0.4.r0.g3cf1e79
+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 ..
-    usrdir="$pkgdir/usr"
-    mkdir -p $usrdir
-    cargo install --no-track --path . --root "$usrdir"
+  install -Dm755 "$startdir/target/x86_64-unknown-linux-musl/release/rexec" "$pkgdir/usr/bin/rexec"
 }
 
+

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,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 ] admin-gce-sc-1.mmk-prod.** [35.211.79.202]
-[ERROR] admin-gce-sc-1.led-prod.** couldn't be resolved.
-[INFO ] admin-gce-sc-1.msq-dev.** [35.211.0.24]
-[ERROR] admin-gce-sc-1.hui-dev.** couldn't be resolved.
+[INFO ] cassandra-gce-or-1.prod.example.com [2.22.123.79]
+[INFO ] cassandra-gce-or-2.prod.example.com [2.22.123.158]
+Continue on following 2 servers? y
+[INFO ] Run command on 2 servers.
 
-[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
 
-
-[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
+cassandra-gce-or-2.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
 ```

src/main.rs

@@ -9,7 +9,6 @@ use std::process;
 
 use clap::Parser;
 use colored::*;
-//use dialoguer::Confirm;
 use dns_lookup::lookup_host;
 use env_logger::Env;
 use itertools::Itertools;
@@ -35,9 +34,10 @@ 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: String,
+    expression: Vec<String>,
 
     #[arg(short, long, help = "Command to execute on servers")]
     command: String,
@@ -157,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_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
@@ -223,20 +231,18 @@ fn main() {
     // Ask for confirmation
     if config.hosts.len() != 0
         && (args.noconfirm == true
-        || match Question::new(&*format!(
-            "Continue on following {} servers?",
-            &config.hosts.len()
-        ))
-        .confirm()
-        {
-            Answer::YES => true,
-            Answer::NO => false,
-            _ => unreachable!(),
-        })
+            || match Question::new(&*format!(
+                "Continue on following {} servers?",
+                &config.hosts.len()
+            ))
+            .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.
@@ -248,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())
@@ -265,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 {