Skip to content

Export resty functions to subshells #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Export resty functions to subshells #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3fc75d9
Testing if the resty functions are exported to subshells
laparca May 28, 2019
0a1d877
Testing if the resty functions are exported to subshells
laparca May 28, 2019
651423b
Now should work on bash the function export
laparca May 28, 2019
1c145ae
Open the test to a more open bash check
laparca May 28, 2019
71e571e
Checks bash subshell
laparca May 28, 2019
d317ef0
Fix problem with nvm perms in MacOS X
laparca May 29, 2019
9cdf0eb
Triming the test output to fix a problem at MacOS X
laparca May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ install:
- zsh ~/.zshrc
- sh -c "export BINDIR=$HOME ; `curl -L https://raw.github.com/rylnd/shpec/master/install.sh`"

- chmod +x $HOME/.nvm/nvm.sh
- $HOME/.nvm/nvm.sh
- nvm install 6 && nvm use 6
- (cd test && npm install)
Expand Down
22 changes: 22 additions & 0 deletions resty
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,4 +337,26 @@ HELP
# With -W option, does not write to history file
[ "$1" = "-W" ] && export _RESTY_NO_HISTORY="/dev/null" && [[ $# -gt 0 ]] && shift

# Force functions to be exported to subshells if it is supported
case "$SHELL" in
*/bash|bash)
declare -fx \
resty \
resty-compute-host-option \
resty-call \
resty-load-alias \
resty-unload-alias \
resty-head \
resty-options \
resty-get \
resty-post \
resty-put \
resty-patch \
resty-delete \
resty-trace \
-resty-help-options
;;
esac


resty "$@" >/dev/null 2>&1
23 changes: 23 additions & 0 deletions test/resty_shpec.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
[[ "$SHELL" == "bash" ]] && shopt -s expand_aliases # needed for bash

RESTY_FUNCTIONS=()
RESTY_FUNCTIONS+=(resty)
RESTY_FUNCTIONS+=(resty-compute-host-option )
RESTY_FUNCTIONS+=(resty-call)
RESTY_FUNCTIONS+=(resty-load-alias)
RESTY_FUNCTIONS+=(resty-unload-alias)
RESTY_FUNCTIONS+=(resty-head)
RESTY_FUNCTIONS+=(resty-options)
RESTY_FUNCTIONS+=(resty-get)
RESTY_FUNCTIONS+=(resty-post)
RESTY_FUNCTIONS+=(resty-put)
RESTY_FUNCTIONS+=(resty-patch)
RESTY_FUNCTIONS+=(resty-delete)
RESTY_FUNCTIONS+=(resty-trace)
RESTY_FUNCTIONS+=(-resty-help-options )

describe "Resty"

describe "Basic"
Expand All @@ -26,6 +42,13 @@ describe "Resty"
assert equal "$output" "hi there"
end

if [ "${SHELL}" == "bash" ]; then
it "should work in a subshell"
exported_functions="$(printf "%d" $(bash -c "declare -F | grep $(printf " -e %s" ${RESTY_FUNCTIONS})" | wc -l))"
assert equal "$exported_functions" "${#RESTY_FUNCTIONS[@]}"
end
fi

end


Expand Down