From c1785f32825431d30a5d826066d37dfb0403cd46 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 4 Feb 2010 18:28:45 -0800
Subject: Release using gemcutter gem:push tasks

---
 railties/Rakefile | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'railties/Rakefile')

diff --git a/railties/Rakefile b/railties/Rakefile
index ea0b8ef8fb..808e39f887 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -4,6 +4,7 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
+require 'rake/gemcutter'
 
 require 'date'
 require 'rbconfig'
@@ -90,12 +91,10 @@ 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'`
-end
+Rake::Gemcutter::Tasks(spec)
+
+desc "Release to gemcutter"
+task :release => [:package, 'gem:push']
 
 desc "Publish the guides"
 task :pguides => :generate_guides do
@@ -105,15 +104,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
-- 
cgit v1.2.3


From 7b81f5981fd6dfcede61a89da80b09a1650e2c02 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 4 Feb 2010 18:44:14 -0800
Subject: Fix task defines

---
 railties/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/Rakefile')

diff --git a/railties/Rakefile b/railties/Rakefile
index 808e39f887..fad60e50c9 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -91,7 +91,7 @@ end
 
 # Publishing -------------------------------------------------------
 
-Rake::Gemcutter::Tasks(spec)
+Rake::Gemcutter::Tasks.new(spec).define
 
 desc "Release to gemcutter"
 task :release => [:package, 'gem:push']
-- 
cgit v1.2.3


From 459ecaf95db12ec64e70c02f8ee58ddb1133021e Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 5 Feb 2010 00:03:03 -0800
Subject: Submarine the rake-gemcutter dep in Rakefiles

---
 railties/Rakefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'railties/Rakefile')

diff --git a/railties/Rakefile b/railties/Rakefile
index fad60e50c9..f32a794544 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -4,7 +4,6 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
-require 'rake/gemcutter'
 
 require 'date'
 require 'rbconfig'
@@ -91,10 +90,12 @@ end
 
 # Publishing -------------------------------------------------------
 
-Rake::Gemcutter::Tasks.new(spec).define
-
 desc "Release to gemcutter"
-task :release => [:package, 'gem:push']
+task :release => :package do
+  require 'rake/gemcutter'
+  Rake::Gemcutter::Tasks.new(spec).define
+  Rake::Task['gem:push'].invoke
+end
 
 desc "Publish the guides"
 task :pguides => :generate_guides do
-- 
cgit v1.2.3