try-cli 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00a24afe865c51ab7042ceb3800d665c9446524c48aca062463fad9aeb54a894
-  data.tar.gz: 3433f233d6191fdd578d37e09ac2f229ee7fe030a13c0ec5ab4a1bce60e5821e
+  metadata.gz: 07dc2d2cbbb24c4c934bffceead77e583ef973e1c7f7a08361863c340a373783
+  data.tar.gz: 8c110d86811dbecdd9b7a0778605f76d3564f6f9eec697a05da809a98f39b5dd
 SHA512:
-  metadata.gz: 89ee4cecc2f8f7d05ba6ac56037db149b43b52efb111615753d975fea0a835e04adb9905c0864ccc3242a3f080510365d1a25b89fb077c04aa958a767a9b91b5
-  data.tar.gz: 1adc18aa91717d0984dfc468c7844ffe95357d50a1314bea7c2143b38666f7d7531cd933a3d8533e2b22a4f90359ee367580852c08229dfbb99a9dea629148ba
+  metadata.gz: c93e4020653e00136115a24cd831e409e00b3e1e9ae48013794b794115f37eae3df599af93c01bd4e571ca45933188c460a4e808e4ad6a78eef5b2384c814ff6
+  data.tar.gz: 5487462b36084f6f4b5b7ebe553724d9ac1bddd42246a5d9bea5a53f2702a1be311cfbae448686c68fe73a8134ab73af1bda5d2403ed0d19f5bc62589f33b09c

data/VERSION

@@ -1 +1 @@
-1.9.2
+1.9.3

data/try.rb

@@ -955,7 +955,7 @@ end
 # Main execution with OptionParser subcommands
 if __FILE__ == $0
 
-  VERSION = "1.9.2"
+  VERSION = "1.9.3"
 
   def print_global_help
     text = <<~HELP
@@ -1176,37 +1176,142 @@ if __FILE__ == $0
       File.expand_path(args.shift)
     end
 
-    # Priority: explicit init argument > $TRY_PATH (runtime) > default
     default_path = tries_path || File.expand_path("~/src/tries")
