pure-fish · edouard-lopez · Oct 6, 2022 · Jan 13, 2021 · Jan 13, 2021 · Jan 13, 2021
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,24 +17,11 @@ jobs:
     strategy:
       matrix:
         fish_version:
+          - "3.3.1"
           - "3.1.2"
-          - "3.1.0"
-          - "3.0.2"
     steps:
       - uses: actions/checkout@v2
       - run: make build-pure-on FISH_VERSION=${{ matrix.fish_version }}
+      - run: docker --version
       - run: make test-pure-on FISH_VERSION=${{ matrix.fish_version }}
 
-  test-macos:
-    name: Test on fish on MacOS
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install Fish
-        run: brew install fish
-      - name: Install Fisher > Fishtape > Pure
-        run: curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher jorgebucaran/fishtape ./
-        shell: fish {0}
-      - name: Test Pure
-        run: fishtape tests/*.test.fish
-        shell: fish {0}
diff --git a/README.md b/README.md
@@ -99,26 +99,26 @@ You can tweak `pure` behavior and color by changing [universal variables](https:
 
 > :warning: The absence of `$` sign is expected in `pure_` named colours.
 
-| Base Color               | Inherited by                                                                                                                                                                                                                  | Default   |
-| :----------------------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :-------- |
-| **`pure_color_danger`**  | **`pure_color_prompt_on_error`**                                                                                                                                                                                              | `red`     |
-| **`pure_color_dark`**    |                                                                                                                                                                                                                               | `black`   |
-| **`pure_color_info`**    | **`pure_color_git_unpulled_commits`**<br>**`pure_color_git_unpushed_commits`**                                                                                                                                                | `cyan`    |
-| **`pure_color_light`**   | **`pure_color_username_root`**                                                                                                                                                                                                | `white`   |
+| Base Color               | Inherited by                                                                                                                                                                                                        | Default   |
+| :----------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | :-------- |
+| **`pure_color_danger`**  | **`pure_color_prompt_on_error`**                                                                                                                                                                                    | `red`     |
+| **`pure_color_dark`**    |                                                                                                                                                                                                                     | `black`   |
+| **`pure_color_info`**    | **`pure_color_git_unpulled_commits`**<br>**`pure_color_git_unpushed_commits`**                                                                                                                                      | `cyan`    |
+| **`pure_color_light`**   | **`pure_color_username_root`**                                                                                                                                                                                      | `white`   |
 | **`pure_color_mute`**    | **`pure_color_git_branch`**<br>**`pure_color_git_dirty`**<br>**`pure_color_git_stash`**<br>**`pure_color_hostname`**<br>**`pure_color_at_sign`**<br>**`pure_color_username_normal`**<br>**`pure_color_virtualenv`** | `brblack` |
-| **`pure_color_normal`**  | **`pure_color_jobs`**                                                                                                                                                                                                         | `normal`  |
-| **`pure_color_primary`** | **`pure_color_current_directory`**                                                                                                                                                                                            | `blue`    |
-| **`pure_color_success`** | **`pure_color_prompt_on_success`**                                                                                                                                                                                            | `magenta` |
-| **`pure_color_warning`** | **`pure_color_command_duration`**                                                                                                                                                                                             | `yellow`  |
+| **`pure_color_normal`**  | **`pure_color_jobs`**                                                                                                                                                                                               | `normal`  |
+| **`pure_color_primary`** | **`pure_color_current_directory`**                                                                                                                                                                                  | `blue`    |
+| **`pure_color_success`** | **`pure_color_prompt_on_success`**                                                                                                                                                                                  | `magenta` |
+| **`pure_color_warning`** | **`pure_color_command_duration`**                                                                                                                                                                                   | `yellow`  |
 
 ## :+1:  Contribute
 
 > **requirements:** [`docker`](https://docs.docker.com/install/) (isolate from your environment)
 
 Specify the [`FISH_VERSION`][fish-releases] you want, and the `CMD` executed by the container:
 
-    make build-pure-on FISH_VERSION=3.1.2
-    make dev-pure-on FISH_VERSION=3.1.2 CMD="fishtape tests/*.test.fish"
+    make build-pure-on FISH_VERSION=3.3.1
+    make dev-pure-on FISH_VERSION=3.3.1 CMD="fishtape tests/*.test.fish"
 
 ## :man_technologist: Maintainer
 

diff --git a/conf.d/pure.fish b/conf.d/pure.fish
@@ -1,4 +1,4 @@
-set --global pure_version 4.1.1 # For bug report and tag-after-merge workflow
+set --global pure_version 4.1.2 # For bug report and tag-after-merge workflow
 
 # Base colors
 _pure_set_default pure_color_primary blue

diff --git a/functions/_pure_detect_container_by_cgroup_method.fish b/functions/_pure_detect_container_by_cgroup_method.fish
@@ -0,0 +1,11 @@
+function _pure_detect_container_by_cgroup_method \
+    --description "Linux method to detect container using cgroup. see https://stackoverflow.com/a/37015387/802365" \
+    --argument-names cgroup_namespace
+    set --query cgroup_namespace[1]; or set cgroup_namespace /proc/1/cgroup
+
+    # echo "cgroup_namespace: $cgroup_namespace"
+    string match \
+        --quiet \
+        --entire \
+        --regex '(lxc|docker)' <$cgroup_namespace
+end
diff --git a/functions/_pure_detect_container_by_pid_method.fish b/functions/_pure_detect_container_by_pid_method.fish
@@ -0,0 +1,11 @@
+function _pure_detect_container_by_pid_method \
+    --description "Linux method to detect container using /proc. see https://stackoverflow.com/a/37015387/802365"
+
+    set --query proc_sched[1]; or set proc_sched /proc/1/sched
+
+    head -n 1 $proc_sched \
+        | string match \
+        --quiet \
+        --invert \
+        --regex 'init|systemd'
+end
diff --git a/functions/_pure_is_inside_container.fish b/functions/_pure_is_inside_container.fish
@@ -2,13 +2,27 @@ function _pure_is_inside_container \
     --argument-names cgroup_namespace
     set --query cgroup_namespace[1]; or set cgroup_namespace /proc/1/cgroup
 
-    begin
-        test -r $cgroup_namespace
-        and string match \
-                --quiet \
-                --entire \
-                --regex '(lxc|docker)' \
-            <$cgroup_namespace
-    end
-    or test "$container" = "lxc"
+    function _pure_detect_container_by_pid_method # see https://stackoverflow.com/a/37015387/802365
+        head -n 1 /proc/1/sched \
+            | string match \
+            --quiet \
+            --invert \
+            --regex 'init|systemd'
+    end
+
+    set --local success 0
+    if test -n "$container"
+        return $success
+    end
+
+    if _pure_detect_container_by_pid_method
+        return $success
+    end
+
+    if _pure_detect_container_by_cgroup_method $cgroup_namespace
+        return $success
+    end
+
+    set --local failure 1
+    return $failure
 end
diff --git a/functions/_pure_print_prompt.fish b/functions/_pure_print_prompt.fish
@@ -1,4 +1,6 @@
-function _pure_print_prompt
+function _pure_print_prompt \
+    --description 'Concatenate parts single prompt string' \
+
     set --local prompt
 
     for prompt_part in $argv

diff --git a/functions/_pure_prompt.fish b/functions/_pure_prompt.fish
@@ -9,18 +9,19 @@ function _pure_prompt \
     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 \
-        $space \
-        $pure_symbol \
+            _pure_print_prompt \
+                $system_time \
+                $root_prefix \
+                $jobs \
+                $virtualenv \
+                $vimode_indicator \
+                $space \
+                $pure_symbol \
     )
 end
diff --git a/functions/_pure_prompt_container.fish b/functions/_pure_prompt_container.fish
@@ -1,4 +1,6 @@
 function _pure_prompt_container
+    _pure_is_inside_container
+    echo _pure_is_inside_container $status
     if _pure_is_inside_container
         echo (_pure_user_at_host)
     end

diff --git a/functions/_pure_prompt_vimode.fish b/functions/_pure_prompt_vimode.fish
@@ -1,5 +1,6 @@
 function _pure_prompt_vimode
-    if set --query pure_reverse_prompt_symbol_in_vimode; and test "$pure_reverse_prompt_symbol_in_vimode" = false
-      echo (fish_default_mode_prompt)
+    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
diff --git a/functions/_pure_user_at_host.fish b/functions/_pure_user_at_host.fish
@@ -5,9 +5,9 @@ function _pure_user_at_host
     set --local hostname_color (_pure_set_color $pure_color_hostname)
 
     set --local username_color (_pure_set_color $pure_color_username_normal) # default color
-    if test "$username" = "root"
+    if test "$username" = root
         set username_color (_pure_set_color $pure_color_username_root) # different color for root
     end
 
-    echo "$username_color$username$at_sign_color$at_sign$hostname_color$hostname"
+    echo "2<$username_color$username$at_sign_color$at_sign$hostname_color$hostname>2"
 end
diff --git a/makefile b/makefile
@@ -9,14 +9,14 @@ INTERACTIVE=true
 default: usage
 usage:
 	@printf "usage:"
-	@printf "\tmake build-pure-on FISH_VERSION=3.1.2\t# build container\n"
-	@printf "\tmake test-pure-on  FISH_VERSION=3.1.2\t# run tests\n"
-	@printf "\tmake dev-pure-on   FISH_VERSION=3.1.2\t# dev in container\n"
+	@printf "\tmake build-pure-on FISH_VERSION=3.3.1\t# build container\n"
+	@printf "\tmake test-pure-on  FISH_VERSION=3.3.1\t# run tests\n"
+	@printf "\tmake dev-pure-on   FISH_VERSION=3.3.1\t# dev in container\n"
 
 .PHONY: build-pure-on
 build-pure-on:
 	docker build \
-        --quiet \
+		--quiet \
 		--file ./Dockerfile \
 		--build-arg FISH_VERSION=${FISH_VERSION} \
 		--tag=pure-on-fish-${FISH_VERSION} \
@@ -25,14 +25,15 @@ build-pure-on:
 .PHONY: dev-pure-on
 dev-pure-on: CMD?=fish
 dev-pure-on:
+	chmod o=rwx tests/fixtures/ # for migration-to-4.0.0.test.fish only
 	docker run \
-        --quiet \
 		--name run-pure-on-${FISH_VERSION} \
 		--rm \
 		--interactive \
 		--tty \
 		--volume=$$(pwd):/tmp/.pure/ \
 		pure-on-fish-${FISH_VERSION} "${CMD}"
+	chmod o=r-x tests/fixtures/ # for migration-to-4.0.0.test.fish only
 
 # Don't override COPY directive as `--volume` doesnt play nice with Travis
 .PHONY: test-pure-on

diff --git a/tests/_detect_container_by_cgroup_method.test.fish b/tests/_detect_container_by_cgroup_method.test.fish
@@ -0,0 +1,49 @@
+source (dirname (status filename))/fixtures/constants.fish
+source (dirname (status filename))/../functions/_pure_detect_container_by_cgroup_method.fish
+@echo (_print_filename (status filename))
+
+
+function setup
+    _purge_configs
+    _disable_colors
+
+    set --global cgroup_namespace /tmp/proc/1/cgroup
+    set --global namespace (dirname $cgroup_namespace)
+    mkdir -p $namespace; and touch $cgroup_namespace
+end
+setup
+
+function teardown
+    rm -rf \
+        $namespace \
+        $cgroup_namespace
+    set --erase cgroup_namespace
+    set --erase namespace
+end
+
+@test "_pure_detect_container_by_cgroup_method: false for host OS" (
+    echo "1:name=systemd:/init.scope" > $cgroup_namespace
+    set --global container $EMPTY
+
+    _pure_detect_container_by_cgroup_method $cgroup_namespace
+) $status -eq $FAILURE
+
+@test "_pure_detect_container_by_cgroup_method: true for Docker's container" (
+    echo "1:name=systemd:/docker/54c541…af18c609c" > $cgroup_namespace
+
+    _pure_detect_container_by_cgroup_method $cgroup_namespace
+) $status -eq $SUCCESS
+
+@test "_pure_detect_container_by_cgroup_method: true for LXC/LXD's container (using namespace detail)" (
+    echo "1:name=systemd:/lxc/54c541…af18c609c" > $cgroup_namespace
+
+    _pure_detect_container_by_cgroup_method $cgroup_namespace
+) $status -eq $SUCCESS
+
+@test "_pure_detect_container_by_cgroup_method: true for LXC/LXD's container (using environment variable)" (
+    set --global container 'lxc'
+
+    _pure_detect_container_by_cgroup_method $cgroup_namespace
+) $status -eq $SUCCESS
+
+teardown