avoiding duplicate path elements on push and append (fix #1) (#41)

* reproducing issue #1 in the 'push' and 'append' commands test

* ci housekeeping

* fixed push and append dedup elements

.github/workflows/ci.yml

@@ -21,9 +21,12 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0 
+
       - name: Install Zsh
         if: runner.os == 'Linux'
         run: |
@@ -33,8 +36,8 @@ jobs:
       - name: Zsh Version
         run: zsh --version
 
-      - name: Update Submodules
-        run: make update_submodules
+      - name: Initialize Submodules
+        run: make init
 
       - name: Run Tests
         run: make test

Makefile

@@ -4,7 +4,7 @@ BASEDIR := $(shell pwd)
 default: test 
 
 test:
-	@-$(BASEDIR)/tests/zsh-scriptest/run_tests.sh $(BASEDIR)/tests
+	$(BASEDIR)/tests/zsh-scriptest/run_tests.sh $(BASEDIR)/tests
 
 
 init:

peth-edit.zsh

@@ -11,14 +11,18 @@ function __pe_reset() {
 
 # Prepends the specified path element re-exports PATH
 function __pe_push() {
+    local original_path=$(__pe_strip_original_path)
     PATH_ETHIC_HEAD=$(__pe_normalize_path "$1:$PATH_ETHIC_HEAD")
-    __pe_reexport_path
+
+    __pe_reexport_path "$original_path"
 }
 
 # Appends the specified path element re-exports PATH
 function __pe_append() {
+    local original_path=$(__pe_strip_original_path)
     PATH_ETHIC_TAIL=$(__pe_normalize_path "$PATH_ETHIC_TAIL:$1")
-    __pe_reexport_path
+
+    __pe_reexport_path "$original_path"
 }
 
 function __pe_add_path_element() {

tests/path_edit_commands.test.sh

@@ -37,24 +37,32 @@ function test_peth_reset() {
 function test_peth_push() {
   before_each
 
-  local push_path=$(mktemp -d)
+  local push_path1=$(mktemp -d)
+  local push_path2=$(mktemp -d)
+  local original_path="$PATH"
 
-  peth push $push_path
+  peth push $push_path1
+  peth push $push_path2
 
-  assert_equal $PATH_ETHIC_HEAD $push_path
+  assert_equal $PATH_ETHIC_HEAD "$push_path2:$push_path1"
   assert_equal $PATH_ETHIC_TAIL ""
+  assert_equal $PATH "$PATH_ETHIC_HEAD:$original_path"
 }
 
 # peth append #################################################################
 function test_peth_append() {
   before_each
 
-  local append_path=$(mktemp -d)
+  local append_path1=$(mktemp -d)
+  local append_path2=$(mktemp -d)
+  local original_path="$PATH"
 
-  peth append $append_path
+  peth append $append_path1
+  peth append $append_path2
 
-  assert_equal $PATH_ETHIC_TAIL $append_path
+  assert_equal $PATH_ETHIC_TAIL "$append_path1:$append_path2"
   assert_equal $PATH_ETHIC_HEAD ""
+  assert_equal $PATH "$original_path:$PATH_ETHIC_TAIL"
 }
 
 # peth flip #####################################################################

tests/unit.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env zsh
+
 autoload -U colors && colors
 
 source "$__ZSH_SCRIPTEST_HOME/matchers.sh"