bundler 1.4.0.pre.1 → 1.4.0.pre.2

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 (63) hide show
  1. data/.travis.yml +18 -7
  2. data/CHANGELOG.md +15 -0
  3. data/CONTRIBUTING.md +8 -0
  4. data/DEVELOPMENT.md +27 -25
  5. data/ISSUES.md +33 -20
  6. data/README.md +6 -4
  7. data/Rakefile +1 -1
  8. data/UPGRADING.md +1 -1
  9. data/bin/bundle +1 -1
  10. data/bin/bundler +10 -0
  11. data/bundler.gemspec +2 -2
  12. data/lib/bundler/capistrano.rb +4 -0
  13. data/lib/bundler/cli.rb +7 -0
  14. data/lib/bundler/current_ruby.rb +9 -1
  15. data/lib/bundler/definition.rb +2 -0
  16. data/lib/bundler/dependency.rb +3 -1
  17. data/lib/bundler/dsl.rb +1 -1
  18. data/lib/bundler/fetcher.rb +1 -1
  19. data/lib/bundler/friendly_errors.rb +5 -0
  20. data/lib/bundler/gem_helpers.rb +7 -6
  21. data/lib/bundler/installer.rb +27 -20
  22. data/lib/bundler/parallel_workers/unix_worker.rb +2 -2
  23. data/lib/bundler/ruby_dsl.rb +1 -1
  24. data/lib/bundler/ruby_version.rb +12 -3
  25. data/lib/bundler/rubygems_ext.rb +1 -0
  26. data/lib/bundler/rubygems_integration.rb +1 -1
  27. data/lib/bundler/runtime.rb +2 -1
  28. data/lib/bundler/shared_helpers.rb +13 -0
  29. data/lib/bundler/source/git.rb +3 -3
  30. data/lib/bundler/source/git/git_proxy.rb +1 -1
  31. data/lib/bundler/source/path.rb +1 -2
  32. data/lib/bundler/source/rubygems.rb +3 -5
  33. data/lib/bundler/version.rb +1 -1
  34. data/man/bundle.ronn +1 -1
  35. data/man/gemfile.5.ronn +6 -2
  36. data/spec/bundler/dsl_spec.rb +2 -2
  37. data/spec/bundler/friendly_errors_spec.rb +13 -0
  38. data/spec/{other → commands}/binstubs_spec.rb +0 -0
  39. data/spec/{other → commands}/check_spec.rb +0 -0
  40. data/spec/{other → commands}/clean_spec.rb +0 -0
  41. data/spec/{other → commands}/config_spec.rb +0 -0
  42. data/spec/{other → commands}/console_spec.rb +0 -0
  43. data/spec/{other → commands}/exec_spec.rb +0 -0
  44. data/spec/{other → commands}/help_spec.rb +0 -0
  45. data/spec/{other → commands}/init_spec.rb +0 -0
  46. data/spec/{other → commands}/licenses_spec.rb +0 -0
  47. data/spec/{other → commands}/newgem_spec.rb +0 -0
  48. data/spec/{other → commands}/open_spec.rb +0 -0
  49. data/spec/{other → commands}/outdated_spec.rb +0 -0
  50. data/spec/{other → commands}/show_spec.rb +0 -0
  51. data/spec/install/gems/dependency_api_spec.rb +14 -0
  52. data/spec/install/git_spec.rb +42 -0
  53. data/spec/other/bundle_ruby_spec.rb +105 -75
  54. data/spec/other/cli_dispatch_spec.rb +21 -0
  55. data/spec/other/ext_spec.rb +23 -0
  56. data/spec/other/platform_spec.rb +204 -4
  57. data/spec/resolver/platform_spec.rb +7 -1
  58. data/spec/runtime/setup_spec.rb +1 -1
  59. data/spec/support/builders.rb +5 -1
  60. data/spec/support/indexes.rb +1 -1
  61. data/spec/support/platforms.rb +9 -1
  62. metadata +116 -84
  63. checksums.yaml +0 -7
@@ -32,7 +32,7 @@ describe "Resolving platform craziness" do
32
32
 
