bundler 1.9.4 → 1.9.5

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of bundler might be problematic. Click here for more details.

checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3fd72f56b8e88b2e79896d64cbc9fc6ae4ede97c
4
- data.tar.gz: a264fc3a829a856bf74c94ba2386983480878822
3
+ metadata.gz: 2b1aaf8e4e40f84d9eca9b9d919d08c10f5b426c
4
+ data.tar.gz: e7d8a3f164414640330e9d82da8ca3d697f72065
5
5
  SHA512:
6
- metadata.gz: 9fd42a2f2eac4fbb2d115b1c77af1a0adbe1dec2826dc664e7973d48742d31a30232d89f59daa6c7e9f17f9bedbb80dd239c52bc51e4d70f5bd3fda8f0bcbdd4
7
- data.tar.gz: 8661d781682dc0d08fe1663f884cf8017b4c1913217a3052f6daadd6e3181c2b443a8193a3b2cffcd2bddbf7be4e9774e6b94fbddc4b24310067bdc9585f7a19
6
+ metadata.gz: c412782fb44f681f0d932a2315aea509c12592788993ecf9fc91ca6fe1608ff51b1733b17048879b0bb3a61fb9fb5c9c928f08422527a0d38d5acd5e35f02f89
7
+ data.tar.gz: 925bf88b4902b053e2f16348fac713091b1390e386c036bca32066a61ea52e890a9bd906faf84fd5e10084b98584dc03226022fba515c2af04944f24ae788b6f
@@ -1,3 +1,9 @@
1
+ ## 1.9.5 (2015-04-29)
2
+
3
+ Bugfixes:
4
+
5
+ - Respect Gemfile sources when installing a gem present in two sources (#3585, @tmoore)
6
+
1
7
  ## 1.9.4 (2015-04-13)
2
8
 
3
9
  Bugfixes:
@@ -136,7 +136,7 @@ module Bundler
136
136
 
137
137
  if choice.nil?
138
138
  Bundler.ui.confirm header
139
- choice = (Bundler.ui.ask("#{message} y/(n):") =~ /y|yes/)
139
+ choice = Bundler.ui.yes? "#{message} y/(n):"
140
140
  Bundler.settings.set_global("gem.#{key}", choice)
141
141
  end
142
142
 
@@ -184,11 +184,10 @@ module Bundler
184
184
  # @return [SpecSet] resolved dependencies
185
185
  def resolve
186
186
  @resolve ||= begin
187
+ last_resolve = converge_locked_specs
187
188
  if Bundler.settings[:frozen] || (!@unlocking && nothing_changed?)
188
- @locked_specs
189
+ last_resolve
189
190
  else
190
- last_resolve = converge_locked_specs
191
-
192
191
  # Run a resolve against the locally available gems
193
192
  last_resolve.merge Resolver.resolve(expanded_dependencies, index, source_requirements, last_resolve)
194
193
  end
@@ -521,7 +520,9 @@ module Bundler
521
520
 
522
521
  converged = []
523
522
  @locked_specs.each do |s|
524
- s.source = sources.get(s.source)
523
+ # Replace the locked dependency's source with the equivalent source from the Gemfile
524
+ dep = @dependencies.find { |dep| s.satisfies?(dep) }
525
+ s.source = (dep && dep.source) || sources.get(s.source)
525
526
 
526
527
  # Don't add a spec to the list if its source is expired. For example,
527
528
  # if you change a Git gem to Rubygems.
@@ -569,7 +570,7 @@ module Bundler
569
570
  end
570
571
 
571
572
  def satisfies_locked_spec?(dep)
572
- @locked_specs.any? { |s| s.satisfies?(dep) && (!dep.source || s.source == dep.source) }
573
+ @locked_specs.any? { |s| s.satisfies?(dep) && (!dep.source || s.source.include?(dep.source)) }
573
574
  end
574
575
 
575
576
  def expanded_dependencies
@@ -46,6 +46,14 @@ module Bundler
46
46
  @shell.ask(msg)
47
47
  end
48
48
 
49
+ def yes?(msg)
50
+ @shell.yes?(msg)
51
+ end
52
+
53
+ def no?
54
+ @shell.no?(msg)
55
+ end
56
+
49
57
  def level=(level)
50
58
  raise ArgumentError unless LEVELS.include?(level.to_s)
51
59
  @level = level
@@ -2,5 +2,5 @@ module Bundler
2
2
  # We're doing this because we might write tests that deal
3
3
  # with other versions of bundler and we are unsure how to
4
4
  # handle this better.
5
- VERSION = "1.9.4" unless defined?(::Bundler::VERSION)
5
+ VERSION = "1.9.5" unless defined?(::Bundler::VERSION)
6
6
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bundler
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.9.4
4
+ version: 1.9.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - André Arko
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2015-04-14 00:00:00.000000000 Z
14
+ date: 2015-04-30 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: mustache