feat/add fishtape option to fish feature

CONTRIBUTING.md

@@ -0,0 +1,19 @@
+# Contribute
+
+## Install
+
+```console
+yarn install
+```
+
+## Test
+
+**requirements:** [`just`][just]
+
+Pass a `feature` and a `base image`, _e.g._:
+
+```fish
+just test fish mcr.microsoft.com/devcontainers/base:debian
+```
+
+[just]: https://github.com/casey/just

justfile

@@ -0,0 +1,10 @@
+test feature image:
+  devcontainer features test \
+    --skip-scenarios \
+    --features {{feature}} \
+    --base-image {{image}} .
+
+test-with-scenarios feature image:
+  devcontainer features test \
+    --features {{feature}} \
+    --base-image {{image}} .

package.json

@@ -1,6 +1,7 @@
 {
   "name": "devcontainer-features",
   "devDependencies": {
+    "@devcontainers/cli": "^0.23.2",
     "gitmoji-cli": "^7.0.2"
   }
 }

src/fish/README.md

@@ -1,14 +1,14 @@
 
 # fish (fish)
 
-Installs fish shell and Fisher plugin manager (optionally)
+Installs fish shell and [Fisher][fisher] plugin manager and optionally [Fishtape][fishtape] test runner.
 
 ## Example Usage
 
 ```json
 "features": {
     "ghcr.io/meaningful-ooo/devcontainer-features/fish:1": {
-        "version": "latest"
+        "fishtape": true
     }
 }
 ```
@@ -17,10 +17,12 @@ Installs fish shell and Fisher plugin manager (optionally)
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| fisher | Install Fisher plugin manager | boolean | true |
-
-
+| `fisher` | Install [Fisher][fisher] plugin manager | boolean | `true` |
+| `fishtape` | Install [Fishtape][fishtape], 100% pure-Fish test runner | boolean | `false` |
 
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/meaningful-ooo/devcontainer-features/blob/main/src/fish/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
+
+[fisher]: https://github.com/jorgebucaran/fisher
+[fishtape]: https://github.com/jorgebucaran/fishtape

src/fish/devcontainer-feature.json

@@ -9,6 +9,11 @@
       "type": "boolean",
       "default": true,
       "description": "Install Fisher plugin manager"
+    },
+    "fisher_plugins": {
+      "type": "string",
+      "default": "",
+      "description": "Install [Fish's plugins](https://github.com/jorgebucaran/awsm.fish) using `fisher`"
     }
   },
   "customizations": {

src/fish/install.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 FISHER=${FISHER:-"true"}
+FISHER_PLUGINS=${FISHER_PLUGINS:-""}
 USERNAME=${USERNAME:-"automatic"}
 
 source /etc/os-release
@@ -118,6 +119,24 @@ if [ "${FISHER}" = "true" ]; then
   fish -c "fisher -v"
 fi
 
+# Install Fisher plugins
+if [ -n "${FISHER_PLUGINS}" ]; then
+  echo "Installing Fisher plugins…"
+  for plugin in "${FISHER_PLUGINS[@]}"; do
+    printf "\tInstalling plugin: ${plugin}"
+    fish -c "fisher install ${FISHER_PLUGINS}"
+  done
+
+  if [ "${USERNAME}" != "root" ]; then
+    for plugin in "${FISHER_PLUGINS[@]}"; do
+      printf "\tInstalling plugin: ${plugin}"
+      su $USERNAME -c "fish -c 'fisher install ${FISHER_PLUGINS}'"
+    done
+  fi
+  fish -c 'fisher list; cat $__fish_config_dir/fish_plugins'
+fi
+
+
 # Clean up
 cleanup
 

test/fish/alpine_with_fisher_multiple_plugins.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -e
+
+NON_ROOT_USER=""
+POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
+for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
+  if id -u ${CURRENT_USER} >/dev/null 2>&1; then
+    NON_ROOT_USER=${CURRENT_USER}
+    break
+  fi
+done
+if [ "${NON_ROOT_USER}" = "" ]; then
+  NON_ROOT_USER=root
+fi
+
+# Optional: Import test library bundled with the devcontainer CLI
+source dev-container-features-test-lib
+
+check "fish" fish -v
+echo "Testing with user: ${NON_ROOT_USER}"
+check "fisher" su "${NON_ROOT_USER}" -c 'fish -c "fisher -v"'
+check "fishtape has been installed" su "${NON_ROOT_USER}" -c 'fish -c "type -q fishtape"'
+check "pure has been installed" su "${NON_ROOT_USER}" -c 'fish -c "set --query pure_version"'
+
+# Report result
+reportResults

test/fish/alpine.sh → test/fish/alpine_with_fisher_single_plugin.sh

@@ -20,6 +20,7 @@ source dev-container-features-test-lib
 check "fish" fish -v
 echo "Testing with user: ${NON_ROOT_USER}"
 check "fisher" su "${NON_ROOT_USER}" -c 'fish -c "fisher -v"'
+check "fishtape has been installed" su "${NON_ROOT_USER}" -c 'fish -c "type -q fishtape"'
 
 # Report result
 reportResults

test/fish/scenarios.json

@@ -1,8 +1,19 @@
 {
-  "alpine": {
+  "alpine_with_fisher_single_plugin": {
     "image": "mcr.microsoft.com/devcontainers/base:alpine",
     "features": {
-      "fish": {}
+      "fish": {
+        "fisher_plugins": "jorgebucaran/fishtape"
+      }
+    }
+  },
+  "alpine_with_fisher_multiple_plugins": {
+    "image": "mcr.microsoft.com/devcontainers/base:alpine",
+    "features": {
+      "fish": {
+        "fisher_plugins": "jorgebucaran/fishtape pure-fish/pure"
+      }
     }
   }
 }
+

test/fish/test.sh

@@ -72,6 +72,8 @@ case "${ID}" in
 esac
 echo "Testing with user: ${NON_ROOT_USER}"
 check "fisher" su "${NON_ROOT_USER}" -c 'fish -c "fisher -v"'
+ONLY_FISHER_IS_INSTALL=1
+check "no fisher plugins are installed by default" test "$(su "${NON_ROOT_USER}" -c 'fish -c "fisher list" | wc -l')" -eq $ONLY_FISHER_IS_INSTALL
 
 # Report result
 reportResults