rubygems-update 3.1.1 → 3.1.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (109) hide show
  1. checksums.yaml +4 -4
  2. data/CONTRIBUTING.md +1 -1
  3. data/History.txt +74 -2
  4. data/Manifest.txt +3 -3
  5. data/README.md +4 -4
  6. data/Rakefile +10 -5
  7. data/bin/update_rubygems +1 -1
  8. data/bundler/CHANGELOG.md +29 -0
  9. data/bundler/lib/bundler/build_metadata.rb +2 -2
  10. data/bundler/lib/bundler/cli/exec.rb +3 -12
  11. data/bundler/lib/bundler/cli/install.rb +3 -2
  12. data/bundler/lib/bundler/gem_helper.rb +2 -3
  13. data/bundler/lib/bundler/inline.rb +1 -1
  14. data/bundler/lib/bundler/rubygems_integration.rb +10 -0
  15. data/bundler/lib/bundler/setup.rb +5 -0
  16. data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +0 -22
  17. data/bundler/lib/bundler/version.rb +1 -1
  18. data/bundler/man/bundle-add.1 +1 -1
  19. data/bundler/man/bundle-add.1.txt +1 -1
  20. data/bundler/man/bundle-binstubs.1 +1 -1
  21. data/bundler/man/bundle-binstubs.1.txt +1 -1
  22. data/bundler/man/bundle-cache.1 +1 -1
  23. data/bundler/man/bundle-cache.1.txt +1 -1
  24. data/bundler/man/bundle-check.1 +1 -1
  25. data/bundler/man/bundle-check.1.txt +1 -1
  26. data/bundler/man/bundle-clean.1 +1 -1
  27. data/bundler/man/bundle-clean.1.txt +1 -1
  28. data/bundler/man/bundle-config.1 +1 -1
  29. data/bundler/man/bundle-config.1.txt +1 -1
  30. data/bundler/man/bundle-doctor.1 +1 -1
  31. data/bundler/man/bundle-doctor.1.txt +1 -1
  32. data/bundler/man/bundle-exec.1 +1 -1
  33. data/bundler/man/bundle-exec.1.txt +1 -1
  34. data/bundler/man/bundle-gem.1 +1 -1
  35. data/bundler/man/bundle-gem.1.txt +1 -1
  36. data/bundler/man/bundle-info.1 +1 -1
  37. data/bundler/man/bundle-info.1.txt +1 -1
  38. data/bundler/man/bundle-init.1 +1 -1
  39. data/bundler/man/bundle-init.1.txt +1 -1
  40. data/bundler/man/bundle-inject.1 +1 -1
  41. data/bundler/man/bundle-inject.1.txt +1 -1
  42. data/bundler/man/bundle-install.1 +1 -1
  43. data/bundler/man/bundle-install.1.txt +1 -1
  44. data/bundler/man/bundle-list.1 +1 -1
  45. data/bundler/man/bundle-list.1.txt +1 -1
  46. data/bundler/man/bundle-lock.1 +1 -1
  47. data/bundler/man/bundle-lock.1.txt +1 -1
  48. data/bundler/man/bundle-open.1 +1 -1
  49. data/bundler/man/bundle-open.1.txt +1 -1
  50. data/bundler/man/bundle-outdated.1 +1 -1
  51. data/bundler/man/bundle-outdated.1.txt +1 -1
  52. data/bundler/man/bundle-platform.1 +1 -1
  53. data/bundler/man/bundle-platform.1.txt +1 -1
  54. data/bundler/man/bundle-pristine.1 +1 -1
  55. data/bundler/man/bundle-pristine.1.txt +1 -1
  56. data/bundler/man/bundle-remove.1 +1 -1
  57. data/bundler/man/bundle-remove.1.txt +1 -1
  58. data/bundler/man/bundle-show.1 +1 -1
  59. data/bundler/man/bundle-show.1.txt +1 -1
  60. data/bundler/man/bundle-update.1 +1 -1
  61. data/bundler/man/bundle-update.1.txt +1 -1
  62. data/bundler/man/bundle-viz.1 +1 -1
  63. data/bundler/man/bundle-viz.1.txt +1 -1
  64. data/bundler/man/bundle.1 +1 -1
  65. data/bundler/man/bundle.1.txt +1 -1
  66. data/bundler/man/gemfile.5 +1 -1
  67. data/bundler/man/gemfile.5.txt +1 -1
  68. data/lib/rubygems.rb +72 -42
  69. data/lib/rubygems/basic_specification.rb +1 -1
  70. data/lib/rubygems/command.rb +1 -1
  71. data/lib/rubygems/commands/help_command.rb +1 -1
  72. data/lib/rubygems/commands/setup_command.rb +29 -14
  73. data/lib/rubygems/commands/sources_command.rb +3 -3
  74. data/lib/rubygems/commands/uninstall_command.rb +1 -1
  75. data/lib/rubygems/core_ext/kernel_require.rb +25 -35
  76. data/lib/rubygems/ext/builder.rb +3 -1
  77. data/lib/rubygems/request_set/gem_dependency_api.rb +1 -1
  78. data/lib/rubygems/resolver/api_set.rb +1 -1
  79. data/lib/rubygems/resolver/api_specification.rb +1 -1
  80. data/lib/rubygems/server.rb +1 -1
  81. data/lib/rubygems/source_list.rb +2 -0
  82. data/lib/rubygems/specification.rb +12 -8
  83. data/lib/rubygems/specification_policy.rb +9 -1
  84. data/lib/rubygems/ssl_certs/{index.rubygems.org → rubygems.org}/GlobalSignRootCA.pem +0 -0
  85. data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem +21 -0
  86. data/lib/rubygems/test_case.rb +61 -0
  87. data/lib/rubygems/util.rb +7 -1
  88. data/lib/rubygems/version.rb +1 -1
  89. data/rubygems-update.gemspec +1 -1
  90. data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +14 -0
  91. data/test/rubygems/test_bundled_ca.rb +7 -3
  92. data/test/rubygems/test_gem.rb +87 -43
  93. data/test/rubygems/test_gem_commands_build_command.rb +18 -1
  94. data/test/rubygems/test_gem_commands_setup_command.rb +56 -10
  95. data/test/rubygems/test_gem_commands_sources_command.rb +39 -1
  96. data/test/rubygems/test_gem_commands_uninstall_command.rb +1 -0
  97. data/test/rubygems/test_gem_installer.rb +10 -23
  98. data/test/rubygems/test_gem_package.rb +3 -8
  99. data/test/rubygems/test_gem_package_tar_writer.rb +5 -0
  100. data/test/rubygems/test_gem_request_set.rb +52 -0
  101. data/test/rubygems/test_gem_specification.rb +26 -6
  102. data/test/rubygems/test_gem_stub_specification.rb +0 -1
  103. data/test/rubygems/test_kernel.rb +19 -0
  104. data/test/rubygems/test_require.rb +104 -0
  105. data/util/update_bundled_ca_certificates.rb +1 -3
  106. data/util/update_changelog.rb +7 -10
  107. metadata +9 -9
  108. data/lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -23
  109. data/lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -25
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cfff2250893c2233e664042cf61c859db6ddc09bf9085e9360c1e32ec92b0621
4
- data.tar.gz: 37a8b000b154d1dea0595ba0f3ee85255acfd8767a50872433f6737b82572ed2
3
+ metadata.gz: cf1897c1f4290a7c09ac7fc031441915d225aaa7ffab473229a244310eaa39ac
4
+ data.tar.gz: d6aef4fc02c767b99957e4dfaff7818399b9fb59de550d23bee19256b618a5f6
5
5
  SHA512:
6
- metadata.gz: 43b3357db0d0790fdf81140513ca87cd60d899f20c23975957bfdb75902731de0245f5f0881e04c8e1d0e8d225b827cf4f1777254702996e8b2a85de2f7c42e7
7
- data.tar.gz: f050beceeb7f08355c6d390d8a5d88fe253f749a6cfd87b5bfb05417c3ca188cae947dad74c43d9137bf248d77501119b91778bf2c97d0939372c16eb1a5cfe8
6
+ metadata.gz: 2421931e30162b92a93891c80eb17bd3d78a135da9019f49a18ce701bf4ca1fa7731260f4cc6de1342a74accceb8df21024ccd5042cbefa9a89cf67c69528a54
7
+ data.tar.gz: 131eb583b3864dec611fab7574a8ebf75cc796288ed2a4c43e96d6b53d24509f282e83fa36b2851ad5e5c21b6d8f78fc3fadc3da974575428b3489d3d28d3a88
@@ -26,7 +26,7 @@ contributors to follow to reduce the time it takes to get changes merged in.
26
26
 
27
27
 
28
28
  For more information and ideas on how to contribute to RubyGems ecosystem, see
29
- here: http://guides.rubygems.org/contributing/
29
+ here: https://guides.rubygems.org/contributing/
30
30
 
