bundler 1.1.pre.8 → 1.1.pre.9

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 (45) hide show
  1. data/.travis.yml +29 -5
  2. data/CHANGELOG.md +58 -3
  3. data/Rakefile +25 -2
  4. data/UPGRADING.md +2 -2
  5. data/bin/bundle +10 -10
  6. data/bundler.gemspec +2 -1
  7. data/lib/bundler.rb +8 -6
  8. data/lib/bundler/cli.rb +45 -14
  9. data/lib/bundler/definition.rb +4 -4
  10. data/lib/bundler/dependency.rb +1 -8
  11. data/lib/bundler/deployment.rb +8 -3
  12. data/lib/bundler/dsl.rb +3 -18
  13. data/lib/bundler/fetcher.rb +15 -3
  14. data/lib/bundler/gem_helper.rb +1 -1
  15. data/lib/bundler/gem_installer.rb +9 -0
  16. data/lib/bundler/installer.rb +33 -18
  17. data/lib/bundler/resolver.rb +19 -7
  18. data/lib/bundler/rubygems_ext.rb +3 -1
  19. data/lib/bundler/rubygems_integration.rb +37 -4
  20. data/lib/bundler/runtime.rb +47 -15
  21. data/lib/bundler/settings.rb +1 -3
  22. data/lib/bundler/source.rb +23 -23
  23. data/lib/bundler/ui.rb +9 -9
  24. data/lib/bundler/version.rb +1 -1
  25. data/man/bundle-install.ronn +3 -3
  26. data/man/bundle.ronn +0 -6
  27. data/man/gemfile.5.ronn +2 -2
  28. data/spec/bundler/dsl_spec.rb +22 -0
  29. data/spec/{other → bundler}/gem_helper_spec.rb +7 -0
  30. data/spec/install/deprecated_spec.rb +2 -3
  31. data/spec/install/gems/dependency_api_spec.rb +13 -2
  32. data/spec/install/gems/groups_spec.rb +14 -0
  33. data/spec/install/gems/simple_case_spec.rb +34 -1
  34. data/spec/install/gems/standalone_spec.rb +24 -10
  35. data/spec/lock/lockfile_spec.rb +48 -15
  36. data/spec/other/clean_spec.rb +236 -37
  37. data/spec/other/exec_spec.rb +6 -0
  38. data/spec/other/help_spec.rb +2 -1
  39. data/spec/other/newgem_spec.rb +18 -0
  40. data/spec/other/outdated_spec.rb +19 -2
  41. data/spec/other/show_spec.rb +6 -0
  42. data/spec/runtime/setup_spec.rb +19 -0
  43. data/spec/support/builders.rb +10 -1
  44. data/spec/update/gems_spec.rb +3 -2
  45. metadata +90 -17
@@ -33,6 +33,12 @@ describe "bundle exec" do
33
33
  out.should == "1.0.0"
34
34
  end
35
35
 
36
+ it "works when exec'ing something else" do
37
+ install_gemfile 'gem "rack"'
38
+ bundle "exec echo exec"
39
+ out.should == "exec"
40
+ end
41
+
36
42
  it "handles different versions in different bundles" do
37
43
  build_repo2 do
38
44
  build_gem "rack_two", "1.0.0" do |s|
@@ -7,7 +7,8 @@ describe "bundle help" do
7
7
  system_gems "bundler-0.8.1"
8
8
 
9
9
  bundle "help", :expect_err => true
10
- err.should == "Please remove older versions of bundler. This can be done by running `gem cleanup bundler`."
10
+ err.should include("Please remove Bundler 0.8 versions.")
11
+ err.should include("This can be done by running `gem cleanup bundler`.")
11
12
  end
12
13
 
13
14
  it "uses groff when available" do
@@ -64,4 +64,22 @@ describe "bundle gem" do
64
64
  it "requires the version file" do
65
65
  bundled_app("test-gem/lib/test-gem.rb").read.should =~ /require "test-gem\/version"/
66
66
  end
67
+
68
+ it "runs rake without problems" do
69
+ system_gems ["rake-0.8.7"]
70
+
71
+ rakefile = <<-RAKEFILE
72
+ task :default do
73
+ puts 'SUCCESS'
74
+ end
75
+ RAKEFILE
76
+ File.open(bundled_app("test-gem/Rakefile"), 'w') do |file|
77
+ file.puts rakefile
78
+ end
79
+
80
+ Dir.chdir(bundled_app("test-gem")) do
81
+ sys_exec("rake")
82
+ out.should include("SUCCESS")
83
+ end
84
+ end
67
85
  end
@@ -61,7 +61,7 @@ describe "bundle outdated" do
61
61
  end
62
62
  end
63
63
 
64
- describe "with the --pre option" do
64
+ context "with the --pre option" do
65
65
  it "includes pre-release versions" do
66
66
  update_repo2 do
67
67
  build_gem "activesupport", "3.0.0.beta"
@@ -71,6 +71,23 @@ describe "bundle outdated" do
71
71
  out.should include("activesupport (3.0.0.beta > 2.3.5)")
72
72
  end
73
73
  end
74
+
75
+ context "when current gem is a pre-release" do
76
+ it "includes the gem" do
77
+ update_repo2 do
78
+ build_gem "activesupport", "3.0.0.beta.1"
79
+ build_gem "activesupport", "3.0.0.beta.2"
80
+ end
81
+
82
+ install_gemfile <<-G
83
+ source "file://#{gem_repo2}"
84
+ gem "activesupport", "3.0.0.beta.1"
85
+ G
86
+
87
+ bundle "outdated"
88
+ out.should include("activesupport (3.0.0.beta.2 > 3.0.0.beta.1)")
89
+ end
90
+ end
74
91
  end
75
92
 
76
- end
93
+ end
@@ -38,6 +38,12 @@ describe "bundle show" do
38
38
  bundle "show missing"
39
39
  out.should =~ /could not find gem 'missing'/i
40
40
  end
41
+
42
+ it "prints path of all gems in bundle" do
43
+ bundle "show --paths"
44
+ out.should include(default_bundle_path('gems', 'rake-0.8.7').to_s)
45
+ out.should include(default_bundle_path('gems', 'rails-2.3.2').to_s)
46
+ end
41
47
  end
42
48
 
43
49
  describe "bundle show with a git repo" do
@@ -25,6 +25,7 @@ describe "Bundler.setup" do
25
25
  before(:each) do
26
26
  install_gemfile <<-G
27
27
  source "file://#{gem_repo1}"
28
+ gem "yard"
28
29
  gem "rack", :group => :test
29
30
  G
30
31
  end
@@ -58,6 +59,24 @@ describe "Bundler.setup" do
58
59
  err.should eq("")
59
60
  out.should eq("1.0.0")
60
61
  end
62
+
63
+ it "leaves :default available if setup is called twice" do
64
+ ruby <<-RUBY
65
+ require 'rubygems'
66
+ require 'bundler'
67
+ Bundler.setup(:default)
68
+ Bundler.setup(:default, :test)
69
+
70
+ begin
71
+ require 'yard'
72
+ puts "WIN"
73
+ rescue LoadError
74
+ puts "FAIL"
75
+ end
76
+ RUBY
77
+ err.should eq("")
78
+ out.should match("WIN")
79
+ end
61
80
  end
62
81
 
63
82
  it "raises if the Gemfile was not yet installed" do
@@ -167,10 +167,19 @@ module Spec
167
167
  s.write "lib/rubygems_plugin.rb", "require 'bundler/omg' ; puts 'FAIL'"
168
168
  end
169
169
 
170
+ build_gem "bundler_dep" do |s|
171
+ s.add_dependency "bundler"
172
+ end
173
+
170
174
  # The yard gem iterates over Gem.source_index looking for plugins
171
175
  build_gem "yard" do |s|
172
176
  s.write "lib/yard.rb", <<-Y
173
- Gem.source_index.find_name('').each do |gem|
177
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new("1.8.10")
178
+ specs = Gem::Specification
179
+ else
180
+ specs = Gem.source_index.find_name('')
181
+ end
182
+ specs.each do |gem|
174
183
  puts gem.full_name
175
184
  end
176
185
  Y
@@ -115,7 +115,8 @@ describe "bundle update when a gem depends on a newer version of bundler" do
115
115
 
116
116
  it "should explain that bundler conflicted" do
117
117
  bundle "update"
118
- out.should_not =~ /In snapshot/
119
- out.should =~ /Current Bundler version/
118
+ out.should_not =~ /in snapshot/i
119
+ out.should =~ /current Bundler version/i
120
+ out.should =~ /perhaps you need to update bundler/i
120
121
  end
121
122
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bundler
3
3
  version: !ruby/object:Gem::Version
4
- hash: 1923831889
4
+ hash: 1923831891
5
5
  prerelease: true
6
6
  segments:
7
7
  - 1
8
8
  - 1
9
9
  - pre
10
- - 8
11
- version: 1.1.pre.8
10
+ - 9
11
+ version: 1.1.pre.9
12
12
  platform: ruby
13
13
  authors:
14
14
  - "Andr\xC3\xA9 Arko"
@@ -19,7 +19,7 @@ autorequire:
19
19
  bindir: bin
20
20
  cert_chain: []
21
21
 
22
- date: 2011-08-15 00:00:00 -05:00
22
+ date: 2011-09-19 00:00:00 -07:00
23
23
  default_executable:
24
24
  dependencies:
25
25
  - !ruby/object:Gem::Dependency
@@ -82,6 +82,7 @@ files:
82
82
  - lib/bundler/environment.rb
83
83
  - lib/bundler/fetcher.rb
84
84
  - lib/bundler/gem_helper.rb
85
+ - lib/bundler/gem_installer.rb
85
86
  - lib/bundler/gem_tasks.rb
86
87
  - lib/bundler/graph.rb
87
88
  - lib/bundler/index.rb
@@ -150,6 +151,8 @@ files:
150
151
  - man/bundle.ronn
151
152
  - man/gemfile.5.ronn
152
153
  - man/index.txt
154
+ - spec/bundler/dsl_spec.rb
155
+ - spec/bundler/gem_helper_spec.rb
153
156
  - spec/bundler/source_spec.rb
154
157
  - spec/cache/gems_spec.rb
155
158
  - spec/cache/git_spec.rb
@@ -183,7 +186,6 @@ files:
183
186
  - spec/other/console_spec.rb
184
187
  - spec/other/exec_spec.rb
185
188
  - spec/other/ext_spec.rb
186
- - spec/other/gem_helper_spec.rb
187
189
  - spec/other/help_spec.rb
188
190
  - spec/other/init_spec.rb
189
191
  - spec/other/newgem_spec.rb
@@ -223,22 +225,20 @@ files:
223
225
  - spec/update/gems_spec.rb
224
226
  - spec/update/git_spec.rb
225
227
  - spec/update/source_spec.rb
226
- - lib/bundler/man/bundle-exec
227
228
  - lib/bundler/man/bundle
229
+ - lib/bundler/man/bundle-config
230
+ - lib/bundler/man/bundle-config.txt
231
+ - lib/bundler/man/bundle-exec
232
+ - lib/bundler/man/bundle-exec.txt
228
233
  - lib/bundler/man/bundle-install
229
- - lib/bundler/man/gemfile.5
230
- - lib/bundler/man/bundle-benchmark
234
+ - lib/bundler/man/bundle-install.txt
231
235
  - lib/bundler/man/bundle-package
236
+ - lib/bundler/man/bundle-package.txt
232
237
  - lib/bundler/man/bundle-update
233
- - lib/bundler/man/bundle-exec.txt
234
- - lib/bundler/man/gemfile.5.txt
235
238
  - lib/bundler/man/bundle-update.txt
236
- - lib/bundler/man/bundle-config
237
- - lib/bundler/man/bundle-config.txt
238
- - lib/bundler/man/bundle-benchmark.txt
239
239
  - lib/bundler/man/bundle.txt
240
- - lib/bundler/man/bundle-package.txt
241
- - lib/bundler/man/bundle-install.txt
240
+ - lib/bundler/man/gemfile.5
241
+ - lib/bundler/man/gemfile.5.txt
242
242
  has_rdoc: true
243
243
  homepage: http://gembundler.com
244
244
  licenses: []
