bundler 1.15.2 → 1.17.3

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.

Files changed (286) hide show
  1. checksums.yaml +5 -5
  2. data/CHANGELOG.md +302 -0
  3. data/README.md +17 -8
  4. data/bundler.gemspec +25 -9
  5. data/exe/bundle +1 -1
  6. data/exe/bundle_ruby +4 -3
  7. data/lib/bundler/build_metadata.rb +53 -0
  8. data/lib/bundler/capistrano.rb +5 -0
  9. data/lib/bundler/cli/add.rb +15 -6
  10. data/lib/bundler/cli/binstubs.rb +17 -9
  11. data/lib/bundler/cli/cache.rb +5 -4
  12. data/lib/bundler/cli/check.rb +3 -5
  13. data/lib/bundler/cli/clean.rb +5 -6
  14. data/lib/bundler/cli/common.rb +11 -2
  15. data/lib/bundler/cli/config.rb +2 -1
  16. data/lib/bundler/cli/console.rb +2 -1
  17. data/lib/bundler/cli/doctor.rb +48 -1
  18. data/lib/bundler/cli/exec.rb +6 -5
  19. data/lib/bundler/cli/gem.rb +13 -8
  20. data/lib/bundler/cli/info.rb +0 -1
  21. data/lib/bundler/cli/init.rb +18 -6
  22. data/lib/bundler/cli/inject.rb +1 -0
  23. data/lib/bundler/cli/install.rb +64 -61
  24. data/lib/bundler/cli/issue.rb +1 -1
  25. data/lib/bundler/cli/list.rb +58 -0
  26. data/lib/bundler/cli/lock.rb +0 -1
  27. data/lib/bundler/cli/open.rb +2 -2
  28. data/lib/bundler/cli/outdated.rb +20 -9
  29. data/lib/bundler/cli/package.rb +9 -6
  30. data/lib/bundler/cli/platform.rb +1 -0
  31. data/lib/bundler/cli/plugin.rb +1 -0
  32. data/lib/bundler/cli/pristine.rb +20 -6
  33. data/lib/bundler/cli/remove.rb +18 -0
  34. data/lib/bundler/cli/show.rb +0 -1
  35. data/lib/bundler/cli/update.rb +35 -7
  36. data/lib/bundler/cli/viz.rb +1 -0
  37. data/lib/bundler/cli.rb +227 -89
  38. data/lib/bundler/compact_index_client/cache.rb +1 -2
  39. data/lib/bundler/compact_index_client/updater.rb +14 -4
  40. data/lib/bundler/compact_index_client.rb +1 -0
  41. data/lib/bundler/compatibility_guard.rb +14 -0
  42. data/lib/bundler/constants.rb +1 -0
  43. data/lib/bundler/current_ruby.rb +13 -5
  44. data/lib/bundler/definition.rb +192 -139
  45. data/lib/bundler/dep_proxy.rb +3 -1
  46. data/lib/bundler/dependency.rb +9 -9
  47. data/lib/bundler/deployment.rb +1 -1
  48. data/lib/bundler/deprecate.rb +15 -3
  49. data/lib/bundler/dsl.rb +115 -64
  50. data/lib/bundler/endpoint_specification.rb +10 -1
  51. data/lib/bundler/env.rb +90 -29
  52. data/lib/bundler/environment_preserver.rb +27 -6
  53. data/lib/bundler/errors.rb +1 -0
  54. data/lib/bundler/feature_flag.rb +46 -4
  55. data/lib/bundler/fetcher/base.rb +1 -0
  56. data/lib/bundler/fetcher/compact_index.rb +2 -11
  57. data/lib/bundler/fetcher/dependency.rb +2 -1
  58. data/lib/bundler/fetcher/downloader.rb +11 -5
  59. data/lib/bundler/fetcher/index.rb +3 -2
  60. data/lib/bundler/fetcher.rb +18 -11
  61. data/lib/bundler/friendly_errors.rb +6 -1
  62. data/lib/bundler/gem_helper.rb +19 -10
  63. data/lib/bundler/gem_helpers.rb +1 -0
  64. data/lib/bundler/gem_remote_fetcher.rb +1 -0
  65. data/lib/bundler/gem_tasks.rb +1 -0
  66. data/lib/bundler/gem_version_promoter.rb +17 -2
  67. data/lib/bundler/gemdeps.rb +1 -0
  68. data/lib/bundler/graph.rb +1 -0
  69. data/lib/bundler/index.rb +8 -8
  70. data/lib/bundler/injector.rb +192 -30
  71. data/lib/bundler/inline.rb +5 -7
  72. data/lib/bundler/installer/gem_installer.rb +11 -2
  73. data/lib/bundler/installer/parallel_installer.rb +78 -42
  74. data/lib/bundler/installer/standalone.rb +1 -0
  75. data/lib/bundler/installer.rb +138 -53
  76. data/lib/bundler/lazy_specification.rb +3 -2
  77. data/lib/bundler/lockfile_generator.rb +95 -0
  78. data/lib/bundler/lockfile_parser.rb +10 -4
  79. data/lib/bundler/match_platform.rb +1 -0
  80. data/lib/bundler/mirror.rb +8 -5
  81. data/lib/bundler/plugin/api/source.rb +9 -2
  82. data/lib/bundler/plugin/events.rb +61 -0
  83. data/lib/bundler/plugin/index.rb +7 -2
  84. data/lib/bundler/plugin/installer.rb +7 -6
  85. data/lib/bundler/plugin/source_list.rb +7 -8
  86. data/lib/bundler/plugin.rb +13 -5
  87. data/lib/bundler/process_lock.rb +24 -0
  88. data/lib/bundler/psyched_yaml.rb +10 -0
  89. data/lib/bundler/remote_specification.rb +1 -0
  90. data/lib/bundler/resolver/spec_group.rb +106 -0
  91. data/lib/bundler/resolver.rb +158 -195
  92. data/lib/bundler/retry.rb +1 -0
  93. data/lib/bundler/ruby_dsl.rb +1 -0
  94. data/lib/bundler/ruby_version.rb +2 -1
  95. data/lib/bundler/rubygems_ext.rb +5 -4
  96. data/lib/bundler/rubygems_gem_installer.rb +31 -1
  97. data/lib/bundler/rubygems_integration.rb +71 -32
  98. data/lib/bundler/runtime.rb +11 -9
  99. data/lib/bundler/settings/validator.rb +102 -0
  100. data/lib/bundler/settings.rb +200 -77
  101. data/lib/bundler/setup.rb +1 -0
  102. data/lib/bundler/shared_helpers.rb +131 -26
  103. data/lib/bundler/similarity_detector.rb +1 -0
  104. data/lib/bundler/source/gemspec.rb +1 -0
  105. data/lib/bundler/source/git/git_proxy.rb +21 -11
  106. data/lib/bundler/source/git.rb +24 -19
  107. data/lib/bundler/source/metadata.rb +62 -0
  108. data/lib/bundler/source/path/installer.rb +2 -0
  109. data/lib/bundler/source/path.rb +8 -8
  110. data/lib/bundler/source/rubygems/remote.rb +8 -2
  111. data/lib/bundler/source/rubygems.rb +161 -84
  112. data/lib/bundler/source.rb +36 -0
  113. data/lib/bundler/source_list.rb +75 -15
  114. data/lib/bundler/spec_set.rb +10 -5
  115. data/lib/bundler/ssl_certs/certificate_manager.rb +2 -1
  116. data/lib/bundler/stub_specification.rb +1 -0
  117. data/lib/bundler/templates/.document +1 -0
  118. data/lib/bundler/templates/Executable +12 -0
  119. data/lib/bundler/templates/Executable.bundler +105 -0
  120. data/lib/bundler/templates/Gemfile +1 -0
  121. data/lib/bundler/templates/gems.rb +8 -0
  122. data/lib/bundler/templates/newgem/README.md.tt +1 -1
  123. data/lib/bundler/templates/newgem/gitignore.tt +0 -1
  124. data/lib/bundler/templates/newgem/lib/newgem.rb.tt +1 -0
  125. data/lib/bundler/templates/newgem/newgem.gemspec.tt +12 -3
  126. data/lib/bundler/templates/newgem/rspec.tt +1 -0
  127. data/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +0 -2
  128. data/lib/bundler/templates/newgem/{.travis.yml.tt → travis.yml.tt} +2 -0
  129. data/lib/bundler/ui/rg_proxy.rb +1 -0
  130. data/lib/bundler/ui/shell.rb +17 -4
  131. data/lib/bundler/ui/silent.rb +1 -0
  132. data/lib/bundler/ui.rb +1 -0
  133. data/lib/bundler/uri_credentials_filter.rb +1 -0
  134. data/lib/bundler/vendor/fileutils/lib/fileutils.rb +1638 -0
  135. data/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +26 -0
  136. data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +7 -0
  137. data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +1 -0
  138. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +1 -0
  139. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +1 -0
  140. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +1 -0
  141. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +1 -0
  142. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +1 -0
  143. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +1 -0
  144. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +1 -0
  145. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +1 -0
  146. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +15 -4
  147. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +3 -2
  148. data/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +75 -7
  149. data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +2 -1
  150. data/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +1 -0
  151. data/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +3 -1
  152. data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +491 -148
  153. data/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +1 -0
  154. data/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +8 -4
  155. data/lib/bundler/vendor/molinillo/lib/molinillo.rb +2 -0
  156. data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +1 -1
  157. data/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +1 -0
  158. data/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +1 -0
  159. data/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb +9 -1
  160. data/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +45 -8
  161. data/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +9 -3
  162. data/lib/bundler/vendor/thor/lib/thor/actions.rb +6 -3
  163. data/lib/bundler/vendor/thor/lib/thor/base.rb +27 -4
  164. data/lib/bundler/vendor/thor/lib/thor/command.rb +9 -7
  165. data/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +12 -0
  166. data/lib/bundler/vendor/thor/lib/thor/group.rb +1 -1
  167. data/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb +2 -0
  168. data/lib/bundler/vendor/thor/lib/thor/parser/option.rb +5 -5
  169. data/lib/bundler/vendor/thor/lib/thor/parser/options.rb +6 -5
  170. data/lib/bundler/vendor/thor/lib/thor/runner.rb +6 -4
  171. data/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +10 -9
  172. data/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
  173. data/lib/bundler/vendor/thor/lib/thor.rb +25 -8
  174. data/lib/bundler/vendored_fileutils.rb +9 -0
  175. data/lib/bundler/vendored_molinillo.rb +1 -0
  176. data/lib/bundler/vendored_persistent.rb +35 -0
  177. data/lib/bundler/vendored_thor.rb +1 -0
  178. data/lib/bundler/version.rb +6 -2
  179. data/lib/bundler/version_ranges.rb +1 -0
  180. data/lib/bundler/vlad.rb +5 -0
  181. data/lib/bundler/worker.rb +1 -0
  182. data/lib/bundler/yaml_serializer.rb +3 -3
  183. data/lib/bundler.rb +86 -52
  184. data/man/bundle-add.1 +18 -3
  185. data/man/bundle-add.1.txt +26 -14
  186. data/man/bundle-add.ronn +13 -2
  187. data/man/bundle-binstubs.1 +11 -1
  188. data/man/bundle-binstubs.1.txt +33 -18
  189. data/man/bundle-binstubs.ronn +15 -1
  190. data/man/bundle-check.1 +4 -4
  191. data/man/bundle-check.1.txt +15 -14
  192. data/man/bundle-check.ronn +3 -3
  193. data/man/bundle-clean.1 +1 -1
  194. data/man/bundle-clean.1.txt +10 -10
  195. data/man/bundle-config.1 +129 -29
  196. data/man/bundle-config.1.txt +285 -174
  197. data/man/bundle-config.ronn +167 -88
  198. data/man/bundle-doctor.1 +44 -0
  199. data/man/bundle-doctor.1.txt +44 -0
  200. data/man/bundle-doctor.ronn +33 -0
  201. data/man/bundle-exec.1 +6 -3
  202. data/man/bundle-exec.1.txt +78 -71
  203. data/man/bundle-exec.ronn +10 -3
  204. data/man/bundle-gem.1 +3 -3
  205. data/man/bundle-gem.1.txt +40 -39
  206. data/man/bundle-gem.ronn +2 -1
  207. data/man/bundle-info.1 +1 -1
  208. data/man/bundle-info.1.txt +8 -8
  209. data/man/bundle-init.1 +9 -4
  210. data/man/bundle-init.1.txt +23 -13
  211. data/man/bundle-init.ronn +15 -4
  212. data/man/bundle-inject.1 +4 -4
  213. data/man/bundle-inject.1.txt +10 -10
  214. data/man/bundle-inject.ronn +3 -3
  215. data/man/bundle-install.1 +31 -28
  216. data/man/bundle-install.1.txt +205 -194
  217. data/man/bundle-install.ronn +44 -35
  218. data/man/bundle-list.1 +50 -0
  219. data/man/bundle-list.1.txt +43 -0
  220. data/man/bundle-list.ronn +33 -0
  221. data/man/bundle-lock.1 +1 -1
  222. data/man/bundle-lock.1.txt +47 -47
  223. data/man/bundle-lock.ronn +1 -1
  224. data/man/bundle-open.1 +1 -1
  225. data/man/bundle-open.1.txt +7 -7
  226. data/man/bundle-outdated.1 +7 -3
  227. data/man/bundle-outdated.1.txt +40 -36
  228. data/man/bundle-outdated.ronn +6 -2
  229. data/man/bundle-package.1 +6 -3
  230. data/man/bundle-package.1.txt +44 -39
  231. data/man/bundle-package.ronn +7 -2
  232. data/man/bundle-platform.1 +1 -1
  233. data/man/bundle-platform.1.txt +13 -13
  234. data/man/bundle-pristine.1 +21 -3
  235. data/man/bundle-pristine.1.txt +33 -10
  236. data/man/bundle-pristine.ronn +24 -3
  237. data/man/bundle-remove.1 +31 -0
  238. data/man/bundle-remove.1.txt +34 -0
  239. data/man/bundle-remove.ronn +23 -0
  240. data/man/bundle-show.1 +3 -3
  241. data/man/bundle-show.1.txt +14 -12
  242. data/man/bundle-show.ronn +3 -2
  243. data/man/bundle-update.1 +13 -9
  244. data/man/bundle-update.1.txt +133 -130
  245. data/man/bundle-update.ronn +21 -17
  246. data/man/bundle-viz.1 +7 -7
  247. data/man/bundle-viz.1.txt +17 -15
  248. data/man/bundle-viz.ronn +6 -6
  249. data/man/bundle.1 +31 -23
  250. data/man/bundle.1.txt +63 -57
  251. data/man/bundle.ronn +35 -29
  252. data/man/gemfile.5 +44 -8
  253. data/man/gemfile.5.ronn +54 -8
  254. data/man/gemfile.5.txt +218 -165
  255. data/man/index.txt +25 -15
  256. metadata +36 -36
  257. data/.codeclimate.yml +0 -25
  258. data/.gitignore +0 -18
  259. data/.rspec +0 -3
  260. data/.rubocop.yml +0 -131
  261. data/.rubocop_todo.yml +0 -418
  262. data/.travis.yml +0 -122
  263. data/CODE_OF_CONDUCT.md +0 -42
  264. data/CONTRIBUTING.md +0 -17
  265. data/Rakefile +0 -338
  266. data/bin/rake +0 -19
  267. data/bin/rspec +0 -15
  268. data/bin/rubocop +0 -17
  269. data/bin/with_rubygems +0 -39
  270. data/doc/README.md +0 -30
  271. data/doc/TROUBLESHOOTING.md +0 -64
  272. data/doc/contributing/BUG_TRIAGE.md +0 -36
  273. data/doc/contributing/COMMUNITY.md +0 -13
  274. data/doc/contributing/GETTING_HELP.md +0 -11
  275. data/doc/contributing/HOW_YOU_CAN_HELP.md +0 -27
  276. data/doc/contributing/ISSUES.md +0 -51
  277. data/doc/contributing/README.md +0 -38
  278. data/doc/development/NEW_FEATURES.md +0 -10
  279. data/doc/development/PULL_REQUESTS.md +0 -40
  280. data/doc/development/README.md +0 -19
  281. data/doc/development/RELEASING.md +0 -9
  282. data/doc/development/SETUP.md +0 -27
  283. data/doc/documentation/README.md +0 -29
  284. data/doc/documentation/VISION.md +0 -26
  285. data/doc/documentation/WRITING.md +0 -54
  286. data/task/release.rake +0 -116
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  module Bundler::Molinillo
3
4
  class Resolver
