Permalink
Browse files

added Rack dependency to gem and installer (required for full Rack ra…

…ckup support as well as the adapters and middleware that come with Rack)
  • Loading branch information...
1 parent 3462db3 commit a7472636435b00b8db2b6551c3a6a51df7232616 @remi remi committed Jun 3, 2008
Showing with 20 additions and 1 deletion.
  1. +1 −0 Rakefile
  2. +2 −1 bin/passenger-install-apache2-module
  3. +17 −0 lib/passenger/dependencies.rb
View
@@ -393,6 +393,7 @@ spec = Gem::Specification.new do |s|
s.require_path = ["lib", "ext"]
s.add_dependency 'rake', '>= 0.8.1'
s.add_dependency 'fastthread', '>= 1.0.1'
+ s.add_dependency 'rack', '>= 0.1.0'
s.extensions << 'ext/passenger/extconf.rb'
s.files = FileList[
'Rakefile',
@@ -47,7 +47,8 @@ class Installer
Dependencies::Apache2,
Dependencies::Apache2_DevHeaders,
Dependencies::APR_DevHeaders,
- Dependencies::FastThread
+ Dependencies::FastThread,
+ Dependencies::Rack
]
def start
@@ -287,6 +287,23 @@ module Dependencies # :nodoc: all
end
dep.install_instructions = "Please install RubyGems first, then run <b>gem install fastthread</b>"
end
+
+ Rack = Dependency.new do |dep|
+ dep.name = "rack"
+ dep.define_checker do |result|
+ begin
+ begin
+ require 'rubygems'
+ rescue LoadError
+ end
+ require 'rack'
+ result.found
+ rescue LoadError
+ result.not_found
+ end
+ end
+ dep.install_instructions = "Please install RubyGems first, then run <b>gem install rack</b>"
+ end
end
end # module Passenger

0 comments on commit a747263

Please sign in to comment.