Merge remote branch 'mainstream/master'

Conflicts:
	railties/README
	railties/guides/source/active_support_core_extensions.textile
	railties/guides/source/getting_started.textile
	railties/lib/generators/rails/app/templates/README

1 files changed, 5 insertions, 17 deletions

diff --git a/railties/Rakefile b/railties/Rakefile
index ea0b8ef8fb..f32a794544 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -90,11 +90,11 @@ end
 
 # Publishing -------------------------------------------------------
 
-desc "Publish the rails gem"
-task :pgem => [:gem] do
-  require 'rake/contrib/sshpublisher'
-  Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
+desc "Release to gemcutter"
+task :release => :package do
+  require 'rake/gemcutter'
+  Rake::Gemcutter::Tasks.new(spec).define
+  Rake::Task['gem:push'].invoke
 end
 
 desc "Publish the guides"
@@ -105,15 +105,3 @@ task :pguides => :generate_guides do
   Rake::SshFilePublisher.new("web.rubyonrails.org", "/u/sites/guides.rubyonrails.org/public", "pkg", "guides.gz").upload
   `ssh web.rubyonrails.org 'cd /u/sites/guides.rubyonrails.org/public/ && tar -xvzf guides.gz && mv guides/output/* . && rm -rf guides*'`
 end
-
-desc "Publish the release files to RubyForge."
-task :release => [ :package ] do
-  require 'rake/contrib/rubyforgepublisher'
-  require 'rubyforge'
-
-  packages = %w( gem ).collect{ |ext| "pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}" }
-
-  rubyforge = RubyForge.new
-  rubyforge.login
-  rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
-end