4
5
  # A specific resolution from a given {Resolver}
@@ -8,22 +9,125 @@ module Bundler::Molinillo
8
9
  # @attr [{String,Nil=>[Object]}] requirements the requirements that caused the conflict
9
10
  # @attr [Object, nil] existing the existing spec that was in conflict with
10
11
  # the {#possibility}
11
- # @attr [Object] possibility the spec that was unable to be activated due
12
- # to a conflict
12
+ # @attr [Object] possibility_set the set of specs that was unable to be
13
+ # activated due to a conflict.
13
14
  # @attr [Object] locked_requirement the relevant locking requirement.
14
15
  # @attr [Array<Array<Object>>] requirement_trees the different requirement
15
16
  # trees that led to every requirement for the conflicting name.
16
17
  # @attr [{String=>Object}] activated_by_name the already-activated specs.
18
+ # @attr [Object] underlying_error an error that has occurred during resolution, and
19
+ # will be raised at the end of it if no resolution is found.
17
20
  Conflict = Struct.new(
18
21
  :requirement,
19
22
  :requirements,
20
23
  :existing,
21
- :possibility,
24
+ :possibility_set,
22
25
  :locked_requirement,
23
26
  :requirement_trees,
24
- :activated_by_name
27
+ :activated_by_name,
28
+ :underlying_error
25
29
  )
