feature single line prompt

README.md

@@ -107,6 +107,7 @@ or changing the defaults in your `config.fish`:
 | **`pure_show_system_time`**                    | `false` | `true`: shows system time before the prompt symbol (as `%H:%M:%S`).                             |
 | **`pure_threshold_command_duration`**          | `5`     | Show command duration when above this value (seconds).                                          |
 | **`pure_show_prefix_root_prompt`**             | `false` | `true`: shows prompt prefix when logged in as `root`.                                           |
+| **`pure_enable_single_line_prompt`**                        | `false` | `true`: Compact prompt as a single line |
 
 ### Colors
 

conf.d/pure.fish

@@ -1,4 +1,4 @@
-set --global pure_version 3.4.2 # used for bug report
+set --global pure_version 3.5.0 # used for bug report
 
 # Base colors
 _pure_set_default pure_color_primary blue
@@ -79,3 +79,6 @@ _pure_set_default pure_check_for_new_release false
 _pure_set_default pure_show_prefix_root_prompt false
 _pure_set_default pure_symbol_prefix_root_prompt "#"
 _pure_set_default pure_color_prefix_root_prompt pure_color_danger
+
+# Compact mode
+_pure_set_default pure_enable_single_line_prompt false

functions/_pure_check_for_new_release.fish

@@ -6,7 +6,7 @@ function _pure_check_for_new_release \
         set latest (pure_get_latest_release_version "rafaelrinaldi/pure")
 
         if test "v"$pure_version != $latest
-            set --local latest_version (_pure_set_color $pure_color_info)$latest(_pure_set_color pure_color_normal)
+            set --local latest_version (_pure_set_color $pure_color_info)$latest(_pure_set_color $pure_color_normal)
             echo -e "🔔 New version available!\n"
             echo -e (_pure_set_color $pure_color_success)"fisher install rafaelrinaldi/pure@$latest_version\n"
         end

functions/_pure_is_single_line_prompt.fish

@@ -0,0 +1,5 @@
+function _pure_is_single_line_prompt \
+    --description 'Test if single line prompt feature is enabled'
+    set --query pure_enable_single_line_prompt
+    and test $pure_enable_single_line_prompt = true
+end

functions/_pure_prefix_root_prompt.fish

@@ -1,8 +1,8 @@
 function _pure_prefix_root_prompt
     set --local username (id -u -n) # current user name
-    set --local prefix_root_prompt ''
+    set --local prefix_root_prompt
 
-    if test $pure_show_prefix_root_prompt = true -a "$username" = "root"
+    if set --query pure_show_prefix_root_prompt; and test $pure_show_prefix_root_prompt = true -a "$username" = "root"
         set --local prefix_color (_pure_set_color $pure_color_prefix_root_prompt)
         set prefix_root_prompt "$prefix_color$pure_symbol_prefix_root_prompt"
     end

functions/_pure_print_prompt_rows.fish

@@ -0,0 +1,10 @@
+function _pure_print_prompt_rows \
+    --description "Manage default vs. compact prompt"
+
+    # print current path, git branch/status, command duration
+    if _pure_is_single_line_prompt
+        echo -e -n (_pure_prompt_first_line)
+    else
+        echo -e (_pure_prompt_first_line)
+    end
+end

functions/_pure_prompt.fish

@@ -8,6 +8,19 @@ function _pure_prompt \
     set --local pure_symbol (_pure_prompt_symbol $exit_code)
     set --local system_time (_pure_prompt_system_time)
     set --local root_prefix (_pure_prefix_root_prompt)
+    set --local space
+    if _pure_is_single_line_prompt
+        set space ' '
+    end
 
-    echo (_pure_print_prompt $system_time $root_prefix $jobs $virtualenv $vimode_indicator $pure_symbol)
+    echo (\
+        _pure_print_prompt \
+        $system_time \
+        $root_prefix \
+        $jobs \
+        $virtualenv \
+        $vimode_indicator \
+        $space \
+        $pure_symbol \
+    )
 end

functions/_pure_prompt_first_line.fish

