New Version

Sync with Latest Instiki Trunk.
Migrate to Rails 1.2.5.
Bump version number.

vendor/rails/railties/lib/tasks/framework.rake

@@ -7,8 +7,8 @@ namespace :rails do
       Gem.manage_gems
 
       rails = (version = ENV['VERSION']) ?
-        Gem.cache.search('rails', "= #{version}").first :
-        Gem.cache.search('rails').sort_by { |g| g.version }.last
+        Gem.cache.find_name('rails', "= #{version}").first :
+        Gem.cache.find_name('rails').sort_by { |g| g.version }.last
 
       version ||= rails.version
 
@@ -59,8 +59,8 @@ namespace :rails do
 
         touch "vendor/rails/REVISION_#{ENV['REVISION']}"
       end
-      
-      for framework in %w( railties actionpack activerecord actionmailer activesupport actionwebservice )
+
+      for framework in %w(railties actionpack activerecord actionmailer activesupport activeresource)
         system "svn export #{rails_svn}/#{framework} vendor/rails/#{framework}" + (ENV['REVISION'] ? " -r #{ENV['REVISION']}" : "")
       end
     end

vendor/rails/railties/lib/tasks/routes.rake

@@ -0,0 +1,17 @@
+desc 'Print out all defined routes in match order, with names.'
+task :routes => :environment do
+  routes = ActionController::Routing::Routes.routes.collect do |route|
+    name = ActionController::Routing::Routes.named_routes.routes.index(route).to_s
+    verb = route.conditions[:method].to_s.upcase
+    segs = route.segments.inject("") { |str,s| str << s.to_s }
+    segs.chop! if segs.length > 1
+    reqs = route.requirements.empty? ? "" : route.requirements.inspect
+    {:name => name, :verb => verb, :segs => segs, :reqs => reqs}
+  end
+  name_width = routes.collect {|r| r[:name]}.collect {|n| n.length}.max
+  verb_width = routes.collect {|r| r[:verb]}.collect {|v| v.length}.max
+  segs_width = routes.collect {|r| r[:segs]}.collect {|s| s.length}.max
+  routes.each do |r|
+    puts "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:segs].ljust(segs_width)} #{r[:reqs]}"
+  end
+end