26
30
 
31
+ class Conflict
32
+ # @return [Object] a spec that was unable to be activated due to a conflict
33
+ def possibility
34
+ possibility_set && possibility_set.latest_version
35
+ end
36
+ end
37
+
38
+ # A collection of possibility states that share the same dependencies
39
+ # @attr [Array] dependencies the dependencies for this set of possibilities
40
+ # @attr [Array] possibilities the possibilities
41
+ PossibilitySet = Struct.new(:dependencies, :possibilities)
42
+
43
+ class PossibilitySet
44
+ # String representation of the possibility set, for debugging
45
+ def to_s
46
+ "[#{possibilities.join(', ')}]"
47
+ end
48
+
49
+ # @return [Object] most up-to-date dependency in the possibility set
50
+ def latest_version
51
+ possibilities.last
52
+ end
53
+ end
54
+
55
+ # Details of the state to unwind to when a conflict occurs, and the cause of the unwind
56
+ # @attr [Integer] state_index the index of the state to unwind to
57
+ # @attr [Object] state_requirement the requirement of the state we're unwinding to
58
+ # @attr [Array] requirement_tree for the requirement we're relaxing
59
+ # @attr [Array] conflicting_requirements the requirements that combined to cause the conflict
60
+ # @attr [Array] requirement_trees for the conflict
61
+ # @attr [Array] requirements_unwound_to_instead array of unwind requirements that were chosen over this unwind
62
+ UnwindDetails = Struct.new(
63
+ :state_index,
64
+ :state_requirement,
65
+ :requirement_tree,
66
+ :conflicting_requirements,
67
+ :requirement_trees,
68
+ :requirements_unwound_to_instead
69
+ )
70
+
71
+ class UnwindDetails
72
+ include Comparable
73
+
74
+ # We compare UnwindDetails when choosing which state to unwind to. If
75
+ # two options have the same state_index we prefer the one most
76
+ # removed from a requirement that caused the conflict. Both options
77
+ # would unwind to the same state, but a `grandparent` option will
78
+ # filter out fewer of its possibilities after doing so - where a state
79
+ # is both a `parent` and a `grandparent` to requirements that have
80
+ # caused a conflict this is the correct behaviour.
81
+ # @param [UnwindDetail] other UnwindDetail to be compared
82
+ # @return [Integer] integer specifying ordering
83
+ def <=>(other)
84
+ if state_index > other.state_index
85
+ 1
86
+ elsif state_index == other.state_index
87
+ reversed_requirement_tree_index <=> other.reversed_requirement_tree_index
88
+ else
89
+ -1
90
+ end
91
+ end
92
+
93
+ # @return [Integer] index of state requirement in reversed requirement tree
94
+ # (the conflicting requirement itself will be at position 0)
95
+ def reversed_requirement_tree_index
96
+ @reversed_requirement_tree_index ||=
97
+ if state_requirement
98
+ requirement_tree.reverse.index(state_requirement)
99
+ else
100
+ 999_999
101
+ end
102
+ end
103
+
104
+ # @return [Boolean] where the requirement of the state we're unwinding
105
+ # to directly caused the conflict. Note: in this case, it is
106
+ # impossible for the state we're unwinding to to be a parent of
107
+ # any of the other conflicting requirements (or we would have
108
+ # circularity)
109
+ def unwinding_to_primary_requirement?
110
+ requirement_tree.last == state_requirement
111
+ end
112
+
113
+ # @return [Array] array of sub-dependencies to avoid when choosing a
114
+ # new possibility for the state we've unwound to. Only relevant for
115
+ # non-primary unwinds
116
+ def sub_dependencies_to_avoid
117
+ @requirements_to_avoid ||=
118
+ requirement_trees.map do |tree|
119
+ index = tree.index(state_requirement)
120
+ tree[index + 1] if index
121
+ end.compact
122
+ end
123
+
124
+ # @return [Array] array of all the requirements that led to the need for
125
+ # this unwind
126
+ def all_requirements
127
+ @all_requirements ||= requirement_trees.flatten(1)
128
+ end
129
+ end
130
+
27
131
  # @return [SpecificationProvider] the provider that knows about
28
132
  # dependencies, requirements, specifications, versions, etc.
29
133
  attr_reader :specification_provider
@@ -64,7 +168,7 @@ module Bundler::Molinillo
64
168
  start_resolution
65
169
 
66
170
  while state
67
- break unless state.requirements.any? || state.requirement
171
+ break if !state.requirement && state.requirements.empty?
68
172
  indicate_progress
69
173
  if state.respond_to?(:pop_possibility_state) # DependencyState
70
174
  debug(depth) { "Creating possibility state for #{requirement} (#{possibilities.count} remaining)" }
@@ -78,7 +182,7 @@ module Bundler::Molinillo
78
182
  process_topmost_state
79
183
  end
80
184
 
81
- activated.freeze
185
+ resolve_activated_specs
82
186
  ensure
83
187
  end_resolution
84
188
  end
@@ -109,6 +213,19 @@ module Bundler::Molinillo
109
213
  resolver_ui.before_resolution
110
214
  end
111
215
 
216
+ def resolve_activated_specs
217
+ activated.vertices.each do |_, vertex|
218
+ next unless vertex.payload
219
+
220
+ latest_version = vertex.payload.possibilities.reverse_each.find do |possibility|
221
+ vertex.requirements.all? { |req| requirement_satisfied_by?(req, activated, possibility) }
222
+ end
223
+
224
+ activated.set_payload(vertex.name, latest_version)
225
+ end
226
+ activated.freeze
227
+ end
228
+
112
229
  # Ends the resolution process
113
230
  # @return [void]
114
231
  def end_resolution
@@ -136,9 +253,12 @@ module Bundler::Molinillo
136
253
  if possibility
137
254
  attempt_to_activate
138
255
  else
139
- create_conflict if state.is_a? PossibilityState
140
- unwind_for_conflict until possibility && state.is_a?(DependencyState)
256
+ create_conflict
257
+ unwind_for_conflict
141
258
  end
259
+ rescue CircularDependencyError => underlying_error
260
+ create_conflict(underlying_error)
261
+ unwind_for_conflict
142
262
  end
143
263
 
144
264
  # @return [Object] the current possibility that the resolution is trying
@@ -158,7 +278,10 @@ module Bundler::Molinillo
158
278
  # @return [DependencyState] the initial state for the resolution
159
279
  def initial_state
160
280
  graph = DependencyGraph.new.tap do |dg|
161
- original_requested.each { |r| dg.add_vertex(name_for(r), nil, true).tap { |v| v.explicit_requirements << r } }
281
+ original_requested.each do |requested|
282
+ vertex = dg.add_vertex(name_for(requested), nil, true)
283
+ vertex.explicit_requirements << requested
284
+ end
162
285
  dg.tag(:initial_state)
163
286
  end
164
287
 
@@ -169,45 +292,280 @@ module Bundler::Molinillo
169
292
  requirements,
170
293
  graph,
171
294
  initial_requirement,
172
- initial_requirement && search_for(initial_requirement),
295
+ possibilities_for_requirement(initial_requirement, graph),
173
296
  0,
174
- {}
297
+ {},
298
+ []
175
299
  )
176
300
  end
177
301
 
178
302
  # Unwinds the states stack because a conflict has been encountered
179
303
  # @return [void]
180
304
  def unwind_for_conflict
181
- debug(depth) { "Unwinding for conflict: #{requirement} to #{state_index_for_unwind / 2}" }
305
+ details_for_unwind = build_details_for_unwind
306
+ unwind_options = unused_unwind_options
307
+ debug(depth) { "Unwinding for conflict: #{requirement} to #{details_for_unwind.state_index / 2}" }
182
308
  conflicts.tap do |c|
183
- sliced_states = states.slice!((state_index_for_unwind + 1)..-1)
184
- raise VersionConflict.new(c) unless state
309
+ sliced_states = states.slice!((details_for_unwind.state_index + 1)..-1)
310
+ raise_error_unless_state(c)
185
311
  activated.rewind_to(sliced_states.first || :initial_state) if sliced_states
186
312
  state.conflicts = c
