bundler 1.8.9 → 1.9.0.pre

Sign up to get free protection for your applications and to get access to all the features.
Files changed (69) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +9 -7
  3. data/CHANGELOG.md +8 -33
  4. data/Rakefile +51 -8
  5. data/lib/bundler/cli/gem.rb +20 -1
  6. data/lib/bundler/cli/install.rb +1 -1
  7. data/lib/bundler/definition.rb +8 -12
  8. data/lib/bundler/dep_proxy.rb +2 -2
  9. data/lib/bundler/installer.rb +12 -18
  10. data/lib/bundler/resolver.rb +168 -383
  11. data/lib/bundler/rubygems_ext.rb +1 -1
  12. data/lib/bundler/rubygems_integration.rb +6 -14
  13. data/lib/bundler/runtime.rb +3 -0
  14. data/lib/bundler/shared_helpers.rb +12 -7
  15. data/lib/bundler/source.rb +0 -5
  16. data/lib/bundler/source/path.rb +2 -1
  17. data/lib/bundler/source/path/installer.rb +0 -2
  18. data/lib/bundler/source/rubygems.rb +9 -11
  19. data/lib/bundler/templates/newgem/Rakefile.tt +0 -1
  20. data/lib/bundler/templates/newgem/newgem.gemspec.tt +1 -1
  21. data/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo.rb +5 -0
  22. data/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/dependency_graph.rb +266 -0
  23. data/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/errors.rb +69 -0
  24. data/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/gem_metadata.rb +3 -0
  25. data/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/modules/specification_provider.rb +90 -0
  26. data/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/modules/ui.rb +63 -0
  27. data/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/resolution.rb +412 -0
  28. data/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/resolver.rb +43 -0
  29. data/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/state.rb +43 -0
  30. data/lib/bundler/vendor/{thor.rb → thor-0.19.1/lib/thor.rb} +57 -53
  31. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/actions.rb +34 -34
  32. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/actions/create_file.rb +7 -7
  33. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/actions/create_link.rb +2 -2
  34. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/actions/directory.rb +11 -11
  35. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/actions/empty_directory.rb +2 -2
  36. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/actions/file_manipulation.rb +14 -14
  37. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/actions/inject_into_file.rb +24 -24
  38. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/base.rb +71 -71
  39. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/command.rb +8 -8
  40. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/core_ext/hash_with_indifferent_access.rb +2 -2
  41. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/core_ext/io_binary_read.rb +1 -1
  42. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/core_ext/ordered_hash.rb +2 -2
  43. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/error.rb +3 -3
  44. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/group.rb +27 -27
  45. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/invocation.rb +16 -11
  46. data/lib/bundler/vendor/thor-0.19.1/lib/thor/line_editor.rb +17 -0
  47. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/line_editor/basic.rb +2 -2
  48. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/line_editor/readline.rb +7 -7
  49. data/lib/bundler/vendor/thor-0.19.1/lib/thor/parser.rb +4 -0
  50. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/parser/argument.rb +7 -7
  51. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/parser/arguments.rb +10 -10
  52. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/parser/option.rb +14 -10
  53. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/parser/options.rb +12 -12
  54. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/rake_compat.rb +14 -14
  55. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/runner.rb +76 -76
  56. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/shell.rb +18 -18
  57. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/shell/basic.rb +31 -30
  58. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/shell/color.rb +10 -10
  59. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/shell/html.rb +28 -28
  60. data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/util.rb +61 -61
  61. data/lib/bundler/vendor/thor-0.19.1/lib/thor/version.rb +3 -0
  62. data/lib/bundler/vendored_molinillo.rb +5 -0
  63. data/lib/bundler/vendored_thor.rb +3 -6
  64. data/lib/bundler/version.rb +1 -1
  65. metadata +44 -35
  66. data/lib/bundler/vendor/.document +0 -0
  67. data/lib/bundler/vendor/thor/line_editor.rb +0 -17
  68. data/lib/bundler/vendor/thor/parser.rb +0 -4
  69. data/lib/bundler/vendor/thor/version.rb +0 -3
@@ -0,0 +1,3 @@
1
+ class Bundler::Thor
2
+ VERSION = "0.19.1"
3
+ end
@@ -0,0 +1,5 @@
1
+ vendor = File.expand_path('../vendor/Molinillo-0.2.1/lib', __FILE__)
2
+ loaded = $:.include?(vendor)
3
+ $:.unshift(vendor) unless loaded
4
+ require 'molinillo'
5
+ $:.delete(vendor) unless loaded
@@ -1,8 +1,5 @@
1
- if defined?(Thor)
2
- Bundler.ui.warn "Thor has already been required. " +
3
- "This may cause Bundler to malfunction in unexpected ways."
4
- end
5
- vendor = File.expand_path('../vendor', __FILE__)
6
- $:.unshift(vendor) unless $:.include?(vendor)
1
+ vendor = File.expand_path('../vendor/thor-0.19.1/lib', __FILE__)
2
+ loaded = $:.include?(vendor)
3
+ $:.unshift(vendor) unless loaded
7
4
  require 'thor'
8
5
  require 'thor/actions'
