Merge remote-tracking branch 'upstream/master' into fix-latest-defaul…

…t-query

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: asdf-vm/actions/install@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ env.PYTHON_MIN_VERSION }}
       - run: scripts/install_dependencies.bash

CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## [0.14.0](https://github.com/asdf-vm/asdf/compare/v0.13.1...v0.14.0) (2024-01-19)
+
+
+### ⚠ BREAKING CHANGES
+
+* Enable `pipefail` ([#1608](https://github.com/asdf-vm/asdf/issues/1608))
+
+### Patches
+
+* `plugin test` git-ref to use plugin repo default branch ([#1694](https://github.com/asdf-vm/asdf/issues/1694)) ([6d8cf9d](https://github.com/asdf-vm/asdf/commit/6d8cf9d44b3d985ac59f1eac827c5275392f90fd))
+* avoid mention of `ASDF_NU_DIR` ([#1660](https://github.com/asdf-vm/asdf/issues/1660)) ([dfea89c](https://github.com/asdf-vm/asdf/commit/dfea89ccc703f3ef5a87c4b85726456d70167d89))
+* Enable `pipefail` ([#1608](https://github.com/asdf-vm/asdf/issues/1608)) ([4085e55](https://github.com/asdf-vm/asdf/commit/4085e5542bac824ea124610ad247c2f90d1b8d93))
+* **fish:** use PATH instead of fish_user_paths ([#1709](https://github.com/asdf-vm/asdf/issues/1709)) ([5327697](https://github.com/asdf-vm/asdf/commit/53276973f7c99695cd9a28b04c010b006d7f60ca))
+* list `asdf version` command under help.txt UTILS section ([#1673](https://github.com/asdf-vm/asdf/issues/1673)) ([240a5fb](https://github.com/asdf-vm/asdf/commit/240a5fbdea1de055672d02f83db1de990ea2bf83))
+* **nushell:** Use `def --env` instead of `def-env` ([#1681](https://github.com/asdf-vm/asdf/issues/1681)) ([3b8f400](https://github.com/asdf-vm/asdf/commit/3b8f400c3e628851286bfebd8da5bc7ab45cd676))
+* plugin extension commands to not require `bin/` directory ([#1643](https://github.com/asdf-vm/asdf/issues/1643)) ([61420ad](https://github.com/asdf-vm/asdf/commit/61420ad90829b2c9bf1ca16681a2eb652adcc755))
+* use universal scope for fish_user_paths ([#1699](https://github.com/asdf-vm/asdf/issues/1699)) ([0ffee72](https://github.com/asdf-vm/asdf/commit/0ffee7224bc00a917ceaea689c6268fd1f03bd62))
+* warn if plugin does not support keeping downloads if configured ([#1644](https://github.com/asdf-vm/asdf/issues/1644)) ([19515ed](https://github.com/asdf-vm/asdf/commit/19515eda3b91167b0d76c35ffc4402de688007e0))
+
+
+### Documentation
+
+* add Japanese translation ([#1667](https://github.com/asdf-vm/asdf/issues/1667)) ([2b9bec7](https://github.com/asdf-vm/asdf/commit/2b9bec7710cd18e51a01652e1f58cc309baf2fd7))
+* fix some pt-br spelling ([#1640](https://github.com/asdf-vm/asdf/issues/1640)) ([0c7c41a](https://github.com/asdf-vm/asdf/commit/0c7c41ab44d3a42a9e57e3d20a646569c2eacfdc))
+* fix typo "node version" filename ([#1679](https://github.com/asdf-vm/asdf/issues/1679)) ([fad23bc](https://github.com/asdf-vm/asdf/commit/fad23bc9f4d38747f28d6708ab01689749030063))
+* fix typo ([#1670](https://github.com/asdf-vm/asdf/issues/1670)) ([5737fa3](https://github.com/asdf-vm/asdf/commit/5737fa316eab01c4033565eacf678222cd861f8d))
+* Improve `.asdfrc` plugin hook docuentation ([#1661](https://github.com/asdf-vm/asdf/issues/1661)) ([8fbf9a3](https://github.com/asdf-vm/asdf/commit/8fbf9a396bd4a5b71ec7cf215d12040fb5365d6a))
+
 ## [0.13.1](https://github.com/asdf-vm/asdf/compare/v0.13.0...v0.13.1) (2023-09-12)
 
 

SECURITY.md

@@ -9,7 +9,7 @@ not covered under this security policy.**
 <!-- x-release-please-start-version -->
 
 ```
-0.13.1
+0.14.0
 ```
 
 <!-- x-release-please-end -->

asdf.fish

@@ -11,12 +11,12 @@ else
 end
 
 # Do not use fish_add_path (added in Fish 3.2) because it
-# potentially changes the order of items in fish_user_paths
-if not contains $_asdf_bin $fish_user_paths
-    set --global --prepend fish_user_paths $_asdf_bin
+# potentially changes the order of items in PATH
+if not contains $_asdf_bin $PATH
+    set -gx --prepend PATH $_asdf_bin
 end
-if not contains $_asdf_shims $fish_user_paths
-    set --global --prepend fish_user_paths $_asdf_shims
+if not contains $_asdf_shims $PATH
+    set -gx --prepend PATH $_asdf_shims
 end
 set --erase _asdf_bin
 set --erase _asdf_shims

asdf.nu

@@ -1,14 +1,27 @@
-def-env configure-asdf [] {
-
-    $env.ASDF_DIR = ( if ( $env | get --ignore-errors ASDF_DIR | is-empty ) { $env.ASDF_NU_DIR } else { $env.ASDF_DIR } )
-
-    let shims_dir = ( if ( $env | get --ignore-errors ASDF_DATA_DIR | is-empty ) { $env.HOME | path join '.asdf' } else { $env.ASDF_DIR } | path join 'shims' )
-
+def --env configure-asdf [] {
+    $env.ASDF_DIR = (
+      if ($env | get --ignore-errors ASDF_NU_DIR | is-empty) == false {
+        $env.ASDF_NU_DIR
+      }
+      else if ($env | get --ignore-errors ASDF_DIR | is-empty) == false {
+        $env.ASDF_DIR
+      } else {
+        print --stderr "asdf: Either ASDF_NU_DIR or ASDF_DIR must not be empty"
+        return
+      }
+    )
+
+    let shims_dir = (
+      if ( $env | get --ignore-errors ASDF_DATA_DIR | is-empty ) {
+        $env.HOME | path join '.asdf'
+      } else {
+        $env.ASDF_DIR
+      } | path join 'shims'
+    )
     let asdf_bin_dir = ( $env.ASDF_DIR | path join 'bin' )
 
     $env.PATH = ( $env.PATH | split row (char esep) | where { |p| $p != $shims_dir } | prepend $shims_dir )
     $env.PATH = ( $env.PATH | split row (char esep) | where { |p| $p != $asdf_bin_dir } | prepend $asdf_bin_dir )
-
 }
 
 configure-asdf

bin/asdf

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
+
 set -o pipefail
+if [[ "${ASDF_DEBUG}" == "1" ]]; then
+  set -x
+fi
 
 # shellcheck source=lib/utils.bash
 . "$(dirname "$(dirname "$0")")/lib/utils.bash"

docs/.vitepress/config.ts

@@ -16,6 +16,14 @@ export default defineConfig({
         sidebar: sidebars.en,
       },
     },
+    "ja-jp": {
+      label: "日本語",
+      lang: "ja-jp",
+      themeConfig: {
+        nav: navbars.ja_jp,
+        sidebar: sidebars.ja_jp,
+      },
+    },
     "pt-br": {
       label: "Brazilian Portuguese",
       lang: "pr-br",

docs/.vitepress/navbars.ts

@@ -32,6 +32,24 @@ const en = [
   },
 ];
 
+const ja_jp = [
+  { text: "ガイド", link: "/ja-jp/guide/getting-started" },
+  {
+    text: "リファレンス",
+    link: "/ja-jp/manage/configuration",
+  },
+  {
+    text: getVersion(),
+    items: [
+      {
+        text: "変更履歴",
+        link: "https://github.com/asdf-vm/asdf/blob/master/CHANGELOG.md",
+      },
+      { text: "コントリビューション", link: "/ja-jp/contribute/core" },
+    ],
+  },
+];
+
 const pt_br = [
   { text: "Guia", link: "/pt-br/guide/getting-started" },
   {
@@ -68,4 +86,4 @@ const zh_hans = [
   },
 ];
 
-export { en, pt_br, zh_hans };
+export { en, ja_jp, pt_br, zh_hans };

docs/.vitepress/sidebars.ts

@@ -110,6 +110,118 @@ const en = [
   { text: "Thanks", link: "/more/thanks" },
 ];
 
+const ja_jp = [
+  {
+    text: "ガイド",
+    collapsed: false,
+    items: [
+      { text: "asdfってなに?", link: "/ja-jp/guide/introduction" },
+      { text: "はじめよう", link: "/ja-jp/guide/getting-started" },
+    ],
+  },
+  {
+    text: "使い方",
+    collapsed: false,
+    items: [
+      { text: "コア", link: "/ja-jp/manage/core" },
+      { text: "プラグイン", link: "/ja-jp/manage/plugins" },
+      { text: "バージョン", link: "/ja-jp/manage/versions" },
+    ],
+  },
+  {
+    text: "リファレンス",
+    collapsed: false,
+    items: [
+      { text: "構成設定", link: "/ja-jp/manage/configuration" },
+      { text: "すべてのコマンド", link: "/ja-jp/manage/commands" },
+      {
+        text: "プラグインショートネームの一覧",
+        link: "https://github.com/asdf-vm/asdf-plugins",
+      },
+    ],
+  },
+  {
+    text: "プラグイン",
+    collapsed: true,
+    items: [
+      {
+        text: "開発者向け",
+        items: [
+          { text: "プラグインの作成", link: "/ja-jp/plugins/create" },
+          {
+            text: "GitHubプラグインテンプレート",
+            link: "https://github.com/asdf-vm/asdf-plugin-template",
+          },
+        ],
+      },
+      {
+        text: "公式プラグイン",
+        items: [
+          {
+            text: "Elixir",
+            link: "https://github.com/asdf-vm/asdf-elixir",
+          },
+          {
+            text: "Erlang",
+            link: "https://github.com/asdf-vm/asdf-erlang",
+          },
+          {
+            text: "Node.js",
+            link: "https://github.com/asdf-vm/asdf-nodejs",
+          },
+          {
+            text: "Ruby",
+            link: "https://github.com/asdf-vm/asdf-ruby",
+          },
+        ],
+      },
+      {
+        text: "コミュニティプラグイン",
+        items: [
+          {
+            text: "asdf-community",
+            link: "https://github.com/asdf-community",
+          },
+          {
+            text: "GitHubトピック検索",
+            link: "https://github.com/topics/asdf-plugin",
+          },
+        ],
+      },
+    ],
+  },
+  {
+    text: "困ったときは",
+    collapsed: true,
+    items: [
+      { text: "FAQ", link: "/ja-jp/more/faq" },
+      {
+        text: "GitHub イシュー",
+        link: "https://github.com/asdf-vm/asdf/issues",
+      },
+      {
+        text: "Stack Overflow タグ",
+        link: "https://stackoverflow.com/questions/tagged/asdf-vm",
+      },
+    ],
+  },
+  {
+    text: "コントリビューション",
+    collapsed: true,
+    items: [
+      { text: "asdf コア", link: "/ja-jp/contribute/core" },
+      { text: "ドキュメント", link: "/ja-jp/contribute/documentation" },
+      {
+        text: "公式プラグイン",
+        link: "/ja-jp/contribute/first-party-plugins",
+      },
+      { text: "GitHub Actions", link: "/ja-jp/contribute/github-actions" },
+    ],
+  },
+  { text: "コミュニティプロジェクト", link: "/ja-jp/more/community-projects" },
+  { text: "謝辞", link: "/ja-jp/more/thanks" },
+];
+
 const pt_br = [
   {
     text: "Guia",
@@ -334,4 +446,4 @@ const zh_hans = [
   { text: "致谢", link: "/zh-hans/more/thanks" },
 ];
 
-export { en, pt_br, zh_hans };
+export { en, ja_jp, pt_br, zh_hans };

docs/guide/getting-started.md

@@ -36,7 +36,7 @@ asdf primarily requires `git` & `curl`. Here is a _non-exhaustive_ list of comma
 
 
 ```shell
-git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.13.1
+git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.14.0
 
 ```
 
@@ -300,7 +300,7 @@ Add the following to `~/.config/powershell/profile.ps1`:
 Add `asdf.nu` to your `~/.config/nushell/config.nu` with:
 
 ```shell
-"\n$env.ASDF_NU_DIR = ($env.HOME | path join '.asdf')\n source " + ($env.HOME | path join '.asdf/asdf.nu') | save --append $nu.config-path
+"\n$env.ASDF_DIR = ($env.HOME | path join '.asdf')\n source " + ($env.HOME | path join '.asdf/asdf.nu') | save --append $nu.config-path
 ```
 
 Completions are automatically configured
@@ -311,7 +311,7 @@ Completions are automatically configured
 Add `asdf.nu` to your `~/.config/nushell/config.nu` with:
 
 ```shell
-"\n$env.ASDF_NU_DIR = (brew --prefix asdf | str trim | into string | path join 'libexec')\n source " +  (brew --prefix asdf | into string | path join 'libexec/asdf.nu') | save --append $nu.config-path
+"\n$env.ASDF_DIR = (brew --prefix asdf | str trim | into string | path join 'libexec')\n source " +  (brew --prefix asdf | str trim | into string | path join 'libexec/asdf.nu') | save --append $nu.config-path
 ```
 
 Completions are automatically configured
@@ -322,7 +322,7 @@ Completions are automatically configured
 Add `asdf.nu` to your `~/.config/nushell/config.nu` with:
 
 ```shell
-"\n$env.ASDF_NU_DIR = '/opt/asdf-vm/'\n source /opt/asdf-vm/asdf.nu" | save --append $nu.config-path
+"\n$env.ASDF_DIR = '/opt/asdf-vm/'\n source /opt/asdf-vm/asdf.nu" | save --append $nu.config-path
 ```
 
 Completions are automatically configured.