spaceship-prompt 4.5.0 → 4.6.0

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+# [4.6.0](https://github.com/spaceship-prompt/spaceship-prompt/compare/v4.5.1...v4.6.0) (2022-10-07)
+
+
+### Bug Fixes
+
+* locale dependent test ([#1253](https://github.com/spaceship-prompt/spaceship-prompt/issues/1253)) ([7477dfb](https://github.com/spaceship-prompt/spaceship-prompt/commit/7477dfb601b7fa41975406c53a4e3969899f0471))
+* problem async section not updating ([b72b54a](https://github.com/spaceship-prompt/spaceship-prompt/commit/b72b54ac2ab2babb829ab5d39565961a8591379e))
+
+
+### Features
+
+* add Dart section ([#1249](https://github.com/spaceship-prompt/spaceship-prompt/issues/1249)) ([f403f2f](https://github.com/spaceship-prompt/spaceship-prompt/commit/f403f2f3f499ee5abb8d8d6b1dac30c5bd8412f1))
+* add Lua section ([#1254](https://github.com/spaceship-prompt/spaceship-prompt/issues/1254)) ([7a3a2e9](https://github.com/spaceship-prompt/spaceship-prompt/commit/7a3a2e94657c90c66c20f7d1627625e851ae9ad6))
+
+## [4.5.1](https://github.com/spaceship-prompt/spaceship-prompt/compare/v4.5.0...v4.5.1) (2022-09-30)
+
+
+### Bug Fixes
+
+* **kubectl:** Avoids checking kubectl server version if no context is loaded, stopping potential hangs ([#1246](https://github.com/spaceship-prompt/spaceship-prompt/issues/1246)) ([44819b0](https://github.com/spaceship-prompt/spaceship-prompt/commit/44819b09c3017d0fb42bc22bdcbd05f847b2d915))
+* prepend spaceship root folder to spaceship precompile path ([#1244](https://github.com/spaceship-prompt/spaceship-prompt/issues/1244)) ([6c4623f](https://github.com/spaceship-prompt/spaceship-prompt/commit/6c4623fe9f31ac7b16fb7ebeffaa23b123220ef9))
+* upsearch was exiting when the first file is not found ([#1239](https://github.com/spaceship-prompt/spaceship-prompt/issues/1239)) ([dcfd690](https://github.com/spaceship-prompt/spaceship-prompt/commit/dcfd690f7b7607d05d160b084eb193460e9edf81))
+
 # [4.5.0](https://github.com/spaceship-prompt/spaceship-prompt/compare/v4.4.0...v4.5.0) (2022-09-23)
 
 

package/lib/core.zsh

@@ -49,7 +49,7 @@ spaceship::core::start() {
 # USAGE:
 #   spaceship::core::async_callback
 spaceship::core::async_callback() {
-  local job="$1" ret="$2" output="$3" exec_time="$4" err="$5" has_next="$6"
+  local job="$1" code="$2" output="$3" exec_time="$4" err="$5" has_next="$6"
   local section="${job#"spaceship_"}" # TODO: Move spaceship_ to a constant
 
   # Notify the worker that the job is done
@@ -79,6 +79,13 @@ spaceship::core::async_callback() {
       ;;
     *)
       # Hanlde regular successfully finished jobs
+
+      # Refresh async section when the last async job has finished
+      if [[ "${#SPACESHIP_JOBS}" -eq 0 ]]; then
+        spaceship::core::refresh_section "async"
+        spaceship::core::render
+      fi
+
       # Skip prompt re-rendering if section is empty
       if [[ "$(spaceship::cache::get $section)" == "$output" ]]; then
         return
@@ -89,12 +96,6 @@ spaceship::core::async_callback() {
       ;;
   esac
 
-  # Refresh async section when the last async job has finished
-  if [[ "${#SPACESHIP_JOBS}" -eq 0 ]]; then
-    spaceship::core::refresh_section "async"
-    spaceship::core::render
-  fi
-
   if [[ "$has_next" == 0 ]]; then
     spaceship::core::render
   fi

package/lib/utils.zsh

@@ -96,7 +96,7 @@ spaceship::deprecated() {
   print -P "%B$deprecated%b is deprecated. $message"
 }
 
-# Display seconds in human readable fromat
+# Display seconds in human readable format
 # For that use `strftime` and convert the duration (float) to seconds (integer).
 # USAGE:
 #   spaceship::displaytime <seconds> [precision]
@@ -155,12 +155,14 @@ spaceship::upsearch() {
           echo "$filepath"
         fi
         return 0
-      elif [[ -d "$root/.git" || -d "$root/.hg" ]]; then
-        # If we reached the root of repo, return non-zero
-        return 1
       fi
     done
 
+    if [[ -d "$root/.git" || -d "$root/.hg" ]]; then
+      # If we reached the root of repo, return non-zero
+      return 1
+    fi
+
     # Go one level up
     root="${root%/*}"
   done

package/package.json

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

package/sections/dart.zsh

@@ -0,0 +1,40 @@
+
+# Dart
+
+# Dart is a client-optimized language for fast apps on any platform
+# Link: https://dart.dev/
+
+# ------------------------------------------------------------------------------
+# Configuration
+# ------------------------------------------------------------------------------
+SPACESHIP_DART_SHOW="${SPACESHIP_DART_SHOW=true}"
+SPACESHIP_DART_ASYNC="${SPACESHIP_DART_ASYNC=true}"
+SPACESHIP_DART_PREFIX="${SPACESHIP_DART_PREFIX="$SPACESHIP_PROMPT_DEFAULT_PREFIX"}"
+SPACESHIP_DART_SUFFIX="${SPACESHIP_DART_SUFFIX="$SPACESHIP_PROMPT_DEFAULT_SUFFIX"}"
+SPACESHIP_DART_SYMBOL="${SPACESHIP_DART_SYMBOL="🎯 "}"
+SPACESHIP_DART_COLOR="${SPACESHIP_DART_COLOR="blue"}"
+
+# ------------------------------------------------------------------------------
+# Section
+# ------------------------------------------------------------------------------
+
+spaceship_dart() {
+  [[ $SPACESHIP_DART_SHOW == false ]] && return
+  spaceship::exists dart || return
+
+  local is_dart_project="$(spaceship::upsearch pubspec.yaml pubspec.yml pubspec.lock dart_tool)"
+  [[ -n "$is_dart_project" || -n *.dart(#qN^/) ]] || return
+
+  # The Dart binary can be installed directly as 'dart-sdk' or as bundle via Flutter
+  # The version can have the following patterns:
+  # dart-sdk >       Dart SDK version: 2.19.0-edge.efb509c114dcaf54d0a011f717b48893d71ec9c3 (be) (Thu Sep 29 01:58:56 2022 +0000) on "macos_x64"
+  # flutter bundle > Dart SDK version: 2.18.1 (stable) (Tue Sep 13 11:42:55 2022 +0200) on "macos_x64"
+  local dart_version=$(dart --version | awk '{sub(/-.*/, "", $4); print $4}')
+
+  spaceship::section \
+    --color "$SPACESHIP_DART_COLOR" \
+    --prefix "$SPACESHIP_DART_PREFIX" \
+    --suffix "$SPACESHIP_DART_SUFFIX" \
+    --symbol "${SPACESHIP_DART_SYMBOL}" \
+    "v${dart_version}"
+}

package/sections/kubectl_version.zsh

@@ -25,6 +25,11 @@ spaceship_kubectl_version() {
 
   spaceship::exists kubectl || return
 
+  # kubectl can hang for upwards of 10 seconds if a context isn't loaded, this avoids the unnecessary server version
+  #  check if a context isn't loaded, avoiding the issue entirely.
+  local kube_context=$(kubectl config current-context 2>/dev/null)
+  [[ -z $kube_context ]] && return
+
   # if kubectl can't connect kubernetes cluster, kubernetes version section will be not shown
   local kubectl_version=$(kubectl version --short 2>/dev/null | grep "Server Version" | sed 's/Server Version: \(.*\)/\1/')
   [[ -z $kubectl_version ]] && return

package/sections/lua.zsh

@@ -0,0 +1,34 @@
+# Lua
+#
+# Lua is a powerful, efficient, lightweight, embeddable scripting language
+# Link: https://lua.org/
+
+# ------------------------------------------------------------------------------
+# Configuration
+# ------------------------------------------------------------------------------
+SPACESHIP_LUA_SHOW="${SPACESHIP_LUA_SHOW=true}"
+SPACESHIP_LUA_ASYNC="${SPACESHIP_LUA_ASYNC=true}"
+SPACESHIP_LUA_PREFIX="${SPACESHIP_LUA_PREFIX="$SPACESHIP_PROMPT_DEFAULT_PREFIX"}"
+SPACESHIP_LUA_SUFFIX="${SPACESHIP_LUA_SUFFIX="$SPACESHIP_PROMPT_DEFAULT_SUFFIX"}"
+SPACESHIP_LUA_SYMBOL="${SPACESHIP_LUA_SYMBOL="🌙 "}"
+SPACESHIP_LUA_COLOR="${SPACESHIP_LUA_COLOR="cyan"}"
+
+# ------------------------------------------------------------------------------
+# Section(s)
+# ------------------------------------------------------------------------------
+spaceship_lua() {
+  [[ $SPACESHIP_LUA_SHOW == false ]] && return
+  spaceship::exists lua || return
+
+  local is_lua_project="$(spaceship::upsearch .lua-version lua)"
+  [[ -n "$is_lua_project" || -n *.lua(#qN^/) ]] || return
+
+  local lua_version=$(lua -v | awk '{print $2}')
+
+  spaceship::section \
+    --color "$SPACESHIP_LUA_COLOR" \
+    --prefix "$SPACESHIP_LUA_PREFIX" \
+    --suffix "$SPACESHIP_LUA_SUFFIX" \
+    --symbol "${SPACESHIP_LUA_SYMBOL}" \
+    "v${lua_version}"
+}

package/spaceship.zsh

@@ -7,7 +7,7 @@
 
 # Current version of Spaceship
 # Useful for issue reporting
-export SPACESHIP_VERSION='4.5.0'
+export SPACESHIP_VERSION='4.6.0'
 
 # Determination of Spaceship working directory
 # https://git.io/vdBH7
@@ -57,6 +57,8 @@ if [ -z "$SPACESHIP_PROMPT_ORDER" ]; then
     rust          # Rust section
     haskell       # Haskell Stack section
     java          # Java section
+    lua           # Lua section
+    dart          # Dart section
     julia         # Julia section
     crystal       # Crystal section
     docker        # Docker section
@@ -119,7 +121,7 @@ for lib in "${SPACESHIP_LIBS[@]}"; do
 done
 
 # Load and precompile this file
-spaceship::precompile "$0"
+spaceship::precompile "$SPACESHIP_ROOT/$0"
 
 # ------------------------------------------------------------------------------
 # BACKWARD COMPATIBILITY WARNINGS