diff --git a/lean/click.py b/lean/click.py index db0d10d5..94c98afc 100644 --- a/lean/click.py +++ b/lean/click.py @@ -79,7 +79,8 @@ def _parse_verbose_option(ctx: Context, param: Parameter, value: Optional[bool]) from sys import version as sys_version from lean import __version__ as lean_cli_version from subprocess import run - from os import getcwd + from os import getcwd, getlogin + from socket import gethostname from lean.container import container logger = container.logger @@ -87,6 +88,18 @@ def _parse_verbose_option(ctx: Context, param: Parameter, value: Optional[bool]) # show additional context information python_version = sys_version.replace("\n", ". ") + try: + hostname = gethostname() + hostname = f" Hostname: {hostname}\n" + except: + hostname = "" + + try: + username = getlogin() + username = f" Username: {username}\n" + except: + username = "" + try: dotnet_version = run("dotnet --version", capture_output=True).stdout.decode("utf").replace("\n", "") except: @@ -113,13 +126,21 @@ def _parse_verbose_option(ctx: Context, param: Parameter, value: Optional[bool]) except: pass - logger.debug(f"Context information:\n" + try: + docker_version = run("docker --version", shell=True, capture_output=True).stdout.decode("utf").replace("Docker version ", "") + except: + docker_version = "Not installed" + + logger.debug(f"Context information:\n" + + hostname + + username + f" Python version: {python_version}\n" f" OS: {platform()}\n" f" Lean CLI version: {lean_cli_version}\n" f" .NET version: {dotnet_version}\n" f" VS Code version: {vscode_version}\n" - f" VS Code installed versions: {vscode_installed_extensions}") + f" VS Code installed versions: {vscode_installed_extensions}\n" + f" Docker version: {docker_version}\n") try: logger.debug(get_whoami_message()) except: