Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

OMG, prioritizing bundler sources is the bane of my existence

  • Loading branch information...
commit 353f4086d681427fe86b428ab7096d1a1cc65d6e 1 parent ecec2af
Carlhuda authored
Showing with 14 additions and 10 deletions.
  1. +14 −8 lib/bundler/installer.rb
  2. +0 −2  lib/bundler/source.rb
22 lib/bundler/installer.rb
View
@@ -53,12 +53,6 @@ def resolve_locally
# Return unless all the dependencies have = version requirements
return if dependencies.any? { |d| ambiguous?(d) }
- index = local_index
- sources.each do |source|
- next unless source.respond_to?(:local_specs)
- index = source.local_specs.merge(index)
- end
-
source_requirements = {}
dependencies.each do |dep|
next unless dep.source && dep.source.respond_to?(:local_specs)
@@ -118,14 +112,26 @@ def index
index = cache_source.specs.merge(index).freeze
end
- sources.each do |source|
+ rg_sources = sources.select { |s| s.is_a?(Source::Rubygems) }
+ other_sources = sources.select { |s| !s.is_a?(Source::Rubygems) }
+
+ other_sources.each do |source|
i = source.specs
Bundler.ui.debug "Source: Processing index... "
index = i.merge(index).freeze
Bundler.ui.debug "Done."
end
- Index.from_installed_gems.merge(index)
+ index = Index.from_installed_gems.merge(index)
+
+ rg_sources.each do |source|
+ i = source.specs
+ Bundler.ui.debug "Source: Processing index... "
+ index = i.merge(index).freeze
+ Bundler.ui.debug "Done."
+ end
+
+ index
end
end
2  lib/bundler/source.rb
View
@@ -247,8 +247,6 @@ def install(spec)
end
git "fetch --quiet"
git "reset --hard #{revision}"
- git "submodule init"
- git "submodule update"
end
@installed = true
end
Please sign in to comment.
Something went wrong with that request. Please try again.