33
33
  before :each do
34
34
  @index = build_index do
35
- platforms "mingw32 mswin32" do |platform|
35
+ platforms "mingw32 mswin32 x64-mingw32" do |platform|
36
36
  gem "thin", "1.2.7", platform
37
37
  end
38
38
  end
@@ -51,6 +51,12 @@ describe "Resolving platform craziness" do
51
51
  dep "thin"
52
52
  should_resolve_as %w(thin-1.2.7-x86-mingw32)
53
53
  end
54
+
55
+ it "finds x64-mingw gems" do
56
+ platforms "x64-mingw32"
57
+ dep "thin"
58
+ should_resolve_as %w(thin-1.2.7-x64-mingw32)
59
+ end
54
60
  end
55
61
 
56
62
  describe "with conflicting cases" do
@@ -550,7 +550,7 @@ describe "Bundler.setup" do
550
550
  end
551
551
  R
552
552
 
553
- expect(out).to eq("You have already activated thin 1.1, but your Gemfile requires thin 1.0. Using bundle exec may solve this.")
553
+ expect(out).to eq("You have already activated thin 1.1, but your Gemfile requires thin 1.0. Prepending `bundle exec` to your command may solve this.")
554
554
  end
555
555
 
556
556
  it "version_requirement is now deprecated in rubygems 1.4.0+" do
@@ -1,3 +1,5 @@
1
+ require 'bundler/shared_helpers'
2
+
1
3
  module Spec
2
4
  module Builders
3
5
  def self.constantize(name)
@@ -588,7 +590,9 @@ module Spec
588
590
  private
589
591
 
590
592
  def git(cmd)
591
- Dir.chdir(@path) { `git #{cmd}`.strip }
593
+ Bundler::SharedHelpers.with_clean_git_env do
594
+ Dir.chdir(@path) { `git #{cmd}`.strip }
595
+ end
592
596
  end
593
597
 
594
598
  end
@@ -87,7 +87,7 @@ module Spec
87
87
  end
88
88
 
89
89
  versions '1.0 1.2 1.2.1 1.2.2 1.3 1.3.0.1 1.3.5 1.4.0 1.4.2 1.4.2.1' do |version|
90
- platforms "ruby java mswin32 mingw32" do |platform|
90
+ platforms "ruby java mswin32 mingw32 x64-mingw32" do |platform|
91
91
  next if version == v('1.4.2.1') && platform != pl('x86-mswin32')
92
92
  next if version == v('1.4.2') && platform == pl('x86-mswin32')
93
93
  gem "nokogiri", version, platform do
@@ -26,8 +26,12 @@ module Spec
26
26
  Gem::Platform.new(['x86', 'mingw32', nil])
27
27
  end
28
28
 
29
+ def x64_mingw
30
+ Gem::Platform.new(['x64', 'mingw32', nil])
31
+ end
32
+
29
33
  def all_platforms
30
- [rb, java, linux, mswin, mingw]
34
+ [rb, java, linux, mswin, mingw, x64_mingw]
31
35
  end
32
36
 
33
37
  def local
@@ -82,5 +86,9 @@ module Spec
82
86
  def not_local_ruby_version
83
87
  "1.12"
84
88
  end
89
+
90
+ def not_local_patchlevel
91
+ 9999
92
+ end
85
93
  end
86
94
  end
metadata CHANGED
@@ -1,55 +1,69 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: bundler
3
- version: !ruby/object:Gem::Version
4
- version: 1.4.0.pre.1
3
+ version: !ruby/object:Gem::Version
4
+ hash: 4156093791
5
+ prerelease: 6
6
+ segments:
7
+ - 1
8
+ - 4
9
+ - 0
10
+ - pre
11
+ - 2
12
+ version: 1.4.0.pre.2
5
13
  platform: ruby
6
- authors:
7
- - André Arko
14
+ authors:
15
+ - "Andr\xC3\xA9 Arko"
8
16
  - Terence Lee
9
17
  - Carl Lerche
10
18
  - Yehuda Katz
11
19
  autorequire:
