rubygems-update 2.1.11 → 2.2.0.rc.1

data/lib/rubygems/dependency_resolver/composed_set.rb

@@ -1,18 +0,0 @@
-class Gem::DependencyResolver::ComposedSet
-
-  def initialize *sets
-    @sets = sets
-  end
-
-  def find_all req
-    res = []
-    @sets.each { |s| res += s.find_all(req) }
-    res
-  end
-
-  def prefetch reqs
-    @sets.each { |s| s.prefetch(reqs) }
-  end
-
-end
-

data/lib/rubygems/dependency_resolver/dependency_conflict.rb

@@ -1,85 +0,0 @@
-##
-# Used internally to indicate that a dependency conflicted
-# with a spec that would be activated.
-
-class Gem::DependencyResolver::DependencyConflict
-
-  attr_reader :activated
-
-  attr_reader :dependency
-
-  def initialize(dependency, activated, failed_dep=dependency)
-    @dependency = dependency
-    @activated = activated
-    @failed_dep = failed_dep
-  end
-
-  ##
-  # Return the 2 dependency objects that conflicted
-
-  def conflicting_dependencies
-    [@failed_dep.dependency, @activated.request.dependency]
-  end
-
-  ##
-  # Explanation of the conflict used by exceptions to print useful messages
-
-  def explanation
-    activated   = @activated.spec.full_name
-    requirement = @failed_dep.dependency.requirement
-
-    "  Activated %s instead of (%s) via:\n    %s\n" % [
-      activated, requirement, request_path.join(', ')
-    ]
-  end
-
-  def for_spec?(spec)
-    @dependency.name == spec.name
-  end
-
-  def pretty_print q # :nodoc:
-    q.group 2, '[Dependency conflict: ', ']' do
-      q.breakable
-
-      q.text 'activated '
-      q.pp @activated
-
-      q.breakable
-      q.text ' dependency '
-      q.pp @dependency
-
-      q.breakable
-      if @dependency == @failed_dep then
-        q.text ' failed'
-      else
-        q.text ' failed dependency '
-        q.pp @failed_dep
-      end
-    end
-  end
-
-  ##
-  # Path of specifications that requested this dependency
-
-  def request_path
-    current = requester
-    path    = []
-
-    while current do
-      path << current.spec.full_name
-
-      current = current.request.requester
-    end
-
-    path
-  end
-
-  ##
-  # Return the Specification that listed the dependency
-
-  def requester
-    @failed_dep.requester
-  end
-
-end
-

data/lib/rubygems/dependency_resolver/index_set.rb

@@ -1,64 +0,0 @@
-##
-# The global rubygems pool represented via the traditional
-# source index.
-
-class Gem::DependencyResolver::IndexSet
-
-  def initialize
-    @f = Gem::SpecFetcher.fetcher
-
-    @all = Hash.new { |h,k| h[k] = [] }
-
-    list, = @f.available_specs :released
-
-    list.each do |uri, specs|
-      specs.each do |n|
-        @all[n.name] << [uri, n]
-      end
-    end
-
-    @specs = {}
-  end
-
-  ##
-  # Return an array of IndexSpecification objects matching
-  # DependencyRequest +req+.
-
-  def find_all req
-    res = []
-
-    name = req.dependency.name
-
-    @all[name].each do |uri, n|
-      if req.dependency.match? n then
-        res << Gem::DependencyResolver::IndexSpecification.new(
-          self, n.name, n.version, uri, n.platform)
-      end
-    end
-
-    res
-  end
-
-  ##
-  # Called from IndexSpecification to get a true Specification
-  # object.
-
-  def load_spec name, ver, platform, source
-    key = "#{name}-#{ver}-#{platform}"
-
-    @specs.fetch key do
-      tuple = Gem::NameTuple.new name, ver, platform
-
-      @specs[key] = source.fetch_spec tuple
-    end
-  end
-
-  ##
-  # No prefetching needed since we load the whole index in
-  # initially.
-
-  def prefetch gems
-  end
-
-end
-

data/lib/rubygems/dependency_resolver/index_specification.rb

