spaceship-prompt 4.22.1 → 4.22.3

package/README.md

@@ -94,11 +94,11 @@ Before we begin, let's make sure you have the following installed:
 
 - [Zsh](http://www.zsh.org/) (v5.2 or recent) must be installed. Run the following command to check your version of Zsh:
   ```zsh
-  echo $ZSH_VERSION #> 5.8.1
+  echo $ZSH_VERSION # 5.8.1
   ```
 - [Powerline Font](https://github.com/powerline/fonts) or [Nerd Font](https://www.nerdfonts.com/) (even better) must be installed and used in your terminal. [Fira Code](https://github.com/tonsky/FiraCode) is a popular choice. To check if Powerline Font works for you, run:
   ```zsh
-  echo -e "\xee\x82\xa0" #> 
+  echo -e "\xee\x82\xa0" # 
   ```
 
 ## 🚀 Installation

package/lib/extract.zsh

@@ -23,11 +23,11 @@ spaceship::extract::python::json() {
 
 spaceship::extract::python::toml() {
   local file=$1; shift
-  local import py_version="${(@)$(python3 -V 2>&1)[2]}"
+  local import py_version=${(@)$(python3 -V 2>&1)[2]}
   autoload is-at-least
   # Python 3.11 added tomllib in the stdlib.
   # Previous versions require the tomli package
-  if is-at-least 3.11 "$py_version" ]]; then
+  if is-at-least 3.11 "$py_version"; then
     import=tomllib
   else
     import=tomli

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spaceship-prompt",
-  "version": "4.22.1",
+  "version": "4.22.3",
   "description": "A Zsh prompt for Astronauts.",
   "files": [
     "lib",

package/sections/dotnet.zsh

@@ -26,7 +26,7 @@ spaceship_dotnet() {
   [[ $SPACESHIP_DOTNET_SHOW == false ]] && return
 
   local is_dotnet_project="$(spaceship::upsearch project.json global.json paket.dependencies)"
-  [[ -n "$is_dotnet_project" || -n *.(cs|fs|x)proj(#qN^/) || -n *.sln(#qN^/) ]] || return
+  [[ -n "$is_dotnet_project" || -n *.(cs|fs|x)proj(#qN^/) || -n *.sln(x|)(#qN^/) ]] || return
 
   spaceship::exists dotnet || return
 

package/sections/package.zsh

@@ -74,10 +74,12 @@ spaceship_package::cargo() {
   spaceship::upsearch -s Cargo.toml || return
 
   # Handle missing field `version` in Cargo.toml.
-  # `cargo pkgid` need Cargo.lock exists too. If it does't, do not show package version
+  # `cargo pkgid` needs Cargo.lock to exist too. If it doesn't, do not show package version
   # https://github.com/spaceship-prompt/spaceship-prompt/pull/617
-  local pkgid=$(cargo pkgid 2>&1)
-  echo "$pkgid" | grep -q "error:" && return
+  local pkgid
+  if ! pkgid=$(cargo pkgid 2>&1); then
+    return
+  fi
   echo "${pkgid##*\#}"
 }
 

package/sections/ruby.zsh

@@ -30,11 +30,13 @@ spaceship_ruby() {
   local ruby_version
 
   if spaceship::exists rvm-prompt; then
-    ruby_version=$(rvm-prompt i v g)
+    ruby_version=$(rvm-prompt i v g 2>/dev/null)
   elif spaceship::exists chruby; then
-    ruby_version=$(chruby | sed -n -e 's/ \* //p')
+    ruby_version=$(chruby 2>/dev/null | sed -n -e 's/ \* //p')
   elif spaceship::exists rbenv; then
-    ruby_version=$(rbenv version-name)
+    ruby_version=$(rbenv version-name 2>/dev/null)
+  elif spaceship::exists mise; then
+    ruby_version=$(mise current ruby 2>/dev/null)
   elif spaceship::exists asdf; then
     local asdf_output
     if asdf_output=$(asdf current --no-header ruby 2>/dev/null) && [[ -n "$asdf_output" ]]; then

package/spaceship.zsh

@@ -8,7 +8,7 @@
 
 # Current version of Spaceship
 # Useful for issue reporting
-export SPACESHIP_VERSION='4.22.1'
+export SPACESHIP_VERSION='4.22.3'
 
 # Set SPACESHIP_ROOT if it isn't defined yet or if the directory does
 # not exist anymore (e.g. after an update to a newer version)