diff options
author | Andre Arko <andre@arko.net> | 2015-05-02 14:30:22 -0700 |
---|---|---|
committer | Andre Arko <andre@arko.net> | 2015-05-02 14:30:22 -0700 |
commit | e0c8f44ed32ab62ce4dbaa66455e2dbd5c0a2070 (patch) | |
tree | 36a7ad6051784596536fd0006d92185c37b4d1ae | |
parent | 70aed516410c801c17a5f506106802b9b1bd2534 (diff) | |
parent | 8beeb91dd125331750d56acfa255ae1739d60952 (diff) | |
download | bundler-e0c8f44ed32ab62ce4dbaa66455e2dbd5c0a2070.tar.gz |
Merge tag 'v1.7.15' into 1-8-stable
Version 1.7.15
-rw-r--r-- | CHANGELOG.md | 13 | ||||
-rw-r--r-- | lib/bundler/definition.rb | 2 | ||||
-rw-r--r-- | lib/bundler/source/path/installer.rb | 2 | ||||
-rw-r--r-- | lib/bundler/source/rubygems.rb | 4 | ||||
-rw-r--r-- | spec/commands/config_spec.rb | 3 |
5 files changed, 21 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7512ae7b54..d7bde91d2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -115,6 +115,19 @@ Documentation: - add missing Gemfile global `path` explanation (@agenteo) +## 1.7.15 (2015-04-29) + +Bugfixes: + + - Respect Gemfile sources when installing a gem present in two sources (#3585, @tmoore) + +## 1.7.14 (2015-03-30) + +Bugfixes: + + - Keep gems locked when updating another gem from the same source (#3250, @indirect) + - Don't add extra quotes around long, quoted config values (@aroben, #3338) + ## 1.7.13 (2015-02-07) Bugfixes: diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 70e2efda55..86dbfba2a5 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -521,7 +521,7 @@ module Bundler converged = [] @locked_specs.each do |s| # Replace the locked dependency's source with the equivalent source from the Gemfile - dep = @dependencies.find { |d| s.satisfies?(d) } + dep = @dependencies.find { |dep| s.satisfies?(dep) } s.source = (dep && dep.source) || sources.get(s.source) # Don't add a spec to the list if its source is expired. For example, diff --git a/lib/bundler/source/path/installer.rb b/lib/bundler/source/path/installer.rb index 28e69875aa..6f264489fb 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 efcbf18737..0053688f38 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 diff --git a/spec/commands/config_spec.rb b/spec/commands/config_spec.rb index f12a844cc1..cd1f23e4a0 100644 --- a/spec/commands/config_spec.rb +++ b/spec/commands/config_spec.rb @@ -258,6 +258,9 @@ E "here is quite a long string that will wrap to a second line but will not be " \ "surrounded by quotes" end + let(:long_string_without_special_characters) do + "here is quite a long string that will wrap to a second line but will not be surrounded by quotes" + end it "doesn't wrap values" do bundle "config foo #{long_string}" |