@@ -1,8 +1,10 @@
+set --global FAILURE 1
+
 function _pure_prompt_first_line \
     --description 'Print contextual information before prompt.'
 
-    if not type -fq git  # exit if git is not available
-        return 1
+    if not type --quiet --no-functions git  # exit if git is not available
+        return $FAILURE
     end
 
     set --local prompt_ssh (_pure_prompt_ssh)
@@ -17,7 +19,7 @@ function _pure_prompt_first_line \
     set --local current_folder (_pure_prompt_current_folder $prompt_width)
 
     set --local prompt_components
-    if test $pure_begin_prompt_with_current_directory = true
+    if set --query pure_begin_prompt_with_current_directory; and test $pure_begin_prompt_with_current_directory = true
         set prompt_components \
                 $current_folder \
                 $prompt_git \

functions/_pure_prompt_git.fish

@@ -1,7 +1,7 @@
 function _pure_prompt_git \
     --description 'Print git repository informations: branch name, dirty, upstream ahead/behind'
 
-    if test $pure_enable_git != true
+    if set --query pure_enable_git; and test $pure_enable_git != true
         return
     end
 

functions/_pure_prompt_jobs.fish

@@ -1,5 +1,5 @@
 function _pure_prompt_jobs --description "Display number of running jobs"
-    if test $pure_show_jobs = true
+    if set --query pure_show_jobs; and test $pure_show_jobs = true
         set --local njobs (count (jobs -p))
         set --local jobs_color (_pure_set_color $pure_color_jobs)
         if test $njobs -gt 0

functions/_pure_prompt_new_line.fish

@@ -3,7 +3,7 @@ function _pure_prompt_new_line \
     --on-event fish_prompt
 
     set --local new_line
-    if test $_pure_fresh_session = false
+    if not _pure_is_single_line_prompt; and test $_pure_fresh_session = false
         set new_line "\n"
     end
 

functions/_pure_prompt_symbol.fish

@@ -8,10 +8,10 @@ function _pure_prompt_symbol \
     set --local command_succeed 0
 
     set --local symbol_color $symbol_color_success # default pure symbol color
-    if test $exit_code -ne $command_succeed
+    if set --query exit_code; and test $exit_code -ne $command_succeed
         set symbol_color $symbol_color_error # different pure symbol color when previous command failed
 
-        if test "$pure_separate_prompt_on_error" = true
+        if set --query pure_separate_prompt_on_error; and test $pure_separate_prompt_on_error = true
             set symbol_color "$symbol_color_error$prompt_symbol$symbol_color_success"
         end
     end

functions/_pure_prompt_system_time.fish

@@ -1,5 +1,5 @@
 function _pure_prompt_system_time --description "Display system time"
-    if test $pure_show_system_time = true
+    if set --query pure_show_system_time; and test $pure_show_system_time = true
         set --local time_color (_pure_set_color $pure_color_system_time)
         echo "$time_color"(date '+%T')
     end

functions/_pure_prompt_vimode.fish

@@ -1,5 +1,5 @@
 function _pure_prompt_vimode
-    if test $pure_reverse_prompt_symbol_in_vimode = false
+    if set --query pure_reverse_prompt_symbol_in_vimode; and test $pure_reverse_prompt_symbol_in_vimode = false
       echo (fish_default_mode_prompt)
     end
 end

functions/_pure_set_default.fish

@@ -2,7 +2,10 @@ function _pure_set_default \
     --description 'Set default value for configuration variable' \
     --argument-names var default
 
-    if  not set --query --universal $var; or test -z $$var; and not set --query --global $var
-        set --universal $var $default
+    set is_available_universally (not set --query --universal $var; or test -z $$var; echo $status)
+    set is_available_globally (not set --query --global $var; or test -z $$var; echo $status)
+
+    if test $is_available_universally -eq 0 -a $is_available_globally -eq 0
+        set --universal $var "$default"
     end
 end

functions/fish_prompt.fish

