Allow direct call of helpers: shortcut to execute

(cherry picked from commit 3ab7700)

Author: penguinolog

README.rst

@@ -153,6 +153,15 @@ This methods are almost the same for `SSHCleint` and `Subprocess`, except specif
         raise_on_err=True,  # type: bool
     )
 
+.. code-block:: python
+
+    result = helper(  # Lazy way: instances are callable and uses `execute`.
+        command,  # type: str
+        verbose=False,  # type: bool
+        timeout=1 * 60 * 60,  # type: typing.Union[int, float, None]
+        **kwargs
+    )
+
 If no STDOUT or STDERR required, it is possible to disable this FIFO pipes via `**kwargs` with flags `open_stdout=False` and `open_stderr=False`.
 
 The next command level uses lower level and kwargs are forwarded, so expected exit codes are forwarded from `check_stderr`.

doc/source/SSHClient.rst

@@ -160,6 +160,21 @@ API: SSHClient and SSHAuth.
 
         .. versionchanged:: 1.2.0 default timeout 1 hour
 
+    .. py:method:: __call__(command, verbose=False, timeout=1*60*60, **kwargs)
+
+        Execute command and wait for return code.
+
+        :param command: Command for execution
+        :type command: ``str``
+        :param verbose: Produce log.info records for command call and output
+        :type verbose: ``bool``
+        :param timeout: Timeout for command execution.
+        :type timeout: ``typing.Union[int, float, None]``
+        :rtype: ExecResult
+        :raises ExecHelperTimeoutError: Timeout exceeded
+
+        .. versionadded:: 1.9.7
+
     .. py:method:: check_call(command, verbose=False, timeout=1*60*60, error_info=None, expected=None, raise_on_err=True, **kwargs)
 
         Execute command and check for return code.

doc/source/Subprocess.rst

@@ -82,6 +82,22 @@ API: Subprocess
         .. versionchanged:: 1.2.0 default timeout 1 hour
         .. versionchanged:: 1.2.0 stdin data
 
+    .. py:method:: __call__(command, verbose=False, timeout=1*60*60, **kwargs)
+
+        Execute command and wait for return code.
+
+        :param command: Command for execution
+        :type command: ``str``
+        :param verbose: Produce log.info records for command call and output
+        :type verbose: ``bool``
+        :param timeout: Timeout for command execution.
+        :type timeout: ``typing.Union[int, float, None]``
+        :rtype: ExecResult
+        :raises ExecHelperTimeoutError: Timeout exceeded
+
+        .. note:: stdin channel is closed after the input processing
+        .. versionadded:: 1.9.7
+
     .. py:method:: check_call(command, verbose=False, timeout=1*60*60, error_info=None, expected=None, raise_on_err=True, **kwargs)
 
         Execute command and check for return code.

exec_helpers/__init__.py

@@ -53,9 +53,9 @@
     "ExecResult",
 )
 
-try:
+try:  # pragma: no cover
     __version__ = pkg_resources.get_distribution(__name__).version
-except pkg_resources.DistributionNotFound:
+except pkg_resources.DistributionNotFound:  # pragma: no cover
     # package is not installed, try to get from SCM
     try:
         # noinspection PyPackageRequirements,PyUnresolvedReferences

exec_helpers/api.py

@@ -249,6 +249,31 @@ def execute(
         self.logger.log(level=logging.INFO if verbose else logging.DEBUG, msg=message)  # type: ignore
         return result
 
+    def __call__(
+        self,
+        command,  # type: str
+        verbose=False,  # type: bool
+        timeout=constants.DEFAULT_TIMEOUT,  # type: typing.Union[int, float, None]
+        **kwargs
+    ):  # type: (...) -> exec_result.ExecResult
+        """Execute command and wait for return code.
+
+        :param command: Command for execution
+        :type command: str
+        :param verbose: Produce log.info records for command call and output
+        :type verbose: bool
+        :param timeout: Timeout for command execution.
+        :type timeout: typing.Union[int, float, None]
+        :param kwargs: additional parameters for call.
+        :type kwargs: typing.Any
+        :return: Execution result
+        :rtype: ExecResult
+        :raises ExecHelperTimeoutError: Timeout exceeded
+
+        .. versionadded:: 1.9.7
+        """
+        return self.execute(command=command, verbose=verbose, timeout=timeout, **kwargs)
+
     def check_call(
         self,
         command,  # type: str

test/test_ssh_client_execute.py

@@ -508,3 +508,24 @@ def test_010_execute_together_expected(ssh, ssh2, execute_async, exec_result, ru
         )
     )
     assert results == {(host, port): exec_result, (host2, port): exec_result}
+
+
+def test_011_call(ssh, ssh_transport_channel, exec_result, run_parameters):
+    kwargs = {}
+    if "get_pty" in run_parameters:
+        kwargs["get_pty"] = run_parameters["get_pty"]
+    if "width" in run_parameters:
+        kwargs["width"] = run_parameters["width"]
+    if "height" in run_parameters:
+        kwargs["height"] = run_parameters["height"]
+
+    res = ssh(
+        command,
+        stdin=run_parameters["stdin"],
+        open_stdout=run_parameters["open_stdout"],
+        open_stderr=run_parameters["open_stderr"],
+        **kwargs
+    )
+    assert isinstance(res, exec_helpers.ExecResult)
+    assert res == exec_result
+    ssh_transport_channel.assert_has_calls((mock.call.status_event.is_set(),))

test/test_subprocess.py

@@ -325,3 +325,17 @@ def test_008_check_stderr_no_raise(execute, exec_result, logger):
         runner.check_stderr(command, stdin=exec_result.stdin, expected=[exec_result.exit_code], raise_on_err=False)
         == exec_result
     )
+
+
+def test_009_call(popen, logger, exec_result, run_parameters):
+    runner = exec_helpers.Subprocess()
+    res = runner(
+        command,
+        stdin=run_parameters["stdin"],
+        open_stdout=run_parameters["open_stdout"],
+        open_stderr=run_parameters["open_stderr"],
+    )
+    assert isinstance(res, exec_helpers.ExecResult)
+    assert res == exec_result
+    popen().wait.assert_called_once_with()
+    popen().poll.assert_called_once_with()