Format Rust code using rustfmt

.SRCINFO

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

.github/workflows/release.yml

@@ -23,76 +23,58 @@ jobs:
         uses: gmiam/rust-musl-action@master
         with:
           args: cargo build --target $BUILD_TARGET --release
-      - name: Get version
+      - uses: actions/upload-artifact@v2
-        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 }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}
+          name: ${{ env.BINARY_NAME }}_x86_64-linux-musl
-          path: target/${{ env.BUILD_TARGET }}/release/${{ env.BINARY_NAME }}
+          path: target/x86_64-unknown-linux-musl/release/${{ env.BINARY_NAME }}
-  build_arch:
-    name: Arch Linux package
-    runs-on: ubuntu-latest
-    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: Making New Release ^_^
+    name: Release binary
-    needs:
+    needs: ["build"]
-      - 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 }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}
+        name: ${{ env.BINARY_NAME }}_x86_64-linux-musl
-        path: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}
+        path: ${{ env.BINARY_NAME }}_x86_64-linux-musl
-    - uses: actions/download-artifact@master
+#    - uses: actions/download-artifact@master
-      id: download_pkg
+#      id: download_pkgbuild
-      name: Download ZST package
+#      with:
-      with:
+#        name: PKGBUILD
-        name: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}.zst
+#        path: PKGBUILD
-        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 }}/*,${{ steps.download_pkg.outputs.download-path }}/*"
+        artifacts: "${{ steps.download_binary.outputs.download-path }}/*"
         allowUpdates: true
-        body: Static musl build for x86_64-linux and Arch Linux package
+        body: Static build for x86_64-linux using MUSL

.gitignore

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

CHANGELOG.md

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

Cargo.lock

@@ -110,12 +110,6 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
-[[package]]
-name = "bitflags"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
-
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -169,7 +163,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
  "ansi_term",
  "atty",
- "bitflags 1.3.2",
+ "bitflags",
  "strsim 0.8.0",
  "textwrap",
  "unicode-width",
@@ -195,7 +189,7 @@ checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636"
 dependencies = [
  "anstream",
  "anstyle",
- "bitflags 1.3.2",
+ "bitflags",
  "clap_lex",
  "strsim 0.10.0",
 ]
@@ -331,21 +325,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.0"
@@ -450,7 +429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584"
 dependencies = [
  "base64 0.13.1",
- "bitflags 1.3.2",
+ "bitflags",
  "bytes",
  "headers-core",
  "http",
@@ -805,50 +784,14 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
-[[package]]
-name = "openssl"
-version = "0.10.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
-dependencies = [
- "bitflags 2.4.0",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.18",
-]
-
-[[package]]
-name = "openssl-src"
-version = "111.27.0+1.1.1v"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "openssl-sys"
-version = "0.9.92"
+version = "0.9.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b"
+checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617"
 dependencies = [
  "cc",
  "libc",
- "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -1035,7 +978,7 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
 ]
 
 [[package]]
@@ -1044,7 +987,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
 ]
 
 [[package]]
@@ -1066,7 +1009,7 @@ checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "rexec"
-version = "1.0.9"
+version = "1.0.5"
 dependencies = [
  "brace-expand",
  "clap 4.3.4",
@@ -1077,7 +1020,6 @@ dependencies = [
  "lazy-st",
  "log",
  "massh",
- "openssl",
  "question",
  "regex",
  "whoami",
@@ -1089,7 +1031,7 @@ version = "0.37.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
  "errno",
  "io-lifetimes",
  "libc",
@@ -1246,7 +1188,7 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7fe461910559f6d5604c3731d00d2aafc4a83d1665922e280f42f9a168d5455"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
  "libc",
  "libssh2-sys",
  "parking_lot 0.11.2",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rexec"
-version = "1.0.9"
+version = "1.0.6"
 readme = "https://github.com/house-of-vanity/rexec#readme"
 edition = "2021"
 description = "Parallel SSH executor"
@@ -26,4 +26,3 @@ colored = "2.0.0"
 itertools = "0.10.5"
 brace-expand = "0.1.0"
 question = "0.2.2"
-openssl = { version = "0.10", features = ["vendored"] }

PKGBUILD

@@ -1,14 +1,25 @@
 # Maintainer: AB <gh@hexor.ru>
 pkgname=rexec
-pkgver=some_ver
+pkgver=1.0.4.r0.g3cf1e79
 pkgrel=1
 pkgdesc="Parallel SSH executor"
 url="https://github.com/house-of-vanity/rexec"
 license=("WTFPL")
 arch=("x86_64")
+makedepends=("cargo")
 
-package() {
+pkgver() {
-  install -Dm755 "$startdir/target/x86_64-unknown-linux-musl/release/rexec" "$pkgdir/usr/bin/rexec"
+    (git describe --long --tags || echo "$pkgver") | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+build() {
+    return 0
+}
+
+package() {
+    cd ..
+    usrdir="$pkgdir/usr"
+    mkdir -p $usrdir
+    cargo install --no-track --path . --root "$usrdir"
+}
 

README.md

@@ -1,20 +1,14 @@
 # rexec
-**Parallel SSH executor** in Rust with static binary. It can read servers from `~/.ssh/known_hosts`
+Parallel SSH executor in Rust. It can read servers from `~/.ssh/known_hosts`
+
+or even expand servers from bash expanshion line `cassandra.{prod,dev}.example.com`
 
-or even expand servers from bash expanshion line `cassandra-[1:5].{prod,dev}.example.com`
 
 [![Rust-static-build](https://github.com/house-of-vanity/rexec/actions/workflows/release.yml/badge.svg)](https://github.com/house-of-vanity/rexec/actions/workflows/release.yml)
----
 
-## Usage
-```shell                                                    
-            _|_|_|_|   _|      _|   _|_|_|_|     _|_|_|  
- _|  _|_|   _|           _|  _|     _|         _|        
- _|_|       _|_|_|         _|       _|_|_|     _|        
- _|         _|           _|  _|     _|         _|        
- _|         _|_|_|_|   _|      _|   _|_|_|_|     _|_|_|  
-                                                        
 
+```shell
+[ab@test]$ ./rexec -k admin-gce-sc.* --help
 Parallel SSH executor in Rust
 
 Usage: rexec [OPTIONS] --expression <EXPRESSION> --command <COMMAND>
@@ -30,44 +24,9 @@ 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]$ ./rexec -u ab -k -c uptime -e admin.* -f
+[ab@test debug]$ ./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]
@@ -77,18 +36,27 @@ Filesystem                     Size  Used Avail Use% Mounted on
     
 [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
 ```

src/main.rs

@@ -9,6 +9,7 @@ use std::process;
 
 use clap::Parser;
 use colored::*;
+//use dialoguer::Confirm;
 use dns_lookup::lookup_host;
 use env_logger::Env;
 use itertools::Itertools;
@@ -34,10 +35,9 @@ struct Args {
     #[arg(
         short,
         long,
-        num_args = 1..,
         help = "Expression to build server list. List and range expansion are supported. Example: 'web-[1:12]-io-{prod,dev}'"
     )]
-    expression: Vec<String>,
+    expression: String,
 
     #[arg(short, long, help = "Command to execute on servers")]
     command: String,
@@ -157,30 +157,22 @@ fn main() {
     let hosts = if args.known_hosts {
         info!("Using ~/.ssh/known_hosts to build server list.");
         let known_hosts = read_known_hosts();
-        let mut all_hosts = Vec::new();
+        // Build regex
-        for expression in args.expression.iter() {
+        let re = match Regex::new(&args.expression) {
-            let re = match Regex::new(expression) {
+            Ok(result) => result,
-                Ok(result) => result,
+            Err(e) => {
-                Err(e) => {
+                error!("Error parsing regex. {}", e);
-                    error!("Error parsing regex. {}", e);
+                process::exit(1);
-                    process::exit(1);
+            }
-                }
+        };
-            };
+        // match hostnames from known_hosts to regex
-            let matched: Vec<Host> = known_hosts
+        known_hosts
-                .clone()
+            .into_iter()
-                .into_iter()
+            .filter(|r| re.is_match(&r.name.clone()))
-                .filter(|r| re.is_match(&r.name.clone()))
+            .collect()
-                .collect();
-            all_hosts.extend(matched);
-        }
-        all_hosts
     } else {
         info!("Using string expansion to build server list.");
-        let mut all_hosts = Vec::new();
+        expand_string(&args.expression)
-        for expression in args.expression.iter() {
-            all_hosts.extend(expand_string(expression));
-        }
-        all_hosts
     };
 
     // Dedup hosts from known_hosts file
@@ -242,7 +234,9 @@ fn main() {
                 _ => 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.
@@ -254,8 +248,8 @@ fn main() {
                 .collect::<Vec<_>>()[0]
                 .to_string();
             let ip = ip.parse::<IpAddr>().unwrap();
-            println!(
+            info!(
-                "\n{}",
+                "{}",
                 hosts_and_ips
                     .get(&ip)
                     .unwrap_or(&"Couldn't parse IP".to_string())
@@ -271,50 +265,14 @@ fn main() {
                     continue;
                 }
             };
-            let code_string = if output.exit_status == 0 {
+            if output.exit_status == 0 {
-                format!("{}", output.exit_status.to_string().green())
+                println!("Code {}", output.exit_status);
             } else {
-                format!("{}", output.exit_status.to_string().red())
+                error!("Code {}", output.exit_status);
             };
-            println!(
-                "{}",
-                format!(
-                    "Exit code [{}] | std out/err [{}/{}] bytes",
-                    code_string,
-                    output.stdout.len(),
-                    output.stderr.len()
-                )
-                .bold()
-            );
-
             if !args.code {
-                match String::from_utf8(output.stdout) {
+                println!("STDOUT:\n{}", String::from_utf8(output.stdout).unwrap());
-                    Ok(stdout) => match stdout.as_str() {
+                println!("STDERR:\n{}", String::from_utf8(output.stderr).unwrap());
-                        "" => {}
-                        _ => {
-                            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 {