@@ -1,8 +1,9 @@
+# a called to `_pure_prompt_new_line` is triggered by an event
 function fish_prompt
     set --local exit_code $status  # save previous exit code
 
     echo -e -n (_pure_prompt_beginning)  # init prompt context (clear current line, etc.)
-    echo -e (_pure_prompt_first_line)  # print current path, git branch/status, command duration
+    _pure_print_prompt_rows # manage default vs. compact prompt
     _pure_place_iterm2_prompt_mark # place iTerm shell integration mark
     echo -e -n (_pure_prompt $exit_code)  # print prompt
     echo -e (_pure_prompt_ending)  # reset colors and end prompt

functions/fish_title.fish

@@ -2,7 +2,7 @@ function fish_title \
     --description "Set title to current folder and shell name" \
     --argument-names last_command
 
-    set --local basename (string replace -r '^.*/' '' -- $PWD)
+    set --local basename (string replace --regex '^.*/' '' -- $PWD)
     set --local current_folder (_pure_parse_directory)
     set --local current_command (status current-command 2>/dev/null; or echo $_)
 

makefile

@@ -16,6 +16,7 @@ usage:
 .PHONY: build-pure-on
 build-pure-on:
 	docker build \
+        --quiet \
 		--file ./Dockerfile \
 		--build-arg FISH_VERSION=${FISH_VERSION} \
 		--tag=pure-on-fish-${FISH_VERSION} \
@@ -25,6 +26,7 @@ build-pure-on:
 dev-pure-on: CMD?=fish
 dev-pure-on:
 	docker run \
+        --quiet \
 		--name run-pure-on-${FISH_VERSION} \
 		--rm \
 		--interactive \

tests/_pure.test.fish

@@ -1,7 +1,13 @@
 source $current_dirname/fixtures/constants.fish
 source $current_dirname/../functions/_pure_set_default.fish
+@mesg (_print_filename $current_filename)
 
 
+function setup
+    _purge_configs
+    _disable_colors
+end
+
 @test "configure: pure_version"  (
     set --erase pure_version
     source $current_dirname/../conf.d/pure.fish
@@ -271,3 +277,10 @@ source $current_dirname/../functions/_pure_set_default.fish
     source $current_dirname/../conf.d/pure.fish
     echo $pure_color_prefix_root_prompt
 ) = pure_color_danger
+
+@test "configure: pure_enable_single_line_prompt" (
+    set --erase pure_enable_single_line_prompt
+    source $current_dirname/../conf.d/pure.fish
+    echo $pure_enable_single_line_prompt
+) = false
+

tests/_pure_check_for_new_release.test.fish

@@ -1,27 +1,31 @@
 source $current_dirname/fixtures/constants.fish
 source $current_dirname/../functions/_pure_check_for_new_release.fish
