0
@@ -550,15 +550,19 @@ class Merb::BootLoader::ChooseAdapter < Merb::BootLoader
0
 end
0
 
0
 class Merb::BootLoader::RackUpApplication < Merb::BootLoader
0
-
0
-  # Setup the Merb Rack App or read a rack.rb config file located at the
0
-  # Merb.root or Merb.root / config / rack.rb with the same syntax as the
0
-  # rackup tool that comes with rack. Automatically evals the rack.rb file in
0
+  # Setup the Merb Rack App or read a rackup file located at
0
+  # Merb::Config[:rackup] with the same syntax as the
0
+  # rackup tool that comes with rack. Automatically evals the file in
0
   # the context of a Rack::Builder.new { } block. Allows for mounting
0
   # additional apps or middleware.
0
   def self.run
0
     if File.exists?(Merb.dir_for(:config) / "rack.rb")
0
-      Merb::Config[:app] =  eval("::Rack::Builder.new {( #{IO.read(Merb.dir_for(:config) / 'rack.rb')}\n )}.to_app", TOPLEVEL_BINDING, __FILE__, __LINE__)
0
+      Merb::Config[:rackup] ||= Merb.dir_for(:config) / "rack.rb"
0
+    end
0
+
0
+    if Merb::Config[:rackup]
0
+      rackup_code = File.read(Merb::Config[:rackup])
0
+      Merb::Config[:app] = eval("::Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, Merb::Config[:rackup])
0
     else
0
       Merb::Config[:app] = ::Merb::Rack::Application.new
0
     end

0
@@ -166,6 +166,10 @@ module Merb
0
             options[:adapter] = adapter
0
           end
0
 
0
+          opts.on("-R", "--rackup FILE", "Load an alternate Rack config file (default is config/rack.rb)") do |rackup|
0
+            options[:rackup] = rackup
0
+          end
0
+
0
           opts.on("-i", "--irb-console", "This flag will start merb in irb console mode. All your models and other classes will be available for you in an irb session.") do |console|
0
             options[:adapter] = 'irb'
0
           end

0
@@ -4,29 +4,29 @@ describe Merb::Config do
0
   before do
0
     Merb::Config.setup
0
   end
0
-  
0
+
0
   it "should be able to yield the configuration via #use" do
0
     res = nil
0
     Merb::Config.use {|c| res = c}
0
     res.should == Merb::Config.defaults
0
   end
0
-  
0
+
0
   it "should be able to get a configuration key" do
0
     Merb::Config[:host].should == "0.0.0.0"
0
   end
0
-  
0
+
0
   it "should be able to set a configuration key" do
0
     Merb::Config[:bar] = "Hello"
0
     Merb::Config[:bar].should == "Hello"
0
   end
0
-  
0
+
0
   it "should be able to #delete a configuration key" do
0
-    Merb::Config[:bar] = "Hello"    
0
-    Merb::Config[:bar].should == "Hello"    
0
+    Merb::Config[:bar] = "Hello"
0
+    Merb::Config[:bar].should == "Hello"
0
     Merb::Config.delete(:bar)
0
-    Merb::Config[:bar].should == nil    
0
+    Merb::Config[:bar].should == nil
0
   end
0
-  
0
+
0
   it "should be able to #fetch a key that does exist" do
0
     Merb::Config.fetch(:host, "192.168.2.1").should == "0.0.0.0"
0
   end
0
@@ -43,43 +43,43 @@ describe Merb::Config do
0
     Merb::Config.parse_args(["-u", "tester"])
0
     Merb::Config[:user].should == "tester"
0
   end
0
-  
0
+
0
   it "should support -G to set the group to run Merb as" do
0
     Merb::Config.parse_args(["-G", "tester"])
0
-    Merb::Config[:group].should == "tester"    
0
+    Merb::Config[:group].should == "tester"
0
   end
0
 
0
   it "should support -f to set the filename to run Merb as" do
0
     Merb::Config.parse_args(["-d"])
0
     Merb::Config[:daemonize].should == true
0
   end
0
-  
0
+
0
   it "should support -c to set the number of cluster nodes" do
0
     Merb::Config.parse_args(["-c", "4"])
0
     Merb::Config[:cluster].should == "4"
0
   end
0
-  
0
+
0
   it "should support -p to set the port number" do
0
     Merb::Config.parse_args(["-p", "6000"])
0
-    Merb::Config[:port].should == "6000"    
0
+    Merb::Config[:port].should == "6000"
0
   end
0
-  
0
+
0
   it "should support -P to set the PIDfile" do
0
     Merb::Config.parse_args(["-P", "pidfile"])
0
     Merb::Config[:pid_file].should == "pidfile"
0
   end
0
-  
0
+
0
   it "should have server return PIDfile setting as is with no cluster nodes" do
0
     Merb::Config.parse_args(["-P", "pidfile", "-p", "6000"])
0
     Merb::Server.pid_file(6000).should == "pidfile"
0
   end
0
-  
0
+
0
   it "should support setting of PIDfile with cluster nodes" do
0
     Merb::Config.parse_args(["-P", "/tmp/merb.pidfile", "-c", "2", "-p", "6000"])
0
     Merb::Server.pid_file(6000).should == "/tmp/merb.6000.pidfile"
0
     Merb::Server.pid_file(6001).should == "/tmp/merb.6001.pidfile"
0
   end
0
-  
0
+
0
   it "should support default PIDfile setting" do
0
     Merb::Config.parse_args(["-p", "6000"])
0
     Merb::Server.pid_file(6000).should == Merb.log_path / "merb.6000.pid"
0
@@ -89,28 +89,33 @@ describe Merb::Config do
0
     Merb::Config.parse_args(["-h", "hostname"])
0
     Merb::Config[:host].should == "hostname"
0
   end
0
-  
0
+
0
   it "should support -i to specify loading IRB" do
0
     Merb::Config.parse_args(["-i"])
0
     Merb::Config[:adapter].should == "irb"
0
   end
0
-  
0
+
0
   it "should support -l to specify the log level" do
0
     Merb::Config.parse_args(["-l", "debug"])
0
     Merb::Config[:log_level].should == :debug
0
   end
0
-  
0
+
0
   it "should support -L to specify the location of the log file" do
0
     Merb::Config.parse_args(["-L", "log_file"])
0
     Merb::Config[:log_file].should == "log_file"
0
   end
0
-  
0
+
0
   it "should support -r to specify a runner" do
0
     Merb::Config.parse_args(["-r", "foo_runner"])
0
     Merb::Config[:runner_code].should == "foo_runner"
0
     Merb::Config[:adapter].should == "runner"
0
   end
0
-  
0
+
0
+  it "should support -R to specify a rackup file" do
0
+    Merb::Config.parse_args(["-R", "config.ru"])
0
+    Merb::Config[:rackup].should == "config.ru"
0
+  end
0
+
0
   it "should support -K for a graceful kill" do
0
     Merb::Server.should_receive(:kill).with("all", 1)
0
     Merb.start(["-K", "all"])
0
@@ -120,7 +125,7 @@ describe Merb::Config do
0
     Merb::Server.should_receive(:kill).with("all", 9)
0
     Merb.start(["-k", "all"])
0
   end
0
-  
0
+
0
   it "should support -X off to turn off the mutex" do
0
     Merb::Config.parse_args(["-X", "off"])
0
     Merb::Config[:use_mutex].should == false
0
@@ -130,7 +135,7 @@ describe Merb::Config do
0
     Merb::Config.parse_args(["-X", "on"])
0
     Merb::Config[:use_mutex].should == true
0
   end
0
-  
0
+
0
   it "should take Merb.disable into account" do
0
     Merb::Config[:disabled_components].should == []
0
     Merb::Config[:disabled_components] << :foo
0
@@ -140,7 +145,7 @@ describe Merb::Config do
0
     Merb.disabled?(:foo).should == true
0
     Merb.disabled?(:foo, :buz).should == true
0
   end
0
-  
0
+
0
   it "should take Merb.testing? into account" do
0
     $TESTING.should == true
0
     Merb::Config[:testing].should be_nil
0
@@ -151,5 +156,5 @@ describe Merb::Config do
0
     Merb.should be_testing
0
     $TESTING = true; Merb::Config[:testing] = false # reset
0
   end
0
-    
0
-end
0
\ No newline at end of file
0
+
0
+end