railties/lib/rails.rb railties/lib/rails/application.rb railties/test/application/load_test.rb railties/test/isolation/abstract_unit.rb @@ -31,3 +31,4 @@ actionpack/bin vendor/gems/ */vendor/gems/ bin/ +railties/tmp \ No newline at end of file .gitignore @@ -1,7 +1,6 @@ -require 'action_controller' - require 'fileutils' require 'optparse' +require 'rails' options = { :Port => 3000, @@ -46,10 +45,6 @@ end puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}" puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}#{options[:path]}" -%w(cache pids sessions sockets).each do |dir_to_make| - FileUtils.mkdir_p(File.join(RAILS_ROOT, 'tmp', dir_to_make)) -end - if options[:detach] Process.daemon pid = "#{RAILS_ROOT}/tmp/pids/server.pid" @@ -60,38 +55,7 @@ end ENV["RAILS_ENV"] = options[:environment] RAILS_ENV.replace(options[:environment]) if defined?(RAILS_ENV) -if File.exist?(options[:config]) - config = options[:config] - if config =~ /\.ru$/ - cfgfile = File.read(config) - if cfgfile[/^#\\(.*)/] - opts.parse!($1.split(/\s+/)) - end - inner_app = eval("Rack::Builder.new {( " + cfgfile + "\n )}.to_app", nil, config) - else - require config - inner_app = Object.const_get(File.basename(config, '.rb').capitalize) - end -else - require RAILS_ROOT + "/config/environment" - inner_app = ActionController::Dispatcher.new -end - -if options[:path].nil? - map_path = "/" -else - ActionController::Base.relative_url_root = options[:path] - map_path = options[:path] -end - -app = Rack::Builder.new { - use Rails::Rack::LogTailer unless options[:detach] - use Rails::Rack::Debugger if options[:debugger] - map map_path do - use Rails::Rack::Static - run inner_app - end -}.to_app +app = Rails::Application.load(RAILS_ROOT, options) puts "=> Call with -d to detach" railties/lib/rails/commands/server.rb 088ce2904d63d15979de561b913e3e88e656f3fa Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/rails/rails/commit/4129449594ad3d8ff2f8fb4836104f25406a104f 4129449594ad3d8ff2f8fb4836104f25406a104f 2009-09-25T17:42:53-07:00 2009-09-25T17:42:53-07:00 Start Rails::Application object 4c9f1c0de51cee6e37511e0c0e73550a982e78e0 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com