diff options
author | Homu <homu@barosl.com> | 2016-02-25 14:12:22 +0900 |
---|---|---|
committer | Homu <homu@barosl.com> | 2016-02-25 14:12:22 +0900 |
commit | 5eab4722511d53bd53d1e9a55cb7a4535c0365ee (patch) | |
tree | 3ef95f0d34bebb563ecc9dea569022d4b35359d7 /lib | |
parent | 43b31afde9628c211f5ebd82bb46cab5982a80c4 (diff) | |
parent | 45136c90c3be96107c6a350cff22072cf318bba9 (diff) | |
download | bundler-5eab4722511d53bd53d1e9a55cb7a4535c0365ee.tar.gz |
Auto merge of #4271 - bundler:seg-load-exec, r=indirect
[Exec] Load instead of exec-ing
Proof-of-concept to avoid `exec` where possible, instead just using `load` when we'd be launching the same interpreter anyways. About a .2 second gain in my limited testing. Over a second gain in jruby in my testing, somehow.
Not near ready for merging, but pretty cool for an hour of hacking.
- [x] Tests
- [ ] Centralize error handling
- [ ] Raise exceptions instead of exiting
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bundler/cli/exec.rb | 58 |
1 files changed, 47 insertions, 11 deletions
diff --git a/lib/bundler/cli/exec.rb b/lib/bundler/cli/exec.rb index 77e75580..865ac202 100644 --- a/lib/bundler/cli/exec.rb +++ b/lib/bundler/cli/exec.rb @@ -18,16 +18,30 @@ module Bundler end def run - ui = Bundler.ui - raise ArgumentError if cmd.nil? - + validate_cmd! SharedHelpers.set_bundle_environment - bin_path = Bundler.which(@cmd) + if bin_path = Bundler.which(cmd) + kernel_load(bin_path, *args) && return if ruby_shebang?(bin_path) + # First, try to exec directly to something in PATH + kernel_exec([bin_path, cmd], *args) + else + # Just exec using the given command + kernel_exec(cmd, *args) + end + end + + private + + def validate_cmd! + return unless cmd.nil? + Bundler.ui.error "bundler: exec needs a command to run" + exit 128 + end + + def kernel_exec(*args) + ui = Bundler.ui Bundler.ui = nil - # First, try to exec directly to something in PATH - Kernel.exec([bin_path, @cmd], *args) if bin_path - # Just exec using the given command - Kernel.exec(@cmd, *args) + Kernel.exec(*args) rescue Errno::EACCES, Errno::ENOEXEC Bundler.ui = ui Bundler.ui.error "bundler: not executable: #{cmd}" @@ -37,10 +51,32 @@ module Bundler Bundler.ui.error "bundler: command not found: #{cmd}" Bundler.ui.warn "Install missing gem executables with `bundle install`" exit 127 - rescue ArgumentError + end + + def kernel_load(file, *args) + args.pop if args.last.is_a?(Hash) + ARGV.replace(args) + $0 = file + ui = Bundler.ui + Bundler.ui = nil + require "bundler/setup" + Kernel.load(file) + rescue SystemExit + raise + rescue Exception => e # rubocop:disable Lint/RescueException Bundler.ui = ui - Bundler.ui.error "bundler: exec needs a command to run" - exit 128 + Bundler.ui.error "bundler: failed to load command: #{cmd} (#{file})" + backtrace = e.backtrace.take_while {|bt| !bt.start_with?(__FILE__) } + abort "#{e.class}: #{e.message}\n #{backtrace.join("\n ")}" + end + + def ruby_shebang?(file) + possibilities = [ + "#!/usr/bin/env ruby\n", + "#!#{Gem.ruby}\n", + ] + first_line = File.open(file, "rb") {|f| f.read(possibilities.map(&:size).max) } + possibilities.any? {|shebang| first_line.start_with?(shebang) } end end end |