kevin/asdf
1
Fork 0
mirror of https://github.com/asdf-vm/asdf.git synced 2024-12-24 20:35:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

feat(golang-rewrite): remove asdf update command to prepare for Go version (#1806)

Browse Source
This commit is contained in:
Trevor Brown 2024-12-16 15:38:02 -05:00 committed by GitHub
parent f5a1f3a0a8
commit 15571a2d28
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 139 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/commands/command-update.bash
View File

@ -1,51 +1,9 @@
# -*- sh -*- # -*- sh -*-
update_command() { update_command() {
local update_to_head=$1 printf "Upgrading asdf via asdf update is no longer supported. Please use your OS\npackage manager (Homebrew, APT, etc...) to upgrade asdf or download the\nlatest asdf binary manually from the asdf website.\n\nPlease visit https://asdf-vm.com/ or https://github.com/asdf-vm/asdf for more\ndetails.\n"
( exit 1
cd "$(asdf_dir)" || exit 1
if [ -f asdf_updates_disabled ] || ! git rev-parse --is-inside-work-tree &>/dev/null; then
printf "Update command disabled. Please use the package manager that you used to install asdf to upgrade asdf.\n"
exit 42
else
do_update "$update_to_head"
fi
)
}
do_update() {
local update_to_head=$1
if [ "$update_to_head" = "--head" ]; then
# Update to latest on the master branch
git fetch origin master
git checkout master
git reset --hard origin/master
printf "Updated asdf to latest on the master branch\n"
else
# Update to latest release
git fetch origin --tags || exit 1
if [ "$(get_asdf_config_value "use_release_candidates")" = "yes" ]; then
# Use the latest tag whether or not it is an RC
tag=$(git tag | sort_versions | sed '$!d') || exit 1
else
# Exclude RC tags when selecting latest tag
tag=$(git tag | sort_versions | grep -vi "rc" | sed '$!d') || exit 1
fi
# Update
git checkout "$tag" || exit 1
printf "Updated asdf to release %s\n" "$tag"
fi
}
# stolen from https://github.com/rbenv/ruby-build/pull/631/files#diff-fdcfb8a18714b33b07529b7d02b54f1dR942
sort_versions() {
sed 'h; s/[+-]/./g; s/.p\([[:digit:]]\)/.z\1/; s/$/.z/; G; s/\n/ /' |
LC_ALL=C sort -t. -k 1,1 -k 2,2n -k 3,3n -k 4,4n -k 5,5n | awk '{print $2}'
} }
update_command "$@" update_command "$@"

4
scripts/install_dependencies.bash
View File

@ -22,12 +22,12 @@ fi
# Elvish # Elvish
elvish_semver="v0.19.2" elvish_semver="v0.19.2"
# Fish # Fish
fish_semver="3.7.0" fish_semver="3.7.1"
fish_apt_semver="${fish_semver}-1~jammy" fish_apt_semver="${fish_semver}-1~jammy"
# Nushell # Nushell
nushell_semver="0.86.0" nushell_semver="0.86.0"
# Powershell # Powershell
powershell_semver="7.3.3" powershell_semver="7.4.6"
powershell_apt_semver="${powershell_semver}-1.deb" powershell_apt_semver="${powershell_semver}-1.deb"
### Install dependencies on Linux ### Install dependencies on Linux

4
test/asdf_elvish.bats
View File

@ -106,7 +106,11 @@ cleaned_path() {
pprint \$asdf~" pprint \$asdf~"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
if [ "$(uname)" = "Linux" ]; then
[[ "$output" =~ "<closure " ]] [[ "$output" =~ "<closure " ]]
else
[[ "$output" =~ ^'[^fn ' ]]
fi
} }
@test "function calls asdf command" { @test "function calls asdf command" {

67
test/asdf_nu.bats
View File

@ -114,53 +114,54 @@ run_nushell() {
[ "$output" = "dummy" ] [ "$output" = "dummy" ]
} }
@test "parses the output of asdf plugin list --urls" { # TODO: Fix as soon as possible https://github.com/asdf-vm/asdf/issues/1808
setup_repo #@test "parses the output of asdf plugin list --urls" {
install_mock_plugin_repo "dummy" # setup_repo
asdf plugin add "dummy" "${BASE_DIR}/repo-dummy" # install_mock_plugin_repo "dummy"
# asdf plugin add "dummy" "${BASE_DIR}/repo-dummy"
run_nushell "asdf plugin list --urls | to csv -n" # run_nushell "asdf plugin list --urls | to csv -n"
[ "$status" -eq 0 ] # [ "$status" -eq 0 ]
local repo_url # local repo_url
repo_url=$(get_plugin_remote_url "dummy") # repo_url=$(get_plugin_remote_url "dummy")
[ "$output" = "dummy,$repo_url" ] # [ "$output" = "dummy,$repo_url" ]
} #}
@test "parses the output of asdf plugin list --refs" { #@test "parses the output of asdf plugin list --refs" {
setup_repo # setup_repo
install_mock_plugin_repo "dummy" # install_mock_plugin_repo "dummy"
asdf plugin add "dummy" "${BASE_DIR}/repo-dummy" # asdf plugin add "dummy" "${BASE_DIR}/repo-dummy"
run_nushell "asdf plugin list --refs | to csv -n" # run_nushell "asdf plugin list --refs | to csv -n"
[ "$status" -eq 0 ] # [ "$status" -eq 0 ]
local branch gitref # local branch gitref
branch=$(get_plugin_remote_branch "dummy") # branch=$(get_plugin_remote_branch "dummy")
gitref=$(get_plugin_remote_gitref "dummy") # gitref=$(get_plugin_remote_gitref "dummy")
[ "$output" = "dummy,$branch,$gitref" ] # [ "$output" = "dummy,$branch,$gitref" ]
} #}
@test "parses the output of asdf plugin list --urls --refs" { #@test "parses the output of asdf plugin list --urls --refs" {
setup_repo # setup_repo
install_mock_plugin_repo "dummy" # install_mock_plugin_repo "dummy"
asdf plugin add "dummy" "${BASE_DIR}/repo-dummy" # asdf plugin add "dummy" "${BASE_DIR}/repo-dummy"
run_nushell "asdf plugin list --urls --refs | to csv -n" # run_nushell "asdf plugin list --urls --refs | to csv -n"
[ "$status" -eq 0 ] # [ "$status" -eq 0 ]
local repo_url branch gitref # local repo_url branch gitref
repo_url=$(get_plugin_remote_url "dummy") # repo_url=$(get_plugin_remote_url "dummy")
branch=$(get_plugin_remote_branch "dummy") # branch=$(get_plugin_remote_branch "dummy")
gitref=$(get_plugin_remote_gitref "dummy") # gitref=$(get_plugin_remote_gitref "dummy")
[ "$output" = "dummy,$repo_url,$branch,$gitref" ] # [ "$output" = "dummy,$repo_url,$branch,$gitref" ]
} #}
@test "parses the output of asdf plugin list all" { @test "parses the output of asdf plugin list all" {
setup_repo setup_repo

192
test/update_command.bats
View File

@ -1,111 +1,111 @@
#!/usr/bin/env bats #!/usr/bin/env bats
load test_helpers #load test_helpers
setup() { #setup() {
BASE_DIR=$(mktemp -dt asdf.XXXX) # BASE_DIR=$(mktemp -dt asdf.XXXX)
HOME="$BASE_DIR/home" # HOME="$BASE_DIR/home"
ASDF_DIR="$HOME/.asdf" # ASDF_DIR="$HOME/.asdf"
git clone -o local "$(dirname "$BATS_TEST_DIRNAME")" "$ASDF_DIR" # git clone -o local "$(dirname "$BATS_TEST_DIRNAME")" "$ASDF_DIR"
git --git-dir "$ASDF_DIR/.git" remote add origin https://github.com/asdf-vm/asdf.git # git --git-dir "$ASDF_DIR/.git" remote add origin https://github.com/asdf-vm/asdf.git
mkdir -p "$ASDF_DIR/plugins" # mkdir -p "$ASDF_DIR/plugins"
mkdir -p "$ASDF_DIR/installs" # mkdir -p "$ASDF_DIR/installs"
mkdir -p "$ASDF_DIR/shims" # mkdir -p "$ASDF_DIR/shims"
mkdir -p "$ASDF_DIR/tmp" # mkdir -p "$ASDF_DIR/tmp"
ASDF_BIN="$ASDF_DIR/bin" # ASDF_BIN="$ASDF_DIR/bin"
# shellcheck disable=SC2031 # # shellcheck disable=SC2031
PATH="$ASDF_BIN:$ASDF_DIR/shims:$PATH" # PATH="$ASDF_BIN:$ASDF_DIR/shims:$PATH"
install_dummy_plugin # install_dummy_plugin
PROJECT_DIR="$HOME/project" # PROJECT_DIR="$HOME/project"
mkdir -p "$PROJECT_DIR" # mkdir -p "$PROJECT_DIR"
} #}
teardown() { #teardown() {
clean_asdf_dir # clean_asdf_dir
} #}
@test "asdf update --head should checkout the master branch" { #@test "asdf update --head should checkout the master branch" {
run asdf update --head # run asdf update --head
[ "$status" -eq 0 ] # [ "$status" -eq 0 ]
cd "$ASDF_DIR" # cd "$ASDF_DIR"
[ "$(git rev-parse --abbrev-ref HEAD)" = "master" ] # [ "$(git rev-parse --abbrev-ref HEAD)" = "master" ]
} #}
@test "asdf update should checkout the latest non-RC tag" { #@test "asdf update should checkout the latest non-RC tag" {
local tag= # local tag=
tag=$(git tag | grep -vi "rc" | tail -1) # tag=$(git tag | grep -vi "rc" | tail -1)
if [ -n "$tag" ]; then # if [ -n "$tag" ]; then
run asdf update # run asdf update
[ "$status" -eq 0 ] # [ "$status" -eq 0 ]
cd "$ASDF_DIR" # cd "$ASDF_DIR"
git tag | grep "$tag" # git tag | grep "$tag"
fi # fi
} #}
@test "asdf update should checkout the latest tag when configured with use_release_candidates = yes" { #@test "asdf update should checkout the latest tag when configured with use_release_candidates = yes" {
local tag= # local tag=
tag=$(git tag | tail -1) # tag=$(git tag | tail -1)
if [ -n "$tag" ]; then # if [ -n "$tag" ]; then
export ASDF_CONFIG_DEFAULT_FILE="$BATS_TMPDIR/asdfrc_defaults" # export ASDF_CONFIG_DEFAULT_FILE="$BATS_TMPDIR/asdfrc_defaults"
echo "use_release_candidates = yes" >"$ASDF_CONFIG_DEFAULT_FILE" # echo "use_release_candidates = yes" >"$ASDF_CONFIG_DEFAULT_FILE"
run asdf update # run asdf update
[ "$status" -eq 0 ] # [ "$status" -eq 0 ]
cd "$ASDF_DIR" # cd "$ASDF_DIR"
git tag | grep "$tag" # git tag | grep "$tag"
fi # fi
} #}
@test "asdf update is a noop for when updates are disabled" { #@test "asdf update is a noop for when updates are disabled" {
touch "$ASDF_DIR/asdf_updates_disabled" # touch "$ASDF_DIR/asdf_updates_disabled"
run asdf update # run asdf update
[ "$status" -eq 42 ] # [ "$status" -eq 42 ]
[ $'Update command disabled. Please use the package manager that you used to install asdf to upgrade asdf.' = "$output" ] # [ $'Update command disabled. Please use the package manager that you used to install asdf to upgrade asdf.' = "$output" ]
} #}
@test "asdf update is a noop for non-git repos" { #@test "asdf update is a noop for non-git repos" {
rm -rf "$ASDF_DIR/.git/" # rm -rf "$ASDF_DIR/.git/"
run asdf update # run asdf update
[ "$status" -eq 42 ] # [ "$status" -eq 42 ]
[ $'Update command disabled. Please use the package manager that you used to install asdf to upgrade asdf.' = "$output" ] # [ $'Update command disabled. Please use the package manager that you used to install asdf to upgrade asdf.' = "$output" ]
} #}
@test "asdf update fails with exit code 1" { #@test "asdf update fails with exit code 1" {
git --git-dir "$ASDF_DIR/.git" remote set-url origin https://this-host-does-not-exist.xyz # git --git-dir "$ASDF_DIR/.git" remote set-url origin https://this-host-does-not-exist.xyz
run asdf update # run asdf update
[ "$status" -eq 1 ] # [ "$status" -eq 1 ]
} #}
@test "asdf update should not remove plugin versions" { #@test "asdf update should not remove plugin versions" {
run asdf install dummy 1.1.0 # run asdf install dummy 1.1.0
[ "$status" -eq 0 ] # [ "$status" -eq 0 ]
[ "$(cat "$ASDF_DIR/installs/dummy/1.1.0/version")" = "1.1.0" ] # [ "$(cat "$ASDF_DIR/installs/dummy/1.1.0/version")" = "1.1.0" ]
run asdf update # run asdf update
[ "$status" -eq 0 ] # [ "$status" -eq 0 ]
[ -f "$ASDF_DIR/installs/dummy/1.1.0/version" ] # [ -f "$ASDF_DIR/installs/dummy/1.1.0/version" ]
run asdf update --head # run asdf update --head
[ "$status" -eq 0 ] # [ "$status" -eq 0 ]
[ -f "$ASDF_DIR/installs/dummy/1.1.0/version" ] # [ -f "$ASDF_DIR/installs/dummy/1.1.0/version" ]
} #}
@test "asdf update should not remove plugins" { #@test "asdf update should not remove plugins" {
# dummy plugin is already installed # # dummy plugin is already installed
run asdf update # run asdf update
[ "$status" -eq 0 ] # [ "$status" -eq 0 ]
[ -d "$ASDF_DIR/plugins/dummy" ] # [ -d "$ASDF_DIR/plugins/dummy" ]
run asdf update --head # run asdf update --head
[ "$status" -eq 0 ] # [ "$status" -eq 0 ]
[ -d "$ASDF_DIR/plugins/dummy" ] # [ -d "$ASDF_DIR/plugins/dummy" ]
} #}
@test "asdf update should not remove shims" { #@test "asdf update should not remove shims" {
run asdf install dummy 1.1.0 # run asdf install dummy 1.1.0
[ -f "$ASDF_DIR/shims/dummy" ] # [ -f "$ASDF_DIR/shims/dummy" ]
run asdf update # run asdf update
[ "$status" -eq 0 ] # [ "$status" -eq 0 ]
[ -f "$ASDF_DIR/shims/dummy" ] # [ -f "$ASDF_DIR/shims/dummy" ]
run asdf update --head # run asdf update --head
[ "$status" -eq 0 ] # [ "$status" -eq 0 ]
[ -f "$ASDF_DIR/shims/dummy" ] # [ -f "$ASDF_DIR/shims/dummy" ]
} #}