Skip to content
Browse files

oops... gems is quite necessary

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@865 19e92222-5c0b-0410-8929-a290d50e31e9
  • Loading branch information...
1 parent 6329da4 commit e7e39dd8868bed091431fe7d9d87a9dd460e7169 evanweaver committed
Showing with 48 additions and 14 deletions.
  1. +8 −8 Rakefile
  2. +2 −0 TODO
  3. +1 −1 bin/mongrel_rails
  4. +1 −1 lib/mongrel.rb
  5. +23 −0 lib/mongrel/gems.rb
  6. +1 −1 projects/mongrel_experimental/lib/mongrel_experimental.rb
  7. +10 −1 site/src/news.include
  8. +2 −2 site/src/news.page
View
16 Rakefile
@@ -15,14 +15,14 @@ e = Echoe.new("mongrel") do |p|
p.need_tar_gz = false
p.need_tgz = true
- case RUBY_PLATFORM
- when /mswin/
- p.certificate_chain = ['~/gem_certificates/mongrel-public_cert.pem',
- '~/gem_certificates/luislavena-mongrel-public_cert.pem']
- else
+# case RUBY_PLATFORM
+# when /mswin/
+# p.certificate_chain = ['~/gem_certificates/mongrel-public_cert.pem',
+# '~/gem_certificates/luislavena-mongrel-public_cert.pem']
+# else
p.certificate_chain = ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem',
'~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem']
- end
+# end
p.eval = proc do
case RUBY_PLATFORM
@@ -198,8 +198,8 @@ namespace :site do
FileList["**/*.tgz"].each {|tgz| mv tgz, "pkg/tars" }
# XXX Hack, because only Luis can package for Win32 right now
- # sh "cp ~/Downloads/mongrel-#{e.version}-mswin32.gem pkg/gems/"
- # sh "cp ~/Downloads/mongrel_service-0.3.3-mswin32.gem pkg/gems/"
+ sh "cp ~/Downloads/mongrel-#{e.version}-mswin32.gem pkg/gems/"
+ sh "cp ~/Downloads/mongrel_service-0.3.3-mswin32.gem pkg/gems/"
sh "rm -rf pkg/mongrel*"
sh "gem generate_index -d pkg"
sh "scp -r CHANGELOG pkg/* rubyforge.org:/var/www/gforge-projects/mongrel/releases/"
View
2 TODO
@@ -1,3 +1,5 @@
v1.2. Rewrite and merge mongrel cluster and mongrel_rails into something small and maintainable. Remove gem_plugin entirely.
+v1.1.1. See if Java is setting the server version string in the request properly.
+
View
2 bin/mongrel_rails
@@ -124,7 +124,7 @@ module Mongrel
end
config.run
- config.log "Mongrel available at #{@address}:#{@port}"
+ config.log "Mongrel #{Mongrel::Const::MONGREL_VERSION} available at #{@address}:#{@port}"
if config.defaults[:daemon]
config.write_pid_file
View
2 lib/mongrel.rb
@@ -348,4 +348,4 @@ def stop(synchronous=false)
# in regular Mongrel.
$LOAD_PATH.unshift 'projects/mongrel_experimental/lib/'
-Mongrel::Gems.require 'mongrel_experimental', '=1.1'
+Mongrel::Gems.require 'mongrel_experimental', ">=#{Mongrel::Const::MONGREL_VERSION}"
View
23 lib/mongrel/gems.rb
@@ -0,0 +1,23 @@
+module Mongrel
+ module Gems
+ class << self
+
+ alias :original_require :require
+
+ def require(library, version = nil)
+ begin
+ original_require library
+ rescue LoadError, RuntimeError => e
+ unless respond_to? 'gem'
+ # ActiveSupport breaks 'require' by making it always return a true value
+ require 'rubygems'
+ gem library, version if version
+ retry
+ end
+ # Fail without reraising
+ end
+ end
+
+ end
+ end
+end
View
2 projects/mongrel_experimental/lib/mongrel_experimental.rb
@@ -1,3 +1,3 @@
require 'uri_classifier'
-STDERR.puts "** mongrel_experimental loaded"
+STDERR.puts "** Mongrel_experimental loaded"
View
11 site/src/news.include
@@ -1,7 +1,16 @@
<dl>
+ <dt>Nov-1-2007</dt>
+ <dd>
+ <h5><a href="{relocatable: news.html}">Mongrel 1.1, caffeinated edition</a></h5>
+
+ <p>Mongrel 1.1 is out, with JRuby support. Mongrel_cluster is also updated to 1.0.4.</p>
+ <a href="http://rubyforge.org/frs/?group_id=1306" title="Downloads">Download</a>
+ <a href="{relocatable: news.html}"><img src="{relocatable: images/li4.gif}" alt="more" /><br /></a></p>
+ </dd>
+
<dt>Oct-29-2007</dt>
<dd>
- <h5><a href="{relocatable: news.html}">Mongrel 1.0.4 released</a></h5>
+ <h5><a href="{relocatable: news.html}">Mongrel 1.0.4, bugfix release</a></h5>
<p>Mongrel 1.0.4 is out. It fixes three bugs that were introduced in 1.0.3.</p>
<a href="http://rubyforge.org/frs/?group_id=1306" title="Downloads">Download</a>
View
4 site/src/news.page
@@ -7,9 +7,9 @@ ordering: 2
h1. Latest News
-h2. Nov 1: Mongrel 1.1, Java edition
+h2. Nov 1: Mongrel 1.1, caffeinated edition
-Mongrel 1.1. It adds JRuby support. Mongrel_cluster is also updated to 1.0.4, with fixes for a Capistrano recipe bug.
+Mongrel 1.1 is out, with JRuby support. Mongrel_cluster is also updated to 1.0.4, with fixes for a Capistrano recipe bug. The URIClassifier has been updated; if you still need the old one (you don't), it's available in the mongrel_experimental gem.
h2. Oct 29: Mongrel 1.0.4, spooky.

0 comments on commit e7e39dd

Please sign in to comment.
Something went wrong with that request. Please try again.