kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

Properly detect the puma lib dir to find puma-wild

Browse source
This commit is contained in:
Evan Phoenix 2014-03-03 11:56:35 -08:00
parent b41e3e175c
commit c94b7995d2
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/puma/cli.rb
View file

@ -457,7 +457,10 @@ module Puma
if prune_bundler? && defined?(Bundler) if prune_bundler? && defined?(Bundler)
puma = Bundler.rubygems.loaded_specs("puma") puma = Bundler.rubygems.loaded_specs("puma")
puma_lib_dir = File.join(puma.full_gem_path, puma.require_paths.first)
dirs = puma.require_paths.map { |x| File.join(puma.full_gem_path, x) }
puma_lib_dir = dirs.detect { |x| File.exist? File.join(x, "../bin/puma-wild") }
deps = puma.runtime_dependencies.map { |d| deps = puma.runtime_dependencies.map { |d|
spec = Bundler.rubygems.loaded_specs(d.name) spec = Bundler.rubygems.loaded_specs(d.name)
@ -467,10 +470,13 @@ module Puma
if puma_lib_dir if puma_lib_dir
log "* Pruning Bundler environment" log "* Pruning Bundler environment"
Bundler.with_clean_env do Bundler.with_clean_env do
Kernel.exec(Gem.ruby, "-I", puma_lib_dir,
File.expand_path(puma_lib_dir + "/../bin/puma-wild"), wild = File.expand_path(File.join(puma_lib_dir, "../bin/puma-wild"))
deps,
*@original_argv) args = [Gem.ruby] + dirs.map { |x| ["-I", x] }.flatten +
[wild, deps] + @original_argv
Kernel.exec(*args)
end end
end end