@@ -275,5 +275,78 @@ rubygems_version: 1.3.7
275
275
  signing_key:
276
276
  specification_version: 3
277
277
  summary: The best way to manage your application's dependencies
278
- test_files: []
279
-
278
+ test_files:
279
+ - spec/bundler/dsl_spec.rb
280
+ - spec/bundler/gem_helper_spec.rb
281
+ - spec/bundler/source_spec.rb
282
+ - spec/cache/gems_spec.rb
283
+ - spec/cache/git_spec.rb
284
+ - spec/cache/path_spec.rb
285
+ - spec/cache/platform_spec.rb
286
+ - spec/install/deploy_spec.rb
287
+ - spec/install/deprecated_spec.rb
288
+ - spec/install/gems/c_ext_spec.rb
289
+ - spec/install/gems/dependency_api_spec.rb
290
+ - spec/install/gems/env_spec.rb
291
+ - spec/install/gems/flex_spec.rb
292
+ - spec/install/gems/groups_spec.rb
293
+ - spec/install/gems/packed_spec.rb
294
+ - spec/install/gems/platform_spec.rb
295
+ - spec/install/gems/post_install_spec.rb
296
+ - spec/install/gems/resolving_spec.rb
297
+ - spec/install/gems/simple_case_spec.rb
298
+ - spec/install/gems/standalone_spec.rb
299
+ - spec/install/gems/sudo_spec.rb
300
+ - spec/install/gems/win32_spec.rb
301
+ - spec/install/gemspec_spec.rb
302
+ - spec/install/git_spec.rb
303
+ - spec/install/invalid_spec.rb
304
+ - spec/install/path_spec.rb
305
+ - spec/install/upgrade_spec.rb
306
+ - spec/lock/git_spec.rb
307
+ - spec/lock/lockfile_spec.rb
308
+ - spec/other/check_spec.rb
309
+ - spec/other/clean_spec.rb
310
+ - spec/other/config_spec.rb
311
+ - spec/other/console_spec.rb
312
+ - spec/other/exec_spec.rb
313
+ - spec/other/ext_spec.rb
314
+ - spec/other/help_spec.rb
315
+ - spec/other/init_spec.rb
316
+ - spec/other/newgem_spec.rb
317
+ - spec/other/open_spec.rb
318
+ - spec/other/outdated_spec.rb
319
+ - spec/other/show_spec.rb
320
+ - spec/quality_spec.rb
321
+ - spec/resolver/basic_spec.rb
322
+ - spec/resolver/platform_spec.rb
323
+ - spec/runtime/executable_spec.rb
324
+ - spec/runtime/load_spec.rb
325
+ - spec/runtime/platform_spec.rb
326
+ - spec/runtime/require_spec.rb
327
+ - spec/runtime/setup_spec.rb
328
+ - spec/runtime/with_clean_env_spec.rb
329
+ - spec/spec_helper.rb
330
+ - spec/support/artifice/endpoint.rb
331
+ - spec/support/artifice/endpoint_api_missing.rb
332
+ - spec/support/artifice/endpoint_basic_authentication.rb
333
+ - spec/support/artifice/endpoint_extra.rb
334
+ - spec/support/artifice/endpoint_extra_missing.rb
335
+ - spec/support/artifice/endpoint_fallback.rb
336
+ - spec/support/artifice/endpoint_marshal_fail.rb
337
+ - spec/support/artifice/endpoint_redirect.rb
338
+ - spec/support/builders.rb
339
+ - spec/support/fakeweb/rack-1.0.0.marshal
340
+ - spec/support/fakeweb/windows.rb
341
+ - spec/support/helpers.rb
342
+ - spec/support/indexes.rb
343
+ - spec/support/matchers.rb
344
+ - spec/support/path.rb
345
+ - spec/support/platforms.rb
346
+ - spec/support/ruby_ext.rb
347
+ - spec/support/rubygems_ext.rb
348
+ - spec/support/rubygems_hax/platform.rb
349
+ - spec/support/sudo.rb
350
+ - spec/update/gems_spec.rb
351
+ - spec/update/git_spec.rb
352
+ - spec/update/source_spec.rb