Skip to content

init: pin Ruby interpreter in shell wrappers #120

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
ipsavitsky wants to merge 1 commit into
base: main
Choose a base branch
from
Open

init: pin Ruby interpreter in shell wrappers #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions spec/init_spec.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Supported shells:
```bash
try() {
local out
out=$('/path/to/try' exec --path '/default/tries/path' "$@" 2>/dev/tty)
out=$('/path/to/ruby' '/path/to/try' exec --path '/default/tries/path' "$@" 2>/dev/tty)
if [ $? -eq 0 ]; then
eval "$out"
else
Expand All @@ -35,6 +35,9 @@ try() {

Key elements:
- Function name: `try`
- Pins the Ruby interpreter that was used to run `init` (via `RbConfig.ruby`), so the
function works even when Ruby is not on `$PATH` (e.g. NixOS, where Ruby only exists
inside the `try` package's wrapper)
- Captures `try exec` output to local variable
- Redirects stderr to `/dev/tty` (TUI renders to stderr)
- Exit code 0: Evaluates the output (executes cd, git clone, etc.)
Expand All @@ -44,7 +47,7 @@ Key elements:

```fish
function try
set -l out (/path/to/try exec --path '/default/tries/path' $argv 2>/dev/tty | string collect)
set -l out ('/path/to/ruby' '/path/to/try' exec --path '/default/tries/path' $argv 2>/dev/tty | string collect)
if test $pipestatus[1] -eq 0
eval $out
else
Expand All @@ -56,10 +59,13 @@ end
## Path Embedding

The init output must embed:
1. The full path to the `try` binary (resolved at init time)
2. The default tries path (typically `~/src/tries`)
1. The absolute path to the Ruby interpreter that ran `init` (`RbConfig.ruby`),
resolved at init time so the function does not depend on Ruby being in `$PATH`
2. The full path to the `try` script (resolved at init time)
3. The default tries path (typically `~/src/tries`)

This ensures the wrapper always calls the correct binary regardless of `$PATH` changes.
This ensures the wrapper always calls the correct binary and interpreter regardless
of `$PATH` changes.

## Installation Instructions

Expand Down
8 changes: 5 additions & 3 deletions try.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1263,12 +1263,14 @@ def shell_rc_file(shell)
end

def init_snippet(shell, script_path, explicit_path, default_path)
require 'rbconfig'
ruby_bin = RbConfig.ruby
case shell
when 'fish'
fish_path_arg = explicit_path ? " --path '#{explicit_path}'" : " --path (if set -q TRY_PATH; echo \"$TRY_PATH\"; else; echo '#{default_path}'; end)"
<<~FISH
function try
set -l out (/usr/bin/env ruby '#{script_path}' exec#{fish_path_arg} $argv 2>/dev/tty | string collect)
set -l out ('#{ruby_bin}' '#{script_path}' exec#{fish_path_arg} $argv 2>/dev/tty | string collect)
if test $pipestatus[1] -eq 0
eval $out
else
Expand All @@ -1286,7 +1288,7 @@ def init_snippet(shell, script_path, explicit_path, default_path)
function try {
$tryPath = #{ps_path_expr}
$tempErr = [System.IO.Path]::GetTempFileName()
$out = & ruby '#{script_path}' exec --path $tryPath @args 2>$tempErr
$out = & '#{ruby_bin}' '#{script_path}' exec --path $tryPath @args 2>$tempErr
if ($LASTEXITCODE -eq 0) {
$out | Invoke-Expression
} else {
Expand All @@ -1301,7 +1303,7 @@ def init_snippet(shell, script_path, explicit_path, default_path)
<<~SH
try() {
local out
out=$(/usr/bin/env ruby '#{script_path}' exec#{path_arg} "$@" 2>/dev/tty)
out=$('#{ruby_bin}' '#{script_path}' exec#{path_arg} "$@" 2>/dev/tty)
if [ $? -eq 0 ]; then
eval "$out"
else
Expand Down