aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2008-04-02 17:48:30 +0000
committerRick Olson <technoweenie@gmail.com>2008-04-02 17:48:30 +0000
commit7d2316604a0bb04fe8c800e12876c58bdac651b4 (patch)
treec692746bd96df3f3ae82962c77388c0446c1e207
parent2c6f1d43962796558301528e2c9ff40e53f01409 (diff)
downloadrails-7d2316604a0bb04fe8c800e12876c58bdac651b4.tar.gz
rails-7d2316604a0bb04fe8c800e12876c58bdac651b4.tar.bz2
rails-7d2316604a0bb04fe8c800e12876c58bdac651b4.zip
Flesh out rake gems:unpack to unpack all gems, and add rake gems:build for native extensions. Closes #11513 [ddollar]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9215 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/CHANGELOG8
-rw-r--r--railties/lib/initializer.rb1
-rw-r--r--railties/lib/rails/gem_dependency.rb16
-rw-r--r--railties/lib/tasks/gems.rake23
4 files changed, 40 insertions, 8 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 90e3a48102..dfa80e1e82 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,13 @@
*SVN*
+* Flesh out rake gems:unpack to unpack all gems, and add rake gems:build for native extensions. [ddollar]
+
+ rake gems:unpack # unpacks all gems
+ rake gems:unpack GEM=mygem # unpacks only the gem 'mygem'
+
+ rake gems:build # builds all unpacked gems
+ rake gems:build GEM=mygem # builds only the gem 'mygem'
+
* Add config.active_support for future configuration options. Also, add more new Rails 3 config settings to new_rails_defaults.rb [rick]
* Add Rails.logger, Rails.root, Rails.env and Rails.cache shortcuts for RAILS_* constants [pratik]
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 8a5ca6f91b..61fcddc5f0 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -7,6 +7,7 @@ require 'railties_path'
require 'rails/version'
require 'rails/plugin/locator'
require 'rails/plugin/loader'
+require 'rails/gem_builder'
require 'rails/gem_dependency'
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index f9c37cb70a..8d6a748e4c 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -33,6 +33,10 @@ module Rails
rescue Gem::LoadError
puts $!.to_s
end
+
+ def gem_dir(base_directory)
+ File.join(base_directory, specification.full_name)
+ end
def load
return if @loaded || @load_paths_added == false
@@ -54,12 +58,24 @@ module Rails
def install
Gem::GemRunner.new.run(install_command)
end
+
+ def specification
+ @spec ||= Gem.source_index.search(Gem::Dependency.new(@name, @requirement)).sort_by { |s| s.version }.last
+ end
def unpack_to(directory)
FileUtils.mkdir_p directory
Dir.chdir directory do
Gem::GemRunner.new.run(unpack_command)
end
+
+ # copy the gem's specification into GEMDIR/.specification so that
+ # we can access information about the gem on deployment systems
+ # without having the gem installed
+ spec_filename = File.join(gem_dir(directory), '.specification')
+ File.open(spec_filename, 'w') do |file|
+ file.puts specification.to_yaml
+ end
end
def install_command
diff --git a/railties/lib/tasks/gems.rake b/railties/lib/tasks/gems.rake
index 198f6050c3..8f3fc51635 100644
--- a/railties/lib/tasks/gems.rake
+++ b/railties/lib/tasks/gems.rake
@@ -6,6 +6,18 @@ task :gems => :environment do
end
namespace :gems do
+ desc "Build any native extensions for unpacked gems"
+ task :build do
+ Dir[File.join(RAILS_ROOT, 'vendor', 'gems', '*')].each do |gem_dir|
+ spec_file = File.join(gem_dir, '.specification')
+ next unless File.exists?(spec_file)
+ specification = YAML::load_file(spec_file)
+ next unless ENV['GEM'].blank? || ENV['GEM'] == specification.name
+ Rails::GemBuilder.new(specification, gem_dir).build_extensions
+ puts "Built gem: '#{gem_dir}'"
+ end
+ end
+
desc "Installs all required gems for this application."
task :install => :environment do
require 'rubygems'
@@ -15,17 +27,12 @@ namespace :gems do
desc "Unpacks the specified gem into vendor/gems."
task :unpack do
- raise "Specify name of gem in the config.gems array with GEM=" if ENV['GEM'].blank?
Rake::Task["environment"].invoke
require 'rubygems'
require 'rubygems/gem_runner'
- unless Rails.configuration.gems.select do |gem|
- if gem.loaded? && gem.name == ENV['GEM']
- gem.unpack_to(File.join(RAILS_ROOT, 'vendor', 'gems'))
- true
- end
- end.any?
- puts "No gem named #{ENV['GEM'].inspect} found."
+ Rails.configuration.gems.each do |gem|
+ next unless ENV['GEM'].blank? || ENV['GEM'] == gem.name
+ gem.unpack_to(File.join(RAILS_ROOT, 'vendor', 'gems')) if gem.loaded?
end
end
end \ No newline at end of file