@@ -1,25 +1,25 @@ module Rack class AdapterNotFound < RuntimeError; end - + # Hash used to guess which adapter to use in <tt>Adapter.for</tt>. # Framework name => file unique to this framework. # +nil+ for value to never guess. - ADAPTERS = { - :rails => "config/environment.rb", - :ramaze => "start.rb", - :merb => "config/init.rb", - :halcyon => 'runner.ru', - :mack => 'config/app_config/default.yml', - :file => nil - } - - module Adapter + ADAPTERS = [ + [:rails, 'config/environment.rb'], + [:ramaze, 'start.rb'], + [:halcyon, 'runner.ru'], + [:merb, 'config/init.rb'], + [:mack, 'config/app_config/default.yml'], + [:file, nil] + ] + + module Adapter # Guess which adapter to use based on the directory structure # or file content. # Returns a symbol representing the name of the adapter to use # to load the application under <tt>dir/</tt>. def self.guess(dir) - ADAPTERS.each_pair do |adapter, file| + ADAPTERS.each do |(adapter, file)| return adapter if file && ::File.exist?(::File.join(dir, file)) end raise AdapterNotFound, "No adapter found for #{dir}" @@ -33,39 +33,39 @@ module Rack when :ramaze require "#{options[:chdir]}/start" - + Ramaze.trait[:essentials].delete Ramaze::Adapter Ramaze.start :force => true - + return Ramaze::Adapter::Base - + when :merb require 'merb-core' - + Merb::Config.setup(:merb_root => options[:chdir], :environment => options[:environment]) Merb.environment = Merb::Config[:environment] Merb.root = Merb::Config[:merb_root] Merb::BootLoader.run - + return Merb::Rack::Application.new - + when :halcyon require 'halcyon' $:.unshift(Halcyon.root/'lib') - Halcyon::Runner.load_config Halcyon.root/'config'/'config.yml' return Halcyon::Runner.new - + when :mack ENV["MACK_ENV"] = options[:environment] load(::File.join(options[:chdir], "Rakefile")) require 'mack' return Mack::Utils::Server.build_app + when :file return Rack::File.new(options[:chdir]) - + else raise AdapterNotFound, "Adapter not found: #{name}" lib/rack/adapter/loader.rb @@ -63,7 +63,7 @@ module Thin opts.on("-S", "--socket FILE", "bind to unix domain socket") { |file| @options[:socket] = file } opts.on("-y", "--swiftiply [KEY]", "Run using swiftiply") { |key| @options[:swiftiply] = key } opts.on("-A", "--adapter NAME", "Rack adapter to use (default: autodetect)", - "(#{Rack::ADAPTERS.keys.join(', ')})") { |name| @options[:adapter] = name } + "(#{Rack::ADAPTERS.map{|a|a.first}.join(', ')})") { |name| @options[:adapter] = name } opts.on("-R", "--rackup FILE", "Load a Rack config file instead of " + "Rack adapter") { |file| @options[:rackup] = file } opts.on("-c", "--chdir DIR", "Change to dir before starting") { |dir| @options[:chdir] = File.expand_path(dir) } lib/thin/runner.rb bdddd86657ae44adef067acc43b0a7391f3530de Matt Todd chiology@gmail.com http://github.com/macournoyer/thin/commit/1537b449d44cb79cfa3236e2d264cfea31ae8f0f 1537b449d44cb79cfa3236e2d264cfea31ae8f0f 2008-07-01T09:48:37-07:00 2008-07-01T09:48:37-07:00 Changed adapters to be guessed in specific order (due t potential conflicts). Updated testing and option listing. Updated the Halcyon adapter loader. cbe1bfede88d770dac5147fd0f99c4c6f3a98260 Matt Todd chiology@gmail.com