12
20
  bindir: bin
13
21
  cert_chain: []
14
- date: 2013-08-05 00:00:00.000000000 Z
15
- dependencies:
16
- - !ruby/object:Gem::Dependency
22
+
23
+ date: 2013-08-27 00:00:00 Z
24
+ dependencies:
25
+ - !ruby/object:Gem::Dependency
17
26
  name: ronn
18
- requirement: !ruby/object:Gem::Requirement
19
- requirements:
20
- - - ~>
21
- - !ruby/object:Gem::Version
22
- version: 0.7.3
23
- type: :development
24
27
  prerelease: false
25
- version_requirements: !ruby/object:Gem::Requirement
26
- requirements:
28
+ requirement: &id001 !ruby/object:Gem::Requirement
29
+ none: false
30
+ requirements:
27
31
  - - ~>
28
- - !ruby/object:Gem::Version
32
+ - !ruby/object:Gem::Version
33
+ hash: 5
34
+ segments:
35
+ - 0
36
+ - 7
37
+ - 3
29
38
  version: 0.7.3
30
- - !ruby/object:Gem::Dependency
31
- name: rspec
32
- requirement: !ruby/object:Gem::Requirement
33
- requirements:
34
- - - ~>
35
- - !ruby/object:Gem::Version
36
- version: '2.11'
37
39
  type: :development
40
+ version_requirements: *id001
41
+ - !ruby/object:Gem::Dependency
42
+ name: rspec
38
43
  prerelease: false
39
- version_requirements: !ruby/object:Gem::Requirement
40
- requirements:
44
+ requirement: &id002 !ruby/object:Gem::Requirement
45
+ none: false
46
+ requirements:
41
47
  - - ~>
42
- - !ruby/object:Gem::Version
43
- version: '2.11'
44
- description: Bundler manages an application's dependencies through its entire life,
45
- across many machines, systematically and repeatably
46
- email:
48
+ - !ruby/object:Gem::Version
49
+ hash: 21
50
+ segments:
51
+ - 2
52
+ - 11
53
+ version: "2.11"
54
+ type: :development
55
+ version_requirements: *id002
56
+ description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
57
+ email:
47
58
  - andre@arko.net
48
- executables:
59
+ executables:
49
60
  - bundle
61
+ - bundler
50
62
  extensions: []
63
+
51
64
  extra_rdoc_files: []
52
- files:
65
+
66
+ files:
53
67
  - .gitignore
54
68
  - .rspec
55
69
  - .travis.yml
@@ -63,6 +77,7 @@ files:
63
77
  - UPGRADING.md
64
78
  - bin/bundle
65
79
  - bin/bundle_ruby
80
+ - bin/bundler
66
81
  - bundler.gemspec
67
82
  - lib/bundler.rb
68
83
  - lib/bundler/capistrano.rb
@@ -190,6 +205,7 @@ files:
190
205
  - spec/bundler/cli_rspec.rb
191
206
  - spec/bundler/definition_spec.rb
192
207
  - spec/bundler/dsl_spec.rb
208
+ - spec/bundler/friendly_errors_spec.rb
193
209
  - spec/bundler/gem_helper_spec.rb
194
210
  - spec/bundler/psyched_yaml_spec.rb
195
211
  - spec/bundler/safe_catch_spec.rb
@@ -198,6 +214,19 @@ files:
198
214
  - spec/cache/git_spec.rb
199
215
  - spec/cache/path_spec.rb
200
216
  - spec/cache/platform_spec.rb
217
+ - spec/commands/binstubs_spec.rb
218
+ - spec/commands/check_spec.rb
219
+ - spec/commands/clean_spec.rb
220
+ - spec/commands/config_spec.rb
221
+ - spec/commands/console_spec.rb
222
+ - spec/commands/exec_spec.rb
223
+ - spec/commands/help_spec.rb
224
+ - spec/commands/init_spec.rb
225
+ - spec/commands/licenses_spec.rb
226
+ - spec/commands/newgem_spec.rb
227
+ - spec/commands/open_spec.rb
228
+ - spec/commands/outdated_spec.rb
229
+ - spec/commands/show_spec.rb
201
230
  - spec/install/deploy_spec.rb
