Skip to content
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

Jump to bottom

fix a regression, closes #1559 #1560

Merged
merged 1 commit into from Aug 22, 2019
Merged

fix a regression, closes #1559 #1560

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 12 additions & 3 deletions lib/sinatra/main.rb
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ module Sinatra

if ARGV.any?
require 'optparse'
OptionParser.new { |op|
parser = OptionParser.new { |op|
op.on('-p port', 'set the port (default is 4567)') { |val| ParamsConfig[:port] = Integer(val) }
op.on('-s server', 'specify rack server/handler (default is thin)') { |val| ParamsConfig[:server] = val }
op.on('-q', 'turn on quiet mode (default is off)') { ParamsConfig[:quiet] = true }
Expand All @@ -15,7 +15,12 @@ module Sinatra
op.on('-o addr', "set the host (default is (env == 'development' ? 'localhost' : '0.0.0.0'))") do |val|
ParamsConfig[:bind] = val
end
}.parse!(ARGV.dup)
}
begin
parser.parse!(ARGV.dup)
rescue => evar
ParamsConfig[:optparse_error] = evar
end
end

require 'sinatra/base'
Expand All @@ -29,7 +34,11 @@ class Application < Base

set :run, Proc.new { File.expand_path($0) == File.expand_path(app_file) }

ParamsConfig.each { |k, v| set k, v } if run? && ARGV.any?
if run? && ARGV.any?
error = ParamsConfig.delete(:optparse_error)
raise error if error
namusyaka marked this conversation as resolved.
Show resolved Hide resolved
ParamsConfig.each { |k, v| set k, v }
end
end

remove_const(:ParamsConfig)
Expand Down