From 372e2cd24a292997669741b877763df11071743f Mon Sep 17 00:00:00 2001 From: Tim Preston Date: Tue, 12 Jul 2011 22:59:26 +1000 Subject: [PATCH] Add custom server to options (:server => 'thin'). --- lib/guard/rails.rb | 6 ++++-- lib/guard/rails/runner.rb | 1 + spec/lib/guard/rails/runner_spec.rb | 8 ++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/guard/rails.rb b/lib/guard/rails.rb index c7a9608..11758bc 100644 --- a/lib/guard/rails.rb +++ b/lib/guard/rails.rb @@ -12,7 +12,8 @@ module Guard :environment => 'development', :start_on_start => true, :force_run => false, - :timeout => 20 + :timeout => 20, + :server => nil } def initialize(watchers = [], options = {}) @@ -23,7 +24,8 @@ module Guard end def start - UI.info "Guard::Rails will now restart your app on port #{options[:port]} using #{options[:environment]} environment." + server = options[:server] ? "#{options[:server]} and " : "" + UI.info "Guard::Rails will now restart your app on port #{options[:port]} using #{server}#{options[:environment]} environment." run_all if options[:start_on_start] end diff --git a/lib/guard/rails/runner.rb b/lib/guard/rails/runner.rb index f909a49..322005c 100644 --- a/lib/guard/rails/runner.rb +++ b/lib/guard/rails/runner.rb @@ -37,6 +37,7 @@ module Guard ] rails_options << '-d' if options[:daemon] + rails_options << options[:server] if options[:server] %{sh -c 'cd #{Dir.pwd} && rails s #{rails_options.join(' ')} &'} end diff --git a/spec/lib/guard/rails/runner_spec.rb b/spec/lib/guard/rails/runner_spec.rb index 2280cf4..73f6b76 100644 --- a/spec/lib/guard/rails/runner_spec.rb +++ b/spec/lib/guard/rails/runner_spec.rb @@ -46,6 +46,14 @@ describe Guard::RailsRunner do runner.build_rails_command.should match(%r{ -d}) end end + + context 'custom server' do + let(:options) { default_options.merge(:server => 'thin') } + + it "should have the server name" do + runner.build_rails_command.should match(%r{thin}) + end + end end describe '#start' do -- 2.40.1