202
231
  - spec/install/gems/c_ext_spec.rb
203
232
  - spec/install/gems/dependency_api_spec.rb
@@ -222,22 +251,10 @@ files:
222
251
  - spec/integration/inject.rb
223
252
  - spec/lock/git_spec.rb
224
253
  - spec/lock/lockfile_spec.rb
225
- - spec/other/binstubs_spec.rb
226
254
  - spec/other/bundle_ruby_spec.rb
227
- - spec/other/check_spec.rb
228
- - spec/other/clean_spec.rb
229
- - spec/other/config_spec.rb
230
- - spec/other/console_spec.rb
231
- - spec/other/exec_spec.rb
255
+ - spec/other/cli_dispatch_spec.rb
232
256
  - spec/other/ext_spec.rb
233
- - spec/other/help_spec.rb
234
- - spec/other/init_spec.rb
235
- - spec/other/licenses_spec.rb
236
- - spec/other/newgem_spec.rb
237
- - spec/other/open_spec.rb
238
- - spec/other/outdated_spec.rb
239
257
  - spec/other/platform_spec.rb
240
- - spec/other/show_spec.rb
241
258
  - spec/quality_spec.rb
242
259
  - spec/realworld/dependency_api_spec.rb
243
260
  - spec/realworld/edgecases_spec.rb
@@ -279,51 +296,65 @@ files:
279
296
  - spec/update/gems_spec.rb
280
297
  - spec/update/git_spec.rb
281
298
  - spec/update/source_spec.rb
282
- - lib/bundler/man/bundle
283
- - lib/bundler/man/bundle-config
284
- - lib/bundler/man/bundle-config.txt
285
299
  - lib/bundler/man/bundle-exec
286
- - lib/bundler/man/bundle-exec.txt
300
+ - lib/bundler/man/bundle
287
301
  - lib/bundler/man/bundle-install
288
- - lib/bundler/man/bundle-install.txt
289
- - lib/bundler/man/bundle-package
290
- - lib/bundler/man/bundle-package.txt
302
+ - lib/bundler/man/gemfile.5
291
303
  - lib/bundler/man/bundle-platform
292
- - lib/bundler/man/bundle-platform.txt
304
+ - lib/bundler/man/bundle-package
293
305
  - lib/bundler/man/bundle-update
306
+ - lib/bundler/man/bundle-exec.txt
307
+ - lib/bundler/man/gemfile.5.txt
294
308
  - lib/bundler/man/bundle-update.txt
309
+ - lib/bundler/man/bundle-config
310
+ - lib/bundler/man/bundle-platform.txt
311
+ - lib/bundler/man/bundle-config.txt
295
312
  - lib/bundler/man/bundle.txt
296
- - lib/bundler/man/gemfile.5
297
- - lib/bundler/man/gemfile.5.txt
298
- homepage: http://gembundler.com
299
- licenses:
313
+ - lib/bundler/man/bundle-package.txt
314
+ - lib/bundler/man/bundle-install.txt
315
+ homepage: http://bundler.io
316
+ licenses:
300
317
  - MIT
301
- metadata: {}
302
318
  post_install_message:
303
319
  rdoc_options: []
304
- require_paths:
320
+
321
+ require_paths:
305
322
  - lib
306
- required_ruby_version: !ruby/object:Gem::Requirement
307
- requirements:
308
- - - '>='
309
- - !ruby/object:Gem::Version
323
+ required_ruby_version: !ruby/object:Gem::Requirement
324
+ none: false
325
+ requirements:
326
+ - - ">="
327
+ - !ruby/object:Gem::Version
328
+ hash: 57
329
+ segments:
330
+ - 1
331
+ - 8
332
+ - 7
310
333
  version: 1.8.7
