Skip to content
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

Jump to bottom

fix: ensure shims get created when data dir has spaces #996

Merged
merged 2 commits into from Jul 20, 2021
Merged

fix: ensure shims get created when data dir has spaces #996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5759d21
fix: ensure shims get created when data dir has spaces
mook-as Jul 14, 2021
1699728
fix: test reshim with spaces in ASDF_DIR
mook-as Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/commands/command-reshim.bash
View file
Open in desktop
Expand Up @@ -103,7 +103,9 @@ generate_shim_for_executable() {
generate_shims_for_version() {
local plugin_name=$1
local full_version=$2
for executable_path in $(plugin_executables "$plugin_name" "$full_version"); do
local all_executable_paths
IFS=$'\n' read -rd '' -a all_executable_paths <<<"$(plugin_executables "$plugin_name" "$full_version")"
for executable_path in "${all_executable_paths[@]}"; do
write_shim_script "$plugin_name" "$full_version" "$executable_path"
done
}
Expand Down
4 changes: 3 additions & 1 deletion lib/utils.bash
View file
Open in desktop
Expand Up @@ -576,7 +576,9 @@ with_plugin_env() {
plugin_executables() {
local plugin_name=$1
local full_version=$2
for bin_path in $(list_plugin_exec_paths "$plugin_name" "$full_version"); do
local all_bin_paths
IFS=$'\n' read -rd '' -a all_bin_paths <<<"$(list_plugin_exec_paths "$plugin_name" "$full_version")"
for bin_path in "${all_bin_paths[@]}"; do
for executable_file in "$bin_path"/*; do
if is_executable "$executable_file"; then
printf "%s\\n" "$executable_file"
Expand Down
38 changes: 19 additions & 19 deletions test/reshim_command.bats
View file
Open in desktop
Expand Up @@ -3,11 +3,11 @@
load test_helpers

setup() {
setup_asdf_dir
ASDF_BATS_SPACE_IN_PATH=true setup_asdf_dir
install_dummy_plugin

PROJECT_DIR=$HOME/project
mkdir $PROJECT_DIR
PROJECT_DIR="$HOME/project"
mkdir "$PROJECT_DIR"
}

teardown() {
Expand Down Expand Up @@ -69,61 +69,61 @@ teardown() {
}

@test "reshim should not duplicate shims" {
cd $PROJECT_DIR
cd "$PROJECT_DIR"

run asdf install dummy 1.0
run asdf install dummy 1.1
[ "$status" -eq 0 ]
[ -f "$ASDF_DIR/shims/dummy" ]

run rm $ASDF_DIR/shims/*
run rm "$ASDF_DIR/shims/"*
[ "$status" -eq 0 ]
[ "0" -eq "$(ls $ASDF_DIR/shims/dummy* | wc -l)" ]
[ "0" -eq "$(ls "$ASDF_DIR/shims/"dummy* | wc -l)" ]

run asdf reshim dummy
[ "$status" -eq 0 ]
[ "1" -eq "$(ls $ASDF_DIR/shims/dummy* | wc -l)" ]
[ "1" -eq "$(ls "$ASDF_DIR/shims/"dummy* | wc -l)" ]

run asdf reshim dummy
[ "$status" -eq 0 ]
[ "1" -eq "$(ls $ASDF_DIR/shims/dummy* | wc -l)" ]
[ "1" -eq "$(ls "$ASDF_DIR/shims/"dummy* | wc -l)" ]
}

@test "reshim should create shims only for files and not folders" {
cd $PROJECT_DIR
cd "$PROJECT_DIR"

run asdf install dummy 1.0
run asdf install dummy 1.1
[ "$status" -eq 0 ]
[ -f "$ASDF_DIR/shims/dummy" ]
[ ! -f "$ASDF_DIR/shims/subdir" ]

run rm $ASDF_DIR/shims/*
run rm "$ASDF_DIR/shims/"*
[ "$status" -eq 0 ]
[ "0" -eq "$(ls $ASDF_DIR/shims/dummy* | wc -l)" ]
[ "0" -eq "$(ls $ASDF_DIR/shims/subdir* | wc -l)" ]
[ "0" -eq "$(ls "$ASDF_DIR/shims/"dummy* | wc -l)" ]
[ "0" -eq "$(ls "$ASDF_DIR/shims/"subdir* | wc -l)" ]

run asdf reshim dummy
[ "$status" -eq 0 ]
[ "1" -eq "$(ls $ASDF_DIR/shims/dummy* | wc -l)" ]
[ "0" -eq "$(ls $ASDF_DIR/shims/subdir* | wc -l)" ]
[ "1" -eq "$(ls "$ASDF_DIR/shims/"dummy* | wc -l)" ]
[ "0" -eq "$(ls "$ASDF_DIR/shims/"subdir* | wc -l)" ]

}

@test "reshim without arguments reshims all installed plugins" {
run asdf install dummy 1.0
run rm $ASDF_DIR/shims/*
run rm "$ASDF_DIR/shims/"*
[ "$status" -eq 0 ]
[ "0" -eq "$(ls $ASDF_DIR/shims/dummy* | wc -l)" ]
[ "0" -eq "$(ls "$ASDF_DIR/shims/"dummy* | wc -l)" ]
run asdf reshim
[ "$status" -eq 0 ]
[ "1" -eq "$(ls $ASDF_DIR/shims/dummy* | wc -l)" ]
[ "1" -eq "$(ls "$ASDF_DIR/shims/"dummy* | wc -l)" ]
}

@test "reshim command executes configured pre hook" {
run asdf install dummy 1.0

cat > $HOME/.asdfrc <<-'EOM'
cat > "$HOME/.asdfrc" <<-'EOM'
pre_asdf_reshim_dummy = echo RESHIM
EOM

Expand All @@ -134,7 +134,7 @@ EOM
@test "reshim command executes configured post hook" {
run asdf install dummy 1.0

cat > $HOME/.asdfrc <<-'EOM'
cat > "$HOME/.asdfrc" <<-'EOM'
post_asdf_reshim_dummy = echo RESHIM
EOM

Expand Down
14 changes: 9 additions & 5 deletions test/test_helpers.bash
View file
Open in desktop
Expand Up @@ -8,17 +8,21 @@ unset ASDF_DIR
. "$(dirname "$BATS_TEST_DIRNAME")"/lib/utils.bash

setup_asdf_dir() {
BASE_DIR=$(mktemp -dt asdf.XXXX)
HOME=$BASE_DIR/home
ASDF_DIR=$HOME/.asdf
if [ -n "${ASDF_BATS_SPACE_IN_PATH:-}" ]; then
BASE_DIR="$(mktemp -dt "asdf with spaces.XXXX")"
else
BASE_DIR="$(mktemp -dt asdf.XXXX)"
fi
HOME="$BASE_DIR/home"
ASDF_DIR="$HOME/.asdf"
mkdir -p "$ASDF_DIR/plugins"
mkdir -p "$ASDF_DIR/installs"
mkdir -p "$ASDF_DIR/shims"
mkdir -p "$ASDF_DIR/tmp"
ASDF_BIN=$(dirname "$BATS_TEST_DIRNAME")/bin
ASDF_BIN="$(dirname "$BATS_TEST_DIRNAME")/bin"

# shellcheck disable=SC2031
PATH=$ASDF_BIN:$ASDF_DIR/shims:$PATH
PATH="$ASDF_BIN:$ASDF_DIR/shims:$PATH"
}

install_mock_plugin() {
Expand Down