@@ -1,60 +0,0 @@
-##
-# Represents a possible Specification object returned
-# from IndexSet. Used to delay needed to download full
-# Specification objects when only the +name+ and +version+
-# are needed.
-
-class Gem::DependencyResolver::IndexSpecification
-
-  attr_reader :name
-
-  attr_reader :platform
-
-  attr_reader :source
-
-  attr_reader :version
-
-  def initialize set, name, version, source, platform
-    @set = set
-    @name = name
-    @version = version
-    @source = source
-    @platform = platform.to_s
-
-    @spec = nil
-  end
-
-  def dependencies
-    spec.dependencies
-  end
-
-  def full_name
-    "#{@name}-#{@version}"
-  end
-
-  def inspect # :nodoc:
-    '#<%s %s source %s>' % [self.class, full_name, @source]
-  end
-
-  def pretty_print q # :nodoc:
-    q.group 2, '[Index specification', ']' do
-      q.breakable
-      q.text full_name
-
-      unless Gem::Platform::RUBY == @platform then
-        q.breakable
-        q.text @platform.to_s
-      end
-
-      q.breakable
-      q.text 'source '
-      q.pp @source
-    end
-  end
-
-  def spec
-    @spec ||= @set.load_spec(@name, @version, @platform, @source)
-  end
-
-end
-

data/lib/rubygems/dependency_resolver/installed_specification.rb

@@ -1,52 +0,0 @@
-class Gem::DependencyResolver::InstalledSpecification
-
-  attr_reader :spec
-
-  def initialize set, spec, source=nil
-    @set    = set
-    @source = source
-    @spec   = spec
-  end
-
-  def == other # :nodoc:
-    self.class === other and
-      @set  == other.set and
-      @spec == other.spec
-  end
-
-  def dependencies
-    @spec.dependencies
-  end
-
-  def full_name
-    "#{@spec.name}-#{@spec.version}"
-  end
-
-  def name
-    @spec.name
-  end
-
-  def platform
-    @spec.platform
-  end
-
-  def installable_platform?
-    # BACKCOMPAT If the file is coming out of a specified file, then we
-    # ignore the platform. This code can be removed in RG 3.0.
-    if @source.kind_of? Gem::Source::SpecificFile
-      return true
-    else
-      Gem::Platform.match @spec.platform
-    end
-  end
-
-  def source
-    @source ||= Gem::Source::Installed.new
-  end
-
-  def version
-    @spec.version
-  end
-
-end
-

data/test/rubygems/test_gem_dependency_resolver_api_specification.rb

@@ -1,33 +0,0 @@
-require 'rubygems/test_case'
-require 'rubygems/dependency_resolver'
-
-class TestGemDependencyResolverAPISpecification < Gem::TestCase
-
-  def test_initialize
-    set = Gem::DependencyResolver::APISet.new
-    data = {
-      :name     => 'rails',
-      :number   => '3.0.3',
-      :platform => 'ruby',
-      :dependencies => [
-        ['bundler',  '~> 1.0'],
-        ['railties', '= 3.0.3'],
-      ],
-    }
-
-    spec = Gem::DependencyResolver::APISpecification.new set, data
-
-    assert_equal 'rails',                   spec.name
-    assert_equal Gem::Version.new('3.0.3'), spec.version
-    assert_equal Gem::Platform::RUBY,       spec.platform
-
-    expected = [
-      Gem::Dependency.new('bundler',  '~> 1.0'),
-      Gem::Dependency.new('railties', '= 3.0.3'),
-    ]
-
-    assert_equal expected, spec.dependencies
-  end
-
-end
-

data/test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb

@@ -1,36 +0,0 @@
-require 'rubygems/test_case'
-require 'rubygems/dependency_resolver'
-
-class TestGemDependencyResolverDependencyConflict < Gem::TestCase
-
-  def test_explanation
-    root  =
-      dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
-    child =
-      dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', root
-
-    conflict =
-      Gem::DependencyResolver::DependencyConflict.new child, child.requester
-
-    expected = <<-EXPECTED
-  Activated net-ssh-2.2.2 instead of (>= 2.6.5) via:
-    net-ssh-2.2.2, rye-0.9.8
-    EXPECTED
-
-    assert_equal expected, conflict.explanation
-  end
-
-  def test_request_path
-    root  =
-      dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
-    child =
-      dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', root
-
-    conflict =
-      Gem::DependencyResolver::DependencyConflict.new child, nil
-
-    assert_equal %w[net-ssh-2.2.2 rye-0.9.8], conflict.request_path
-  end
-
-end
-

