multiSSH3 6.30__tar.gz → 6.31__tar.gz

{multissh3-6.30 → multissh3-6.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multiSSH3
-Version: 6.30
+Version: 6.31
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan

{multissh3-6.30 → multissh3-6.31}/mssh_complete.py

@@ -16,7 +16,7 @@ import sys
 import time
 from bisect import bisect_left
 
-version = '0.3'
+version = '0.4'
 __version__ = version
 PROTOCOL = 'MSSHC1'
 MSSH_NAMES = ('mssh', 'mssh3', 'multissh', 'multissh3', 'multiSSH3')
@@ -2037,6 +2037,32 @@ def _ipv4_range(name):
 		plain = plain and not sep
 	return not plain
 
+def _ipv4_members(name, limit=None):
+	'''
+	(the first limit members, how many in all) of an IPv4 range (_ipv4_range), expanded as mssh
+	expands it: [ ] dropped, an a-b range per octet, x * ? for a whole octet or a range end (0 or
+	255), and no .0 or .255 in the last octet. limit: RANGE_MEMBERS_LIMIT when None.
+	'''
+	import itertools
+	wild = ('x', '*', '?')
+	octets = []
+	for part in name.replace('[', '').replace(']', '').strip().split('.'):
+		if '-' in part:
+			low, high = part.split('-', 1)
+			low = 0 if not low or low in wild else int(low)
+			high = 255 if not high or high in wild else int(high)
+			octets.append([str(value) for value in range(low, high + 1)])
+		elif part in wild:
+			octets.append([str(value) for value in range(256)])
+		else:
+			octets.append([part])
+	octets[-1] = [value for value in octets[-1] if value not in ('0', '255')]
+	total = 1
+	for values in octets:
+		total *= len(values)
+	limit = RANGE_MEMBERS_LIMIT if limit is None else limit
+	return ['.'.join(address) for address in itertools.islice(itertools.product(*octets), limit)], total
+
 def _range_count(text):
 	'''How many names expand_ranges makes of text, without a limit; None when it cannot expand it.'''
 	start = text.find('[')
@@ -2407,8 +2433,7 @@ class Engine(object):
 			return 'unsure' if answer == 'invalid' and self._mssh_may_know(host, reach) else answer
 		found = []
 		for name, (start, end) in _host_parts(token):
-			if not name or _ipv4_range(name):
-				# IP addresses only: nothing to say about them
+			if not name:
 				continue
 			members = self._host_members(name)
 			if members is None:
@@ -2436,7 +2461,10 @@ class Engine(object):
 		'''
 		(members, how many) for an alias or a range, the members up to RANGE_MEMBERS_LIMIT; None for
 		one host; () for a range that cannot be expanded here (letters, hex): nothing is said about it.
+		The members of an IPv4 range are addresses: they are only pinged, never unknown.
 		'''
+		if _ipv4_range(name):
+			return _ipv4_members(name)
 		number = self.hosts.alias_index(name)
 		if number is not None:
 			members = self.hosts.alias_members(number)
@@ -4051,6 +4079,14 @@ class LineEditor(object):
 		term.write(('\x1b[{}A'.format(self._row) if getattr(self, '_row', 0) else '') + '\r\x1b[J')
 		self._row = 0
 
+	def interrupted(self, term, prompt):
+		'''
+		Leave the screen as bash leaves it after Ctrl-C: the prompt and the text as typed (no grey
+		suggestion, no warning), ^C, and the cursor at the start of the next row.
+		'''
+		term.write(('\x1b[{}A'.format(self._row) if getattr(self, '_row', 0) else '') + '\r' + prompt + self.text + '^C\x1b[J\r\n')
+		self._row = 0
+
 	def run(self, term, prompt, style=None):
 		'''
 		Edit until the line is handed back.
@@ -4075,7 +4111,10 @@ class LineEditor(object):
 			self.busy = term.has_input()
 			outcome = self.handle(name, raw)
 			if outcome is not None:
-				self.erase(term)
+				if outcome[0] == 'abandon':
+					self.interrupted(term, prompt)
+				else:
+					self.erase(term)
 				return outcome
 			if not self.busy:
 				self.draw(term, prompt, style)
@@ -4383,7 +4422,8 @@ _mssh_complete_space() {
 					MSSH_COMPLETE_PROMPT=$_mssh_complete_ps1 _mssh_complete_engine edit ${expand[@]+"${expand[@]}"} -- "$READLINE_LINE " 2>/dev/null)
 				if _mssh_complete_apply "$resp"; then
 					case $_mssh_complete_action in
-						abandon) READLINE_LINE= READLINE_POINT=0; bind -m emacs '"\C-x\C-y": accept-line' ;;
+						# the editor left the line and ^C on screen: readline draws a fresh prompt below
+						abandon) READLINE_LINE= READLINE_POINT=0 ;;
 						pass) bind -m emacs "\"\\C-x\\C-y\": \"$_mssh_complete_keys\"" ;;
 					esac
 					return 0

{multissh3-6.30 → multissh3-6.31}/multiSSH3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multiSSH3
-Version: 6.30
+Version: 6.31
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan

{multissh3-6.30 → multissh3-6.31}/multiSSH3.py

@@ -35,10 +35,10 @@ from itertools import count, product
 from pprint import pformat
 
 
-version = '6.30'
+version = '6.31'
 VERSION = version
 __version__ = version
-COMMIT_DATE = '2026-10-12'
+COMMIT_DATE = '2026-10-13'
 # TODO: Add terminal TUI
 
 # no current-directory entry: a cloned repo or unpacked archive could set any global (e.g. _sshPath),

{multissh3-6.30 → multissh3-6.31}/tests/test_complete_diagnose.py

@@ -162,7 +162,22 @@ def test_a_huge_range_is_checked_up_to_the_member_limit(engine, monkeypatch):
 
 def test_ipv4_ranges_hold_only_addresses(engine):
 	# mssh's IPv4 range syntax: ranges, x, * or ? in an octet (found replaying real history)
-	assert warnings(engine, 'mssh 127.0.0.1-20,10.0.[1-2].x,10.1.1.* uptime') == ([], False)
+	assert warnings(engine, 'mssh 127.0.0.1-20,10.0.[1-2].x,10.1.1.* uptime')[0] == []
+
+
+def test_members_of_an_ipv4_range_are_pinged(engine):
+	# addresses need no DNS: they are queued for the prober's ping, as members of other ranges are
+	assert warnings(engine, 'mssh 10.0.0.1-3 uptime') == ([], True)
+	assert sorted(mc.take_probe_queue(engine.directory)) == ['10.0.0.1', '10.0.0.2', '10.0.0.3']
+
+
+@pytest.mark.parametrize('pattern', ['192.168.1.1-254', '10.0.[1-2].x', '10.1.1.*', '127.0.0.1-20', '10.0.x-1.?', '[10-11].0.0.5'])
+def test_ipv4_ranges_expand_as_mssh_expands_them(pattern):
+	members, total = mc._ipv4_members(pattern, limit=100000)
+	expanded = getattr(multiSSH3, '__expandIPv4Address')(frozenset([pattern]))
+	assert sorted(members) == sorted(expanded) and total == len(expanded)
+	# past the limit the total is still counted
+	assert mc._ipv4_members(pattern, limit=5) == (members[:5], total)
 
 
 def test_lines_that_do_not_run_mssh_get_nothing(engine):
@@ -268,6 +283,16 @@ def test_unreachable_members_of_a_range(skipping):
 	assert warnings(skipping, 'mssh node[01-08] uptime')[0] == [('node[01-08]', 'unreachable', 'node[01-08]: 2 unreachable (node03, node07)')]
 
 
+@pytest.mark.parametrize('pattern, down', [
+	('192.168.1.1-254', ['192.168.1.5', '192.168.1.9']),
+	('10.0.[1-2].x', ['10.0.2.7']),
+])
+def test_unreachable_members_of_an_ipv4_range(skipping, pattern, down):
+	unavailable(skipping, *down)
+	assert warnings(skipping, 'mssh {} uptime'.format(pattern))[0] == [
+		(pattern, 'unreachable', '{}: {} unreachable ({})'.format(pattern, len(down), ', '.join(down)))]
+
+
 def test_an_unknown_host_is_not_also_unreachable(skipping):
 	seed(skipping, gpu017='invalid')
 	unavailable(skipping, 'gpu017')

{multissh3-6.30 → multissh3-6.31}/tests/test_complete_keys.py

@@ -54,6 +54,17 @@ def plain(text):
 	return re.sub(r'\x1b(\[[0-9;?<=>]*[ -/]*[@-~]|[()][A-Z0-9]|[=>78])', '', text).replace('\r', '')
 
 
+def read_until_shown(session, text, timeout=10.0):
+	'''Read until text is on screen, whatever the shell drew between its characters; return what was read.'''
+	start = len(session.output)
+	end = time.monotonic() + timeout
+	while True:
+		shown = plain(session.output[start:].decode('utf-8', 'replace'))
+		if text in shown or time.monotonic() >= end:
+			return shown
+		session.read_until(b'@@never@@', 0.1)
+
+
 def words(line):
 	'''The words a line means, whatever quoting was chosen.'''
 	return None if line is None else [token.text for token in mc.lex(line)]
@@ -149,7 +160,7 @@ def test_bash_ctrl_r_keeps_the_last_argument(home):
 		session.send('true lastarg\r')
 		time.sleep(0.3)
 		session.send('mssh x\x12')
-		session.read_until(b'hosts', 10)
+		session.read_until(b'type to filter', 10)
 		session.send('\x1b')
 		time.sleep(0.3)
 		session.send('\x15echo "[$_]"\r')
@@ -214,7 +225,7 @@ def test_editor_runs_pasted_lines_in_order(home):
 	session = editor_session(env, home)
 	try:
 		session.send('mssh host1 uptime\rmssh host2 uptime\r')
-		output = session.read_until(b'@@RAN[host2', 15) + session.read_until(b']@@', 5)
+		output = session.read_until(b'@@RAN[host2 uptime]@@', 15)
 		assert '@@RAN[host1 uptime]@@' in output and '@@RAN[host2 uptime]@@' in output
 		assert output.index('@@RAN[host1 uptime]@@') < output.index('@@RAN[host2 uptime]@@')
 		assert 'not found' not in output
@@ -264,7 +275,7 @@ def test_editor_enter_runs_what_was_typed(home):
 		session.send('mssh gp')
 		session.read_until(b'nvidia-smi', 10)
 		session.send('\r')
-		assert '@@RAN[gp]@@' in session.read_until(b'@@RAN[', 10) + session.read_until(b']@@', 10)
+		assert '@@RAN[gp]@@' in session.read_until(b'@@RAN[gp]@@', 10)
 	finally:
 		session.close()
 
@@ -313,6 +324,22 @@ def test_editor_ctrl_c_drops_the_line(home):
 		session.close()
 
 
+def test_editor_ctrl_c_leaves_the_line_on_screen(home):
+	# as bash does: what was typed stays, ^C after it, and one fresh prompt below (no warning left over)
+	env, home = home
+	known(env, gpu017='invalid')
+	session = editor_session(env, home)
+	try:
+		session.send('mssh gpu017 upt')
+		session.read_until('unknown host'.encode(), 10)
+		time.sleep(0.3)
+		session.send('\x03')
+		rows = settled(session)
+		assert rows[-2:] == ['@@READY@@ mssh gpu017 upt^C', '@@READY@@'], rows
+	finally:
+		session.close()
+
+
 def test_editor_ctrl_r_opens_the_picker(home):
 	env, home = home
 	session = editor_session(env, home)
@@ -335,7 +362,7 @@ def test_editor_without_colours_still_edits(home):
 		session.send('mssh gp')
 		time.sleep(0.5)
 		session.send('u\r')
-		output = session.read_until(b'@@RAN[', 10) + session.read_until(b']@@', 10)
+		output = session.read_until(b'@@RAN[gpu]@@', 10)
 		assert '@@RAN[gpu]@@' in output
 		assert '\x1b[38;5;244m' not in output and '\x1b[2m' not in output
 	finally:
@@ -406,7 +433,7 @@ def test_blesh_ctrl_r_opens_the_picker_and_keeps_isearch_elsewhere(home):
 		session.send('\x15\x12aa')
 		time.sleep(0.5)
 		session.send('\x12')
-		assert 'echo aa1' in plain(session.read_until(b'aa1', 10))
+		assert 'echo aa1' in read_until_shown(session, 'echo aa1')
 		session.send('\x07')
 	finally:
 		session.close()