ladyrick 0.5.0__tar.gz → 0.5.1__tar.gz

{ladyrick-0.5.0 → ladyrick-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ladyrick
-Version: 0.5.0
+Version: 0.5.1
 Summary: ladyrick's tools
 Author-email: ladyrick <ladyrick@qq.com>
 License-Expression: MIT

{ladyrick-0.5.0 → ladyrick-0.5.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ladyrick"
-version = "0.5.0"
+version = "0.5.1"
 authors = [{ name = "ladyrick", email = "ladyrick@qq.com" }]
 description = "ladyrick's tools"
 readme = "README.md"

{ladyrick-0.5.0 → ladyrick-0.5.1}/src/ladyrick/cli/multi_ssh.py

@@ -1,17 +1,9 @@
-import argparse
-import dataclasses
-import itertools
 import json
 import os
-import pathlib
-import random
 import select
-import shlex
 import signal
 import subprocess
 import sys
-import time
-import uuid
 
 
 def log(msg):
@@ -37,19 +29,18 @@ def remote_head():
     extra_envs = json.loads(sys.argv[2])
     os.environ.update(extra_envs)
 
-    parser = argparse.ArgumentParser(prog=REMOTE_HEAD_PROG_NAME)
-    parser.add_argument("cmd", type=str, nargs="+", help="cmd")
-    args = parser.parse_args(sys.argv[3:])
+    cmd = sys.argv[3:]
     try:
         from setproctitle import setproctitle
 
-        setproctitle(" ".join([REMOTE_HEAD_PROG_NAME] + args.cmd))
+        setproctitle(" ".join([REMOTE_HEAD_PROG_NAME] + cmd))
     except ImportError:
         pass
 
     # start child process
     child = subprocess.Popen(
-        args.cmd,
+        cmd,
+        stdin=subprocess.PIPE,
         stdout=sys.stdout,
         stderr=sys.stderr,
         start_new_session=True,
@@ -97,6 +88,15 @@ if __name__ == "__main__" and len(sys.argv) > 1 and sys.argv[1] == REMOTE_HEAD_P
 
 
 # ----- remote_head end ----- #
+if True:
+    import argparse
+    import dataclasses
+    import itertools
+    import pathlib
+    import random
+    import shlex
+    import time
+    import uuid
 
 
 @dataclasses.dataclass
@@ -213,10 +213,6 @@ def signal_repeat_checker(sig_to_check, count, duration):
     return checker
 
 
-def get_common_envs():
-    pass
-
-
 def main():
     parser = argparse.ArgumentParser(prog="multi-ssh", add_help=False)
     parser.add_argument("-h", type=str, action="append", help="hosts to connect. order is 1")
@@ -225,13 +221,18 @@ def main():
     parser.add_argument("-l", type=str, help="ssh login User")
     parser.add_argument("-o", type=str, action="append", help="ssh options")
     parser.add_argument("-F", type=str, help="ssh config file")
-    parser.add_argument("cmd", type=str, nargs="+", help="cmd")
     parser.add_argument("--hosts-config", type=str, action="append", help="hosts config string. order is 2")
     parser.add_argument("--hosts-config-file", type=str, action="append", help="hosts config file. order is 3")
     parser.add_argument("--help", action="help", default=argparse.SUPPRESS, help="show this help message and exit")
+    parser.add_argument("cmd", type=str, nargs=argparse.REMAINDER, help="cmd")
 
     args = parser.parse_args()
 
+    if not args.cmd:
+        print("cmd is required\n")
+        parser.print_help()
+        sys.exit(1)
+
     hosts = [
         Host(hn, args.F, args.l, args.p, args.i, args.o)
         for hn in itertools.chain.from_iterable(h.split(",") for h in args.h or [])
@@ -255,6 +256,11 @@ def main():
             )
         )
 
+    if not hosts:
+        print("hosts is required. specify hosts by -h, --hosts-config or --hosts-config-file\n")
+        parser.print_help()
+        sys.exit(1)
+
     executors = [RemoteExecutor(host, args.cmd) for host in hosts]
 
     RemoteExecutor.set_envs(executors)

{ladyrick-0.5.0 → ladyrick-0.5.1}/src/ladyrick/cli/psf.py

@@ -5,7 +5,7 @@ import sys
 
 def main():
     if os.uname().sysname != "Linux":
-        print("Only support uname Linux")
+        print("only support uname Linux")
         sys.exit(1)
     verbose = ""
     root_pid = 0
@@ -15,7 +15,7 @@ def main():
         elif arg.isdigit():
             root_pid = int(arg)
         else:
-            print(f"Invalid args: {arg}")
+            print(f"invalid args: {arg}")
             sys.exit(1)
     if root_pid in (0, 1):
         cmd = ["ps", verbose + "afxopid,user,cmd"]

{ladyrick-0.5.0 → ladyrick-0.5.1}/src/ladyrick.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ladyrick
-Version: 0.5.0
+Version: 0.5.1
 Summary: ladyrick's tools
 Author-email: ladyrick <ladyrick@qq.com>
 License-Expression: MIT