mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
Don't rely on Bundler, but use Bundler env (#1466)
bundle exec puma was causing a lot of problems in development for me, and uninstalling puma constantly was getting on my nerves. AFAIK bundle exec ruby <puma script> is the same as bundle exec puma.
This commit is contained in:
parent
7165775970
commit
c87bbffdb0
1 changed files with 2 additions and 4 deletions
|
@ -41,10 +41,8 @@ class TestIntegration < Minitest::Test
|
|||
end
|
||||
|
||||
def server(argv)
|
||||
# when we were started with bundler all load-paths and bin-paths are setup correctly
|
||||
# this is what 9X% of users run, so it is what we should test
|
||||
# the other case is solely for package builders or testing 1-off cases where the system puma is used
|
||||
base = (defined?(Bundler) ? "bundle exec puma" : "#{Gem.ruby} -Ilib bin/puma")
|
||||
base = "#{Gem.ruby} -Ilib bin/puma"
|
||||
base.prepend("bundle exec ") if defined?(Bundler)
|
||||
cmd = "#{base} -b tcp://127.0.0.1:#{@tcp_port} #{argv}"
|
||||
@server = IO.popen(cmd, "r")
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue