spaceship-prompt 4.15.2 → 4.16.0

package/package.json

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

package/scripts/tests

@@ -52,6 +52,11 @@ header() {
 main() {
   for test in $TESTS; do
     header "Run $test..."
+    if [[ ! -x "$test" ]]; then
+      header $red "Test $test is not executable!"
+      EXIT_CODE=1
+      continue
+    fi
     ( eval zsh $test 2>&1 )
     local exitcode="$?"
     [ "$exitcode" != "0" ] && EXIT_CODE=$exitcode

package/sections/git.zsh

@@ -13,7 +13,7 @@ SPACESHIP_GIT_SUFFIX="${SPACESHIP_GIT_SUFFIX="$SPACESHIP_PROMPT_DEFAULT_SUFFIX"}
 SPACESHIP_GIT_SYMBOL="${SPACESHIP_GIT_SYMBOL=" "}"
 
 if [ -z "$SPACESHIP_GIT_ORDER" ]; then
-  SPACESHIP_GIT_ORDER=(git_branch git_status)
+  SPACESHIP_GIT_ORDER=(git_branch git_status git_commit)
 fi
 
 # ------------------------------------------------------------------------------
@@ -22,9 +22,11 @@ fi
 
 source "$SPACESHIP_ROOT/sections/git_branch.zsh"
 source "$SPACESHIP_ROOT/sections/git_status.zsh"
+source "$SPACESHIP_ROOT/sections/git_commit.zsh"
 
 spaceship::precompile "$SPACESHIP_ROOT/sections/git_branch.zsh"
 spaceship::precompile "$SPACESHIP_ROOT/sections/git_status.zsh"
+spaceship::precompile "$SPACESHIP_ROOT/sections/git_commit.zsh"
 
 # ------------------------------------------------------------------------------
 # Section

package/sections/git_commit.zsh

@@ -0,0 +1,36 @@
+#
+# Git commit
+#
+
+# ------------------------------------------------------------------------------
+# Configuration
+# ------------------------------------------------------------------------------
+
+SPACESHIP_GIT_COMMIT_SHOW="${SPACESHIP_GIT_COMMIT_SHOW=false}"
+SPACESHIP_GIT_COMMIT_ASYNC="${SPACESHIP_GIT_COMMIT_ASYNC=true}"
+SPACESHIP_GIT_COMMIT_PREFIX="${SPACESHIP_GIT_COMMIT_PREFIX=" "}"
+SPACESHIP_GIT_COMMIT_SYMBOL="${SPACESHIP_GIT_COMMIT_SYMBOL="#"}"
+SPACESHIP_GIT_COMMIT_SUFFIX="${SPACESHIP_GIT_COMMIT_SUFFIX=""}"
+SPACESHIP_GIT_COMMIT_COLOR="${SPACESHIP_GIT_COMMIT_COLOR="yellow"}"
+
+# ------------------------------------------------------------------------------
+# Section
+# ------------------------------------------------------------------------------
+
+spaceship_git_commit() {
+  [[ $SPACESHIP_GIT_COMMIT_SHOW == false ]] && return
+
+  spaceship::is_git || return
+
+  # Get commit short commit hash
+  commit_hash=$(command git rev-parse --short HEAD 2>/dev/null)
+
+  if [[ -n $commit_hash ]]; then
+    spaceship::section \
+      --color "$SPACESHIP_GIT_COMMIT_COLOR" \
+      --prefix "$SPACESHIP_GIT_COMMIT_PREFIX" \
+      --suffix "$SPACESHIP_GIT_COMMIT_SUFFIX" \
+      --symbol "$SPACESHIP_GIT_COMMIT_SYMBOL" \
+      "$commit_hash"
+  fi
+}

package/sections/kubectl_version.zsh

@@ -31,7 +31,7 @@ spaceship_kubectl_version() {
   [[ -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/')
+  local kubectl_version=$(kubectl version 2>/dev/null | grep "Server Version" | sed 's/Server Version: \(.*\)/\1/')
   [[ -z $kubectl_version ]] && return
 
   spaceship::section \

package/sections/red.zsh

@@ -0,0 +1,44 @@
+#
+# Red
+#
+# Red is a next-gen programming language, strongly inspired by REBOL
+# Link: https://www.red-lang.org/
+
+# ------------------------------------------------------------------------------
+# Configuration
+# ------------------------------------------------------------------------------
+
+SPACESHIP_RED_SHOW="${SPACESHIP_RED_SHOW=true}"
+SPACESHIP_RED_ASYNC="${SPACESHIP_RED_ASYNC=true}"
+SPACESHIP_RED_PREFIX="${SPACESHIP_RED_PREFIX="$SPACESHIP_PROMPT_DEFAULT_PREFIX"}"
+SPACESHIP_RED_SUFFIX="${SPACESHIP_RED_SUFFIX="$SPACESHIP_PROMPT_DEFAULT_SUFFIX"}"
+SPACESHIP_RED_SYMBOL="${SPACESHIP_RED_SYMBOL="🔺 "}"
+SPACESHIP_RED_COLOR="${SPACESHIP_RED_COLOR="red"}"
+
+# ------------------------------------------------------------------------------
+# Section
+# ------------------------------------------------------------------------------
+
+# Show current version of Python
+spaceship_red() {
+  [[ $SPACESHIP_RED_SHOW == false ]] && return
+
+  # Show red version only in directories with relevant files
+  local is_red_project="$(spaceship::upsearch red.rc redbol)"
+  [[ -n "$is_red_project" || -n *.red(#qN^/) || -n *.reds(#qN^/) ]] || return
+
+  local red_version
+
+  if  [[ -n "$VIRTUAL_ENV" ]] || [[ $SPACESHIP_RED_SHOW == always ]]; then
+    red_version=${(@)$(red --version 2>&1)[2]}
+  fi
+
+  [[ -z $red_version ]] && return
+
+  spaceship::section \
+    --color "$SPACESHIP_RED_COLOR" \
+    --prefix "$SPACESHIP_RED_PREFIX" \
+    --suffix "$SPACESHIP_RED_SUFFIX" \
+    --symbol "$SPACESHIP_RED_SYMBOL" \
+    "$red_version"
+}

package/spaceship.zsh

@@ -8,7 +8,7 @@
 
 # Current version of Spaceship
 # Useful for issue reporting
-export SPACESHIP_VERSION='4.15.2'
+export SPACESHIP_VERSION='4.16.0'
 
 # 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)
@@ -44,7 +44,7 @@ if [ -z "$SPACESHIP_PROMPT_ORDER" ]; then
     user           # Username section
     dir            # Current directory section
     host           # Hostname section
-    git            # Git section (git_branch + git_status)
+    git            # Git section (git_branch + git_status + [git_commit](default off))
     hg             # Mercurial section (hg_branch  + hg_status)
     package        # Package version
     node           # Node.js section
@@ -52,6 +52,7 @@ if [ -z "$SPACESHIP_PROMPT_ORDER" ]; then
     deno           # Deno section
     ruby           # Ruby section
     python         # Python section
+    red            # Red section
     elm            # Elm section
     elixir         # Elixir section
     xcode          # Xcode section