311
- required_rubygems_version: !ruby/object:Gem::Requirement
312
- requirements:
313
- - - '>='
314
- - !ruby/object:Gem::Version
334
+ required_rubygems_version: !ruby/object:Gem::Requirement
335
+ none: false
336
+ requirements:
337
+ - - ">="
338
+ - !ruby/object:Gem::Version
339
+ hash: 23
340
+ segments:
341
+ - 1
342
+ - 3
343
+ - 6
315
344
  version: 1.3.6
316
345
  requirements: []
346
+
317
347
  rubyforge_project:
318
- rubygems_version: 2.0.6
348
+ rubygems_version: 1.8.24
319
349
  signing_key:
320
- specification_version: 4
350
+ specification_version: 3
321
351
  summary: The best way to manage your application's dependencies
322
- test_files:
352
+ test_files:
323
353
  - spec/bundler/bundler_spec.rb
324
354
  - spec/bundler/cli_rspec.rb
325
355
  - spec/bundler/definition_spec.rb
326
356
  - spec/bundler/dsl_spec.rb
357
+ - spec/bundler/friendly_errors_spec.rb
327
358
  - spec/bundler/gem_helper_spec.rb
328
359
  - spec/bundler/psyched_yaml_spec.rb
329
360
  - spec/bundler/safe_catch_spec.rb
@@ -332,6 +363,19 @@ test_files:
332
363
  - spec/cache/git_spec.rb
333
364
  - spec/cache/path_spec.rb
334
365
  - spec/cache/platform_spec.rb
366
+ - spec/commands/binstubs_spec.rb
367
+ - spec/commands/check_spec.rb
368
+ - spec/commands/clean_spec.rb
369
+ - spec/commands/config_spec.rb
370
+ - spec/commands/console_spec.rb
371
+ - spec/commands/exec_spec.rb
372
+ - spec/commands/help_spec.rb
373
+ - spec/commands/init_spec.rb
374
+ - spec/commands/licenses_spec.rb
375
+ - spec/commands/newgem_spec.rb
376
+ - spec/commands/open_spec.rb
377
+ - spec/commands/outdated_spec.rb
378
+ - spec/commands/show_spec.rb
335
379
  - spec/install/deploy_spec.rb
336
380
  - spec/install/gems/c_ext_spec.rb
337
381
  - spec/install/gems/dependency_api_spec.rb
@@ -356,22 +400,10 @@ test_files:
356
400
  - spec/integration/inject.rb
357
401
  - spec/lock/git_spec.rb
358
402
  - spec/lock/lockfile_spec.rb
359
- - spec/other/binstubs_spec.rb
360
403
  - spec/other/bundle_ruby_spec.rb
361
- - spec/other/check_spec.rb
362
- - spec/other/clean_spec.rb
363
- - spec/other/config_spec.rb
364
- - spec/other/console_spec.rb
365
- - spec/other/exec_spec.rb
404
+ - spec/other/cli_dispatch_spec.rb
366
405
  - spec/other/ext_spec.rb
367
- - spec/other/help_spec.rb
368
- - spec/other/init_spec.rb
369
- - spec/other/licenses_spec.rb
370
- - spec/other/newgem_spec.rb
371
- - spec/other/open_spec.rb
372
- - spec/other/outdated_spec.rb
373
406
  - spec/other/platform_spec.rb
374
- - spec/other/show_spec.rb
375
407
  - spec/quality_spec.rb
376
408
  - spec/realworld/dependency_api_spec.rb
377
409
  - spec/realworld/edgecases_spec.rb
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- SHA1:
3
- metadata.gz: 1fb14de795ee1e2465028243460a3fb96dfdbcaa
4
- data.tar.gz: 12561bb2d356025acecf0256224ae8e6ded869d5
5
- SHA512:
6
- metadata.gz: 1a4e14da992b28d578950b11b3cd2fedbbb79f33300106c979a365a205be106f8922ef272566eb44145b8ff131a0def5646dd6929ea90a8a95642413cbc3bffb
7
- data.tar.gz: 51d99c4f9383fbb0685d72f120b2ae8117e9b0d084f88517fa8429c7084c604e1458394c72ec4de911a17944f7d020e3ac87437b46fe3a8113b0e11d6710a8c5