From 137524b1761db2ade2a5712b4b13029ee2c2efa6 Mon Sep 17 00:00:00 2001 From: Federico Luzzi Date: Fri, 1 Dec 2023 15:31:17 -0300 Subject: [PATCH] bug fixes --- connpy/_version.py | 2 +- connpy/core.py | 4 ++-- docs/connpy/index.html | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/connpy/_version.py b/connpy/_version.py index 5065167..d94f0ec 100644 --- a/connpy/_version.py +++ b/connpy/_version.py @@ -1,2 +1,2 @@ -__version__ = "3.6.4" +__version__ = "3.6.5" diff --git a/connpy/core.py b/connpy/core.py index e54a716..e8c95ce 100755 --- a/connpy/core.py +++ b/connpy/core.py @@ -203,8 +203,8 @@ class node: ''' connect = self._connect(debug = debug) if connect == True: - # size = re.search('columns=([0-9]+).*lines=([0-9]+)',str(os.get_terminal_size())) - # self.child.setwinsize(int(size.group(2)),int(size.group(1))) + size = re.search('columns=([0-9]+).*lines=([0-9]+)',str(os.get_terminal_size())) + self.child.setwinsize(int(size.group(2)),int(size.group(1))) print("Connected to " + self.unique + " at " + self.host + (":" if self.port != '' else '') + self.port + " via: " + self.protocol) if 'logfile' in dir(self): # Initialize self.mylog diff --git a/docs/connpy/index.html b/docs/connpy/index.html index faf5796..b132d35 100644 --- a/docs/connpy/index.html +++ b/docs/connpy/index.html @@ -36,7 +36,7 @@

Usage

usage: conn [-h] [--add | --del | --mod | --show | --debug] [node|folder] [--sftp]
-       conn {profile,move,mv,copy,cp,list,ls,bulk,config} ...
+       conn {profile,move,copy,list,bulk,export,import,run,config,api,ai} ...
 
 positional arguments:
   node|folder    node[@subfolder][@folder]
@@ -271,7 +271,7 @@ Connpy is a connection manager that allows you to store nodes to connect them fa
 ### Usage
 ```
 usage: conn [-h] [--add | --del | --mod | --show | --debug] [node|folder] [--sftp]
-       conn {profile,move,mv,copy,cp,list,ls,bulk,config} ...
+       conn {profile,move,copy,list,bulk,export,import,run,config,api,ai} ...
 
 positional arguments:
   node|folder    node[@subfolder][@folder]
@@ -3006,9 +3006,9 @@ Categorize the user's request based on the operation they want to perform on
     def _help(self, type):
         #Store text for help and other commands
         if type == "node":
-            return "node[@subfolder][@folder]\nConnect to specific node or show all matching nodes\n[@subfolder][@folder]\nShow all available connections globaly or in specified path"
+            return "node[@subfolder][@folder]\nConnect to specific node or show all matching nodes\n[@subfolder][@folder]\nShow all available connections globally or in specified path"
         if type == "usage":
-            return "conn [-h] [--add | --del | --mod | --show | --debug] [node|folder] [--sftp]\n       conn {profile,move,mv,copy,cp,list,ls,bulk,config} ..."
+            return "conn [-h] [--add | --del | --mod | --show | --debug] [node|folder] [--sftp]\n       conn {profile,move,copy,list,bulk,export,import,run,config,api,ai} ..."
         if type == "end":
             return "Commands:\n  profile        Manage profiles\n  move (mv)      Move node\n  copy (cp)      Copy node\n  list (ls)      List profiles, nodes or folders\n  bulk           Add nodes in bulk\n  export         Export connection folder to Yaml file\n  import         Import connection folder to config from Yaml file\n  run            Run scripts or commands on nodes\n  config         Manage app config\n  api            Start and stop connpy api\n  ai             Make request to an AI"
         if type == "bashcompletion":
@@ -3797,7 +3797,7 @@ tasks:
                 cmd = cmd + " {}".format(self.host)
             else:
                 cmd = cmd + " {}".format("@".join([self.user,self.host]))
-            expects = ['yes/no', 'refused', 'supported', 'Invalid|[u|U]sage:', 'ssh-keygen.*\"', 'timeout|timed.out', 'unavailable', 'closed', '[p|P]assword:|[u|U]sername:', r'>$|#$|\$$|>.$|#.$|\$.$', 'suspend', pexpect.EOF, pexpect.TIMEOUT, "No route to host", "resolve hostname", "no matching"]
+            expects = ['yes/no', 'refused', 'supported', 'Invalid|[u|U]sage:', 'ssh-keygen.*\"', 'timeout|timed.out', 'unavailable', 'closed', '[p|P]assword:|[u|U]sername:', r'>$|#$|\$$|>.$|#.$|\$.$', 'suspend', pexpect.EOF, pexpect.TIMEOUT, "No route to host", "resolve hostname", "no matching", "bad permissions"]
         elif self.protocol == "telnet":
             cmd = "telnet " + self.host
             if self.port != '':
@@ -3810,7 +3810,7 @@ tasks:
                 passwords = self._passtx(self.password)
             else:
                 passwords = []
-            expects = ['[u|U]sername:', 'refused', 'supported', 'cipher', 'ssh-keygen.*\"', 'timeout|timed.out', 'unavailable', 'closed', '[p|P]assword:', r'>$|#$|\$$|>.$|#.$|\$.$', 'suspend', pexpect.EOF, pexpect.TIMEOUT, "No route to host", "resolve hostname", "no matching"]
+            expects = ['[u|U]sername:', 'refused', 'supported', 'cipher', 'ssh-keygen.*\"', 'timeout|timed.out', 'unavailable', 'closed', '[p|P]assword:', r'>$|#$|\$$|>.$|#.$|\$.$', 'suspend', pexpect.EOF, pexpect.TIMEOUT, "No route to host", "resolve hostname", "no matching", "bad permissions"]
         else:
             raise ValueError("Invalid protocol: " + self.protocol)
         attempts = 1
@@ -3837,7 +3837,7 @@ tasks:
                             else:
                                 self.missingtext = True
                                 break
-                    if results in  [1, 2, 3, 4, 5, 6, 7, 12, 13, 14, 15]:
+                    if results in  [1, 2, 3, 4, 5, 6, 7, 12, 13, 14, 15, 16]:
                         child.terminate()
                         if results == 12 and attempts != max_attempts:
                             attempts += 1