Fix skipped CI tests

Author: simeg

filter

@@ -2,12 +2,25 @@
 
 set -eo pipefail
 
-source "/usr/local/lib/fs/functions/_filter"
+# Determine script location and set fs_dir
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+if [ -d "$script_dir/fs" ]; then
+    # Development mode - fs directory is relative to script
+    fs_dir="$script_dir/fs"
+elif [ -d "$HOME/.local/lib/fs" ]; then
+    # Local install mode - use ~/.local/lib/fs
+    fs_dir="$HOME/.local/lib/fs"
+else
+    # System install mode - use /usr/local/lib/fs
+    fs_dir="/usr/local/lib/fs"
+fi
 
-source "/usr/local/lib/fs/operations/arithmetic"
-source "/usr/local/lib/fs/operations/file_and_dir"
-source "/usr/local/lib/fs/operations/comparison"
-source "/usr/local/lib/fs/operations/string"
-source "/usr/local/lib/fs/operations/logical"
+source "$fs_dir/functions/_filter"
+
+source "$fs_dir/operations/arithmetic"
+source "$fs_dir/operations/file_and_dir"
+source "$fs_dir/operations/comparison"
+source "$fs_dir/operations/string"
+source "$fs_dir/operations/logical"
 
 _filter "$@"

fs/functions/_filter

@@ -59,8 +59,10 @@ function _filter {
   local old_ifs=$IFS
   IFS=''
 
+  local has_input=false
   local filter_res
   while read -r line; do
+    has_input=true
     # Use safer function call instead of eval
     if filter_res=$("$fn_arg" "$line" "$args"); then
       if [ "$filter_res" == "true" ]; then
@@ -69,6 +71,11 @@ function _filter {
     fi
   done < /dev/stdin
 
+  # If no input was provided, exit with 1
+  if [ "$has_input" = "false" ]; then
+    exit 1
+  fi
+
   IFS=$old_ifs
 }
 

fs/functions/_map

@@ -27,11 +27,18 @@ function _map {
   local old_ifs=$IFS
   IFS=''
 
+  local has_input=false
   while read -r line; do
+    has_input=true
     # Use safer function call instead of eval
     "$fn_arg" "$line" "$args"
   done < /dev/stdin
 
+  # If no input was provided, exit with 1
+  if [ "$has_input" = "false" ]; then
+    exit 1
+  fi
+
   IFS=$old_ifs
 }
 

map

@@ -2,12 +2,25 @@
 
 set -eo pipefail
 
-source "/usr/local/lib/fs/functions/_map"
+# Determine script location and set fs_dir
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+if [ -d "$script_dir/fs" ]; then
+    # Development mode - fs directory is relative to script
+    fs_dir="$script_dir/fs"
+elif [ -d "$HOME/.local/lib/fs" ]; then
+    # Local install mode - use ~/.local/lib/fs
+    fs_dir="$HOME/.local/lib/fs"
+else
+    # System install mode - use /usr/local/lib/fs
+    fs_dir="/usr/local/lib/fs"
+fi
 
-source "/usr/local/lib/fs/operations/arithmetic"
-source "/usr/local/lib/fs/operations/file_and_dir"
-source "/usr/local/lib/fs/operations/comparison"
-source "/usr/local/lib/fs/operations/string"
-source "/usr/local/lib/fs/operations/other"
+source "$fs_dir/functions/_map"
+
+source "$fs_dir/operations/arithmetic"
+source "$fs_dir/operations/file_and_dir"
+source "$fs_dir/operations/comparison"
+source "$fs_dir/operations/string"
+source "$fs_dir/operations/other"
 
 _map "$@"

tests/integration-tests/tests.py

@@ -18,7 +18,6 @@ def test_map__exits_w_code_1__when_no_function_provided():
     code, _, _ = run(["map"])
     assert code == 1
 
-@pytest.mark.skip(reason="Doesn't pass on CI for unknown reason")
 def test_map__exits_w_code_1__when_no_input():
     code, _, _ = run(["map", "add"])
     assert code == 1
@@ -37,7 +36,6 @@ def test_filter__exits_w_code_1__when_no_function_provided():
     code, _, _ = run(["filter"])
     assert code == 1
 
-@pytest.mark.skip(reason="Doesn't pass on CI for unknown reason")
 def test_filter__exits_w_code_1__when_no_input():
     code, _, _ = run(["filter", "is_file"])
     assert code == 1