31
31
  ## Getting Started
32
32
 
@@ -1,5 +1,77 @@
1
1
  # coding: UTF-8
2
2
 
3
+ === 3.1.6 / 2021-01-26
4
+
5
+ Minor enhancements:
6
+
7
+ * Improve require. Pull request #3133 by David Rodríguez.
8
+ * Simplify nested gem activation exceptions. Pull request #3450 by David
9
+ Rodríguez.
10
+ * Fix correctness and performance regression in `require`. Pull request
11
+ #3639 by David Rodríguez.
12
+
13
+ === 3.1.5 / 2020-12-09
14
+
15
+ Minor enhancements:
16
+
17
+ * Add GlobalSign Root CA - R3 cert and remove outdated certs. Pull request #4100
18
+ by Aditya Prakash.
19
+
20
+ === 3.1.4 / 2020-06-03
21
+
22
+ Minor enhancements:
23
+
24
+ * Deprecate rubyforge_project attribute only during build
25
+ time. Pull request #3609 by Josef Šimánek.
26
+ * Update links. Pull request #3610 by Josef Šimánek.
27
+ * Run CI at 3.1 branch head as well. Pull request #3677 by Josef Šimánek.
28
+ * Remove failing ubuntu-rvm CI flow. Pull request #3611 by
29
+ Josef Šimánek.
30
+
31
+ === 3.1.3 / 2020-05-05
32
+
33
+ Minor enhancements:
34
+
35
+ * Resolver: require NameTuple before use. Pull request #3171 by Olle
36
+ Jonsson.
37
+ * Use absolute paths with autoload. Pull request #3100 by David Rodríguez.
38
+ * Avoid changing $SOURCE_DATE_EPOCH. Pull request #3088 by Ellen Marie
39
+ Dash.
40
+ * Use Bundler 2.1.4. Pull request #3072 by Hiroshi SHIBATA.
41
+ * Add tests to check if Gem.ruby_version works with ruby git master.
42
+ Pull request #3049 by Yusuke Endoh.
43
+
44
+ Bug fixes:
45
+
46
+ * Fix platform comparison check in #contains_requirable_file?. Pull
47
+ request #3495 by Benoit Daloze.
48
+ * Improve gzip errors logging. Pull request #3485 by David Rodríguez.
49
+ * Fix incorrect `gem uninstall --all` message. Pull request #3483 by David
50
+ Rodríguez.
51
+ * Fix incorrect bundler version being required. Pull request #3458 by
52
+ David Rodríguez.
53
+ * Fix gem install from a gemdeps file with complex dependencies.
54
+ Pull request #3054 by Luis Sagastume.
55
+
56
+ === 3.1.2 / 2019-12-20
57
+
58
+ Minor enhancements:
59
+
60
+ * Restore non prompting `gem update --system` behavior. Pull request #3040
61
+ by David Rodríguez.
62
+ * Show only release notes for new code installed. Pull request #3041 by
63
+ David Rodríguez.
64
+ * Inform about installed `bundle` executable after `gem update --system`.
65
+ Pull request #3042 by David Rodríguez.
66
+ * Use Bundler 2.1.2. Pull request #3043 by SHIBATA Hiroshi.
67
+
68
+ Bug fixes:
69
+
70
+ * Require `uri` in source.rb. Pull request #3034 by mihaibuzgau.
71
+ * Fix `gem update --system --force`. Pull request #3035 by David
72
+ Rodríguez.
73
+ * Move `require uri` to source_list. Pull request #3038 by mihaibuzgau.
74
+
3
75
  === 3.1.1 / 2019-12-16
4
76
 
5
77
  Bug fixes:
