mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Revert r42938 "* lib/rubygems: Update to RubyGems 2.1.3"
It breaks build.
20130913T200302Z.diff.html.gz
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse
parent
2614d9ba2f
commit
269503b544
110 changed files with 4928 additions and 3479 deletions
|
|
@ -5,178 +5,179 @@ require 'rubygems/dependency_list'
|
|||
require 'rubygems/installer'
|
||||
require 'tsort'
|
||||
|
||||
module Gem
|
||||
class RequestSet
|
||||
class Gem::RequestSet
|
||||
|
||||
include TSort
|
||||
include TSort
|
||||
|
||||
def initialize(*deps)
|
||||
@dependencies = deps
|
||||
##
|
||||
# Array of gems to install even if already installed
|
||||
|
||||
yield self if block_given?
|
||||
attr_reader :always_install
|
||||
|
||||
attr_reader :dependencies
|
||||
|
||||
attr_accessor :development
|
||||
|
||||
##
|
||||
# Treat missing dependencies as silent errors
|
||||
|
||||
attr_accessor :soft_missing
|
||||
|
||||
def initialize *deps
|
||||
@dependencies = deps
|
||||
|
||||
@always_install = []
|
||||
@development = false
|
||||
@requests = []
|
||||
@soft_missing = false
|
||||
@sorted = nil
|
||||
@specs = nil
|
||||
|
||||
yield self if block_given?
|
||||
end
|
||||
|
||||
##
|
||||
# Declare that a gem of name +name+ with +reqs+ requirements is needed.
|
||||
|
||||
def gem name, *reqs
|
||||
@dependencies << Gem::Dependency.new(name, reqs)
|
||||
end
|
||||
|
||||
##
|
||||
# Add +deps+ Gem::Dependency objects to the set.
|
||||
|
||||
def import deps
|
||||
@dependencies += deps
|
||||
end
|
||||
|
||||
def install options, &block
|
||||
if dir = options[:install_dir]
|
||||
return install_into dir, false, options, &block
|
||||
end
|
||||
|
||||
attr_reader :dependencies
|
||||
cache_dir = options[:cache_dir] || Gem.dir
|
||||
|
||||
# Declare that a gem of name +name+ with +reqs+ requirements
|
||||
# is needed.
|
||||
#
|
||||
def gem(name, *reqs)
|
||||
@dependencies << Gem::Dependency.new(name, reqs)
|
||||
specs = []
|
||||
|
||||
sorted_requests.each do |req|
|
||||
if req.installed? and
|
||||
@always_install.none? { |spec| spec == req.spec.spec } then
|
||||
yield req, nil if block_given?
|
||||
next
|
||||
end
|
||||
|
||||
path = req.download cache_dir
|
||||
|
||||
inst = Gem::Installer.new path, options
|
||||
|
||||
yield req, inst if block_given?
|
||||
|
||||
specs << inst.install
|
||||
end
|
||||
|
||||
# Add +deps+ Gem::Depedency objects to the set.
|
||||
#
|
||||
def import(deps)
|
||||
@dependencies += deps
|
||||
specs
|
||||
end
|
||||
|
||||
def install_into dir, force = true, options = {}
|
||||
existing = force ? [] : specs_in(dir)
|
||||
existing.delete_if { |s| @always_install.include? s }
|
||||
|
||||
dir = File.expand_path dir
|
||||
|
||||
installed = []
|
||||
|
||||
sorted_requests.each do |req|
|
||||
if existing.find { |s| s.full_name == req.spec.full_name }
|
||||
yield req, nil if block_given?
|
||||
next
|
||||
end
|
||||
|
||||
path = req.download(dir)
|
||||
|
||||
unless path then # already installed
|
||||
yield req, nil if block_given?
|
||||
next
|
||||
end
|
||||
|
||||
options[:install_dir] = dir
|
||||
options[:only_install_dir] = true
|
||||
|
||||
inst = Gem::Installer.new path, options
|
||||
|
||||
yield req, inst if block_given?
|
||||
|
||||
inst.install
|
||||
|
||||
installed << req
|
||||
end
|
||||
|
||||
# Resolve the requested dependencies and return an Array of
|
||||
# Specification objects to be activated.
|
||||
#
|
||||
def resolve(set=nil)
|
||||
r = Gem::DependencyResolver.new(@dependencies, set)
|
||||
@requests = r.resolve
|
||||
installed
|
||||
end
|
||||
|
||||
##
|
||||
# Load a dependency management file.
|
||||
|
||||
def load_gemdeps path
|
||||
gf = Gem::RequestSet::GemDepedencyAPI.new self, path
|
||||
gf.load
|
||||
end
|
||||
|
||||
##
|
||||
# Resolve the requested dependencies and return an Array of Specification
|
||||
# objects to be activated.
|
||||
|
||||
def resolve set = nil
|
||||
resolver = Gem::DependencyResolver.new @dependencies, set
|
||||
resolver.development = @development
|
||||
resolver.soft_missing = @soft_missing
|
||||
|
||||
@requests = resolver.resolve
|
||||
end
|
||||
|
||||
##
|
||||
# Resolve the requested dependencies against the gems available via Gem.path
|
||||
# and return an Array of Specification objects to be activated.
|
||||
|
||||
def resolve_current
|
||||
resolve Gem::DependencyResolver::CurrentSet.new
|
||||
end
|
||||
|
||||
def sorted_requests
|
||||
@sorted ||= strongly_connected_components.flatten
|
||||
end
|
||||
|
||||
def specs
|
||||
@specs ||= @requests.map { |r| r.full_spec }
|
||||
end
|
||||
|
||||
def specs_in dir
|
||||
Dir["#{dir}/specifications/*.gemspec"].map do |g|
|
||||
Gem::Specification.load g
|
||||
end
|
||||
end
|
||||
|
||||
# Resolve the requested dependencies against the gems
|
||||
# available via Gem.path and return an Array of Specification
|
||||
# objects to be activated.
|
||||
#
|
||||
def resolve_current
|
||||
resolve DependencyResolver::CurrentSet.new
|
||||
end
|
||||
def tsort_each_node &block # :nodoc:
|
||||
@requests.each(&block)
|
||||
end
|
||||
|
||||
# Load a dependency management file.
|
||||
#
|
||||
def load_gemdeps(path)
|
||||
gf = GemDepedencyAPI.new(self, path)
|
||||
gf.load
|
||||
end
|
||||
def tsort_each_child node # :nodoc:
|
||||
node.spec.dependencies.each do |dep|
|
||||
next if dep.type == :development and not @development
|
||||
|
||||
def specs
|
||||
@specs ||= @requests.map { |r| r.full_spec }
|
||||
end
|
||||
|
||||
def tsort_each_node(&block)
|
||||
@requests.each(&block)
|
||||
end
|
||||
|
||||
def tsort_each_child(node)
|
||||
node.spec.dependencies.each do |dep|
|
||||
next if dep.type == :development
|
||||
|
||||
match = @requests.find { |r| dep.match? r.spec.name, r.spec.version }
|
||||
if match
|
||||
begin
|
||||
yield match
|
||||
rescue TSort::Cyclic
|
||||
end
|
||||
else
|
||||
match = @requests.find { |r| dep.match? r.spec.name, r.spec.version }
|
||||
if match
|
||||
begin
|
||||
yield match
|
||||
rescue TSort::Cyclic
|
||||
end
|
||||
else
|
||||
unless @soft_missing
|
||||
raise Gem::DependencyError, "Unresolved depedency found during sorting - #{dep}"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def sorted_requests
|
||||
@sorted ||= strongly_connected_components.flatten
|
||||
end
|
||||
|
||||
def specs_in(dir)
|
||||
Dir["#{dir}/specifications/*.gemspec"].map do |g|
|
||||
Gem::Specification.load g
|
||||
end
|
||||
end
|
||||
|
||||
def install_into(dir, force=true, &b)
|
||||
existing = force ? [] : specs_in(dir)
|
||||
|
||||
dir = File.expand_path dir
|
||||
|
||||
installed = []
|
||||
|
||||
sorted_requests.each do |req|
|
||||
if existing.find { |s| s.full_name == req.spec.full_name }
|
||||
b.call req, nil if b
|
||||
next
|
||||
end
|
||||
|
||||
path = req.download(dir)
|
||||
|
||||
inst = Gem::Installer.new path, :install_dir => dir,
|
||||
:only_install_dir => true
|
||||
|
||||
b.call req, inst if b
|
||||
|
||||
inst.install
|
||||
|
||||
installed << req
|
||||
end
|
||||
|
||||
installed
|
||||
end
|
||||
|
||||
def install(options, &b)
|
||||
if dir = options[:install_dir]
|
||||
return install_into(dir, false, &b)
|
||||
end
|
||||
|
||||
cache_dir = options[:cache_dir] || Gem.dir
|
||||
|
||||
specs = []
|
||||
|
||||
sorted_requests.each do |req|
|
||||
if req.installed?
|
||||
b.call req, nil if b
|
||||
next
|
||||
end
|
||||
|
||||
path = req.download cache_dir
|
||||
|
||||
inst = Gem::Installer.new path, options
|
||||
|
||||
b.call req, inst if b
|
||||
|
||||
specs << inst.install
|
||||
end
|
||||
|
||||
specs
|
||||
end
|
||||
|
||||
# A semi-compatible DSL for Bundler's Gemfile format
|
||||
#
|
||||
class GemDepedencyAPI
|
||||
def initialize(set, path)
|
||||
@set = set
|
||||
@path = path
|
||||
end
|
||||
|
||||
def load
|
||||
instance_eval File.read(@path).untaint, @path, 1
|
||||
end
|
||||
|
||||
# DSL
|
||||
|
||||
def source(url)
|
||||
end
|
||||
|
||||
def gem(name, *reqs)
|
||||
# Ignore the opts for now.
|
||||
reqs.pop if reqs.last.kind_of?(Hash)
|
||||
|
||||
@set.gem name, *reqs
|
||||
end
|
||||
|
||||
def platform(what)
|
||||
if what == :ruby
|
||||
yield
|
||||
end
|
||||
end
|
||||
|
||||
alias_method :platforms, :platform
|
||||
|
||||
def group(*what)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
require 'rubygems/request_set/gem_dependency_api'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue