spaceship-prompt 4.3.3 → 4.4.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [4.4.1](https://github.com/spaceship-prompt/spaceship-prompt/compare/v4.4.0...v4.4.1) (2022-09-21)
+
+
+### Bug Fixes
+
+* fix grep unknown option: --color ([#1206](https://github.com/spaceship-prompt/spaceship-prompt/issues/1206)) ([540a17a](https://github.com/spaceship-prompt/spaceship-prompt/commit/540a17a37a2199a3faa4987564a6485b63582fef)), closes [#1066](https://github.com/spaceship-prompt/spaceship-prompt/issues/1066)
+
+# [4.4.0](https://github.com/spaceship-prompt/spaceship-prompt/compare/v4.3.3...v4.4.0) (2022-09-21)
+
+
+### Features
+
+* make package section to support maven and gradle ([#1209](https://github.com/spaceship-prompt/spaceship-prompt/issues/1209)) ([c8b6ce7](https://github.com/spaceship-prompt/spaceship-prompt/commit/c8b6ce7ade1a3176353d6ba46faa37db7e05e709))
+
 ## [4.3.3](https://github.com/spaceship-prompt/spaceship-prompt/compare/v4.3.2...v4.3.3) (2022-09-21)
 
 

package/lib/utils.zsh

@@ -232,3 +232,14 @@ spaceship::datafile() {
   # todo: grep by regexp?
   return 1
 }
+
+# grep with --color=never or not
+# USAGE:
+#   spaceship::grep [options] [pattern] [file ...]
+spaceship::grep() {
+  local GREP_OPTIONS=""
+  if command grep --color=never "" &>/dev/null <<< ""; then
+    GREP_OPTIONS="--color=never"
+  fi
+  command grep $GREP_OPTIONS "$@"
+}

package/package.json

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

package/sections/elixir.zsh

@@ -39,7 +39,7 @@ spaceship_elixir() {
 
   if [[ $elixir_version == "" ]]; then
     spaceship::exists elixir || return
-    elixir_version=$(elixir -v 2>/dev/null | grep "Elixir" --color=never | cut -d ' ' -f 2)
+    elixir_version=$(elixir -v 2>/dev/null | spaceship::grep "Elixir" | cut -d ' ' -f 2)
   fi
 
   [[ $elixir_version == "system" ]] && return

package/sections/julia.zsh

@@ -29,7 +29,7 @@ spaceship_julia() {
 
   spaceship::exists julia || return
 
-  local julia_version=$(julia --version | grep --color=never -oE '[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]')
+  local julia_version=$(julia --version | spaceship::grep -oE '[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]')
 
   spaceship::section \
     --color "$SPACESHIP_JULIA_COLOR" \

package/sections/package.zsh

@@ -22,7 +22,7 @@ SPACESHIP_PACKAGE_SYMBOL="${SPACESHIP_PACKAGE_SYMBOL="📦 "}"
 SPACESHIP_PACKAGE_COLOR="${SPACESHIP_PACKAGE_COLOR="red"}"
 
 if [ -z "$SPACESHIP_PACKAGE_ORDER" ]; then
-  SPACESHIP_PACKAGE_ORDER=(npm lerna cargo composer julia)
+  SPACESHIP_PACKAGE_ORDER=(npm lerna cargo composer julia maven gradle)
 fi
 
 # ------------------------------------------------------------------------------
@@ -89,6 +89,24 @@ spaceship_package::julia() {
   spaceship::datafile --toml $project_toml "version"
 }
 
+spaceship_package::maven() {
+
+  spaceship::upsearch -s pom.xml || return
+
+  local maven_exe=$(spaceship::upsearch mvnw) || (spaceship::exists mvn && maven_exe="mvn") || return
+
+  $maven_exe help:evaluate -q -DforceStdout -D"expression=project.version" 2>/dev/null
+}
+
+spaceship_package::gradle() {
+
+  spaceship::upsearch -s settings.gradle settings.gradle.kts || return
+
+  local gradle_exe=$(spaceship::upsearch gradlew) || (spaceship::exists gradle && gradle_exe="gradle") || return
+
+  $gradle_exe properties --no-daemon --console=plain -q 2>/dev/null | grep "^version:" | awk '{printf $2}'
+}
+
 # ------------------------------------------------------------------------------
 # Section
 # ------------------------------------------------------------------------------

package/sections/php.zsh

@@ -29,7 +29,7 @@ spaceship_php() {
 
   spaceship::exists php || return
 
-  local php_version=$(php -v 2>&1 | \grep --color=never -oe "^PHP\s*[0-9.]\+" | awk '{print $2}')
+  local php_version=$(php -v 2>&1 | spaceship::grep -oe "^PHP\s*[0-9.]\+" | awk '{print $2}')
 
   spaceship::section \
     --color "$SPACESHIP_PHP_COLOR" \

package/spaceship.zsh

@@ -7,7 +7,7 @@
 
 # Current version of Spaceship
 # Useful for issue reporting
-export SPACESHIP_VERSION='4.3.3'
+export SPACESHIP_VERSION='4.4.1'
 
 # Determination of Spaceship working directory
 # https://git.io/vdBH7