+@mesg (_print_filename $current_filename)
 
 
-function _pure_set_color; echo $EMPTY; end # drop coloring during test
+function setup
+    _purge_configs
+    _disable_colors
+end
 
 @test "_pure_check_for_new_release: is disabled" (
-    set --global pure_check_for_new_release false
+    set --universal pure_check_for_new_release false
 
     _pure_check_for_new_release
 ) $status -eq $SUCCESS
 
 
 @test "_pure_check_for_new_release: nothing when same as latest" (
-    set --global pure_check_for_new_release true
-    set --global pure_version 0.0.1
+    set --universal pure_check_for_new_release true
+    set --universal pure_version 0.0.1
     function curl; echo '"tag_name": "v0.0.1",'; end # mock
 
     _pure_check_for_new_release
 ) = '🛈 Checking for new release…'
 
 @test "_pure_check_for_new_release: show fisher command to install when enable" (
-    set --global pure_check_for_new_release true
-    set --global pure_version 0.0.1
+    set --universal pure_check_for_new_release true
+    set --universal pure_version 0.0.1
     function curl; echo '"tag_name": "v9.9.9",'; end # mock
 
     set output (_pure_check_for_new_release 2>&1)

tests/_pure_format_time.test.fish

@@ -1,9 +1,16 @@
 source $current_dirname/fixtures/constants.fish
 source $current_dirname/../functions/_pure_format_time.fish
+@mesg (_print_filename $current_filename)
 
 
+function setup
+    _purge_configs
+    _disable_colors
+end
+
 set --local threshold 0 # in seconds
 
+
 @test "_pure_format_time: throws error on negative time" (
     set --local negative_duration -1
     _pure_format_time $negative_duration $threshold

tests/_pure_get_prompt_symbol.test.fish

@@ -1,64 +1,69 @@
+source $current_dirname/fixtures/constants.fish
 source $current_dirname/../functions/_pure_get_prompt_symbol.fish
+@mesg (_print_filename $current_filename)
 
 
 function setup
-    set --global pure_symbol_prompt '❯'
-    set --global pure_symbol_reverse_prompt '❮'
+    _purge_configs
+    _disable_colors
+    set --universal pure_symbol_prompt '❯'
+    set --universal pure_symbol_reverse_prompt '❮'
 end
 
 function teardown
     set fish_key_bindings fish_default_key_bindings
     set fish_bind_mode 'default'
 end
 
+
 @test "_pure_get_prompt_symbol: get default symbol ❯" (
-    set pure_reverse_prompt_symbol_in_vimode false
+    set --universal pure_reverse_prompt_symbol_in_vimode false
 
     _pure_get_prompt_symbol
 ) = '❯'
 
 @test "_pure_get_prompt_symbol: get default symbol ❯ when key binding is default" (
-    set pure_reverse_prompt_symbol_in_vimode true
+    set --universal pure_reverse_prompt_symbol_in_vimode true
     set fish_bind_mode 'insert'
     set fish_key_bindings 'fish_default_key_bindings'
 
     _pure_get_prompt_symbol
 ) = '❯'
 
 @test "_pure_get_prompt_symbol: get default symbol ❯ when bind mode is default" (
-    set pure_reverse_prompt_symbol_in_vimode true
+    set --universal pure_reverse_prompt_symbol_in_vimode true
     set fish_key_bindings 'fish_default_key_bindings'
     set fish_bind_mode 'default'
 
     _pure_get_prompt_symbol
 ) = '❯'
 
 @test "_pure_get_prompt_symbol: get default symbol ❯ when VI key binding and in insert mode" (
-    set pure_reverse_prompt_symbol_in_vimode true
+    set --universal pure_reverse_prompt_symbol_in_vimode true
     set fish_bind_mode 'insert'
     set fish_key_bindings 'fish_vi_key_bindings'
 
     _pure_get_prompt_symbol
 ) = '❯'
 
 @test "_pure_get_prompt_symbol: get default symbol ❯ when VI key binding and in replace mode" (
-    set pure_reverse_prompt_symbol_in_vimode true
+    set --universal pure_reverse_prompt_symbol_in_vimode true
     set fish_bind_mode 'replace'
     set fish_key_bindings 'fish_vi_key_bindings'
 
     _pure_get_prompt_symbol
 ) = '❯'
 
 @test "_pure_get_prompt_symbol: get reverse symbol ❮ when VI key binding and not in insert mode or replace mode" (
-    set pure_reverse_prompt_symbol_in_vimode true
+    set --universal pure_reverse_prompt_symbol_in_vimode true
     set fish_bind_mode 'default'
     set fish_key_bindings 'fish_vi_key_bindings'
 
     _pure_get_prompt_symbol
 ) = '❮'
 
 @test "_pure_get_prompt_symbol: get reverse symbol ❮ when hybrid key binding and not in insert mode or replace mode" (
-    set pure_reverse_prompt_symbol_in_vimode true
+    set --universal pure_reverse_prompt_symbol_in_vimode true
     set fish_bind_mode 'default'
     set fish_key_bindings 'fish_hybrid_key_bindings'
 

tests/_pure_init.test.fish

@@ -1,4 +1,12 @@
 source $current_dirname/fixtures/constants.fish
+@mesg (_print_filename $current_filename)
+
+
+function setup
+    _purge_configs
+    _disable_colors
+end
+
 
 @test "init: _pure_fresh_session"  (
     set --erase _pure_fresh_session