313
+ state.unused_unwind_options = unwind_options
314
+ filter_possibilities_after_unwind(details_for_unwind)
187
315
  index = states.size - 1
188
316
  @parents_of.each { |_, a| a.reject! { |i| i >= index } }
317
+ state.unused_unwind_options.reject! { |uw| uw.state_index >= index }
318
+ end
319
+ end
320
+
321
+ # Raises a VersionConflict error, or any underlying error, if there is no
322
+ # current state
323
+ # @return [void]
324
+ def raise_error_unless_state(conflicts)
325
+ return if state
326
+
327
+ error = conflicts.values.map(&:underlying_error).compact.first
328
+ raise error || VersionConflict.new(conflicts, specification_provider)
329
+ end
330
+
331
+ # @return [UnwindDetails] Details of the nearest index to which we could unwind
332
+ def build_details_for_unwind
333
+ # Get the possible unwinds for the current conflict
334
+ current_conflict = conflicts[name]
335
+ binding_requirements = binding_requirements_for_conflict(current_conflict)
336
+ unwind_details = unwind_options_for_requirements(binding_requirements)
337
+
338
+ last_detail_for_current_unwind = unwind_details.sort.last
339
+ current_detail = last_detail_for_current_unwind
340
+
341
+ # Look for past conflicts that could be unwound to affect the
342
+ # requirement tree for the current conflict
343
+ relevant_unused_unwinds = unused_unwind_options.select do |alternative|
344
+ intersecting_requirements =
345
+ last_detail_for_current_unwind.all_requirements &
346
+ alternative.requirements_unwound_to_instead
347
+ next if intersecting_requirements.empty?
348
+ # Find the highest index unwind whilst looping through
349
+ current_detail = alternative if alternative > current_detail
350
+ alternative
351
+ end
352
+
353
+ # Add the current unwind options to the `unused_unwind_options` array.
354
+ # The "used" option will be filtered out during `unwind_for_conflict`.
355
+ state.unused_unwind_options += unwind_details.reject { |detail| detail.state_index == -1 }
356
+
357
+ # Update the requirements_unwound_to_instead on any relevant unused unwinds
358
+ relevant_unused_unwinds.each { |d| d.requirements_unwound_to_instead << current_detail.state_requirement }
359
+ unwind_details.each { |d| d.requirements_unwound_to_instead << current_detail.state_requirement }
360
+
361
+ current_detail
362
+ end
363
+
364
+ # @param [Array<Object>] array of requirements that combine to create a conflict
365
+ # @return [Array<UnwindDetails>] array of UnwindDetails that have a chance
366
+ # of resolving the passed requirements
367
+ def unwind_options_for_requirements(binding_requirements)
368
+ unwind_details = []
369
+
370
+ trees = []
371
+ binding_requirements.reverse_each do |r|
372
+ partial_tree = [r]
373
+ trees << partial_tree
374
+ unwind_details << UnwindDetails.new(-1, nil, partial_tree, binding_requirements, trees, [])
375
+
376
+ # If this requirement has alternative possibilities, check if any would
377
+ # satisfy the other requirements that created this conflict
378
+ requirement_state = find_state_for(r)
379
+ if conflict_fixing_possibilities?(requirement_state, binding_requirements)
380
+ unwind_details << UnwindDetails.new(
381
+ states.index(requirement_state),
382
+ r,
383
+ partial_tree,
384
+ binding_requirements,
385
+ trees,
386
+ []
387
+ )
388
+ end
389
+
390
+ # Next, look at the parent of this requirement, and check if the requirement
391
+ # could have been avoided if an alternative PossibilitySet had been chosen
392
+ parent_r = parent_of(r)
393
+ next if parent_r.nil?
394
+ partial_tree.unshift(parent_r)
395
+ requirement_state = find_state_for(parent_r)
396
+ if requirement_state.possibilities.any? { |set| !set.dependencies.include?(r) }
397
+ unwind_details << UnwindDetails.new(
398
+ states.index(requirement_state),
399
+ parent_r,
400
+ partial_tree,
401
+ binding_requirements,
402
+ trees,
403
+ []
404
+ )
405
+ end
406
+
407
+ # Finally, look at the grandparent and up of this requirement, looking
408
+ # for any possibilities that wouldn't create their parent requirement
409
+ grandparent_r = parent_of(parent_r)
410
+ until grandparent_r.nil?
411
+ partial_tree.unshift(grandparent_r)
412
+ requirement_state = find_state_for(grandparent_r)
413
+ if requirement_state.possibilities.any? { |set| !set.dependencies.include?(parent_r) }
414
+ unwind_details << UnwindDetails.new(
415
+ states.index(requirement_state),
416
+ grandparent_r,
417
+ partial_tree,
418
+ binding_requirements,
419
+ trees,
420
+ []
421
+ )
422
+ end
423
+ parent_r = grandparent_r
424
+ grandparent_r = parent_of(parent_r)
425
+ end
426
+ end
427
+
428
+ unwind_details
429
+ end
430
+
431
+ # @param [DependencyState] state
432
+ # @param [Array] array of requirements
433
+ # @return [Boolean] whether or not the given state has any possibilities
434
+ # that could satisfy the given requirements
435
+ def conflict_fixing_possibilities?(state, binding_requirements)
436
+ return false unless state
437
+
438
+ state.possibilities.any? do |possibility_set|
439
+ possibility_set.possibilities.any? do |poss|
440
+ possibility_satisfies_requirements?(poss, binding_requirements)
441
+ end
442
+ end
443
+ end
444
+
445
+ # Filter's a state's possibilities to remove any that would not fix the
446
+ # conflict we've just rewound from
447
+ # @param [UnwindDetails] details of the conflict just unwound from
448
+ # @return [void]
449
+ def filter_possibilities_after_unwind(unwind_details)
450
+ return unless state && !state.possibilities.empty?
451
+
452
+ if unwind_details.unwinding_to_primary_requirement?
453
+ filter_possibilities_for_primary_unwind(unwind_details)
454
+ else
455
+ filter_possibilities_for_parent_unwind(unwind_details)
456
+ end
457
+ end
458
+
459
+ # Filter's a state's possibilities to remove any that would not satisfy
460
+ # the requirements in the conflict we've just rewound from
461
+ # @param [UnwindDetails] details of the conflict just unwound from
462
+ # @return [void]
463
+ def filter_possibilities_for_primary_unwind(unwind_details)
464
+ unwinds_to_state = unused_unwind_options.select { |uw| uw.state_index == unwind_details.state_index }
465
+ unwinds_to_state << unwind_details
466
+ unwind_requirement_sets = unwinds_to_state.map(&:conflicting_requirements)
467
+
468
+ state.possibilities.reject! do |possibility_set|
469
+ possibility_set.possibilities.none? do |poss|
470
+ unwind_requirement_sets.any? do |requirements|
471
+ possibility_satisfies_requirements?(poss, requirements)
472
+ end
473
+ end
189
474
  end
