lib/sinatra/main.rb in sinatra-2.0.6 vs lib/sinatra/main.rb in sinatra-2.0.7

@@ -1,11 +1,11 @@
 module Sinatra
   ParamsConfig = {}
 
   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 }
       op.on('-x',        'turn on the mutex lock (default is off)')       {       ParamsConfig[:lock] = true }
       op.on('-e env',    'set the environment (default is development)')  do |val|
@@ -13,11 +13,16 @@
         ParamsConfig[:environment] = val.to_sym
       end
       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'
 
   class Application < Base
@@ -27,10 +32,14 @@
     # on this path by default.
     set :app_file, caller_files.first || $0
 
     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
+      ParamsConfig.each { |k, v| set k, v }
+    end
   end
 
   remove_const(:ParamsConfig)
   at_exit { Application.run! if $!.nil? && Application.run? }
 end