Merge 672b958a7e into 7ff836131a

If the `gcloud` command is interactive (e.g. asks to install a component, or needs an update), the current code will hang forever, and is uninterruptible as `INT` is being swallowed.

Fix this with `</dev/null` and `--quiet`.

config/p10k-classic.zsh

@@ -47,6 +47,7 @@
     virtualenv              # python virtual environment (https://docs.python.org/3/library/venv.html)
     anaconda                # conda environment (https://conda.io/)
     pyenv                   # python environment (https://github.com/pyenv/pyenv)
+    poetry                  # python poetry (https://python-poetry.org/)
     goenv                   # go environment (https://github.com/syndbg/goenv)
     nodenv                  # node.js version from nodenv (https://github.com/nodenv/nodenv)
     nvm                     # node.js version from nvm (https://github.com/nvm-sh/nvm)
@@ -951,6 +952,10 @@
   # If set to "false", won't show virtualenv if pyenv is already shown.
   # If set to "if-different", won't show virtualenv if it's the same as pyenv.
   typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=false
+  # If set to "true", get the virtualenv from poetry if available
+  typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_POETRY=false
+  # Show poetry venv only when in a directory tree containing pyproject.toml.
+  typeset -g POWERLEVEL9K_POETRY_VENV_PROJECT_ONLY=true
   # Separate environment name from Python version only with a space.
   typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER=
   # Custom icon.

config/p10k-lean-8colors.zsh

@@ -47,6 +47,7 @@
     virtualenv              # python virtual environment (https://docs.python.org/3/library/venv.html)
     anaconda                # conda environment (https://conda.io/)
     pyenv                   # python environment (https://github.com/pyenv/pyenv)
+    poetry                  # python poetry (https://python-poetry.org/)
     goenv                   # go environment (https://github.com/syndbg/goenv)
     nodenv                  # node.js version from nodenv (https://github.com/nodenv/nodenv)
     nvm                     # node.js version from nvm (https://github.com/nvm-sh/nvm)
@@ -926,6 +927,10 @@
   # If set to "false", won't show virtualenv if pyenv is already shown.
   # If set to "if-different", won't show virtualenv if it's the same as pyenv.
   typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=false
+  # If set to "true", get the virtualenv from poetry if available
+  typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_POETRY=false
+  # Show poetry venv only when in a directory tree containing pyproject.toml.
+  typeset -g POWERLEVEL9K_POETRY_VENV_PROJECT_ONLY=true
   # Separate environment name from Python version only with a space.
   typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER=
   # Custom icon.

config/p10k-lean.zsh

@@ -47,6 +47,7 @@
     virtualenv              # python virtual environment (https://docs.python.org/3/library/venv.html)
     anaconda                # conda environment (https://conda.io/)
     pyenv                   # python environment (https://github.com/pyenv/pyenv)
+    poetry                  # python poetry (https://python-poetry.org/)
     goenv                   # go environment (https://github.com/syndbg/goenv)
     nodenv                  # node.js version from nodenv (https://github.com/nodenv/nodenv)
     nvm                     # node.js version from nvm (https://github.com/nvm-sh/nvm)
@@ -926,6 +927,10 @@
   # If set to "false", won't show virtualenv if pyenv is already shown.
   # If set to "if-different", won't show virtualenv if it's the same as pyenv.
   typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=false
+  # If set to "true", get the virtualenv from poetry if available
+  typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_POETRY=false
+  # Show poetry venv only when in a directory tree containing pyproject.toml.
+  typeset -g POWERLEVEL9K_POETRY_VENV_PROJECT_ONLY=true
   # Separate environment name from Python version only with a space.
   typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER=
   # Custom icon.

config/p10k-rainbow.zsh

@@ -47,6 +47,7 @@
     virtualenv              # python virtual environment (https://docs.python.org/3/library/venv.html)
     anaconda                # conda environment (https://conda.io/)
     pyenv                   # python environment (https://github.com/pyenv/pyenv)
+    poetry                  # python poetry (https://python-poetry.org/)
     goenv                   # go environment (https://github.com/syndbg/goenv)
     nodenv                  # node.js version from nodenv (https://github.com/nodenv/nodenv)
     nvm                     # node.js version from nvm (https://github.com/nvm-sh/nvm)
@@ -999,6 +1000,10 @@
   # If set to "false", won't show virtualenv if pyenv is already shown.
   # If set to "if-different", won't show virtualenv if it's the same as pyenv.
   typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=false
+  # If set to "true", get the virtualenv from poetry if available
+  typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_POETRY=false
+  # Show poetry venv only when in a directory tree containing pyproject.toml.
+  typeset -g POWERLEVEL9K_POETRY_VENV_PROJECT_ONLY=true
   # Separate environment name from Python version only with a space.
   typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER=
   # Custom icon.

internal/p10k.zsh

@@ -4288,6 +4288,44 @@ function _p9k_parse_virtualenv_cfg() {
   reply=(1 "$res")
 }
 
+################################################################
+# Segment to display poetry virtualenv information
+# https://python-poetry.org/
+prompt_poetry() {
+  local msg=''
+  if (( _POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION )) && _p9k_python_version; then
+    msg="${_p9k__ret//\%/%%} "
+  fi
+  _p9k_poetry_compute || return
+  msg+="$P9K_POETRY_PYTHON_VENV"
+  _p9k_prompt_segment "$0" "blue" "$_p9k_color1" 'PYTHON_ICON' 0 '' "$msg"
+}
+
+_p9k_prompt_poetry_init() {
+  typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='${commands[poetry]:-${${+functions[poetry]}:#0}}'
+}
+
+function _p9k_poetry_compute() {
+  unset P9K_POETRY_PYTHON_VENV
+  case $_POWERLEVEL9K_VIRTUALENV_SHOW_WITH_POETRY in
+    true)
+      _p9k_upglob pyproject.toml
+      local idx=$?
+      if (( idx == 1 )); then
+        _p9k_cached_cmd 0 $_p9k__parent_dirs[idx]/pyproject.toml poetry env info -p || return
+      elif (( idx > 1 )); then
+        (( _POWERLEVEL9K_POETRY_VENV_PROJECT_ONLY )) && return
+        _p9k_cached_cmd 0 '' poetry env info -p || return
+      fi
+      if [[ $_p9k__ret == (#b)*/([^/]##) ]]; then
+        typeset -g P9K_POETRY_PYTHON_VENV=$match[1]
+        return
+      fi
+    ;;
+  esac
+  return 1
+}
+
 ################################################################
 # Virtualenv: current working virtualenv
 # More information on virtualenv (Python):
@@ -4716,7 +4754,9 @@ _p9k_gcloud_prefetch() {
   if ! _p9k_cache_stat_get $0 ${CLOUDSDK_CONFIG:-~/.config/gcloud}/configurations/config_$P9K_GCLOUD_CONFIGURATION; then
     local pair account project_id
     pair="$(gcloud config configurations describe $P9K_GCLOUD_CONFIGURATION \
-      --format=$'value[separator="\1"](properties.core.account,properties.core.project)')"
+      --quiet \
+      --format=$'value[separator="\1"](properties.core.account,properties.core.project)' \
+      </dev/null)"
     (( ! $? )) && IFS=$'\1' read account project_id <<<$pair
     _p9k_cache_stat_set "$account" "$project_id"
   fi