pitchfork in pitchfork-0.2.0

- old
+ new

@@ -4,11 +4,10 @@
 require 'optparse'
 
 ENV["RACK_ENV"] ||= "development"
 rackup_opts = Pitchfork::Configurator::RACKUP
 options = rackup_opts[:options]
-set_no_default_middleware = true
 
 op = OptionParser.new("", 24, '  ') do |opts|
   cmd = File.basename($0)
   opts.banner = "Usage: #{cmd} " \
                 "[ruby options] [#{cmd} options] [rackup config file]"
@@ -57,15 +56,10 @@
   opts.on("-E", "--env RACK_ENV",
           "use RACK_ENV for defaults (default: development)") do |e|
     ENV["RACK_ENV"] = e
   end
 
-  opts.on("-N", "--no-default-middleware",
-          "do not load middleware implied by RACK_ENV") do |e|
-    rackup_opts[:no_default_middleware] = true if set_no_default_middleware
-  end
-
   opts.on("-s", "--server SERVER",
           "this flag only exists for compatibility") do |s|
     warn "-s/--server only exists for compatibility with rackup"
   end
 
@@ -99,11 +93,10 @@
   end
 
   opts.parse! ARGV
 end
 
-set_no_default_middleware = false
 app = Pitchfork.builder(ARGV[0] || 'config.ru', op)
 op = nil
 
 if $DEBUG
   require 'pp'
@@ -111,6 +104,6 @@
     :pitchfork_options => options,
     :app => app,
   })
 end
 
-Pitchfork::HttpServer.new(app, options).start.join
+exit(Pitchfork::HttpServer.new(app, options).start(false).join)