multiSSH3 6.34__tar.gz → 6.35__tar.gz

{multissh3-6.34/multiSSH3.egg-info → multissh3-6.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multiSSH3
-Version: 6.34
+Version: 6.35
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan
@@ -603,10 +603,12 @@ mssh -q -- web1 grep -r TODO /srv
 
 ### `-ea, --extraargs EXTRAARGS` | _`DEFAULT_EXTRA_ARGS`_
 - Extra arguments to pass to the ssh / rsync / scp command. Put in one string for multiple arguments.
+- The word after `-ea` is its value, also when it starts with `-`: `-ea '-p 2222'`, `-ea -A`. Quote an option together with its value: with `-ea -p 2222` the quotes were forgotten, and mssh stops, as it does for a password option there. ( mssh 6.34 and older need `-ea='-p 2222'`, which still works. )
 - The string is split into arguments as a shell would: quote an argument that contains spaces.
 - For a file copy with rsync, ssh's options that take a value go to the ssh that rsync runs, and the other arguments to rsync: the option followed by its value as the next word (`-o ConnectTimeout=5`, `-p 2222`, `-i FILE`, `-J HOST`, `-F FILE`, `-l USER`, ...), or `-oName=value` and `-pPORT`. scp takes ssh's options itself; ssh's `-p PORT` is given to it as `-P PORT`.
 - Example:
 ```bash
+mssh -ea '-p 2222' allServers uptime
 mssh -ea="--delete" -f ./data/ allServers /tmp/data/
 mssh -ea="-o ProxyCommand='ssh -W %h:%p bastion'" allServers uptime
 ```
@@ -717,7 +719,7 @@ mssh -f ./data/ allServers /tmp/data/
 
 ### `-ia, --ipmi_args IPMI_ARGS` | _`DEFAULT_IPMI_ARGS`_
 - Extra arguments for ipmitool (or redfishtool) in `--ipmi` mode, in one string, placed as they are before the command. `-ea` arguments only go to ssh / scp / rsync.
-- Ex: `mssh -M -ia='-I lanplus' bmc[1-4] 'power status'` runs `ipmitool -H <address> -U <user> -E -I lanplus power status`, with the password in its environment. Use `=`, as the value starts with `-`.
+- Ex: `mssh -M -ia '-I lanplus' bmc[1-4] 'power status'` runs `ipmitool -H <address> -U <user> -E -I lanplus power status`, with the password in its environment. The word after `-ia` is its value, also when it starts with `-`; quote an option together with its value ( mssh 6.34 and older need `-ia='-I lanplus'` ).
 
 ### `-im, --ipmi_method IPMI_METHOD` | _`DEFAULT_IPMI_METHOD`_
 - How `--ipmi` reaches a host:
@@ -972,7 +974,7 @@ Option names count in full only: `--user` is not `--username` and `-c` is not `-
 
 Putting the command after `--` is no substitute for quotes: every word after the hosts is a command of its own, so `mssh web1 -- bash -c 'echo hi'` runs `bash`, `-c` and `echo hi` one after another (when each word is a single word, as in `mssh web1 -- ls -la`, mssh asks whether to join them).
 
-Below is a sample help message output from multiSSH3 6.34 @ 2026-10-16 (no config file, 120 columns; the lines after the options list the programs found on that machine)
+Below is a sample help message output from multiSSH3 6.35 @ 2026-10-16 (no config file, 120 columns; the lines after the options list the programs found on that machine)
 
 ```bash
 $ mssh -h
@@ -1003,7 +1005,7 @@ options:
                         The identity file to use to connect to the hosts. Implies --use_key. Specify a folder for program to search for a key. Use option without value to use ~/.ssh/ (default: None)
   -uk, --use_key        Attempt to use public key file to connect to the hosts. (default: False)
   -ea, --extraargs EXTRAARGS
-                        Extra arguments to pass to the ssh / rsync / scp command. (Use -ia for ipmi arguments) Put in one string for multiple arguments.Use "=" ! Ex. -ea="--delete" (default: None)
+                        Extra arguments to pass to the ssh / rsync / scp command. (Use -ia for ipmi arguments) Put in one string for multiple arguments. The word after -ea is its value, also when it starts with "-": quote an option with its value. Ex. -ea "-p 2222 -A" (default: None)
   -11, --oneonone       Run one corresponding command on each host. (default: False)
   -f, --file FILE       The file to be copied to the hosts. Use -f multiple times to copy multiple files
   -s, -fs, --file_sync [FILE_SYNC]
@@ -1028,7 +1030,7 @@ options:
   -ip, --ipmi_password IPMI_PASSWORD
                         The password to use to connect to the hosts via ipmi. (default: set, not shown)
   -ia, --ipmi_args IPMI_ARGS
-                        The arguments passed to ipmitool to use to connect to the hosts via ipmi. (default: )
+                        The arguments passed to ipmitool to use to connect to the hosts via ipmi. The word after -ia is its value, also when it starts with "-": quote an option with its value. Ex. -ia "-I lanplus" (default: )
   -im, --ipmi_method IPMI_METHOD
                         The method to use to connect to the hosts via ipmi. (default: ipmitool)
   -irlt, --ipmi_retry_lockout_time IPMI_RETRY_LOCKOUT_TIME

{multissh3-6.34 → multissh3-6.35}/README.md

@@ -577,10 +577,12 @@ mssh -q -- web1 grep -r TODO /srv
 
 ### `-ea, --extraargs EXTRAARGS` | _`DEFAULT_EXTRA_ARGS`_
 - Extra arguments to pass to the ssh / rsync / scp command. Put in one string for multiple arguments.
+- The word after `-ea` is its value, also when it starts with `-`: `-ea '-p 2222'`, `-ea -A`. Quote an option together with its value: with `-ea -p 2222` the quotes were forgotten, and mssh stops, as it does for a password option there. ( mssh 6.34 and older need `-ea='-p 2222'`, which still works. )
 - The string is split into arguments as a shell would: quote an argument that contains spaces.
 - For a file copy with rsync, ssh's options that take a value go to the ssh that rsync runs, and the other arguments to rsync: the option followed by its value as the next word (`-o ConnectTimeout=5`, `-p 2222`, `-i FILE`, `-J HOST`, `-F FILE`, `-l USER`, ...), or `-oName=value` and `-pPORT`. scp takes ssh's options itself; ssh's `-p PORT` is given to it as `-P PORT`.
 - Example:
 ```bash
+mssh -ea '-p 2222' allServers uptime
 mssh -ea="--delete" -f ./data/ allServers /tmp/data/
 mssh -ea="-o ProxyCommand='ssh -W %h:%p bastion'" allServers uptime
 ```
@@ -691,7 +693,7 @@ mssh -f ./data/ allServers /tmp/data/
 
 ### `-ia, --ipmi_args IPMI_ARGS` | _`DEFAULT_IPMI_ARGS`_
 - Extra arguments for ipmitool (or redfishtool) in `--ipmi` mode, in one string, placed as they are before the command. `-ea` arguments only go to ssh / scp / rsync.
-- Ex: `mssh -M -ia='-I lanplus' bmc[1-4] 'power status'` runs `ipmitool -H <address> -U <user> -E -I lanplus power status`, with the password in its environment. Use `=`, as the value starts with `-`.
+- Ex: `mssh -M -ia '-I lanplus' bmc[1-4] 'power status'` runs `ipmitool -H <address> -U <user> -E -I lanplus power status`, with the password in its environment. The word after `-ia` is its value, also when it starts with `-`; quote an option together with its value ( mssh 6.34 and older need `-ia='-I lanplus'` ).
 
 ### `-im, --ipmi_method IPMI_METHOD` | _`DEFAULT_IPMI_METHOD`_
 - How `--ipmi` reaches a host:
@@ -946,7 +948,7 @@ Option names count in full only: `--user` is not `--username` and `-c` is not `-
 
 Putting the command after `--` is no substitute for quotes: every word after the hosts is a command of its own, so `mssh web1 -- bash -c 'echo hi'` runs `bash`, `-c` and `echo hi` one after another (when each word is a single word, as in `mssh web1 -- ls -la`, mssh asks whether to join them).
 
-Below is a sample help message output from multiSSH3 6.34 @ 2026-10-16 (no config file, 120 columns; the lines after the options list the programs found on that machine)
+Below is a sample help message output from multiSSH3 6.35 @ 2026-10-16 (no config file, 120 columns; the lines after the options list the programs found on that machine)
 
 ```bash
 $ mssh -h
@@ -977,7 +979,7 @@ options:
                         The identity file to use to connect to the hosts. Implies --use_key. Specify a folder for program to search for a key. Use option without value to use ~/.ssh/ (default: None)
   -uk, --use_key        Attempt to use public key file to connect to the hosts. (default: False)
   -ea, --extraargs EXTRAARGS
-                        Extra arguments to pass to the ssh / rsync / scp command. (Use -ia for ipmi arguments) Put in one string for multiple arguments.Use "=" ! Ex. -ea="--delete" (default: None)
+                        Extra arguments to pass to the ssh / rsync / scp command. (Use -ia for ipmi arguments) Put in one string for multiple arguments. The word after -ea is its value, also when it starts with "-": quote an option with its value. Ex. -ea "-p 2222 -A" (default: None)
   -11, --oneonone       Run one corresponding command on each host. (default: False)
   -f, --file FILE       The file to be copied to the hosts. Use -f multiple times to copy multiple files
   -s, -fs, --file_sync [FILE_SYNC]
@@ -1002,7 +1004,7 @@ options:
   -ip, --ipmi_password IPMI_PASSWORD
                         The password to use to connect to the hosts via ipmi. (default: set, not shown)
   -ia, --ipmi_args IPMI_ARGS
-                        The arguments passed to ipmitool to use to connect to the hosts via ipmi. (default: )
+                        The arguments passed to ipmitool to use to connect to the hosts via ipmi. The word after -ia is its value, also when it starts with "-": quote an option with its value. Ex. -ia "-I lanplus" (default: )
   -im, --ipmi_method IPMI_METHOD
                         The method to use to connect to the hosts via ipmi. (default: ipmitool)
   -irlt, --ipmi_retry_lockout_time IPMI_RETRY_LOCKOUT_TIME

{multissh3-6.34 → multissh3-6.35}/mssh_complete.py

@@ -16,7 +16,7 @@ import sys
 import time
 from bisect import bisect_left
 
-version = '0.7'
+version = '0.8'
 __version__ = version
 PROTOCOL = 'MSSHC1'
 MSSH_NAMES = ('mssh', 'mssh3', 'multissh', 'multissh3', 'multiSSH3')
@@ -166,6 +166,31 @@ def split_at_cursor(before, after):
 
 #%% ------------ Option spec ----------------
 PASSWORD_DESTS = frozenset(('password', 'ipmi_password'))
+# options passing options on to another program (-ea, -ia): mssh 6.35+ takes the word after them as
+# their value even when it starts with '-' (its _with_passed_on_values), except as takes_passed_on_value says
+PASSED_ON_DESTS = frozenset(('extraargs', 'ipmi_args'))
+# the letters of the options needing a value of their own, by where they pass them: ssh, ipmitool
+PASSED_ON_BARE_VALUE_LETTERS = {
+	'extraargs': frozenset('BbcDEeFIiJLlmOoPpQRSWw'),
+	'ipmi_args': frozenset('AbBCdefHIklLmNoOpPRtTUyz'),
+}
+
+def takes_passed_on_value(dest, text, spec):
+	'''
+	Whether -ea or -ia (dest) takes text, the word after it, as its value, as mssh's _takes_passed_on_value
+	reads it: not a bare option needing a value of its own (-ea -p 2222: the quotes were forgotten), nor a
+	word giving mssh's password; mssh stops at those.
+	'''
+	if not text.startswith('-') or ' ' in text:
+		return True
+	if len(text) == 2 and text[1] in PASSED_ON_BARE_VALUE_LETTERS[dest]:
+		return False
+	if text.startswith('-ip'):
+		return False
+	if text[:2] == '-p' and text[2:].isdigit():
+		return True
+	option = spec.lookup(text)[0]
+	return option is None or option.dest not in PASSWORD_DESTS
 # options naming files mssh reads its hosts and env aliases from, at Enter
 LOOKUP_DESTS = frozenset(('env_file', 'env_files', 'host_file', 'config_file'))
 PATH_DESTS = frozenset(('file', 'file_sync', 'env_file', 'env_files', 'config_file', 'store_config_file', 'host_file', 'history_file'))
@@ -506,9 +531,12 @@ def assign_roles(words, spec, current=None):
 			pending = None
 			# the word after a password option is its password, whatever it looks like: argparse stops
 			# at "-p -secret", but the shell's history keeps the line, and a password is never another word.
-			# argparse takes a dash word as the value when it holds a space and names no option
-			# (-ea "-o StrictHostKeyChecking=no"); mssh's -11 makes it read negative numbers as options
-			if not dashed or option.dest in PASSWORD_DESTS or (' ' in text and not spec.names_option(text)):
+			# mssh takes the word after -ea and -ia as their value (PASSED_ON_DESTS). argparse takes a dash
+			# word as the value when it holds a space and names no option (-u "-o x"); mssh's -11 makes it
+			# read negative numbers as options
+			# (a word being typed in an open quote will hold more: "-I lanplus")
+			passed_on = option.dest in PASSED_ON_DESTS and (takes_passed_on_value(option.dest, text, spec) or (is_current and token.open_quote))
+			if not dashed or option.dest in PASSWORD_DESTS or passed_on or (' ' in text and not spec.names_option(text)):
 				roles.append((ROLE_VALUE, option))
 				continue
 		if text == '--' and not is_current and not after_separator:
@@ -3616,10 +3644,16 @@ class Engine(object):
 		have_hosts = False
 		run = None        # where the unquoted remote command starts in argv
 		pending = None    # nargs of an option still taking the words that follow as values
+		passed_on = None  # -ea's or -ia's dest: the word may be its value even when it starts with '-'
 		paths = False
 		read = []
 		stop = len(argv)
 		for index, token in enumerate(argv):
+			if passed_on:
+				dest, passed_on = passed_on, None
+				if takes_passed_on_value(dest, token.text, self.spec):
+					pending = None
+					continue
 			if token.text == '--':
 				stop = index
 				break
@@ -3642,6 +3676,7 @@ class Engine(object):
 				option, attached, _ = readings[-1]
 				if attached is None and option.nargs != '0':
 					pending = option.nargs
+					passed_on = option.dest if option.dest in PASSED_ON_DESTS else None
 				if run is None and any(option.dest in ('file', 'file_sync', 'gather_mode') for option, _, _ in readings):
 					paths = True
 			if run is not None:

{multissh3-6.34 → multissh3-6.35/multiSSH3.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multiSSH3
-Version: 6.34
+Version: 6.35
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan
@@ -603,10 +603,12 @@ mssh -q -- web1 grep -r TODO /srv
 
 ### `-ea, --extraargs EXTRAARGS` | _`DEFAULT_EXTRA_ARGS`_
 - Extra arguments to pass to the ssh / rsync / scp command. Put in one string for multiple arguments.
+- The word after `-ea` is its value, also when it starts with `-`: `-ea '-p 2222'`, `-ea -A`. Quote an option together with its value: with `-ea -p 2222` the quotes were forgotten, and mssh stops, as it does for a password option there. ( mssh 6.34 and older need `-ea='-p 2222'`, which still works. )
 - The string is split into arguments as a shell would: quote an argument that contains spaces.
 - For a file copy with rsync, ssh's options that take a value go to the ssh that rsync runs, and the other arguments to rsync: the option followed by its value as the next word (`-o ConnectTimeout=5`, `-p 2222`, `-i FILE`, `-J HOST`, `-F FILE`, `-l USER`, ...), or `-oName=value` and `-pPORT`. scp takes ssh's options itself; ssh's `-p PORT` is given to it as `-P PORT`.
 - Example:
 ```bash
+mssh -ea '-p 2222' allServers uptime
 mssh -ea="--delete" -f ./data/ allServers /tmp/data/
 mssh -ea="-o ProxyCommand='ssh -W %h:%p bastion'" allServers uptime
 ```
@@ -717,7 +719,7 @@ mssh -f ./data/ allServers /tmp/data/
 
 ### `-ia, --ipmi_args IPMI_ARGS` | _`DEFAULT_IPMI_ARGS`_
 - Extra arguments for ipmitool (or redfishtool) in `--ipmi` mode, in one string, placed as they are before the command. `-ea` arguments only go to ssh / scp / rsync.
-- Ex: `mssh -M -ia='-I lanplus' bmc[1-4] 'power status'` runs `ipmitool -H <address> -U <user> -E -I lanplus power status`, with the password in its environment. Use `=`, as the value starts with `-`.
+- Ex: `mssh -M -ia '-I lanplus' bmc[1-4] 'power status'` runs `ipmitool -H <address> -U <user> -E -I lanplus power status`, with the password in its environment. The word after `-ia` is its value, also when it starts with `-`; quote an option together with its value ( mssh 6.34 and older need `-ia='-I lanplus'` ).
 
 ### `-im, --ipmi_method IPMI_METHOD` | _`DEFAULT_IPMI_METHOD`_
 - How `--ipmi` reaches a host:
@@ -972,7 +974,7 @@ Option names count in full only: `--user` is not `--username` and `-c` is not `-
 
 Putting the command after `--` is no substitute for quotes: every word after the hosts is a command of its own, so `mssh web1 -- bash -c 'echo hi'` runs `bash`, `-c` and `echo hi` one after another (when each word is a single word, as in `mssh web1 -- ls -la`, mssh asks whether to join them).
 
-Below is a sample help message output from multiSSH3 6.34 @ 2026-10-16 (no config file, 120 columns; the lines after the options list the programs found on that machine)
+Below is a sample help message output from multiSSH3 6.35 @ 2026-10-16 (no config file, 120 columns; the lines after the options list the programs found on that machine)
 
 ```bash
 $ mssh -h
@@ -1003,7 +1005,7 @@ options:
                         The identity file to use to connect to the hosts. Implies --use_key. Specify a folder for program to search for a key. Use option without value to use ~/.ssh/ (default: None)
   -uk, --use_key        Attempt to use public key file to connect to the hosts. (default: False)
   -ea, --extraargs EXTRAARGS
-                        Extra arguments to pass to the ssh / rsync / scp command. (Use -ia for ipmi arguments) Put in one string for multiple arguments.Use "=" ! Ex. -ea="--delete" (default: None)
+                        Extra arguments to pass to the ssh / rsync / scp command. (Use -ia for ipmi arguments) Put in one string for multiple arguments. The word after -ea is its value, also when it starts with "-": quote an option with its value. Ex. -ea "-p 2222 -A" (default: None)
   -11, --oneonone       Run one corresponding command on each host. (default: False)
   -f, --file FILE       The file to be copied to the hosts. Use -f multiple times to copy multiple files
   -s, -fs, --file_sync [FILE_SYNC]
@@ -1028,7 +1030,7 @@ options:
   -ip, --ipmi_password IPMI_PASSWORD
                         The password to use to connect to the hosts via ipmi. (default: set, not shown)
   -ia, --ipmi_args IPMI_ARGS
-                        The arguments passed to ipmitool to use to connect to the hosts via ipmi. (default: )
+                        The arguments passed to ipmitool to use to connect to the hosts via ipmi. The word after -ia is its value, also when it starts with "-": quote an option with its value. Ex. -ia "-I lanplus" (default: )
   -im, --ipmi_method IPMI_METHOD
                         The method to use to connect to the hosts via ipmi. (default: ipmitool)
   -irlt, --ipmi_retry_lockout_time IPMI_RETRY_LOCKOUT_TIME

{multissh3-6.34 → multissh3-6.35}/multiSSH3.egg-info/SOURCES.txt

@@ -83,6 +83,7 @@ tests/test_run_on_hosts.py
 tests/test_run_on_hosts_modes.py
 tests/test_runtime_branch_matrix.py
 tests/test_runtime_dir.py
+tests/test_shared_lines.py
 tests/test_smoke_optional.py
 tests/test_ssh_error_text.py
 tests/test_ssh_timeouts.py
@@ -90,9 +91,11 @@ tests/test_sshpass_exit.py
 tests/test_start_run_on_hosts.py
 tests/test_stopped_commands.py
 tests/test_stream_reader.py
+tests/test_streamed_output.py
 tests/test_tui_ssh_notices.py
 tests/test_unavailable_hosts.py
 tests/test_underscore_settings.py
+tests/test_waiting.py
 tests/test_wide_wrap.py
 tests/vt_grid.py
 tests/data/run_command_golden.json