-    path_arg = explicit_path ? " --path '#{explicit_path}'" : " --path \"${TRY_PATH:-#{default_path}}\""
-    bash_or_zsh_script = <<~SHELL
-      try() {
-        local out
-        out=$(/usr/bin/env ruby '#{script_path}' exec#{path_arg} "$@" 2>/dev/tty)
-        if [ $? -eq 0 ]; then
-          eval "$out"
-        else
-          echo "$out"
-        fi
-      }
-    SHELL
-
-    fish_path_arg = explicit_path ? " --path '#{explicit_path}'" : " --path (if set -q TRY_PATH; echo \"$TRY_PATH\"; else; echo '#{default_path}'; end)"
-    fish_script = <<~SHELL
-      function try
-        set -l out (/usr/bin/env ruby '#{script_path}' exec#{fish_path_arg} $argv 2>/dev/tty | string collect)
-        if test $pipestatus[1] -eq 0
-          eval $out
-        else
-          echo $out
-        end
-      end
-    SHELL
+    shell = fish? ? 'fish' : 'bash'
+    puts init_snippet(shell, script_path, explicit_path, default_path)
+    exit 0
+  end
+
+  def cmd_install!(args, tries_path)
+    script_path = File.expand_path($0)
+
+    explicit_path = if args[0] && args[0].start_with?('/')
+      File.expand_path(args.shift)
+    end
+
+    default_path = tries_path || File.expand_path("~/src/tries")
+
+    shell = detect_shell
+    rc_file = shell_rc_file(shell)
+    snippet = init_snippet(shell, script_path, explicit_path, default_path)
+
+    unless rc_file
+      STDERR.puts "Error: could not determine shell config file"
+      STDERR.puts "Your shell was detected as: #{shell || 'unknown'}"
+      STDERR.puts "Run 'try init' and manually add the output to your shell config."
+      exit 1
+    end
+
+    rc_path = File.expand_path(rc_file)
+
+    # Check if already installed
+    if File.exist?(rc_path) && File.read(rc_path).include?("# try shell integration")
+      STDERR.puts "try is already installed in #{rc_path}"
+      STDERR.puts "To reinstall, remove the '# try shell integration' block first."
+      exit 0
+    end
+
+    block = "\n# try shell integration\n#{snippet}"
 
-    puts fish? ? fish_script : bash_or_zsh_script
+    if File.exist?(rc_path) && !File.writable?(rc_path)
+      STDERR.puts "Warning: #{rc_path} is read-only, skipping."
+      STDERR.puts "Run 'try init' and manually add the output to your shell config."
+      exit 1
+    end
+
+    FileUtils.mkdir_p(File.dirname(rc_path))
+    File.open(rc_path, 'a') { |f| f.write(block) }
+    STDERR.puts "Added try shell integration to #{rc_path}"
+    STDERR.puts "Restart your shell or run: source #{rc_path}" unless shell == 'pwsh'
+    STDERR.puts "Restart your shell or run: . $PROFILE" if shell == 'pwsh'
     exit 0
   end
 
+  def detect_shell
+    # Check SHELL env (Unix), then parent process, then PSModulePath for PowerShell
+    shell_env = ENV["SHELL"].to_s
+    return 'fish' if shell_env.include?('fish')
+    return 'zsh' if shell_env.include?('zsh')
+    return 'bash' if shell_env.include?('bash')
+
+    # PowerShell detection: PSModulePath is set in pwsh sessions
+    return 'pwsh' if ENV["PSModulePath"] && !ENV["PSModulePath"].empty?
+
+    # Fallback: check parent process name
+    parent = (`ps c -p #{Process.ppid} -o 'ucomm='`.strip rescue nil)
+    return 'fish' if parent&.include?('fish')
+    return 'zsh' if parent&.include?('zsh')
+    return 'bash' if parent&.include?('bash')
+    return 'pwsh' if parent&.match?(/pwsh|powershell/i)
+
+    nil
+  end
+
+  def shell_rc_file(shell)
+    case shell
+    when 'fish' then '~/.config/fish/config.fish'
+    when 'zsh'  then '~/.zshrc'
+    when 'bash'
+      # Prefer .bashrc, fall back to .bash_profile on macOS
+      File.exist?(File.expand_path('~/.bashrc')) ? '~/.bashrc' : '~/.bash_profile'
+    when 'pwsh'
+      # PowerShell profile path from $PROFILE, or the standard location
+      ENV["PROFILE"] || (Gem.win_platform? ?
+        File.join(ENV["USERPROFILE"] || Dir.home, "Documents", "PowerShell", "Microsoft.PowerShell_profile.ps1") :
+        File.join(Dir.home, ".config", "powershell", "Microsoft.PowerShell_profile.ps1"))
+    end
+  end
+
+  def init_snippet(shell, script_path, explicit_path, default_path)
+    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)
+          if test $pipestatus[1] -eq 0
+            eval $out
+          else
+            echo $out
+          end
+        end
+      FISH
+    when 'pwsh'
+      ps_path_expr = if explicit_path
+        "'#{explicit_path}'"
+      else
+        "$(if ($env:TRY_PATH) { $env:TRY_PATH } else { '#{default_path}' })"
+      end
+      <<~PWSH
+        function try {
+          $tryPath = #{ps_path_expr}
+          $tempErr = [System.IO.Path]::GetTempFileName()
+          $out = & ruby '#{script_path}' exec --path $tryPath @args 2>$tempErr
+          if ($LASTEXITCODE -eq 0) {
+            $out | Invoke-Expression
+          } else {
+            Get-Content $tempErr | Write-Host
+            $out | Write-Output
+          }
+          Remove-Item $tempErr -ErrorAction SilentlyContinue
+        }
+      PWSH
+    else # bash, zsh
+      path_arg = explicit_path ? " --path '#{explicit_path}'" : " --path \"${TRY_PATH:-#{default_path}}\""
+      <<~SH
+        try() {
+          local out
+          out=$(/usr/bin/env ruby '#{script_path}' exec#{path_arg} "$@" 2>/dev/tty)
+          if [ $? -eq 0 ]; then
+            eval "$out"
+          else
+            echo "$out"
+          fi
+        }
+      SH
+    end
+  end
+
   def cmd_cd!(args, tries_path, and_type, and_exit, and_keys, and_confirm)
     if args.first == "clone"
       return cmd_clone!(args[1..-1] || [], tries_path)
@@ -1427,6 +1532,9 @@ if __FILE__ == $0
   when 'init'
     cmd_init!(ARGV, tries_path)
     exit 0
+  when 'install'
+    cmd_install!(ARGV, tries_path)
+    exit 0
   when 'exec'
     sub = ARGV.first
     case sub

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: try-cli
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Tobi Lutke