@@ -41,9 +41,6 @@ require 'rack' require 'rack/adapter/loader' module Rack - module Handler - autoload :Thin, 'rack/handler/thin' - end module Adapter autoload :Rails, 'rack/adapter/rails' end lib/thin.rb @@ -34,12 +34,13 @@ module Thin # Turn into a runnable shell command def shellify shellified_options = @options.inject([]) do |args, (name, value)| + option_name = name.to_s.tr("_", "-") case value when NilClass, - TrueClass then args << "--#{name}" + TrueClass then args << "--#{option_name}" when FalseClass - when Array then value.each { |v| args << "--#{name}=#{v.inspect}" } - else args << "--#{name.to_s.tr('_', '-')}=#{value.inspect}" + when Array then value.each { |v| args << "--#{option_name}=#{v.inspect}" } + else args << "--#{option_name}=#{value.inspect}" end args end lib/thin/command.rb @@ -92,7 +92,7 @@ module Thin opts.separator "Cluster options:" opts.on("-s", "--servers NUM", "Number of servers to start") { |num| @options[:servers] = num.to_i } - opts.on("-o", "--only NUM", "Send command to only one server of the cluster") { |only| @options[:only] = only } + opts.on("-o", "--only NUM", "Send command to only one server of the cluster") { |only| @options[:only] = only.to_i } opts.on("-C", "--config FILE", "Load options from config file") { |file| @options[:config] = file } opts.on( "--all [DIR]", "Send command to each config files in DIR") { |dir| @options[:all] = dir } if Thin.linux? end lib/thin/runner.rb @@ -5,14 +5,14 @@ module Thin module VERSION #:nodoc: MAJOR = 1 - MINOR = 0 + MINOR = 1 TINY = 1 STRING = [MAJOR, MINOR, TINY].join('.') - CODENAME = "?".freeze + CODENAME = "Super Disco Power Plus".freeze - RACK = [0, 3].freeze # Latest Rack version that was tested + RACK = [0, 1].freeze # Rack protocol version that was tested end NAME = 'thin'.freeze lib/thin/version.rb @@ -4,7 +4,7 @@ describe Command do before do Command.script = 'thin' @command = Command.new(:start, :port => 3000, :daemonize => true, :log => 'hi.log', - :require => %w(rubygems thin)) + :require => %w(rubygems thin), :no_epoll => true) end it 'should shellify command' do @@ -17,4 +17,9 @@ describe Command do out = @command.shellify out.should include('--require="rubygems"', '--require="thin"') end + + it 'should convert _ to - in option name' do + out = @command.shellify + out.should include('--no-epoll') + end end \ No newline at end of file spec/command_spec.rb @@ -2,10 +2,11 @@ require File.dirname(__FILE__) + '/spec_helper' describe Runner do it "should parse options" do - runner = Runner.new(%w(start --pid test.pid --port 5000)) + runner = Runner.new(%w(start --pid test.pid --port 5000 -o 3000)) runner.options[:pid].should == 'test.pid' runner.options[:port].should == 5000 + runner.options[:only].should == 3000 end it "should parse specified command" do @@ -164,4 +165,4 @@ describe Runner, "service" do runner.run! end -end \ No newline at end of file +end spec/runner_spec.rb @@ -63,7 +63,7 @@ module Matchers class ValidateWithLint def matches?(request) @request = request - Rack::Lint.new(proc{[200, {'Content-Type' => 'text/html'}, []]}).call(@request.env) + Rack::Lint.new(proc{[200, {'Content-Type' => 'text/html', 'Content-Length' => '0'}, []]}).call(@request.env) true rescue Rack::Lint::LintError => e @message = e.message @@ -71,7 +71,7 @@ module Matchers end def failure_message(negation=nil) - "should#{negation} validate with Rack Lint" + "should#{negation} validate with Rack Lint: #{@message}" end def negative_failure_message spec/spec_helper.rb @@ -20,8 +20,8 @@ spec = Gem::Specification.new do |s| s.required_ruby_version = '>= 1.8.5' - s.add_dependency 'rack', '>= 0.3.0' - s.add_dependency 'eventmachine', '>= 0.12.0' + s.add_dependency 'rack', '>= 0.9.1' + s.add_dependency 'eventmachine', '>= 0.12.4' unless WIN s.add_dependency 'daemons', '>= 1.0.9' end tasks/gem.rake lib/rack/handler/thin.rb 1b7c2e0c1ebee29ce342d3e4a9a333923310c9b5 c8f4627bf046680abb85665f28ab926e36c931db raggi jftucker@gmail.com http://github.com/macournoyer/thin/commit/2a331bfbe8a4ae6c332094f333c4308449c11947 2a331bfbe8a4ae6c332094f333c4308449c11947 2009-03-16T15:12:15-07:00 2009-03-16T15:12:15-07:00 Merge commit 'origin/master' into async_for_rack * commit 'origin/master': Add changelog entry for last commit and bump version number. Fix error when using only options Regenerate gemspec Require EventMachine 0.12.4 Remove Thin handler, now part of Rack 0.9.1 regenerate .gemspec Make Parser test work w/ new Lint Rack validator, add Content-Length. Name version Super Disco Power and bump to 1.1.0. Fix Rack protocol version to 0.1. Fix error when passing no_epoll option to a cluster. b4c48dbeef21863bf877105703a069e3bdfcf516 raggi jftucker@gmail.com