190
475
  end
191
476
 
192
- # @return [Integer] The index to which the resolution should unwind in the
193
- # case of conflict.
194
- def state_index_for_unwind
195
- current_requirement = requirement
196
- existing_requirement = requirement_for_existing_name(name)
197
- index = -1
198
- [current_requirement, existing_requirement].each do |r|
199
- until r.nil?
200
- current_state = find_state_for(r)
201
- if state_any?(current_state)
202
- current_index = states.index(current_state)
203
- index = current_index if current_index > index
204
- break
477
+ # @param [Object] possibility a single possibility
478
+ # @param [Array] requirements an array of requirements
479
+ # @return [Boolean] whether the possibility satisfies all of the
480
+ # given requirements
481
+ def possibility_satisfies_requirements?(possibility, requirements)
482
+ name = name_for(possibility)
483
+
484
+ activated.tag(:swap)
485
+ activated.set_payload(name, possibility) if activated.vertex_named(name)
486
+ satisfied = requirements.all? { |r| requirement_satisfied_by?(r, activated, possibility) }
487
+ activated.rewind_to(:swap)
488
+
489
+ satisfied
490
+ end
491
+
492
+ # Filter's a state's possibilities to remove any that would (eventually)
493
+ # create a requirement in the conflict we've just rewound from
494
+ # @param [UnwindDetails] details of the conflict just unwound from
495
+ # @return [void]
496
+ def filter_possibilities_for_parent_unwind(unwind_details)
497
+ unwinds_to_state = unused_unwind_options.select { |uw| uw.state_index == unwind_details.state_index }
498
+ unwinds_to_state << unwind_details
499
+
500
+ primary_unwinds = unwinds_to_state.select(&:unwinding_to_primary_requirement?).uniq
501
+ parent_unwinds = unwinds_to_state.uniq - primary_unwinds
502
+
503
+ allowed_possibility_sets = Compatibility.flat_map(primary_unwinds) do |unwind|
504
+ states[unwind.state_index].possibilities.select do |possibility_set|
505
+ possibility_set.possibilities.any? do |poss|
506
+ possibility_satisfies_requirements?(poss, unwind.conflicting_requirements)
205
507
  end
206
- r = parent_of(r)
207
508
  end
208
509
  end
209
510
 
210
- index
511
+ requirements_to_avoid = Compatibility.flat_map(parent_unwinds, &:sub_dependencies_to_avoid)
512
+
513
+ state.possibilities.reject! do |possibility_set|
514
+ !allowed_possibility_sets.include?(possibility_set) &&
515
+ (requirements_to_avoid - possibility_set.dependencies).empty?
516
+ end
517
+ end
518
+
519
+ # @param [Conflict] conflict
520
+ # @return [Array] minimal array of requirements that would cause the passed
521
+ # conflict to occur.
522
+ def binding_requirements_for_conflict(conflict)
523
+ return [conflict.requirement] if conflict.possibility.nil?
524
+
525
+ possible_binding_requirements = conflict.requirements.values.flatten(1).uniq
526
+
527
+ # When there’s a `CircularDependency` error the conflicting requirement
528
+ # (the one causing the circular) won’t be `conflict.requirement`
529
+ # (which won’t be for the right state, because we won’t have created it,
530
+ # because it’s circular).
531
+ # We need to make sure we have that requirement in the conflict’s list,
532
+ # otherwise we won’t be able to unwind properly, so we just return all
533
+ # the requirements for the conflict.
534
+ return possible_binding_requirements if conflict.underlying_error
535
+
536
+ possibilities = search_for(conflict.requirement)
537
+
538
+ # If all the requirements together don't filter out all possibilities,
539
+ # then the only two requirements we need to consider are the initial one
540
+ # (where the dependency's version was first chosen) and the last
541
+ if binding_requirement_in_set?(nil, possible_binding_requirements, possibilities)
542
+ return [conflict.requirement, requirement_for_existing_name(name_for(conflict.requirement))].compact
543
+ end
544
+
545
+ # Loop through the possible binding requirements, removing each one
546
+ # that doesn't bind. Use a `reverse_each` as we want the earliest set of
547
+ # binding requirements, and don't use `reject!` as we wish to refine the
548
+ # array *on each iteration*.
549
+ binding_requirements = possible_binding_requirements.dup
550
+ possible_binding_requirements.reverse_each do |req|
551
+ next if req == conflict.requirement
552
+ unless binding_requirement_in_set?(req, binding_requirements, possibilities)
553
+ binding_requirements -= [req]
554
+ end
555
+ end
556
+
557
+ binding_requirements
558
+ end
559
+
560
+ # @param [Object] requirement we wish to check
561
+ # @param [Array] array of requirements
562
+ # @param [Array] array of possibilities the requirements will be used to filter
563
+ # @return [Boolean] whether or not the given requirement is required to filter
564
+ # out all elements of the array of possibilities.
565
+ def binding_requirement_in_set?(requirement, possible_binding_requirements, possibilities)
566
+ possibilities.any? do |poss|
567
+ possibility_satisfies_requirements?(poss, possible_binding_requirements - [requirement])
568
+ end
211
569
  end
212
570
 
213
571
  # @return [Object] the requirement that led to `requirement` being added
@@ -222,7 +580,8 @@ module Bundler::Molinillo
222
580
  # @return [Object] the requirement that led to a version of a possibility
223
581
  # with the given name being activated.
224
582
  def requirement_for_existing_name(name)
225
- return nil unless activated.vertex_named(name).payload
583
+ return nil unless vertex = activated.vertex_named(name)
584
+ return nil unless vertex.payload
226
585
  states.find { |s| s.name == name }.requirement
227
586
  end
228
587
 
@@ -230,18 +589,12 @@ module Bundler::Molinillo
230
589
  # `requirement`.
231
590
  def find_state_for(requirement)
232
591
  return nil unless requirement
233
- states.reverse_each.find { |i| requirement == i.requirement && i.is_a?(DependencyState) }
234
- end
235
-
236
- # @return [Boolean] whether or not the given state has any possibilities
237
- # left.
238
- def state_any?(state)
239
- state && state.possibilities.any?
592
+ states.find { |i| requirement == i.requirement }
240
593
  end
241
594
 
242
595
  # @return [Conflict] a {Conflict} that reflects the failure to activate
243
596
  # the {#possibility} in conjunction with the current {#state}