@@ -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.8.9" unless defined?(::Bundler::VERSION)
5
+ VERSION = "1.9.0.pre" 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.8.9
4
+ version: 1.9.0.pre
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-05-03 00:00:00.000000000 Z
14
+ date: 2015-03-11 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: mustache
@@ -216,42 +216,51 @@ files:
216
216
  - lib/bundler/ui/rg_proxy.rb
217
217
  - lib/bundler/ui/shell.rb
218
218
  - lib/bundler/ui/silent.rb
219
- - lib/bundler/vendor/.document
219
+ - lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo.rb
220
+ - lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/dependency_graph.rb
221
+ - lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/errors.rb
222
+ - lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/gem_metadata.rb
223
+ - lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/modules/specification_provider.rb
224
+ - lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/modules/ui.rb
225
+ - lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/resolution.rb
226
+ - lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/resolver.rb
227
+ - lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/state.rb
220
228
  - lib/bundler/vendor/net/http/faster.rb
221
229
  - lib/bundler/vendor/net/http/persistent.rb
222
230
  - lib/bundler/vendor/net/http/persistent/ssl_reuse.rb
223
- - lib/bundler/vendor/thor.rb
224
- - lib/bundler/vendor/thor/actions.rb
225
- - lib/bundler/vendor/thor/actions/create_file.rb
226
- - lib/bundler/vendor/thor/actions/create_link.rb
227
- - lib/bundler/vendor/thor/actions/directory.rb
228
- - lib/bundler/vendor/thor/actions/empty_directory.rb
229
- - lib/bundler/vendor/thor/actions/file_manipulation.rb
230
- - lib/bundler/vendor/thor/actions/inject_into_file.rb
231
- - lib/bundler/vendor/thor/base.rb
232
- - lib/bundler/vendor/thor/command.rb
233
- - lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb
234
- - lib/bundler/vendor/thor/core_ext/io_binary_read.rb
235
- - lib/bundler/vendor/thor/core_ext/ordered_hash.rb
236
- - lib/bundler/vendor/thor/error.rb
237
- - lib/bundler/vendor/thor/group.rb
238
- - lib/bundler/vendor/thor/invocation.rb
239
- - lib/bundler/vendor/thor/line_editor.rb
240
- - lib/bundler/vendor/thor/line_editor/basic.rb
241
- - lib/bundler/vendor/thor/line_editor/readline.rb
242
- - lib/bundler/vendor/thor/parser.rb
243
- - lib/bundler/vendor/thor/parser/argument.rb
244
- - lib/bundler/vendor/thor/parser/arguments.rb
245
- - lib/bundler/vendor/thor/parser/option.rb
246
- - lib/bundler/vendor/thor/parser/options.rb
247
- - lib/bundler/vendor/thor/rake_compat.rb
248
- - lib/bundler/vendor/thor/runner.rb
249
- - lib/bundler/vendor/thor/shell.rb
250
- - lib/bundler/vendor/thor/shell/basic.rb
251
- - lib/bundler/vendor/thor/shell/color.rb
252
- - lib/bundler/vendor/thor/shell/html.rb
253
- - lib/bundler/vendor/thor/util.rb
254
- - lib/bundler/vendor/thor/version.rb
231
+ - lib/bundler/vendor/thor-0.19.1/lib/thor.rb
232
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/actions.rb
233
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/actions/create_file.rb
234
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/actions/create_link.rb
235
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/actions/directory.rb
236
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/actions/empty_directory.rb
237
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/actions/file_manipulation.rb
238
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/actions/inject_into_file.rb
239
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/base.rb
240
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/command.rb
241
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/core_ext/hash_with_indifferent_access.rb
242
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/core_ext/io_binary_read.rb
243
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/core_ext/ordered_hash.rb
244
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/error.rb
245
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/group.rb
246
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/invocation.rb
247
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/line_editor.rb
248
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/line_editor/basic.rb
249
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/line_editor/readline.rb
250
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/parser.rb
251
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/parser/argument.rb
252
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/parser/arguments.rb
253
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/parser/option.rb
254
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/parser/options.rb
255
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/rake_compat.rb
256
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/runner.rb
257
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/shell.rb
258
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/shell/basic.rb
259
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/shell/color.rb
260
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/shell/html.rb
261
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/util.rb
262
+ - lib/bundler/vendor/thor-0.19.1/lib/thor/version.rb
263
+ - lib/bundler/vendored_molinillo.rb
255
264
  - lib/bundler/vendored_persistent.rb
256
265
  - lib/bundler/vendored_thor.rb
257
266
  - lib/bundler/version.rb
File without changes
@@ -1,17 +0,0 @@
1
- require 'thor/line_editor/basic'
2
- require 'thor/line_editor/readline'
3
-
4
- class Thor
5
- module LineEditor
6
- def self.readline(prompt, options={})
7
- best_available.new(prompt, options).readline
8
- end
9
-
10
- def self.best_available
11
- [
12
- Thor::LineEditor::Readline,
13
- Thor::LineEditor::Basic
14
- ].detect(&:available?)
15
- end
16
- end
17
- end
@@ -1,4 +0,0 @@
1
- require 'thor/parser/argument'
2
- require 'thor/parser/arguments'
3
- require 'thor/parser/option'
4
- require 'thor/parser/options'
@@ -1,3 +0,0 @@
1
- class Thor
2
- VERSION = '0.18.1'
3
- end