shellspec_get_nth(): Do not expand glob

lib/core/modifiers/word.sh

@@ -7,7 +7,7 @@ shellspec_modifier_word() {
   shellspec_syntax_param 1 is number "$1" || return 0
 
   if [ "${SHELLSPEC_SUBJECT+x}" ]; then
-    shellspec_get_nth SHELLSPEC_SUBJECT "$1" "$SHELLSPEC_IFS" "$SHELLSPEC_SUBJECT"
+    shellspec_get_nth SHELLSPEC_SUBJECT "$SHELLSPEC_SUBJECT" "$1"
   else
     unset SHELLSPEC_SUBJECT ||:
   fi

lib/core/utils.sh

@@ -1,11 +1,5 @@
 #shellcheck shell=sh disable=SC2016
 
-shellspec_get_nth() {
-  shellspec_reset_params '"$1" "$2" $4' "$3"
-  eval "$SHELLSPEC_RESET_PARAMS"
-  eval "$1=\${$(($2 + 2)):-}"
-}
-
 shellspec_is() {
   case $1 in
     number) case ${2:-} in ( '' | *[!0-9]* ) return 1; esac ;;

lib/general.sh

@@ -521,6 +521,28 @@ shellspec_chomp() {
   eval "$SHELLSPEC_EVAL"
 }
 
+if [ "${ZSH_VERSION:-}" ]; then
+  shellspec_get_nth() {
+    set -- "$1" "$2" "$3" "${4:-}" "$IFS"
+    IFS=${4:-$SHELLSPEC_IFS}
+    eval "set -- \"\$@\" \${=2}"
+    IFS=$5
+    eval "$1=\${$(($3 + 5))}"
+  }
+else
+  shellspec_get_nth() {
+    set -f -u -- "$1" "$2" "$3" "${4:-}" "$IFS" "$-"
+    IFS=${4:-$SHELLSPEC_IFS}
+    # shellcheck disable=SC2086
+    set -- "$@" $2
+    IFS=$5
+    [ "${6#*f}" = "$6" ] && set +f
+    # Workaround for posh 0.10.2: glob does not expand when set -u
+    [ "${6#*u}" = "$6" ] && set +u
+    eval "$1=\${$(($3 + 6))}"
+  }
+fi
+
 shellspec_which() {
   set -- "$1" "${PATH%:}:"
   while [ "${2%:}" ]; do

lib/libexec/shellspec.sh

@@ -57,7 +57,6 @@ ps_command() {
 read_ps() {
   # shellcheck disable=SC2015
   ps_command 2>/dev/null | {
-    [ "${ZSH_VERSION:-}" ] && setopt shwordsplit
     IFS=" " pid=$1 p=0 c=0 _pid=''
     IFS= read -r line
     # shellcheck disable=SC2086

libexec/shellspec-reporter.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 #shellcheck disable=SC2004,SC2016
 
-set -eu
+set -euf
 
 : "${SHELLSPEC_SPEC_FAILURE_CODE:=101}"
 : "${SHELLSPEC_FORMATTER:=debug}" "${SHELLSPEC_GENERATORS:=}"
@@ -56,7 +56,7 @@ parse_lines() {
 }
 
 parse_fields() {
-  OLDIFS=$IFS && IFS=$US && eval "set -- \${${ZSH_VERSION:+=}1}" && IFS=$OLDIFS
+  OLDIFS=$IFS && IFS=$US && eval "set -- \$1" && IFS=$OLDIFS
 
   # Workaround: Do not merge two 'for'. A bug occurs in variable expansion
   # rarely in busybox-1.10.2.

shellspec

@@ -3,7 +3,7 @@
 
 [ "$PPID" ] || { echo "Unsupported shell. (Bourne shell?)" >&2; exit 1; }
 
-set -e -u
+set -e -u -f
 
 if [ "${1:-}" = "-" ]; then
   echo 'IFS= read -r shebang < "$0"'

spec/core/utils_spec.sh

@@ -3,18 +3,6 @@
 Describe "core/utils.sh"
   Include "$SHELLSPEC_LIB/core/utils.sh"
 
-  Describe 'shellspec_get_nth()'
-    It 'fetch nth value seperate by ,'
-      When call shellspec_get_nth var 3 ',' "a,b,c,d,e"
-      The variable var should equal c
-    End
-
-    It 'fetch nth value seperate by space'
-      When call shellspec_get_nth var 3 " " "a   b c"
-      The variable var should equal c
-    End
-  End
-
   Describe 'shellspec_is()'
     Describe 'number'
       It 'succeeds with a numeric value'

spec/general_spec.sh

@@ -718,6 +718,25 @@ Describe "general.sh"
     End
   End
 
+  Describe 'shellspec_get_nth()'
+    It 'fetch nth value seperate by IFS'
+      When call shellspec_get_nth var "  a   b c  " 3
+      The variable var should equal c
+    End
+
+    Parameters
+      "a,b,c,d,e"     3 ','   "c"
+      "  a  b  c  "   3 ' '   "c"
+      ",,a,,"         3 ','   "a"
+      "  a   * c  "   2 " "   "*"
+    End
+
+    It "fetches nth word ($1 : $2 : $3)" a b
+      When call shellspec_get_nth var "$1" "$2" "$3"
+      The variable var should equal "$4"
+    End
+  End
+
   Describe "shellspec_which()"
     Context 'when PATH=/foo:/bin:/bar'
       Before PATH=/foo:/bin:/bar