@@ -3517,10 +3589,10 @@ Bug fixes:
3517
3589
 
3518
3590
  NOTE:
3519
3591
 
3520
- http://rubygems.org is now the default source for downloading gems.
3592
+ https://rubygems.org/ is now the default source for downloading gems.
3521
3593
 
3522
3594
  You may have sources set via ~/.gemrc, so you should replace
3523
- http://gems.rubyforge.org with http://rubygems.org
3595
+ http://gems.rubyforge.org with https://rubygems.org/
3524
3596
 
3525
3597
  http://gems.rubyforge.org will continue to work for the foreseeable future.
3526
3598
 
@@ -497,9 +497,8 @@ lib/rubygems/spec_fetcher.rb
497
497
  lib/rubygems/specification.rb
498
498
  lib/rubygems/specification_policy.rb
499
499
  lib/rubygems/ssl_certs/.document
500
- lib/rubygems/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem
501
- lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem
502
- lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem
500
+ lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem
501
+ lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
503
502
  lib/rubygems/stub_specification.rb
504
503
  lib/rubygems/syck_hack.rb
505
504
  lib/rubygems/test_case.rb
@@ -566,6 +565,7 @@ test/rubygems/sff/discover.rb
566
565
  test/rubygems/simple_gem.rb
567
566
  test/rubygems/specifications/bar-0.0.2.gemspec
568
567
  test/rubygems/specifications/foo-0.0.1-x86-mswin32.gemspec
568
+ test/rubygems/specifications/rubyforge-0.0.1.gemspec
569
569
  test/rubygems/ssl_cert.pem
570
570
  test/rubygems/ssl_key.pem
571
571
  test/rubygems/test_bundled_ca.rb
data/README.md CHANGED
@@ -6,7 +6,7 @@ A package (also known as a library) contains a set of functionality that can be
6
6
  We call these packages "gems" and RubyGems is a tool to install, create, manage and load these packages in your Ruby environment.
7
7
 
