bundler 2.2.19 → 2.2.20

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f548c756c0741d65927b08b2c07251da3cca30b625ee99804f60b8cf54b33fc4
4
- data.tar.gz: bd562afc3f27ae44a64ecb03cc08d6c23613dbfb7377f20a7f291a060be714c0
3
+ metadata.gz: 4a5ddfd28833c653d3cd3a52747d330b88afb969505fb0f86f6d9d0284ecd258
4
+ data.tar.gz: cf7cd1023266b890498a486f908f1dbdc84f8a5c932af96a57bcdfe75e09b4fc
5
5
  SHA512:
6
- metadata.gz: a4eef293c1421bb73fbe81dcc2b1a83297403d0b04dfa7d7c28075208b31376c5eda471b183e856ee158d4654edaf9f575b2cef549177358dcb38b49437b1f9f
7
- data.tar.gz: 964f2af21c28d469a4712853c4e2766f20f14848716f0537c1c3fb3ca0254b435a81671879985e7fb3eac273a39edae3d649f0e0f6e65c437336e38d4adab5d0
6
+ metadata.gz: c370cdb78e65a16549392990fd9c3666a7db97269992a9904b22b247d37673ea76910501ad3cea81657d860eccbfa887d7949912384eb180e274c125a2b2d98e
7
+ data.tar.gz: 52cc6c1e34756194d72937614886b566d887b8cd97d7f13d826f53e9fc51e570a3f7c15ea04ced78ba4e1a956960945302cd050a19d276544519fb8daccfd212
data/CHANGELOG.md CHANGED
@@ -1,3 +1,19 @@
1
+ # 2.2.20 (June 11, 2021)
2
+
3
+ ## Enhancements:
4
+
5
+ - Don't print bug report template on server side errors [#4663](https://github.com/rubygems/rubygems/pull/4663)
6
+ - Don't load `resolv` unnecessarily [#4640](https://github.com/rubygems/rubygems/pull/4640)
7
+
8
+ ## Bug fixes:
9
+
10
+ - Fix `bundle outdated` edge case [#4648](https://github.com/rubygems/rubygems/pull/4648)
11
+ - Fix `bundle check` with scoped rubygems sources [#4639](https://github.com/rubygems/rubygems/pull/4639)
12
+
13
+ ## Performance:
14
+
15
+ - Don't use `extra_rdoc_files` with md files in gemspec to make installing bundler with docs faster [#4628](https://github.com/rubygems/rubygems/pull/4628)
16
+
1
17
  # 2.2.19 (May 31, 2021)
2
18
 
3
19
  ## Bug fixes:
data/bundler.gemspec CHANGED
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
39
39
  # include the gemspec itself because warbler breaks w/o it
40
40
  s.files += %w[bundler.gemspec]
41
41
 
42
- s.extra_rdoc_files = %w[CHANGELOG.md LICENSE.md README.md]
42
+ s.files += %w[CHANGELOG.md LICENSE.md README.md]
43
43
  s.bindir = "exe"
44
44
  s.executables = %w[bundle bundler]
45
45
  s.require_paths = ["lib"]
@@ -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 = "2021-05-31".freeze
8
- @git_commit_sha = "43f80b12c0".freeze
7
+ @built_at = "2021-06-11".freeze
8
+ @git_commit_sha = "4c510a34a4".freeze
9
9
  @release = true
10
10
  # end ivars
11
11
 
@@ -11,9 +11,11 @@ module Bundler
11
11
  def run
12
12
  Bundler.settings.set_command_option_if_given :path, options[:path]
13
13
 
14
+ definition = Bundler.definition
15
+ definition.validate_runtime!
16
+
14
17
  begin
15
- definition = Bundler.definition
16
- definition.validate_runtime!
18
+ definition.resolve_only_locally!
17
19
  not_installed = definition.missing_specs
18
20
  rescue GemNotFound, VersionConflict
19
21
  Bundler.ui.error "Bundler can't satisfy your Gemfile's dependencies."
@@ -147,6 +147,8 @@ module Bundler
147
147
 
148
148
  def retrieve_active_spec(definition, current_spec)
149
149
  active_spec = definition.resolve.find_by_name_and_platform(current_spec.name, current_spec.platform)
150
+ return unless active_spec
151
+
150
152
  return active_spec if strict
151
153
 
152
154
  active_specs = active_spec.source.specs.search(current_spec.name).select {|spec| spec.match_platform(current_spec.platform) }.sort_by(&:version)
@@ -160,6 +160,12 @@ module Bundler
160
160
  @disable_multisource
161
161
  end
162
162
 
163
+ def resolve_only_locally!
164
+ @remote = false
165
+ sources.local_only!
166
+ resolve
167
+ end
168
+
163
169
  def resolve_with_cache!
164
170
  sources.cached!
165
171
  resolve
@@ -1,7 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require_relative "base"
4
- require "rubygems/remote_fetcher"
5
4
 
6
5
  module Bundler
7
6
  class Fetcher
@@ -49,8 +49,6 @@ module Bundler
49
49
  "Alternatively, you can increase the amount of memory the JVM is able to use by running Bundler with jruby -J-Xmx1024m -S bundle (JRuby defaults to 500MB)."
50
50
  else request_issue_report_for(error)
51
51
  end
52
- rescue StandardError
53
- raise error
54
52
  end
55
53
 
56
54
  def exit_status(error)
@@ -111,7 +109,7 @@ module Bundler
111
109
  First, try this link to see if there are any existing issue reports for this error:
112
110
  #{issues_url(e)}
113
111
 
114
- If there aren't any reports for this error yet, please create copy and paste the report template above into a new issue. Don't forget to anonymize any private data! The new issue form is located at:
112
+ If there aren't any reports for this error yet, please copy and paste the report template above into a new issue. Don't forget to anonymize any private data! The new issue form is located at:
115
113
  https://github.com/rubygems/rubygems/issues/new?labels=Bundler&template=bundler-related-issue.md
116
114
  EOS
117
115
  end
@@ -526,13 +526,14 @@ module Bundler
526
526
  Bundler::Retry.new("download gem from #{uri}").attempts do
527
527
  fetcher.download(spec, uri, path)
528
528
  end
529
+ rescue Gem::RemoteFetcher::FetchError => e
530
+ raise Bundler::HTTPError, "Could not download gem from #{uri} due to underlying error <#{e.message}>"
529
531
  end
530
532
 
531
533
  def gem_remote_fetcher
532
- require "resolv"
534
+ require "rubygems/remote_fetcher"
533
535
  proxy = configuration[:http_proxy]
534
- dns = Resolv::DNS.new
535
- Gem::RemoteFetcher.new(proxy, dns)
536
+ Gem::RemoteFetcher.new(proxy)
536
537
  end
537
538
 
538
539
  def gem_from_path(path, policy = nil)
@@ -36,6 +36,8 @@ module Bundler
36
36
 
37
37
  def local!; end
38
38
 
39
+ def local_only!; end
40
+
39
41
  def cached!; end
40
42
 
41
43
  def remote!; end
@@ -26,6 +26,12 @@ module Bundler
26
26
  Array(options["remotes"]).reverse_each {|r| add_remote(r) }
27
27
  end
28
28
 
29
+ def local_only!
30
+ @specs = nil
31
+ @allow_local = true
32
+ @allow_remote = false
33
+ end
34
+
29
35
  def local!
30
36
  return if @allow_local
31
37
 
@@ -132,6 +132,10 @@ module Bundler
132
132
  false
133
133
  end
134
134
 
135
+ def local_only!
136
+ all_sources.each(&:local_only!)
137
+ end
138
+
135
139
  def cached!
136
140
  all_sources.each(&:cached!)
137
141
  end
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: false
2
2
 
3
3
  module Bundler
4
- VERSION = "2.2.19".freeze
4
+ VERSION = "2.2.20".freeze
5
5
 
6
6
  def self.bundler_major_version
7
7
  @bundler_major_version ||= VERSION.split(".").first.to_i
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: 2.2.19
4
+ version: 2.2.20
5
5
  platform: ruby
6
6
  authors:
7
7
  - André Arko
@@ -22,7 +22,7 @@ authors:
22
22
  autorequire:
23
23
  bindir: exe
24
24
  cert_chain: []
25
- date: 2021-05-31 00:00:00.000000000 Z
25
+ date: 2021-06-11 00:00:00.000000000 Z
26
26
  dependencies: []
27
27
  description: Bundler manages an application's dependencies through its entire life,
28
28
  across many machines, systematically and repeatably
@@ -32,10 +32,7 @@ executables:
32
32
  - bundle
33
33
  - bundler
34
34
  extensions: []
35
- extra_rdoc_files:
36
- - CHANGELOG.md
37
- - LICENSE.md
38
- - README.md
35
+ extra_rdoc_files: []
39
36
  files:
40
37
  - CHANGELOG.md
41
38
  - LICENSE.md
@@ -357,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
357
354
  - !ruby/object:Gem::Version
358
355
  version: 2.5.2
359
356
  requirements: []
360
- rubygems_version: 3.2.19
357
+ rubygems_version: 3.2.20
361
358
  signing_key:
362
359
  specification_version: 4
363
360
  summary: The best way to manage your application's dependencies