upperstack reset bug fixed

Makefile

@@ -1,5 +1,5 @@
 default: bash_interactive
 bash_interactive:
-	docker-compose -f testenv/shellenv/bashenv/docker-compose.yaml build
-	docker-compose -f testenv/shellenv/bashenv/docker-compose.yaml run --rm fasttravelcli_bash_interactive
+	docker-compose -f testenv/shellfuncs/bashenv/docker-compose.yaml build
+	docker-compose -f testenv/shellfuncs/bashenv/docker-compose.yaml run --rm fasttravelcli_bash_interactive
 

README.md

@@ -31,11 +31,15 @@ bash install/linux.sh
 ```
 bash install/mac.sh
 ```
-Currently available for Unix-like OS and bash/zsh shells. May work in more shell environments but not guaranteed.
 
+<h2>Disclaimers</h2>
+Currently available for Unix-like OS and bash/zsh shells. May work in more shell environments but not guaranteed.
+<br>
 Compiles using go version >= 1.20.0, may work with older versions but not guaranteed.
+<br>
+Some features have dependencies. 
+ - `-hist` requires tree and [fzf](/~https://github.com/junegunn/fzf).
 
-For some features, like the `-hist` command, [fzf](/~https://github.com/junegunn/fzf) is a dependency.
 
 
 

shells/bash/ftmain.sh

@@ -2,32 +2,40 @@
 
 ft__check_fzf() {
     if ! command -v fzf &>/dev/null; then
-        echo "Error: fzf is needed to use this feature. You can install it using your package manager:"
-        echo "  - Ubuntu/Debian: sudo apt install fzf"
-        echo "  - Fedora: sudo dnf install fzf"
-        echo "  - Arch: sudo pacman -S fzf"
-        echo "  - macOS: brew install fzf"
+        echo "Error: fzf is needed to use this feature. /~https://github.com/junegunn/fzf"
+        return 1
+    fi
+}
+
+ft__check_tree() {
+    if ! command -v tree &>/dev/null; then
+        echo "Error: tree is needed to use this feature. You can install it using your package manager:"
+        echo "  - Ubuntu/Debian: sudo apt install tree"
+        echo "  - Fedora: sudo dnf install tree"
+        echo "  - Arch: sudo pacman -S tree"
+        echo "  - macOS: brew install tree"
         return 1
     fi
 }
 
 ft__upperStack=()
 
 ft__pushup() {
-    local _path="$1"
-    ft__upperStack+=("$_path")
+    local path="$1"
+    ft__upperStack+=("$path")
 }
 
 ft__popup() {
     unset 'ft__upperStack[-1]'
-    ft__upperStack=(${ft_upperStack[@]})
+    ft__upperStack=(${ft__upperStack[@]})
 }
 
 ft__capture() {
     local temp_output=$(mktemp)
 
     "$FT_EXE_PATH" "$@" | tee "$temp_output"
     local output="$(tail -n 1 "$temp_output")"
+    rm "$temp_output"
 
     echo "$output"
 }
@@ -46,7 +54,6 @@ ft__execute() {
 
         if [ ${#ft__upperStack[@]} -eq 0 ]; then
             echo Already at head of history stack.
-            rm "$temp_output"
             return 1 
         fi
 
@@ -60,7 +67,6 @@ ft__execute() {
 
         if [ "$lowerStackLen" -eq 0 ]; then
             echo Already at tail of history stack.
-            rm "$temp_output"
             return 1
         fi
 
@@ -70,6 +76,7 @@ ft__execute() {
 
     elif [[ "$output" == "hist" ]]; then
         ft__check_fzf
+        ft__check_tree
 
         local navigation="up;"
         for i in "${ft__upperStack[@]}"; do
@@ -81,18 +88,14 @@ ft__execute() {
         local historyStack=("${ft__upperStack[@]}" "${lowerStack[@]}")
 
         local selected=$(printf "%s\n" "${historyStack[@]}" | fzf \
-            --bind "start:execute-silent($navigation)")
+            --tac --header "Currently at $(pwd)" --preview 'tree {}')
 
         if [[ -n "$selected" ]]; then
             pushd "$selected" > /dev/null || echo "Could not find directory $selected"
         fi
     else 
         echo "$full_output"
-    fi
-
-    if [[ -f "$temp_output" ]]; then
-        rm "$temp_output"
-    fi
+    fi    
 
 }
 

shells/tests/bashscripts/commands.sh

@@ -1,5 +1,5 @@
 
-test_create_project_tree() {
+maketree() {
     mkdir something
     cd something
     mkdir else
@@ -9,11 +9,15 @@ test_create_project_tree() {
     cd ../../..
 }
 
-available_commands=("]" "[" "-hist" ".." "-")
+maketree
 
-test_cmd() {
+available_commands=("]" "[" "hist" ".." "-")
+
+testcmd() {
     local selected=$(printf "%s\n" "${available_commands[@]}" | fzf)
     if [[ -n "$selected" ]]; then
         ft__execute "$selected"
     fi
 }
+
+

shells/tests/bashscripts/test.lua

@@ -1,8 +1,2 @@
 -- TODO:
---  - Docker container that:
---      - sources appropriate .sh file
---      - runs test script
---      - set up interactive container as well for manual testing
---  - Lua (or Python) script that:
---      - mocks input to ft function for all passToShell commands
---      - verify correct functionality
+--  - write tests for each ft__ function

testenv/shellenv/bashenv/Dockerfile → testenv/shellfuncs/bashenv/Dockerfile

@@ -14,6 +14,7 @@ COPY ../../../shells/bash/ ./
 RUN apt-get update && apt-get install -y \
     git \
     curl \
+    tree \
     && rm -rf /var/lib/apt/lists/*
 
 # Install fzf
@@ -23,13 +24,10 @@ RUN git clone --depth 1 /~https://github.com/junegunn/fzf.git ~/.fzf && \
 # Set up fzf in the shell
 RUN echo 'source ~/.fzf.bash' >> ~/.bashrc
 
-# Source scripts to run test
+# Source scripts used to run tests
 RUN echo 'source commands.sh' >> ~/.bashrc
 
 RUN echo 'source ftmain.sh' >> ~/.bashrc
 
-# Build a project tree
-RUN test_create_project_tree
-
 CMD ["/bin/bash"]
 

testenv/shellenv/bashenv/docker-compose.yaml → testenv/shellfuncs/bashenv/docker-compose.yaml

@@ -3,7 +3,7 @@ services:
   fasttravelcli_bash_interactive:
     build: 
       context: ../../..
-      dockerfile: testenv/shellenv/bashenv/Dockerfile
+      dockerfile: testenv/shellfuncs/bashenv/Dockerfile
     container_name: fasttravelcli_bash_interactive 
     stdin_open: true
     tty: true