8
8
  RubyGems is also a client for [RubyGems.org](https://rubygems.org), a public repository of Gems that allows you to publish a Gem
9
- that can be shared and used by other developers. See our guide on publishing a Gem at [guides.rubygems.org](http://guides.rubygems.org/publishing/)
9
+ that can be shared and used by other developers. See our guide on publishing a Gem at [guides.rubygems.org](https://guides.rubygems.org/publishing/)
10
10
 
11
11
  ## Getting Started
12
12
 
@@ -23,7 +23,7 @@ Finally, inside your Ruby program, load the Nokogiri gem and start parsing your
23
23
 
24
24
  Nokogiri.XML('<h1>Hello World</h1>')
25
25
 
26
- For more information about how to use RubyGems, see our RubyGems basics guide at [guides.rubygems.org](http://guides.rubygems.org/rubygems-basics/)
26
+ For more information about how to use RubyGems, see our RubyGems basics guide at [guides.rubygems.org](https://guides.rubygems.org/rubygems-basics/)
27
27
 
28
28
  ## Requirements
29
29
 
@@ -65,10 +65,10 @@ See [UPGRADING](UPGRADING.md) for more details and alternative instructions.
65
65
  ## Documentation
66
66
 
67
67
  RubyGems uses [rdoc](https://github.com/rdoc/rdoc) for documentation. A compiled set of the docs
68
- can be viewed online at [rubydoc](http://www.rubydoc.info/github/rubygems/rubygems).
68
+ can be viewed online at [rubydoc](https://www.rubydoc.info/github/rubygems/rubygems).
69
69
 
70
70
  RubyGems also provides a comprehensive set of guides which covers numerous topics such as
71
- creating a new gem, security practices and other resources at http://guides.rubygems.org
71
+ creating a new gem, security practices and other resources at https://guides.rubygems.org
72
72
 
73
73
  ## Getting Help
74
74
 
data/Rakefile CHANGED
@@ -96,8 +96,13 @@ task :check_deprecations do
96
96
  end
97
97
 
98
98
  desc "Install rubygems to local system"
99
- task :install => :package do
100
- sh "gem install pkg/rubygems-update-#{v}.gem && update_rubygems"
99
+ task :install => [:clear_package, :package] do
100
+ sh "ruby -Ilib bin/gem install pkg/rubygems-update-#{v}.gem && update_rubygems"
101
+ end
102
+
103
+ desc "Clears previously built package"
104
+ task :clear_package do
105
+ rm_rf "pkg"
101
106
  end
102
107
 
103
108
  desc "Release rubygems-#{v}"
@@ -146,7 +151,7 @@ file "pkg/rubygems-#{v}.tgz" => "pkg/rubygems-#{v}" do
146
151
  sh "7z a -ttar rubygems-#{v}.tar rubygems-#{v}"
147
152
  sh "7z a -tgzip rubygems-#{v}.tgz rubygems-#{v}.tar"
148
153
  else
149
- sh "tar -czf rubygems-#{v}.tgz rubygems-#{v}"
154
+ sh "tar -czf rubygems-#{v}.tgz --owner=rubygems:0 --group=rubygems:0 rubygems-#{v}"
150
155
  end
151
156
  end
152
157
  end
@@ -162,7 +167,7 @@ task :upload_to_s3 do
162
167
  s3 = Aws::S3::Resource.new(region:'us-west-2')
163
168
  %w[zip tgz].each do |ext|
164
169
  obj = s3.bucket('oregon.production.s3.rubygems.org').object("rubygems/rubygems-#{v}.#{ext}")
165
- obj.upload_file("pkg/rubygems-#{v}.#{ext}")
170
+ obj.upload_file("pkg/rubygems-#{v}.#{ext}", acl: 'public-read')
166
171
  end
167
172
  end
168
173
 
@@ -335,7 +340,7 @@ SHA256 Checksums:
335
340
 
336
341
  #{checksums}
337
342
 
338
- [download]: http://rubygems.org/pages/download
343
+ [download]: https://rubygems.org/pages/download
339
344
  [upgrading]: http://docs.seattlerb.org/rubygems/UPGRADING_rdoc.html
340
345
 
341
346
  ANNOUNCEMENT
@@ -32,5 +32,5 @@ else
32
32
  update_dir = File.dirname(update_dir)
33
33
  Dir.chdir update_dir
34
34
  ENV["GEM_PREV_VER"] = Gem::VERSION
35
- system(Gem.ruby, 'setup.rb', *ARGV)
35
+ abort unless system(Gem.ruby, 'setup.rb', *ARGV)
36
36
  end
@@ -1,3 +1,32 @@
1
+ ## 2.1.4 (January 5, 2020)
2
+
3
+ Bugfixes:
4
+
5
+ - Fix `net-http-pipeline` no longer being allowed in Gemfiles if already installed in the system due to our vendored version of `net-http-persistent` optionally requiring it [#7529](https://github.com/bundler/bundler/pull/7529)
6
+ - Fix inline gems no longer being requirable if no Gemfile is present in the directory hierarchy [#7537](https://github.com/bundler/bundler/pull/7537)
7
+
8
+ ## 2.1.3 (January 2, 2020)
9
+
10
+ Bugfixes:
11
+
12
+ - Fix `rake build` when path has spaces on it [#7514](https://github.com/bundler/bundler/pull/7514)
13
+ - Fix `rake release` git push tasks when the running shell has `git` as an alias of another command (like `hub`) [#7510](https://github.com/bundler/bundler/pull/7510)
14
+ - Fix some circular require warnings [#7520](https://github.com/bundler/bundler/pull/7520)
15
+ - Fix `bundle config set deployment true` recommended alternative to `bundle config --deployment` to behave in the same way as the `--deployment` flag [#7519](https://github.com/bundler/bundler/pull/7519)
16
+
17
+ ## 2.1.2 (December 20, 2019)
18
+
19
+ Bugfixes:
20
+
21
+ - Restore an explicit `require "rubygems"` on top `rubygems_integration.rb` to avoid some missing constant errors under some convoluted setups [#7505](https://github.com/bundler/bundler/pull/7505)
22
+
23
+ ## 2.1.1 (December 17, 2019)
24
+
25
+ Bugfixes:
26
+
27
+ - Fix some cases of shelling out to `rubygems` still being silent [#7493](https://github.com/bundler/bundler/pull/7493)
28
+ - Restore compatibility with `rubygems-bundler` so that binstubs work under `RVM` [#7498](https://github.com/bundler/bundler/pull/7498)
29
+
1
30
  ## 2.1.0 (December 15, 2019)
2
31
 
3
32
  Features:
@@ -4,8 +4,8 @@ module Bundler
4
4
  # Represents metadata from when the Bundler gem was built.
5
5
  module BuildMetadata
6
6
  # begin ivars
7
- @built_at = "2019-12-16".freeze
8
- @git_commit_sha = "683fe9799".freeze
7
+ @built_at = "2021-01-26".freeze
8
+ @git_commit_sha = "32a4159325".freeze
9
9
  @release = false
10
10
  # end ivars
11
11
 
@@ -25,12 +25,12 @@ module Bundler
25
25
  SharedHelpers.set_bundle_environment
26
26
  if bin_path = Bundler.which(cmd)
27
27
  if !Bundler.settings[:disable_exec_load] && ruby_shebang?(bin_path)
28
- return with_verbose_rubygems { kernel_load(bin_path, *args) }
28
+ return kernel_load(bin_path, *args)
29
29
  end
30
- with_verbose_rubygems { kernel_exec(bin_path, *args) }
30
+ kernel_exec(bin_path, *args)
31
31
  else
32
32
  # exec using the given command
33
- with_verbose_rubygems { kernel_exec(cmd, *args) }
33
+ kernel_exec(cmd, *args)
34
34
  end
35
35
  end
36
36
 
@@ -89,14 +89,5 @@ module Bundler
89
89
  first_line = File.open(file, "rb") {|f| f.read(possibilities.map(&:size).max) }
90
90
  possibilities.any? {|shebang| first_line.start_with?(shebang) }
91
91
  end
92
-
93
- def with_verbose_rubygems
94
- old_ui = Gem::DefaultUserInteraction.ui
95
- Gem::DefaultUserInteraction.ui = nil
96
-
97
- yield
98
- ensure
99
- Gem::DefaultUserInteraction.ui = old_ui
100
- end
101
92
  end
102
93
  end
@@ -38,7 +38,8 @@ module Bundler
38
38
  if Bundler.feature_flag.deployment_means_frozen?
39
39
  Bundler.settings.set_command_option :deployment, true
40
40
  else
41
- Bundler.settings.set_command_option :frozen, true
41
+ Bundler.settings.set_command_option :deployment, true if options[:deployment]
42
+ Bundler.settings.set_command_option :frozen, true if options[:frozen]
42
43
  end
43
44
  end
44
45
 
@@ -169,7 +170,7 @@ module Bundler
169
170
  def normalize_settings
170
171
  Bundler.settings.set_command_option :path, nil if options[:system]
171
172
  Bundler.settings.temporary(:path_relative_to_cwd => false) do
172
- Bundler.settings.set_command_option :path, "vendor/bundle" if options[:deployment]
173
+ Bundler.settings.set_command_option :path, "vendor/bundle" if Bundler.settings[:deployment] && Bundler.settings[:path].nil?
173
174
  end
174
175
  Bundler.settings.set_command_option_if_given :path, options[:path]
175
176
  Bundler.settings.temporary(:path_relative_to_cwd => false) do
@@ -73,7 +73,7 @@ module Bundler
73
73
 
74
74
  def build_gem
75
75
  file_name = nil
76
- sh("#{gem_command} build -V #{spec_path}".shellsplit) do
76
+ sh("#{gem_command} build -V #{spec_path.shellescape}".shellsplit) do
77
77
  file_name = File.basename(built_gem_path)
78
78
  SharedHelpers.filesystem_access(File.join(base, "pkg")) {|p| FileUtils.mkdir_p(p) }
79
79
  FileUtils.mv(built_gem_path, "pkg")
@@ -130,9 +130,8 @@ module Bundler
130
130
 
131
131
  def perform_git_push(options = "")
132
132
  cmd = "git push #{options}"
133
- out, status = sh_with_status(cmd)
133
+ out, status = sh_with_status(cmd.shellsplit)
134
134
  return if status.success?
135
- cmd = cmd.shelljoin if cmd.respond_to?(:shelljoin)
136
135
  raise "Couldn't git push. `#{cmd}' failed with the following output:\n\n#{out}\n"
137
136
  end
138
137
 
@@ -78,7 +78,7 @@ def gemfile(install = false, options = {}, &gemfile)
78
78
  if old_gemfile
79
79
  ENV["BUNDLE_GEMFILE"] = old_gemfile
80
80
  else
81
- ENV.delete("BUNDLE_GEMFILE")
81
+ ENV["BUNDLE_GEMFILE"] = ""
82
82
  end
83
83
  end
84
84
  end
@@ -1,5 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require "rubygems" unless defined?(Gem)
4
+
3
5
  module Bundler
4
6
  class RubygemsIntegration
5
7
  if defined?(Gem::Ext::Builder::CHDIR_MONITOR)
@@ -525,6 +527,14 @@ module Bundler
525
527
  end
526
528
  end
527
529
 
530
+ def plain_specs
531
+ Gem::Specification._all
532
+ end
533
+
534
+ def plain_specs=(specs)
535
+ Gem::Specification.all = specs
536
+ end
537
+
528
538
  def fetch_specs(remote, name)
529
539
  path = remote.uri.to_s + "#{name}.#{Gem.marshal_version}.gz"
530
540
  fetcher = gem_remote_fetcher
@@ -19,4 +19,9 @@ if Bundler::SharedHelpers.in_bundle?
19
19
  else
20
20
  Bundler.ui.silence { Bundler.setup }
21
21
  end
22
+
23
+ # We might be in the middle of shelling out to rubygems
24
+ # (RUBYOPT=-rbundler/setup), so we need to give rubygems the opportunity of
25
+ # not being silent.
26
+ Gem::DefaultUserInteraction.ui = nil
22
27
  end
@@ -3,11 +3,6 @@ require_relative '../../../../uri/lib/uri'
3
3
  require 'cgi' # for escaping
4
4
  require_relative '../../../../connection_pool/lib/connection_pool'
5
5
 
6
- begin
7
- require 'net/http/pipeline'
8
- rescue LoadError
9
- end
10
-
11
6
  autoload :OpenSSL, 'openssl'
12
7
 
13
8
  ##
@@ -773,23 +768,6 @@ class Bundler::Persistent::Net::HTTP::Persistent
773
768
  (uri =~ /^https?:/) ? uri : "http://#{uri}"
774
769
  end
775
770
 
776
- ##
777
- # Pipelines +requests+ to the HTTP server at +uri+ yielding responses if a
778
- # block is given. Returns all responses received.
779
- #
780
- # See
781
- # Net::HTTP::Pipeline[http://docs.seattlerb.org/net-http-pipeline/Net/HTTP/Pipeline.html]
782
- # for further details.
783
- #
784
- # Only if <tt>net-http-pipeline</tt> was required before
785
- # <tt>net-http-persistent</tt> #pipeline will be present.
786
-
787
- def pipeline uri, requests, &block # :yields: responses
788
- connection_for uri do |connection|
789
- connection.http.pipeline requests, &block
790
- end
791
- end
792
-
793
771
  ##
794
772
  # Sets this client's SSL private key
795
773
 
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: false
2
2
 
3
3
  module Bundler
4
- VERSION = "2.1.0".freeze
4
+ VERSION = "2.1.4".freeze
5
5
 
6
6
  def self.bundler_major_version
7
7
  @bundler_major_version ||= VERSION.split(".").first.to_i
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "BUNDLE\-ADD" "1" "December 2019" "" ""
4
+ .TH "BUNDLE\-ADD" "1" "January 2020" "" ""
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install
@@ -55,4 +55,4 @@ OPTIONS
55
55
 
56
56
 
57
57
 
58
- December 2019 BUNDLE-ADD(1)
58
+ January 2020 BUNDLE-ADD(1)
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "BUNDLE\-BINSTUBS" "1" "December 2019" "" ""
4
+ .TH "BUNDLE\-BINSTUBS" "1" "January 2020" "" ""
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBbundle\-binstubs\fR \- Install the binstubs of the listed gems
@@ -45,4 +45,4 @@ BUNDLE INSTALL --BINSTUBS
45
45
 
46
46
 
47
47
 
48
- December 2019 BUNDLE-BINSTUBS(1)
48
+ January 2020 BUNDLE-BINSTUBS(1)