data/test/rubygems/test_gem_dependency_resolver_index_set.rb

@@ -1,53 +0,0 @@
-require 'rubygems/test_case'
-require 'rubygems/dependency_resolver'
-
-class TestGemDependencyResolverIndexSet < Gem::TestCase
-
-  def test_load_spec
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
-
-    a_2   = quick_spec 'a', 2
-    a_2_p = quick_spec 'a', 2 do |s| s.platform = Gem::Platform.local end
-
-    Gem::Specification.add_specs a_2, a_2_p
-
-    util_setup_spec_fetcher a_2, a_2_p
-
-    source = Gem::Source.new @gem_repo
-    version = v 2
-
-    set = Gem::DependencyResolver::IndexSet.new
-
-    spec = set.load_spec 'a', version, Gem::Platform.local, source
-
-    assert_equal a_2_p.full_name, spec.full_name
-  end
-
-  def test_load_spec_cached
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
-
-    a_2   = quick_spec 'a', 2
-    a_2_p = quick_spec 'a', 2 do |s| s.platform = Gem::Platform.local end
-
-    Gem::Specification.add_specs a_2, a_2_p
-
-    util_setup_spec_fetcher a_2, a_2_p
-
-    source = Gem::Source.new @gem_repo
-    version = v 2
-
-    set = Gem::DependencyResolver::IndexSet.new
-
-    first = set.load_spec 'a', version, Gem::Platform.local, source
-
-    util_setup_spec_fetcher # clear
-
-    second = set.load_spec 'a', version, Gem::Platform.local, source
-
-    assert_same first, second
-  end
-
-end
-

data/test/rubygems/test_gem_dependency_resolver_index_specification.rb

@@ -1,73 +0,0 @@
-require 'rubygems/test_case'
-require 'rubygems/dependency_resolver'
-require 'rubygems/available_set'
-
-class TestGemDependencyResolverIndexSpecification < Gem::TestCase
-
-  def test_initialize
-    set     = Gem::DependencyResolver::IndexSet.new
-    source  = Gem::Source.new @gem_repo
-    version = Gem::Version.new '3.0.3'
-
-    spec = Gem::DependencyResolver::IndexSpecification.new(
-      set, 'rails', version, source, Gem::Platform::RUBY)
-
-    assert_equal 'rails',             spec.name
-    assert_equal version,             spec.version
-    assert_equal Gem::Platform::RUBY, spec.platform
-
-    assert_equal source, spec.source
-  end
-
-  def test_initialize_platform
-    set     = Gem::DependencyResolver::IndexSet.new
-    source  = Gem::Source::Local.new
-    version = Gem::Version.new '3.0.3'
-
-    spec = Gem::DependencyResolver::IndexSpecification.new(
-      set, 'rails', version, source, Gem::Platform.local)
-
-    assert_equal Gem::Platform.local.to_s, spec.platform
-  end
-
-  def test_spec
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
-
-    a_2   = quick_spec 'a', 2
-    a_2_p = quick_spec 'a', 2 do |s| s.platform = Gem::Platform.local end
-
-    Gem::Specification.add_specs a_2, a_2_p
-
-    util_setup_spec_fetcher a_2, a_2_p
-
-    source = Gem::Source.new @gem_repo
-    version = v 2
-
-    set = Gem::DependencyResolver::IndexSet.new
-    i_spec = Gem::DependencyResolver::IndexSpecification.new \
-      set, 'a', version, source, Gem::Platform.local
-
-    spec = i_spec.spec
-
-    assert_equal a_2_p.full_name, spec.full_name
-  end
-
-  def test_spec_local
-    a_2_p = quick_spec 'a', 2 do |s| s.platform = Gem::Platform.local end
-    Gem::Package.build a_2_p
-
-    source = Gem::Source::Local.new
-    set = Gem::DependencyResolver::InstallerSet.new :local
-    set.always_install << a_2_p
-
-    i_spec = Gem::DependencyResolver::IndexSpecification.new \
-      set, 'a', v(2), source, Gem::Platform.local
-
-    spec = i_spec.spec
-
-    assert_equal a_2_p.full_name, spec.full_name
-  end
-
-end
-