lib/rack/adapter/loader.rb spec/rack/loader_spec.rb spec/rack/rails_adapter_spec.rb @@ -1,3 +1,7 @@ +== 0.8.0 ??? release + * Guess which adapter to use from directory (chdir option) + or use specified one in 'adapter' option, re #47. + == 0.7.1 Fancy Pants release * Clean stale PID files when starting as daemon, fixes #53 [Chu Yeow] * Require EventMachine 0.11.0 for UNIX domain sockets. Until it's released, install from: CHANGELOG @@ -37,6 +37,7 @@ module Thin end require 'rack' +require 'rack/adapter/loader' module Rack module Handler lib/thin.rb @@ -1,16 +1,22 @@ require 'yaml' module Thin - # Build and control one Thin server. - # Hey Controller pattern is not only for web apps yo! - module Controllers - # Raised when a mandatory option is missing to run a command. - class OptionRequired < RuntimeError - def initialize(option) - super("#{option} option required") - end + # Error raised that will abort the process and print not backtrace. + class RunnerError < RuntimeError; end + + # Raised when a mandatory option is missing to run a command. + class OptionRequired < RunnerError + def initialize(option) + super("#{option} option required") end + end + + # Raised when an option is not valid. + class InvalidOption < RunnerError; end + # Build and control one Thin server. + # Hey Controller pattern is not only for web apps yo! + module Controllers # Controls a Thin server. # Allow to start, stop, restart and configure a single thin server. class Controller @@ -55,13 +61,11 @@ module Thin server.change_privilege @options[:user], @options[:group] if @options[:user] && @options[:group] # If a Rack config file is specified we eval it inside a Rack::Builder block to create - # a Rack adapter from it. DHH was hacker of the year a couple years ago so we default - # to Rails adapter. + # a Rack adapter from it. Or else we guess which adapter to use and load it. if @options[:rackup] - rackup_code = File.read(@options[:rackup]) - server.app = eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, @options[:rackup]) + server.app = load_rackup_config else - server.app = Rack::Adapter::Rails.new(@options.merge(:root => @options[:chdir])) + server.app = load_adapter end # If a prefix is required, wrap in Rack URL mapper @@ -148,6 +152,20 @@ module Thin sleep 1 if File.exist?(file) # HACK Give the thread a little time to open the file tail_thread end + + private + def load_adapter + adapter = @options[:adapter] || Rack::Adapter.guess(@options[:chdir]) + log ">> Using #{adapter} adapter" + Rack::Adapter.for(adapter, @options) + rescue Rack::AdapterNotFound => e + raise InvalidOption, e.message + end + + def load_rackup_config + rackup_code = File.read(@options[:rackup]) + eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, @options[:rackup]) + end end end end \ No newline at end of file lib/thin/controllers/controller.rb @@ -1,7 +1,7 @@ require 'optparse' require 'yaml' -module Thin +module Thin # CLI runner. # Parse options and send command to the correct Controller. class Runner @@ -62,14 +62,19 @@ module Thin opts.on("-p", "--port PORT", "use PORT (default: #{@options[:port]})") { |port| @options[:port] = port.to_i } 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("-e", "--environment ENV", "Rails environment " + - "(default: #{@options[:environment]})") { |env| @options[:environment] = env } + opts.on("-A", "--adapter NAME", "Rack adapter to use " + + "(default: auto-detected)") { |name| @options[:adapter] = name } opts.on("-c", "--chdir DIR", "Change to dir before starting") { |dir| @options[:chdir] = File.expand_path(dir) } opts.on("-r", "--rackup FILE", "Load a Rack config file instead of " + "Rails adapter") { |file| @options[:rackup] = file } - opts.on( "--prefix PATH", "Mount the app under PATH (start with /)") { |path| @options[:prefix] = path } opts.on( "--stats PATH", "Mount the Stats adapter under PATH") { |path| @options[:stats] = path } + opts.separator "" + opts.separator "Rails options:" + opts.on("-e", "--environment ENV", "Rails environment " + + "(default: #{@options[:environment]})") { |env| @options[:environment] = env } + opts.on( "--prefix PATH", "Mount the app under PATH (start with /)") { |path| @options[:prefix] = path } + unless Thin.win? # Daemonizing not supported on Windows opts.separator "" opts.separator "Daemon options:" @@ -153,7 +158,11 @@ module Thin end if controller.respond_to?(@command) - controller.send(@command, *@arguments) + begin + controller.send(@command, *@arguments) + rescue RunnerError => e + abort e.message + end else abort "Invalid options for command: #{@command}" end lib/thin/runner.rb @@ -5,12 +5,12 @@ module Thin module VERSION #:nodoc: MAJOR = 0 - MINOR = 7 - TINY = 1 + MINOR = 8 + TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') - CODENAME = 'Fancy Pants' + CODENAME = 'No Name Yet' RACK = [0, 3].freeze # Latest Rack version that was tested end lib/thin/version.rb @@ -10,7 +10,8 @@ describe Controller, 'start' do :log => 'thin.log', :timeout => 60, :max_conns => 2000, - :max_persistent_conns => 1000) + :max_persistent_conns => 1000, + :adapter => 'rails') @server = OpenStruct.new @adapter = OpenStruct.new spec/controllers/controller_spec.rb spec/rack_rails_spec.rb 01b9902d59c795e31931b18a97a7a12cbcdbf305 macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/af63af254fc3fe63c62d2091e897f6b74aae1706 af63af254fc3fe63c62d2091e897f6b74aae1706 2008-03-13T20:58:49-07:00 2008-03-13T20:58:49-07:00 * Guess which adapter to use from directory (chdir option) or use specified one in 'adapter' option, re #47. 0f8b3389a8f6ef6d09a5214a6e62a15910418247 macournoyer macournoyer@gmail.com