spaceship-prompt 4.8.0 → 4.9.0

package/lib/utils.zsh

@@ -151,11 +151,9 @@ spaceship::upsearch() {
   while [ "$root" ]; do
     # For every file as an argument
     for file in "${files[@]}"; do
-      local filepath="$root/$file"
-      if [[ -e "$filepath" ]]; then
-        if [[ -z "$silent" ]]; then
-          echo "$filepath"
-        fi
+      local filepath="$(find $root -name $file -maxdepth 1 -print -quit)"
+      if [[ -n "$filepath" ]]; then
+        [[ -z "$silent" ]] && echo "$filepath"
         return 0
       fi
     done

package/package.json

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

package/sections/ansible.zsh

@@ -0,0 +1,53 @@
+#
+# Ansible
+#
+# Ansible is a suite of software tools that enables infrastructure as code.
+# Link: https://docs.ansible.com/ansible/latest/index.html
+
+# ------------------------------------------------------------------------------
+# Configuration
+# ------------------------------------------------------------------------------
+
+SPACESHIP_ANSIBLE_SHOW="${SPACESHIP_ANSIBLE_SHOW=true}"
+SPACESHIP_ANSIBLE_ASYNC="${SPACESHIP_ANSIBLE_ASYNC=true}"
+SPACESHIP_ANSIBLE_PREFIX="${SPACESHIP_ANSIBLE_PREFIX="$SPACESHIP_PROMPT_DEFAULT_PREFIX"}"
+SPACESHIP_ANSIBLE_SUFFIX="${SPACESHIP_ANSIBLE_SUFFIX="$SPACESHIP_PROMPT_DEFAULT_SUFFIX"}"
+SPACESHIP_ANSIBLE_SYMBOL="${SPACESHIP_ANSIBLE_SYMBOL="🅐 "}"
+SPACESHIP_ANSIBLE_COLOR="${SPACESHIP_ANSIBLE_COLOR="white"}"
+
+# ------------------------------------------------------------------------------
+# Section
+# ------------------------------------------------------------------------------
+
+spaceship_ansible() {
+  [[ $SPACESHIP_ANSIBLE_SHOW == false ]] && return
+
+  # Check if ansible is installed
+  spaceship::exists ansible || return
+
+  # Show ansible section only when there are ansible-specific files in current
+  # working directory.
+  # Here glob qualifiers are used to check if files with specific extension are
+  # present in directory. Read more about them here:
+  # https://zsh.sourceforge.net/Doc/Release/Expansion.html
+  local ansible_configs="$(spaceship::upsearch ansible.cfg .ansible.cfg)"
+  local yaml_files="$(echo ?(*.yml|*.yaml)([1]N^/))"
+  local detected_playbooks
+
+  if [[ -n "$yaml_files" ]]; then
+    detected_playbooks="$(spaceship::grep -oE "tasks|hosts|roles" $yaml_files)"
+  fi
+
+  [[ -n "$ansible_configs" || -n "$detected_playbooks" ]] || return
+
+  # Retrieve ansible version
+  local ansible_version=$(ansible --version | head -1 | spaceship::grep -oE '[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]')
+
+  # Display ansible section
+  spaceship::section \
+    --color "$SPACESHIP_ANSIBLE_COLOR" \
+    --prefix "$SPACESHIP_ANSIBLE_PREFIX" \
+    --suffix "$SPACESHIP_ANSIBLE_SUFFIX" \
+    --symbol "$SPACESHIP_ANSIBLE_SYMBOL" \
+    "v$ansible_version"
+}

package/sections/dart.zsh

@@ -1,6 +1,6 @@
-
+#
 # Dart
-
+#
 # Dart is a client-optimized language for fast apps on any platform
 # Link: https://dart.dev/
 

package/sections/docker.zsh

@@ -34,32 +34,24 @@ spaceship_docker() {
   spaceship::exists docker || return
 
   # Better support for docker environment vars: https://docs.docker.com/compose/reference/envvars/
-  local compose_exists=false
   if [[ -n "$COMPOSE_FILE" ]]; then
+    local compose_path
     # Use COMPOSE_PATH_SEPARATOR or colon as default
     local separator=${COMPOSE_PATH_SEPARATOR:-":"}
-
-    # COMPOSE_FILE may have several filenames separated by colon, test all of them
+    # COMPOSE_FILE may have several filenames separated by colon, upsearch all of them
     local filenames=("${(@ps/$separator/)COMPOSE_FILE}")
-
-    for filename in $filenames; do
-      if [[ ! -f $filename ]]; then
-        compose_exists=false
-        break
-      fi
-      compose_exists=true
-    done
+    local compose_path="$(spaceship::upsearch -s $filenames)"
 
     # Must return if COMPOSE_FILE is present but invalid
-    [[ "$compose_exists" == false ]] && return
+    [[ -n "$compose_path" ]] || return
   fi
 
   local docker_context="$(spaceship_docker_context)"
   local docker_context_section="$(spaceship::section::render $docker_context)"
 
   # Show Docker status only for Docker-specific folders or when connected to external host
-  local is_docker_project="$(spaceship::upsearch Dockerfile docker-compose.yml .devcontainer/Dockerfile)"
-  [[ "$compose_exists" == true || -n "$is_docker_project" || -f /.dockerenv || -n $docker_context ]] || return
+  local is_docker_project="$(spaceship::upsearch Dockerfile .devcontainer/Dockerfile docker-compose.y*ml)"
+  [[ -n "$is_docker_project" || -f /.dockerenv || -n "$docker_context" ]] || return
 
   # if docker daemon isn't running you'll get an error saying it can't connect
   # Note: Declaration and assignment is separated for correctly getting the exit code

package/sections/docker_compose.zsh

@@ -0,0 +1,69 @@
+#
+# Docker Compose
+#
+# Compose is a tool for defining and running multi-container Docker applications.
+# Link: https://docs.docker.com/compose/
+
+# ------------------------------------------------------------------------------
+# Configuration
+# ------------------------------------------------------------------------------
+
+SPACESHIP_DOCKER_COMPOSE_SHOW="${SPACESHIP_DOCKER_COMPOSE_SHOW=true}"
+SPACESHIP_DOCKER_COMPOSE_ASYNC="${SPACESHIP_DOCKER_COMPOSE_ASYNC=true}"
+SPACESHIP_DOCKER_COMPOSE_PREFIX="${SPACESHIP_DOCKER_COMPOSE_PREFIX="runs "}"
+SPACESHIP_DOCKER_COMPOSE_SUFFIX="${SPACESHIP_DOCKER_COMPOSE_SUFFIX="$SPACESHIP_PROMPT_DEFAULT_SUFFIX"}"
+SPACESHIP_DOCKER_COMPOSE_SYMBOL="${SPACESHIP_DOCKER_COMPOSE_SYMBOL="🐙 "}"
+SPACESHIP_DOCKER_COMPOSE_COLOR="${SPACESHIP_DOCKER_COMPOSE_COLOR="cyan"}"
+SPACESHIP_DOCKER_COMPOSE_COLOR_UP="${SPACESHIP_DOCKER_COMPOSE_COLOR_UP="green"}"
+SPACESHIP_DOCKER_COMPOSE_COLOR_DOWN="${SPACESHIP_DOCKER_COMPOSE_COLOR_DOWN="red"}"
+SPACESHIP_DOCKER_COMPOSE_COLOR_PAUSED="${SPACESHIP_DOCKER_COMPOSE_COLOR_PAUSED="yellow"}"
+
+# ------------------------------------------------------------------------------
+# Utils
+# ------------------------------------------------------------------------------
+
+spaceship_docker_compose::paint() {
+  local color="$1" text="$2"
+  echo -n "%{%F{$color}%}$text%{%f%}"
+}
+
+# ------------------------------------------------------------------------------
+# Section
+# ------------------------------------------------------------------------------
+
+spaceship_docker_compose() {
+  [[ $SPACESHIP_DOCKER_COMPOSE_SHOW == false ]] && return
+
+  spaceship::exists docker-compose || return
+  spaceship::upsearch -s docker-compose.y*ml || return
+
+  local containers="$(docker-compose ps 2>/dev/null | tail -n+2)"
+  [[ -n "$containers" ]] || return
+
+  local statuses=""
+
+  while IFS= read -r line; do
+    local letter_position=$(echo $line | awk 'match($0,"_"){print RSTART}')
+    local letter=$(echo ${line:$letter:1} | tr '[:lower:]' '[:upper:]')
+    local color=""
+    [[ -z "$letter" ]] && continue
+
+    if [[ "$line" == *"Up"* ]] || [[ "$line" == *"running"* ]]; then
+      color="$SPACESHIP_DOCKER_COMPOSE_COLOR_UP"
+    elif [[ "$line" == *"Paused"* ]] || [[ "$line" == *"paused"* ]]; then
+      color="$SPACESHIP_DOCKER_COMPOSE_COLOR_PAUSED"
+    else
+      color="$SPACESHIP_DOCKER_COMPOSE_COLOR_DOWN"
+    fi
+
+    statuses+="$(spaceship_docker_compose::paint $color $letter)"
+  done <<< "$containers"
+
+  spaceship::section \
+    --color "$SPACESHIP_DOCKER_COMPOSE_COLOR" \
+    --prefix "$SPACESHIP_DOCKER_COMPOSE_PREFIX" \
+    --suffix "$SPACESHIP_DOCKER_COMPOSE_SUFFIX" \
+    --symbol "$SPACESHIP_DOCKER_COMPOSE_SYMBOL" \
+    "$statuses"
+}
+

package/sections/haskell.zsh

@@ -1,5 +1,5 @@
 #
-# Haskell Stack
+# Haskell
 #
 # An advanced, purely functional programming language.
 # Link: https://www.haskell.org/
@@ -25,12 +25,18 @@ spaceship_haskell() {
 
   # If there are stack files in the context
   local is_haskell_project=$(spaceship::upsearch stack.yaml)
-  [[ -n "$is_haskell_project" || -n *.hs(#qN^/) ]] || return
-
-  # The command is stack, so do not change this to haskell.
-  spaceship::exists stack || return
-
-  local haskell_version=$(stack ghc -- --numeric-version --no-install-ghc)
+  [[ -n "$is_haskell_project" || -n *.hs(#qN^/) || -n *.cabal(#qN) ]] || return
+
+  local haskell_version
+
+  # Extracting Haskell version
+  if spaceship::exists cabal; then
+    haskell_version=$(ghc -- --numeric-version --no-install-ghc)
+  elif spaceship::exists stack; then
+    haskell_version=$(stack ghc -- --numeric-version --no-install-ghc)
+  else
+    return
+  fi
 
   spaceship::section \
     --color "$SPACESHIP_HASKELL_COLOR" \

package/sections/perl.zsh

@@ -28,7 +28,7 @@ spaceship_perl() {
   spaceship::exists perl || return
 
   # Show only if perl files or composer.json exist in current directory
-  local is_perl_project="$(spaceship::upsearch META.json META.yml META.yaml .perl-version cpanfile)"
+  local is_perl_project="$(spaceship::upsearch META.{json,yml,yaml} .perl-version cpanfile)"
   [[ -n "$is_perl_project" || -n *.pl(#qN^/) || -n *.pm(#qN^/)  ]] || return
 
   local perl_version=$(perl -v 2>&1 | awk '/This/ {print $9}' | sed -r 's/[(v]+//g;s/[)]//g')

package/sections/pulumi.zsh

@@ -0,0 +1,43 @@
+#
+# Pulumi
+#
+# Pulumi automates the repetitive tasks of setting up cloud resources
+# Link: https://www.pulumi.com/
+#
+# This section shows you the current stack and number of resources
+# Link: https://www.pulumi.com/docs/intro/concepts/stack/
+
+# ------------------------------------------------------------------------------
+# Configuration
+# ------------------------------------------------------------------------------
+
+SPACESHIP_PULUMI_SHOW="${SPACESHIP_PULUMI_SHOW=true}"
+SPACESHIP_PULUMI_ASYNC="${SPACESHIP_PULUMI_ASYNC=true}"
+SPACESHIP_PULUMI_PREFIX="${SPACESHIP_PULUMI_PREFIX="$SPACESHIP_PROMPT_DEFAULT_PREFIX"}"
+SPACESHIP_PULUMI_SUFFIX="${SPACESHIP_PULUMI_SUFFIX="$SPACESHIP_PROMPT_DEFAULT_SUFFIX"}"
+SPACESHIP_PULUMI_SYMBOL="${SPACESHIP_PULUMI_SYMBOL=" "}"
+SPACESHIP_PULUMI_COLOR="${SPACESHIP_PULUMI_COLOR="133"}"
+
+# ------------------------------------------------------------------------------
+# Section
+# ----------------------------------------------- -------------------------------
+
+spaceship_pulumi() {
+  [[ $SPACESHIP_PULUMI_SHOW == false ]] && return
+
+  spaceship::exists pulumi || return
+
+  # Show PULUMI Stack when exists
+  local pulumi_project=$(spaceship::upsearch Pulumi.y*ml)
+  [[ -n "$pulumi_project" || -d .pulumi/stacks ]] || return
+
+  local pulumi_stack=$(pulumi stack ls 2>/dev/null | sed -n -e '2p' | cut -f1 -d" " | sed s/\*//)
+  [[ -z $pulumi_stack ]] && return
+
+  spaceship::section \
+    --color "$SPACESHIP_PULUMI_COLOR" \
+    --prefix "$SPACESHIP_PULUMI_PREFIX" \
+    --suffix "$SPACESHIP_PULUMI_SUFFIX" \
+    --symbol "$SPACESHIP_PULUMI_SYMBOL" \
+    "$pulumi_stack"
+}

package/spaceship.zsh

@@ -8,7 +8,7 @@
 
 # Current version of Spaceship
 # Useful for issue reporting
-export SPACESHIP_VERSION='4.8.0'
+export SPACESHIP_VERSION='4.9.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)
@@ -40,51 +40,54 @@ fi
 
 if [ -z "$SPACESHIP_PROMPT_ORDER" ]; then
   SPACESHIP_PROMPT_ORDER=(
-    time          # Time stamps section
-    user          # Username section
-    dir           # Current directory section
-    host          # Hostname section
-    git           # Git section (git_branch + git_status)
-    hg            # Mercurial section (hg_branch  + hg_status)
-    package       # Package version
-    node          # Node.js section
-    bun           # Bun section
-    deno          # Deno section
-    ruby          # Ruby section
-    python        # Python section
-    elm           # Elm section
-    elixir        # Elixir section
-    xcode         # Xcode section
-    swift         # Swift section
-    golang        # Go section
-    perl          # Perl section
-    php           # PHP section
-    rust          # Rust section
-    haskell       # Haskell Stack section
-    scala         # Scala section
-    java          # Java section
-    lua           # Lua section
-    dart          # Dart section
-    julia         # Julia section
-    crystal       # Crystal section
-    docker        # Docker section
-    aws           # Amazon Web Services section
-    gcloud        # Google Cloud Platform section
-    venv          # virtualenv section
-    conda         # conda virtualenv section
-    dotnet        # .NET section
-    ocaml         # OCaml section
-    kubectl       # Kubectl context section
-    terraform     # Terraform workspace section
-    ibmcloud      # IBM Cloud section
-    nix_shell     # Nix shell
-    exec_time     # Execution time
-    async         # Async jobs indicator
-    line_sep      # Line break
-    battery       # Battery level and status
-    jobs          # Background jobs indicator
-    exit_code     # Exit code section
-    char          # Prompt character
+    time           # Time stamps section
+    user           # Username section
+    dir            # Current directory section
+    host           # Hostname section
+    git            # Git section (git_branch + git_status)
+    hg             # Mercurial section (hg_branch  + hg_status)
+    package        # Package version
+    node           # Node.js section
+    bun            # Bun section
+    deno           # Deno section
+    ruby           # Ruby section
+    python         # Python section
+    elm            # Elm section
+    elixir         # Elixir section
+    xcode          # Xcode section
+    swift          # Swift section
+    golang         # Go section
+    perl           # Perl section
+    php            # PHP section
+    rust           # Rust section
+    haskell        # Haskell Stack section
+    scala          # Scala section
+    java           # Java section
+    lua            # Lua section
+    dart           # Dart section
+    julia          # Julia section
+    crystal        # Crystal section
+    docker         # Docker section
+    docker_compose # Docker section
+    aws            # Amazon Web Services section
+    gcloud         # Google Cloud Platform section
+    venv           # virtualenv section
+    conda          # conda virtualenv section
+    dotnet         # .NET section
+    ocaml          # OCaml section
+    kubectl        # Kubectl context section
+    ansible        # Ansible section
+    terraform      # Terraform workspace section
+    pulumi         # Pulumi stack section
+    ibmcloud       # IBM Cloud section
+    nix_shell      # Nix shell
+    exec_time      # Execution time
+    async          # Async jobs indicator
+    line_sep       # Line break
+    battery        # Battery level and status
+    jobs           # Background jobs indicator
+    exit_code      # Exit code section
+    char           # Prompt character
   )
 fi