244
- def create_conflict
597
+ def create_conflict(underlying_error = nil)
245
598
  vertex = activated.vertex_named(name)
246
599
  locked_requirement = locked_requirement_named(name)
247
600
 
@@ -250,18 +603,21 @@ module Bundler::Molinillo
250
603
  requirements[name_for_explicit_dependency_source] = vertex.explicit_requirements
251
604
  end
252
605
  requirements[name_for_locking_dependency_source] = [locked_requirement] if locked_requirement
253
- vertex.incoming_edges.each { |edge| (requirements[edge.origin.payload] ||= []).unshift(edge.requirement) }
606
+ vertex.incoming_edges.each do |edge|
607
+ (requirements[edge.origin.payload.latest_version] ||= []).unshift(edge.requirement)
608
+ end
254
609
 
255
610
  activated_by_name = {}
256
- activated.each { |v| activated_by_name[v.name] = v.payload if v.payload }
611
+ activated.each { |v| activated_by_name[v.name] = v.payload.latest_version if v.payload }
257
612
  conflicts[name] = Conflict.new(
258
613
  requirement,
259
614
  requirements,
260
- vertex.payload,
615
+ vertex.payload && vertex.payload.latest_version,
261
616
  possibility,
262
617
  locked_requirement,
263
618
  requirement_trees,
264
- activated_by_name
619
+ activated_by_name,
620
+ underlying_error
265
621
  )
266
622
  end
267
623
 
@@ -311,116 +667,48 @@ module Bundler::Molinillo
311
667
  # @return [void]
312
668
  def attempt_to_activate
313
669
  debug(depth) { 'Attempting to activate ' + possibility.to_s }
314
- existing_node = activated.vertex_named(name)
315
- if existing_node.payload
316
- debug(depth) { "Found existing spec (#{existing_node.payload})" }
317
- attempt_to_activate_existing_spec(existing_node)
318
- else
319
- attempt_to_activate_new_spec
320
- end
321
- end
322
-
323
- # Attempts to activate the current {#possibility} (given that it has
324
- # already been activated)
325
- # @return [void]
326
- def attempt_to_activate_existing_spec(existing_node)
327
- existing_spec = existing_node.payload
328
- if requirement_satisfied_by?(requirement, activated, existing_spec)
329
- new_requirements = requirements.dup
330
- push_state_for_requirements(new_requirements, false)
670
+ existing_vertex = activated.vertex_named(name)
671
+ if existing_vertex.payload
672
+ debug(depth) { "Found existing spec (#{existing_vertex.payload})" }
673
+ attempt_to_filter_existing_spec(existing_vertex)
331
674
  else
332
- return if attempt_to_swap_possibility
333
- create_conflict
334
- debug(depth) { "Unsatisfied by existing spec (#{existing_node.payload})" }
335
- unwind_for_conflict
336
- end
337
- end
338
-
339
- # Attempts to swp the current {#possibility} with the already-activated
340
- # spec with the given name
341
- # @return [Boolean] Whether the possibility was swapped into {#activated}
342
- def attempt_to_swap_possibility
343
- activated.tag(:swap)
344
- vertex = activated.vertex_named(name)
345
- activated.set_payload(name, possibility)
346
- if !vertex.requirements.
347
- all? { |r| requirement_satisfied_by?(r, activated, possibility) } ||
348
- !new_spec_satisfied?
349
- activated.rewind_to(:swap)
350
- return
351
- end
352
- fixup_swapped_children(vertex)
353
- activate_spec
354
- end
355
-
356
- # Ensures there are no orphaned successors to the given {vertex}.
357
- # @param [DependencyGraph::Vertex] vertex the vertex to fix up.
358
- # @return [void]
359
- def fixup_swapped_children(vertex) # rubocop:disable Metrics/CyclomaticComplexity
360
- payload = vertex.payload
361
- deps = dependencies_for(payload).group_by(&method(:name_for))
362
- vertex.outgoing_edges.each do |outgoing_edge|
363
- requirement = outgoing_edge.requirement
364
- parent_index = @parents_of[requirement].last
365
- succ = outgoing_edge.destination
366
- matching_deps = Array(deps[succ.name])
367
- dep_matched = matching_deps.include?(requirement)
368
-
369
- # only push the current index when it was originally required by the
370
- # same named spec
371
- if parent_index && states[parent_index].name == name
372
- @parents_of[requirement].push(states.size - 1)
675
+ latest = possibility.latest_version
676
+ # use reject!(!satisfied) for 1.8.7 compatibility
677
+ possibility.possibilities.reject! do |possibility|
678
+ !requirement_satisfied_by?(requirement, activated, possibility)
373
679
  end
374
-
375
- if matching_deps.empty? && !succ.root? && succ.predecessors.to_a == [vertex]
376
- debug(depth) { "Removing orphaned spec #{succ.name} after swapping #{name}" }
377
- succ.requirements.each { |r| @parents_of.delete(r) }
378
-
379
- removed_names = activated.detach_vertex_named(succ.name).map(&:name)
380
- requirements.delete_if do |r|
381
- # the only removed vertices are those with no other requirements,
382
- # so it's safe to delete only based upon name here
383
- removed_names.include?(name_for(r))
384
- end
385
- elsif !dep_matched
386
- debug(depth) { "Removing orphaned dependency #{requirement} after swapping #{name}" }
387
- # also reset if we're removing the edge, but only if its parent has
388
- # already been fixed up
389
- @parents_of[requirement].push(states.size - 1) if @parents_of[requirement].empty?
390
-
391
- activated.delete_edge(outgoing_edge)
392
- requirements.delete(requirement)
680
+ if possibility.latest_version.nil?
681
+ # ensure there's a possibility for better error messages
682
+ possibility.possibilities << latest if latest
683
+ create_conflict
684
+ unwind_for_conflict
685
+ else
686
+ activate_new_spec
393
687
  end
394
688
  end
395
689
  end
396
690
 
397
- # Attempts to activate the current {#possibility} (given that it hasn't
398
- # already been activated)
691
+ # Attempts to update the existing vertex's `PossibilitySet` with a filtered version
399
692
  # @return [void]
400
- def attempt_to_activate_new_spec
401
- if new_spec_satisfied?
402
- activate_spec
693
+ def attempt_to_filter_existing_spec(vertex)
694
+ filtered_set = filtered_possibility_set(vertex)
695
+ if !filtered_set.possibilities.empty?
696
+ activated.set_payload(name, filtered_set)
697
+ new_requirements = requirements.dup
698
+ push_state_for_requirements(new_requirements, false)
403
699
  else
