Permalink
Browse files

add support for trinidad

  • Loading branch information...
1 parent 2efb82b commit 385bca005597c2b0c18e57c50975bf1492eb2714 @rkh rkh committed Mar 10, 2012
Showing with 6 additions and 4 deletions.
  1. +1 −0 Gemfile
  2. +1 −1 lib/sinatra/base.rb
  3. +1 −0 test/integration_helper.rb
  4. +3 −3 test/settings_test.rb
View
@@ -46,6 +46,7 @@ gem 'radius'
if RUBY_ENGINE == 'jruby'
gem 'nokogiri', '!= 1.5.0'
gem 'jruby-openssl'
+ gem 'trinidad'
else
gem 'yajl-ruby'
gem 'nokogiri'
View
@@ -1566,7 +1566,7 @@ class << self
set :run, false # start server via at-exit hook?
set :running, false # is the built-in server running now?
- set :server, %w[thin puma mongrel webrick]
+ set :server, %w[trinidad thin puma mongrel webrick]
set :bind, '0.0.0.0'
set :port, 4567
@@ -119,6 +119,7 @@ def kill
Process.kill("KILL", pipe.pid)
rescue NotImplementedError
system "kill -9 #{pipe.pid}"
+ rescue Errno::ESRCH
end
def webrick?
@@ -422,9 +422,9 @@ def pub; end
end
describe 'server' do
- it 'is one of thin, puma, mongrel, webrick' do
- assert_equal %w[thin puma mongrel webrick], @base.server
- assert_equal %w[thin puma mongrel webrick], @application.server
+ it 'is one of trinidad, thin, puma, mongrel, webrick' do
+ assert_equal %w[trinidad thin puma mongrel webrick], @base.server
+ assert_equal %w[trinidad thin puma mongrel webrick], @application.server
end
end

0 comments on commit 385bca0

Please sign in to comment.