diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/gem_dependency.rb | 34 | ||||
| -rw-r--r-- | railties/lib/tasks/framework.rake | 15 | ||||
| -rw-r--r-- | railties/lib/tasks/gems.rake | 16 |
3 files changed, 52 insertions, 13 deletions
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb index 45d838bcc1..3985443ceb 100644 --- a/railties/lib/rails/gem_dependency.rb +++ b/railties/lib/rails/gem_dependency.rb @@ -8,11 +8,17 @@ module Rails def initialize(name, options = {}) require 'rubygems' unless Object.const_defined?(:Gem) - @name = name.to_s - if options[:version] + + if options[:requirement] + @requirement = options[:requirement] + elsif options[:version] @requirement = Gem::Requirement.create(options[:version]) - @version = @requirement.instance_variable_get("@requirements").first.last + else + raise ArgumentError.new('Must pass either :version or :requirement') end + + @version = @requirement.instance_variable_get("@requirements").first.last if @requirement + @name = name.to_s @lib = options[:lib] @source = options[:source] @loaded = @frozen = @load_paths_added = false @@ -35,6 +41,14 @@ module Rails puts $!.to_s end + def dependencies + all_dependencies = specification.dependencies.map do |dependency| + GemDependency.new(dependency.name, :requirement => dependency.version_requirements) + end + all_dependencies += all_dependencies.map(&:dependencies).flatten + all_dependencies.uniq + end + def gem_dir(base_directory) File.join(base_directory, specification.full_name) end @@ -64,10 +78,6 @@ module Rails 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 @@ -83,6 +93,16 @@ module Rails end end + def ==(other) + self.name == other.name && self.requirement == other.requirement + end + +private ################################################################### + + def specification + @spec ||= Gem.source_index.search(Gem::Dependency.new(@name, @requirement)).sort_by { |s| s.version }.last + end + def install_command cmd = %w(install) << @name cmd << "--version" << "#{@requirement.to_s}" if @requirement diff --git a/railties/lib/tasks/framework.rake b/railties/lib/tasks/framework.rake index 7955ded898..71aea09867 100644 --- a/railties/lib/tasks/framework.rake +++ b/railties/lib/tasks/framework.rake @@ -38,14 +38,17 @@ namespace :rails do end end - desc 'Lock to latest Edge Rails' + desc 'Lock to latest Edge Rails, for a specific release use RELEASE=1.2.0' task :edge do require 'open-uri' + version = ENV["RELEASE"] || "edge" + target = "rails_#{version}.zip" + url = "http://dev.rubyonrails.org/archives/#{target}" chdir 'vendor' do - puts 'Downloading Rails' - File.open('rails_edge.zip', 'wb') do |dst| - open 'http://dev.rubyonrails.org/archives/rails_edge.zip' do |src| + puts "Downloading Rails from #{url}" + File.open('rails.zip', 'wb') do |dst| + open url do |src| while chunk = src.read(4096) dst << chunk end @@ -54,8 +57,8 @@ namespace :rails do puts 'Unpacking Rails' rm_rf 'rails' - `unzip rails_edge.zip` - %w(rails_edge.zip rails/Rakefile rails/cleanlogs.sh rails/pushgems.rb rails/release.rb).each do |goner| + `unzip rails.zip` + %w(rails.zip rails/Rakefile rails/cleanlogs.sh rails/pushgems.rb rails/release.rb).each do |goner| rm_f goner end end diff --git a/railties/lib/tasks/gems.rake b/railties/lib/tasks/gems.rake index c8d5167be6..c18fea2d60 100644 --- a/railties/lib/tasks/gems.rake +++ b/railties/lib/tasks/gems.rake @@ -39,4 +39,20 @@ namespace :gems do gem.unpack_to(File.join(RAILS_ROOT, 'vendor', 'gems')) if gem.loaded? end end + + namespace :unpack do + desc "Unpacks the specified gems and its dependencies into vendor/gems" + task :dependencies => :unpack do + require 'rubygems' + require 'rubygems/gem_runner' + Rails.configuration.gems.each do |gem| + next unless ENV['GEM'].blank? || ENV['GEM'] == gem.name + gem.dependencies.each do |dependency| + dependency.add_load_paths # double check that we have not already unpacked + next if dependency.frozen? + dependency.unpack_to(File.join(RAILS_ROOT, 'vendor', 'gems')) + end + end + end + end end
\ No newline at end of file |