aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler/source
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-05-02 14:30:22 -0700
committerAndre Arko <andre@arko.net>2015-05-02 14:30:22 -0700
commite0c8f44ed32ab62ce4dbaa66455e2dbd5c0a2070 (patch)
tree36a7ad6051784596536fd0006d92185c37b4d1ae /lib/bundler/source
parent70aed516410c801c17a5f506106802b9b1bd2534 (diff)
parent8beeb91dd125331750d56acfa255ae1739d60952 (diff)
downloadbundler-e0c8f44ed32ab62ce4dbaa66455e2dbd5c0a2070.tar.gz
Merge tag 'v1.7.15' into 1-8-stable
Version 1.7.15
Diffstat (limited to 'lib/bundler/source')
-rw-r--r--lib/bundler/source/path/installer.rb2
-rw-r--r--lib/bundler/source/rubygems.rb4
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/bundler/source/path/installer.rb b/lib/bundler/source/path/installer.rb
index 28e69875..6f264489 100644
--- a/lib/bundler/source/path/installer.rb
+++ b/lib/bundler/source/path/installer.rb
@@ -3,6 +3,8 @@ module Bundler
class Path
class Installer < Bundler::GemInstaller
+ attr_reader :spec
+
def initialize(spec, options = {})
@spec = spec
@tmp_bin_dir = "#{Bundler.tmp(spec.full_name)}/bin"
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index efcbf187..0053688f 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -208,6 +208,8 @@ module Bundler
remotes.map(&method(:suppress_configured_credentials))
end
+ private
+
def source_uris_for_spec(spec)
specs.search_all(spec.name).inject([]) do |uris, s|
uris << s.source_uri.without_credentials if s.source_uri
@@ -215,8 +217,6 @@ module Bundler
end
end
- private
-
def loaded_from(spec)
"#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec"
end