404
700
  create_conflict
701
+ debug(depth) { "Unsatisfied by existing spec (#{vertex.payload})" }
405
702
  unwind_for_conflict
406
703
  end
407
704
  end
408
705
 
409
- # @return [Boolean] whether the current spec is satisfied as a new
410
- # possibility.
411
- def new_spec_satisfied?
412
- unless requirement_satisfied_by?(requirement, activated, possibility)
413
- debug(depth) { 'Unsatisfied by requested spec' }
414
- return false
415
- end
416
-
417
- locked_requirement = locked_requirement_named(name)
418
-
419
- locked_spec_satisfied = !locked_requirement ||
420
- requirement_satisfied_by?(locked_requirement, activated, possibility)
421
- debug(depth) { 'Unsatisfied by locked spec' } unless locked_spec_satisfied
422
-
423
- locked_spec_satisfied
706
+ # Generates a filtered version of the existing vertex's `PossibilitySet` using the
707
+ # current state's `requirement`
708
+ # @param [Object] existing vertex
709
+ # @return [PossibilitySet] filtered possibility set
710
+ def filtered_possibility_set(vertex)
711
+ PossibilitySet.new(vertex.payload.dependencies, vertex.payload.possibilities & possibility.possibilities)
424
712
  end
425
713
 
426
714
  # @param [String] requirement_name the spec name to search for
@@ -434,7 +722,7 @@ module Bundler::Molinillo
434
722
  # Add the current {#possibility} to the dependency graph of the current
435
723
  # {#state}
436
724
  # @return [void]
437
- def activate_spec
725
+ def activate_new_spec
438
726
  conflicts.delete(name)
439
727
  debug(depth) { "Activated #{name} at #{possibility}" }
440
728
  activated.set_payload(name, possibility)
@@ -442,14 +730,14 @@ module Bundler::Molinillo
442
730
  end
443
731
 
444
732
  # Requires the dependencies that the recently activated spec has
445
- # @param [Object] activated_spec the specification that has just been
733
+ # @param [Object] activated_possibility the PossibilitySet that has just been
446
734
  # activated
447
735
  # @return [void]
448
- def require_nested_dependencies_for(activated_spec)
449
- nested_dependencies = dependencies_for(activated_spec)
736
+ def require_nested_dependencies_for(possibility_set)
737
+ nested_dependencies = dependencies_for(possibility_set.latest_version)
450
738
  debug(depth) { "Requiring nested dependencies (#{nested_dependencies.join(', ')})" }
451
739
  nested_dependencies.each do |d|
452
- activated.add_child_vertex(name_for(d), nil, [name_for(activated_spec)], d)
740
+ activated.add_child_vertex(name_for(d), nil, [name_for(possibility_set.latest_version)], d)
453
741
  parent_index = states.size - 1
454
742
  parents = @parents_of[d]
455
743
  parents << parent_index if parents.empty?
@@ -464,20 +752,75 @@ module Bundler::Molinillo
464
752
  # @return [void]
465
753
  def push_state_for_requirements(new_requirements, requires_sort = true, new_activated = activated)
466
754
  new_requirements = sort_dependencies(new_requirements.uniq, new_activated, conflicts) if requires_sort
467
- new_requirement = new_requirements.shift
755
+ new_requirement = nil
756
+ loop do
757
+ new_requirement = new_requirements.shift
758
+ break if new_requirement.nil? || states.none? { |s| s.requirement == new_requirement }
759
+ end
468
760
  new_name = new_requirement ? name_for(new_requirement) : ''.freeze
469
- possibilities = new_requirement ? search_for(new_requirement) : []
761
+ possibilities = possibilities_for_requirement(new_requirement)
470
762
  handle_missing_or_push_dependency_state DependencyState.new(
471
763
  new_name, new_requirements, new_activated,
472
- new_requirement, possibilities, depth, conflicts.dup
764
+ new_requirement, possibilities, depth, conflicts.dup, unused_unwind_options.dup
473
765
  )
474
766
  end
475
767
 
768
+ # Checks a proposed requirement with any existing locked requirement
769
+ # before generating an array of possibilities for it.
770
+ # @param [Object] the proposed requirement
771
+ # @return [Array] possibilities
772
+ def possibilities_for_requirement(requirement, activated = self.activated)
773
+ return [] unless requirement
774
+ if locked_requirement_named(name_for(requirement))
775
+ return locked_requirement_possibility_set(requirement, activated)
776
+ end
777
+
778
+ group_possibilities(search_for(requirement))
779
+ end
780
+
781
+ # @param [Object] the proposed requirement
782
+ # @return [Array] possibility set containing only the locked requirement, if any
783
+ def locked_requirement_possibility_set(requirement, activated = self.activated)
784
+ all_possibilities = search_for(requirement)
785
+ locked_requirement = locked_requirement_named(name_for(requirement))
786
+
787
+ # Longwinded way to build a possibilities array with either the locked
788
+ # requirement or nothing in it. Required, since the API for
789
+ # locked_requirement isn't guaranteed.
790
+ locked_possibilities = all_possibilities.select do |possibility|
791
+ requirement_satisfied_by?(locked_requirement, activated, possibility)
792
+ end
793
+
794
+ group_possibilities(locked_possibilities)
795
+ end
796
+
797
+ # Build an array of PossibilitySets, with each element representing a group of
798
+ # dependency versions that all have the same sub-dependency version constraints
799
+ # and are contiguous.
800
+ # @param [Array] an array of possibilities
801
+ # @return [Array] an array of possibility sets
802
+ def group_possibilities(possibilities)
803
+ possibility_sets = []
804
+ current_possibility_set = nil
805
+
806
+ possibilities.reverse_each do |possibility|
807
+ dependencies = dependencies_for(possibility)
808
+ if current_possibility_set && current_possibility_set.dependencies == dependencies
809
+ current_possibility_set.possibilities.unshift(possibility)
810
+ else
811
+ possibility_sets.unshift(PossibilitySet.new(dependencies, [possibility]))
812
+ current_possibility_set = possibility_sets.first
813
+ end
814
+ end
815
+
816
+ possibility_sets
817
+ end
818
+
476
819
  # Pushes a new {DependencyState}.
477
820
  # If the {#specification_provider} says to
478
821
  # {SpecificationProvider#allow_missing?} that particular requirement, and
479
822
  # there are no possibilities for that requirement, then `state` is not
480
- # pushed, and the node in {#activated} is removed, and we continue
823
+ # pushed, and the vertex in {#activated} is removed, and we continue
481
824
  # resolving the remaining requirements.
482
825
  # @param [DependencyState] state
483
826
  # @return [void]