Merge commit 'mainstream/master'

1 files changed, 9 insertions, 30 deletions

diff --git a/activesupport/Rakefile b/activesupport/Rakefile
index 91c874d729..c27167287d 100644
--- a/activesupport/Rakefile
+++ b/activesupport/Rakefile
@@ -15,17 +15,17 @@ RUBY_FORGE_PROJECT = "activesupport"
 RUBY_FORGE_USER    = "webster132"
 
 task :default => :test
-Rake::TestTask.new { |t| 
-  t.libs << "test"
+Rake::TestTask.new do |t|
+  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
   t.warning = true
-}
-task :isolated_test do 
-  ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
-  Dir['test/**/*_test.rb'].all? do |file|
-    system(ruby, '-w', '-Ilib:test', file)
-  end or raise "Failures"
+end
+
+namespace :test do
+  Rake::TestTask.new(:isolated) do |t|
+    t.pattern = 'test/ts_isolated.rb'
+  end
 end
 
 # Create compressed packages
@@ -45,22 +45,7 @@ Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_files.exclude('lib/active_support/vendor/*')
 }
 
-spec = Gem::Specification.new do |s|
-  s.platform = Gem::Platform::RUBY
-  s.name = PKG_NAME
-  s.version = PKG_VERSION
-  s.summary = "Support and utility classes used by the Rails framework."
-  s.description = %q{Utility library which carries commonly used classes and goodies from the Rails framework}
-
-  s.files = [ "CHANGELOG", "README" ] + Dir.glob( "lib/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
-  s.require_path = 'lib'
-  s.has_rdoc = true
-
-  s.author = "David Heinemeier Hansson"
-  s.email = "david@loudthinking.com"
-  s.homepage = "http://www.rubyonrails.org"
-  s.rubyforge_project = "activesupport"
-end
+spec = eval(File.read('activesupport.gemspec'))
 
 Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
@@ -68,12 +53,6 @@ Rake::GemPackageTask.new(spec) do |p|
   p.need_zip = true
 end
 
-task :gemspec do
-  File.open(File.join(File.dirname(__FILE__), "#{spec.name}.gemspec"), "w") do |file|
-    file.puts spec.to_ruby
-  end
-end
-
 desc "Publish the beta gem"
 task :pgem => [:package] do
   require 'rake/contrib/sshpublisher'