Update prompt and tests

.github/workflows/ci.yml

@@ -4,14 +4,13 @@ on: [push, pull_request]
 
 jobs:
   bats:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: true
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
         bundler-cache: true
     - run: test/ci.sh
   spellr:
@@ -20,6 +19,5 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
         bundler-cache: true
     - run: bundle exec spellr

.ruby-version

@@ -1 +1 @@
-3.1.1
+3.2.2

.spellr_wordlists/english.txt

@@ -138,6 +138,7 @@ libffi
 localhost
 lsof
 lvh
+macos
 mailmap
 makefile
 marketfacer

Gemfile.lock

@@ -1,10 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    fast_ignore (0.15.2)
-    parallel (1.21.0)
-    spellr (0.9.1)
+    fast_ignore (0.17.4)
+    jaro_winkler (1.5.6)
+    parallel (1.23.0)
+    spellr (0.11.0)
       fast_ignore (>= 0.11.0)
+      jaro_winkler
       parallel (~> 1.0)
 
 PLATFORMS

bash_profile

@@ -61,4 +61,4 @@ if [ -f /usr/local/bin/direnv ]; then
 fi
 
 export PS2="\[$C_PINK\]» \[$C_RESET\]"
-export PS1="\[\$(last_command_style)\]\[$C_PINK\]\w\[$C_LIGHT_PINK\]\$(version_prompt)\[\$(git_status_color)\]\$(git_prompt_current_ref :)$PS2"
+export PS1="\$(last_command_style)$C_PINK\w\$(prompt_version)\$(prompt_git)$PS2"

bashrc

@@ -1,7 +1,7 @@
 source ~/.dotfiles/functions/bash_support.sh
 source ~/.dotfiles/functions/git_support.sh
 export PS2="\[$C_PINK\]» \[$C_RESET\]"
-export PS1="\[\$(last_command_style)\]\[$C_PINK\]\w\[$C_LIGHT_PINK\]\$(ruby_version_prompt)\[\$(git_status_color)\]\$(git_prompt_current_ref :)$PS2"
+export PS1="\$(last_command_style)$C_PINK\w\$(prompt_version)\$(prompt_git)$PS2"
 
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm

functions/bash_support.sh

@@ -156,25 +156,27 @@ function check_untested_bash_profile {
   fi
 }
 
-function version_prompt {
-  ruby_version=$(ruby_version_prompt)
-  node_version=$(node_version_prompt)
+function prompt_version {
+  ruby_version="$(prompt_ruby_version | cut -d. -f1,2)"
+  node_version="$(prompt_node_version | cut -d. -f1,2)"
   if [[ ! -z "$ruby_version" ]] && [[ ! -z "$node_version" ]]; then
-    echo "{$ruby_version,$node_version}"
-  elif [[ ! -z "$ruby_version" ]] || [[ ! -z "$node_version" ]]; then
-    echo "{$ruby_version$node_version}"
+    echo -ne "$C_LIGHT_PINK{r$ruby_version,n$node_version}"
+  elif [[ ! -z "$ruby_version" ]]; then
+    echo -ne "$C_LIGHT_PINK{r$ruby_version}"
+  elif [[ ! -z "$ruby_version" ]]; then
+    echo -ne "$C_LIGHT_PINK{n$node_version}"
   fi
 }
 
-function ruby_version_prompt {
+function prompt_ruby_version {
   if [ -f Gemfile ]; then
-    echo "r$(ruby --version | cut -d' ' -f 2 | cut -dp -f1 | cut -d. -f1,2 )"
+    ruby --version | cut -d' ' -f 2 | cut -dp -f1
   fi
 }
 
-function node_version_prompt {
+function prompt_node_version {
   if [ -f package.json ]; then
-    echo "n$(nvm current | colrm 1 1 | cut -d. -f1,2 )"
+    nvm current | colrm 1 1 | cut -d. -f1,2
   fi
 }
 

functions/git_support.sh

@@ -289,24 +289,38 @@ function git_current_branch() {
 }
 
 function git_branch_name() {
-  ref=$(git rev-parse --symbolic-full-name --abbrev-ref "$1")
+  ref=$(git rev-parse --symbolic-full-name --abbrev-ref "$1" 2>/dev/null)
   [[ -z "$ref" ]] && echo "$1" || echo "$ref"
 }
 
 # TODO: test
-function git_prompt_current_ref() {
-  local ref
-  ref=$(git_current_branch)
-  if [[ $ref == 'HEAD' ]]; then
-    ref=$(git branch --format='%(refname:short)' --sort=-committerdate --contains HEAD 2>/dev/null | head -n 1)
-    local subref="$(git rev-parse --short HEAD 2>/dev/null)"
-
-    if [[ ! -z $subref ]]; then
-      ref="$ref[$subref]"
+function prompt_git() {
+  if git rev-parse --is-inside-work-tree >/dev/null 2>/dev/null; then
+    local ref
+    local color
+
+    if git_status_clean; then
+      if git_head_pushed; then
+        color="$C_AQUA"
+      else
+        color="$C_GREEN"
+      fi
+    else
+      color="$C_YELLOW"
+    fi
+
+    ref=$(git_current_branch 2>/dev/null)
+    if [[ $ref == 'HEAD' ]]; then
+      ref=$(git branch --format='%(refname:short)' --sort=-committerdate --contains HEAD 2>/dev/null | head -n 1)
+      local subref="$(git rev-parse --short HEAD 2>/dev/null)"
+
+      if [[ ! -z $subref ]]; then
+        ref="$ref[$subref]"
+      fi
     fi
-  fi
 
-  [[ ! -z $ref ]] && echo "$1$ref"
+    echo -ne "$color:$ref"
+  fi
 }
 
 function git_current_repo() {
@@ -569,18 +583,6 @@ function git_head_pushed() {
   fi
 }
 
-function git_status_color() {
-  if git_status_clean; then
-    if git_head_pushed; then
-      echo -en "$C_AQUA"
-    else
-      echo -en "$C_GREEN"
-    fi
-  else
-    echo -en "$C_YELLOW"
-  fi
-}
-
 function git_changed_files_after_merge() {
   git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD
 }