@@ -1,4 +1,5 @@ == 1.0.1 ? release + * Fix error when passing no_epoll option to a cluster. * Omit parsing #defined strings [Jérémy Zurcher] * Defaults SERVER_NAME to localhost like webrick does [#87 state:resolved] * Namespace parser to prevent error when mongrel is required [cliffmoon] CHANGELOG @@ -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 @@ -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 b9ea85d987454a89129c8854c6b43abc640f1efe macournoyer macournoyer@gmail.com http://github.com/rtomayko/thin/commit/3b7357dcbc165ac546fa51b0f14995a1d37e4912 3b7357dcbc165ac546fa51b0f14995a1d37e4912 2009-01-16T13:06:30-08:00 2009-01-16T13:06:30-08:00 Fix error when passing no_epoll option to a cluster. 006963d644e70fbb574ceeb506a1cba88dcfa140 macournoyer macournoyer@gmail.com