From 7688621f4442669f1f75ecd4837cf8017826aaf9 Mon Sep 17 00:00:00 2001 From: rsteube Date: Sun, 19 Jan 2025 12:28:47 +0100 Subject: [PATCH] vhs: fix nushell --- .github/workflows/vhs-template.yml | 1 - .github/workflows/vhs.env | 1 - compose.yaml | 2 +- .../doubleQuote/out/doubleQuote.nushell.ascii | 8 ++++---- .../out/doubleQuoteOpen.nushell.ascii | 8 ++++---- .../vhs/escape/out/escape.nushell.ascii | 12 +++++------ .../vhs/nospace/out/nospace.nushell.ascii | 4 ++-- docs/src/development/vhs/nushell.tape | 3 +++ .../vhs/redirect/out/redirect.nushell.ascii | 14 ++++++------- .../singleQuote/out/singleQuote.nushell.ascii | 8 ++++---- .../out/singleQuoteOpen.nushell.ascii | 8 ++++---- .../vhs/word/out/word.nushell.ascii | 20 +++++++++---------- .../development/vhs/word/out/word.xonsh.ascii | 4 ++-- 13 files changed, 47 insertions(+), 46 deletions(-) diff --git a/.github/workflows/vhs-template.yml b/.github/workflows/vhs-template.yml index 406d87e48..3601cd707 100644 --- a/.github/workflows/vhs-template.yml +++ b/.github/workflows/vhs-template.yml @@ -13,7 +13,6 @@ jobs: continue-on-error: true container: ghcr.io/carapace-sh/vhs env: - RC_BASH: "ln -sf /carapace/example/example /usr/local/bin/example" RC_NUSHELL_ENV: "mkdir ~/.cache/\nexample _carapace nushell | save --force ~/.cache/example.nu" RC_NUSHELL: "source ~/.cache/example.nu\n$$env.config.completions.external.completer = $$example_completer" steps: diff --git a/.github/workflows/vhs.env b/.github/workflows/vhs.env index da1f11a02..f259fdd7c 100644 --- a/.github/workflows/vhs.env +++ b/.github/workflows/vhs.env @@ -1,4 +1,3 @@ -RC_BASH="ln -sf /carapace/example/example /usr/local/bin/example" RC_NUSHELL_ENV="mkdir ~/.cache/\nexample _carapace nushell | save --force ~/.cache/example.nu" RC_NUSHELL="source ~/.cache/example.nu\n$$env.config.completions.external.completer = $$example_completer" diff --git a/compose.yaml b/compose.yaml index 28506e670..e8808932c 100644 --- a/compose.yaml +++ b/compose.yaml @@ -106,6 +106,6 @@ services: volumes: - '.:/carapace/' working_dir: /carapace/docs/src/development/vhs - command: bash --login -c "ls -d */ | xargs -I'{}' bash -c \"cd {};ls *.tape | xargs -n1 vhs\"" + command: bash -c "ln -s /carapace/example/example /usr/local/bin/example && ls -d */ | xargs -I'{}' bash -c \"cd {};ls *.tape | xargs -n1 vhs\"" env_file: - .github/workflows/vhs.env diff --git a/docs/src/development/vhs/doubleQuote/out/doubleQuote.nushell.ascii b/docs/src/development/vhs/doubleQuote/out/doubleQuote.nushell.ascii index 544ff0e2f..70daa59d8 100644 --- a/docs/src/development/vhs/doubleQuote/out/doubleQuote.nushell.ascii +++ b/docs/src/development/vhs/doubleQuote/out/doubleQuote.nushell.ascii @@ -22,16 +22,16 @@ ──────────────────────────────────────────────────────────────────────────────── -> | example "ac" -NO RECORDS FOUND +> > example action + ──────────────────────────────────────────────────────────────────────────────── -> | example "ac" -NO RECORDS FOUND +> > example action + diff --git a/docs/src/development/vhs/doubleQuoteOpen/out/doubleQuoteOpen.nushell.ascii b/docs/src/development/vhs/doubleQuoteOpen/out/doubleQuoteOpen.nushell.ascii index 30d7824ec..eaaabe469 100644 --- a/docs/src/development/vhs/doubleQuoteOpen/out/doubleQuoteOpen.nushell.ascii +++ b/docs/src/development/vhs/doubleQuoteOpen/out/doubleQuoteOpen.nushell.ascii @@ -22,16 +22,16 @@ ──────────────────────────────────────────────────────────────────────────────── -> | example action embeddedP1 "embeddedP2 with -NO RECORDS FOUND +> > example action embeddedP1 "embeddedP2 with space" + ──────────────────────────────────────────────────────────────────────────────── -> | example action embeddedP1 "embeddedP2 with -NO RECORDS FOUND +> > example action embeddedP1 "embeddedP2 with space" + diff --git a/docs/src/development/vhs/escape/out/escape.nushell.ascii b/docs/src/development/vhs/escape/out/escape.nushell.ascii index 983782f81..19ff37201 100644 --- a/docs/src/development/vhs/escape/out/escape.nushell.ascii +++ b/docs/src/development/vhs/escape/out/escape.nushell.ascii @@ -23,17 +23,17 @@ ──────────────────────────────────────────────────────────────────────────────── > | example action embeddedP1 embeddedP2\ with\ -escape.bash.tape escape.elvish.tape escape.fish.tape -escape.nushell.tape escape.oil.tape escape.powershell.tape -escape.xonsh.tape escape.zsh.tape out/ +NO RECORDS FOUND + + ──────────────────────────────────────────────────────────────────────────────── > | example action embeddedP1 embeddedP2\ with\ -escape.bash.tape escape.elvish.tape escape.fish.tape -escape.nushell.tape escape.oil.tape escape.powershell.tape -escape.xonsh.tape escape.zsh.tape out/ +NO RECORDS FOUND + + diff --git a/docs/src/development/vhs/nospace/out/nospace.nushell.ascii b/docs/src/development/vhs/nospace/out/nospace.nushell.ascii index d97185b7f..1d0737d35 100644 --- a/docs/src/development/vhs/nospace/out/nospace.nushell.ascii +++ b/docs/src/development/vhs/nospace/out/nospace.nushell.ascii @@ -22,7 +22,7 @@ ──────────────────────────────────────────────────────────────────────────────── -> > example modifier --nospace out/ +> > example modifier --nospace one, @@ -30,7 +30,7 @@ ──────────────────────────────────────────────────────────────────────────────── -> > example modifier --nospace out/ +> > example modifier --nospace one, diff --git a/docs/src/development/vhs/nushell.tape b/docs/src/development/vhs/nushell.tape index 4441426c8..ac1bf7301 100644 --- a/docs/src/development/vhs/nushell.tape +++ b/docs/src/development/vhs/nushell.tape @@ -10,5 +10,8 @@ Set Padding 0 Set Shell "nu" Hide +Type@10ms "example _carapace nushell | save --force /tmp/example.nu" Enter +Type@10ms "source /tmp/example.nu" Enter +Type@10ms "$env.config.completions.external.completer = $example_completer" Enter Type@10ms "clear" Enter Show diff --git a/docs/src/development/vhs/redirect/out/redirect.nushell.ascii b/docs/src/development/vhs/redirect/out/redirect.nushell.ascii index 861990ef6..20a776241 100644 --- a/docs/src/development/vhs/redirect/out/redirect.nushell.ascii +++ b/docs/src/development/vhs/redirect/out/redirect.nushell.ascii @@ -23,14 +23,14 @@ ──────────────────────────────────────────────────────────────────────────────── > | example >/dev/null -out/ redirect.bash.tape -redirect.elvish.tape redirect.fish.tape -redirect.nushell.tape redirect.oil.tape -redirect.powershell.tape redirect.xonsh.tape -redirect.zsh.tape +NO RECORDS FOUND + + + + ──────────────────────────────────────────────────────────────────────────────── -> > example >/dev/null out/ +> > example >/dev/null @@ -38,7 +38,7 @@ redirect.zsh.tape ──────────────────────────────────────────────────────────────────────────────── -> > example >/dev/null out/ +> > example >/dev/null diff --git a/docs/src/development/vhs/singleQuote/out/singleQuote.nushell.ascii b/docs/src/development/vhs/singleQuote/out/singleQuote.nushell.ascii index f0e26f3d0..266970519 100644 --- a/docs/src/development/vhs/singleQuote/out/singleQuote.nushell.ascii +++ b/docs/src/development/vhs/singleQuote/out/singleQuote.nushell.ascii @@ -22,16 +22,16 @@ ──────────────────────────────────────────────────────────────────────────────── -> | example 'ac' -NO RECORDS FOUND +> > example action + ──────────────────────────────────────────────────────────────────────────────── -> | example 'ac' -NO RECORDS FOUND +> > example action + diff --git a/docs/src/development/vhs/singleQuoteOpen/out/singleQuoteOpen.nushell.ascii b/docs/src/development/vhs/singleQuoteOpen/out/singleQuoteOpen.nushell.ascii index 33a24335f..e036d7119 100644 --- a/docs/src/development/vhs/singleQuoteOpen/out/singleQuoteOpen.nushell.ascii +++ b/docs/src/development/vhs/singleQuoteOpen/out/singleQuoteOpen.nushell.ascii @@ -22,16 +22,16 @@ ──────────────────────────────────────────────────────────────────────────────── -> | example action embeddedP1 'embeddedP2 with -NO RECORDS FOUND +> > example action embeddedP1 "embeddedP2 with space" + ──────────────────────────────────────────────────────────────────────────────── -> | example action embeddedP1 'embeddedP2 with -NO RECORDS FOUND +> > example action embeddedP1 "embeddedP2 with space" + diff --git a/docs/src/development/vhs/word/out/word.nushell.ascii b/docs/src/development/vhs/word/out/word.nushell.ascii index 1606574ad..0ac7b47c0 100644 --- a/docs/src/development/vhs/word/out/word.nushell.ascii +++ b/docs/src/development/vhs/word/out/word.nushell.ascii @@ -6,7 +6,7 @@ ──────────────────────────────────────────────────────────────────────────────── -> > example +> > example _carapace nushell | save --force /tmp/example.nu @@ -14,7 +14,7 @@ ──────────────────────────────────────────────────────────────────────────────── -> > example +> > example _carapace nushell | save --force /tmp/example.nu @@ -23,14 +23,14 @@ ──────────────────────────────────────────────────────────────────────────────── > | example -out/ word.bash.tape word.elvish.tape -word.fish.tape word.nushell.tape word.oil.tape -word.powershell.tape word.xonsh.tape word.zsh.tape - - - +action action example +alias action example +chain shorthand chain +compat +completion Generate the autocompletion script for the specified shell +flag flag example ──────────────────────────────────────────────────────────────────────────────── -> > example out/ +> > example action @@ -38,7 +38,7 @@ word.powershell.tape word.xonsh.tape word.zsh.tape ──────────────────────────────────────────────────────────────────────────────── -> > example out/ +> > example action diff --git a/docs/src/development/vhs/word/out/word.xonsh.ascii b/docs/src/development/vhs/word/out/word.xonsh.ascii index 00982b242..9043ef6b6 100644 --- a/docs/src/development/vhs/word/out/word.xonsh.ascii +++ b/docs/src/development/vhs/word/out/word.xonsh.ascii @@ -6,7 +6,7 @@ ──────────────────────────────────────────────────────────────────────────────── -> example +> example >/dev/null @@ -14,7 +14,7 @@ ──────────────────────────────────────────────────────────────────────────────── -> example +> example >/dev/null