spaceship-prompt 4.22.0 → 4.22.2

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/cli.zsh

@@ -50,6 +50,11 @@ _spaceship::cli::edit() {
     echo "No spaceship config found."
   fi
 
+  if [[ -z $EDITOR ]]; then
+    echo "EDITOR is not set."
+    return 1
+  fi
+
   "$EDITOR" "$SPACESHIP_CONFIG" && source "$SPACESHIP_CONFIG"
 }
 

package/lib/extract.zsh

@@ -6,33 +6,33 @@
 # ------------------------------------------------------------------------------
 
 spaceship::extract::python() {
-  local imports=$1 load=$2; shift 2
+  local imports=$1 load=$2 file=$3; shift 3
   local keys=("$@")
-  python -c "import $imports, functools; data=$load; print(next(filter(None, map(lambda key: functools.reduce(lambda obj, key: obj[key] if key in obj else {}, key.split('.'), data), ['${(j|','|)keys}'])), None))" 2>/dev/null
+  python -c "import sys, $imports, functools; data=$load; print(next(filter(None, map(lambda key: functools.reduce(lambda obj, key: obj[key] if key in obj else {}, key.split('.'), data), ['${(j|','|)keys}'])), None))" "$file" 2>/dev/null
 }
 
 spaceship::extract::python::yaml() {
   local file=$1; shift
-  spaceship::extract::python yaml "yaml.safe_load(open('$file'))" "$@"
+  spaceship::extract::python yaml "yaml.safe_load(open(sys.argv[1]))" "$file" "$@"
 }
 
 spaceship::extract::python::json() {
   local file=$1; shift
-  spaceship::extract::python json "json.load(open('$file'))" "$@"
+  spaceship::extract::python json "json.load(open(sys.argv[1]))" "$file" "$@"
 }
 
 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
   fi
-  spaceship::extract::python "$import" "$import.load(open('$file', 'rb'))" "$@"
+  spaceship::extract::python "$import" "$import.load(open(sys.argv[1], 'rb'))" "$file" "$@"
 }
 
 spaceship::extract::jq() {
@@ -42,25 +42,25 @@ spaceship::extract::jq() {
 }
 
 spaceship::extract::ruby() {
-  local import=$1 load=$2; shift 2
+  local import=$1 load=$2 file=$3; shift 3
   local keys=("$@")
-  ruby -r "$import" -e "puts ['${(j|','|)keys}'].map { |key| key.split('.').reduce($load) { |obj, key| obj[key] } }.find(&:itself)" 2>/dev/null
+  ruby -r "$import" -e "puts ['${(j|','|)keys}'].map { |key| key.split('.').reduce($load) { |obj, key| obj[key] } }.find(&:itself)" -- "$file" 2>/dev/null
 }
 
 spaceship::extract::ruby::yaml() {
   local file=$1; shift
-  spaceship::extract::ruby 'yaml' "YAML::load_file('$file')" "$@"
+  spaceship::extract::ruby 'yaml' "YAML.safe_load(File.read(ARGV[0]))" "$file" "$@"
 }
 
 spaceship::extract::ruby::json() {
   local file=$1; shift
-  spaceship::extract::ruby 'json' "JSON::load(File.read('$file'))" "$@"
+  spaceship::extract::ruby 'json' "JSON::load(File.read(ARGV[0]))" "$file" "$@"
 }
 
 spaceship::extract::node::json() {
   local file=$1; shift
   local keys=("$@")
-  node -p "['${(j|','|)keys}'].map(s => s.split('.').reduce((obj, key) => obj[key], require('./$file'))).find(Boolean)" 2>/dev/null
+  node -p "['${(j|','|)keys}'].map(s => s.split('.').reduce((obj, key) => obj[key], require(require('path').resolve(process.argv[1])))).find(Boolean)" -- "$file" 2>/dev/null
 }
 
 # Read data file with dot notation (JSON, YAML, TOML, XML). Additional keys

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spaceship-prompt",
-  "version": "4.22.0",
+  "version": "4.22.2",
   "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

@@ -38,8 +38,8 @@ spaceship_package::npm() {
 
   local package_json=$(spaceship::upsearch package.json) || return
 
-  local package_version="$(spaceship::extract --json $package_json version)"
-  local is_private_package="$(spaceship::extract --json $package_json private)"
+  local package_version="$(spaceship::extract --json "$package_json" version)"
+  local is_private_package="$(spaceship::extract --json "$package_json" private)"
 
   if [[ "$SPACESHIP_PACKAGE_SHOW_PRIVATE" == false && "$is_private_package" == true ]]; then
     return 0
@@ -60,7 +60,7 @@ spaceship_package::lerna() {
 
   local lerna_json=$(spaceship::upsearch lerna.json) || return
 
-  local package_version="$(spaceship::extract --json $lerna_json version)"
+  local package_version="$(spaceship::extract --json "$lerna_json" version)"
 
   if [[ "$package_version" == "independent" ]]; then
     package_version="($package_version)"
@@ -86,7 +86,7 @@ spaceship_package::composer() {
 
   local composer_json=$(spaceship::upsearch composer.json) || return
 
-  spaceship::extract --json $composer_json "version"
+  spaceship::extract --json "$composer_json" "version"
 }
 
 spaceship_package::julia() {
@@ -94,7 +94,7 @@ spaceship_package::julia() {
 
   local project_toml=$(spaceship::upsearch Project.toml) || return
 
-  spaceship::extract --toml $project_toml "version"
+  spaceship::extract --toml "$project_toml" "version"
 }
 
 spaceship_package::maven() {
@@ -131,7 +131,7 @@ spaceship_package::dart() {
 
   local pubspec_file=$(spaceship::upsearch pubspec.yaml pubspec.yml) || return
 
-  spaceship::extract --yaml $pubspec_file "version"
+  spaceship::extract --yaml "$pubspec_file" "version"
 }
 
 # ------------------------------------------------------------------------------

package/spaceship.zsh

@@ -8,7 +8,7 @@
 
 # Current version of Spaceship
 # Useful for issue reporting
-export SPACESHIP_VERSION='4.22.0'
+export SPACESHIP_VERSION='4.22.2'
 
 # 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)