rubygems-update 3.2.20 → 3.2.21

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: beb9904852db18bc2cb58e157631c112d2951ea7df0bac7f63a1838ffba5ddbc
4
- data.tar.gz: a987e2d21ffd319e2dc0c0ae4d913b5f1d3ad6480783addbc4faaee5ad540b86
3
+ metadata.gz: 7b503ab1ec419e166f305736955f0539fae884d2653b84d57147a5e6b63e484f
4
+ data.tar.gz: 0c1840cb14e65c6711aa0dee3baba49e4cbf725839faa2131c32647282eb5a0a
5
5
  SHA512:
6
- metadata.gz: cc88c86f3691d8b07ce12056d0f1e762de188fe3775d3f80a83c2912020ed039b34ce50e95e118bfe8f6077cdb6ced949cb9c6147699292c6f45e3703b5e0087
7
- data.tar.gz: a91aa086be326926df974bbf2734c94e9ee1dfebc1e1b0a23474d64156c46249448e398baaf38fa4fedbdb2e006fd40ef94949112271842a89a1adc2a1b952a9
6
+ metadata.gz: 3bd0087496816b8814d90435c8401cba34779442f6830a9a247c50b2f39a1d7ac5accf515e7ba7ea84ea7739e619a57fa8ab06e7aacb9b7ede5029245fbb1c72
7
+ data.tar.gz: 3500016861f8abbd10d16e6d37d674430d4cfa709fd5769b12f0fdbfea8b2059dba86234968b49c4f66e1d74b784c570511c468ed6528bb87f3b09bb9b5f775a
data/CHANGELOG.md CHANGED
@@ -1,3 +1,17 @@
1
+ # 3.2.21 / 2021-06-23
2
+
3
+ ## Enhancements:
4
+
5
+ * Fix typo in OpenSSL detection. Pull request #4679 by osyoyu
6
+ * Add the most recent licenses from spdx.org. Pull request #4662 by nobu
7
+ * Simplify setup.rb code to allow installing rubygems from source on
8
+ truffleruby 21.0 and 21.1. Pull request #4624 by deivid-rodriguez
9
+
10
+ ## Bug fixes:
11
+
12
+ * Create credentials folder when setting API keys if not there yet. Pull
13
+ request #4665 by deivid-rodriguez
14
+
1
15
  # 3.2.20 / 2021-06-11
2
16
 
3
17
  ## Security fixes:
data/Rakefile CHANGED
@@ -383,6 +383,11 @@ task :check_manifest do
383
383
  end
384
384
  end
385
385
 
386
+ desc "Update License list from SPDX.org"
387
+ task :update_licenses do
388
+ load "util/generate_spdx_license_list.rb"
389
+ end
390
+
386
391
  namespace :bundler do
387
392
  task :build_metadata do
388
393
  chdir('bundler') { sh "rake build_metadata" }
data/bundler/CHANGELOG.md CHANGED
@@ -1,3 +1,18 @@
1
+ # 2.2.21 (June 23, 2021)
2
+
3
+ ## Security fixes:
4
+
5
+ - Auto-update insecure lockfile to split GEM source sections whenever possible [#4647](https://github.com/rubygems/rubygems/pull/4647)
6
+
7
+ ## Enhancements:
8
+
9
+ - Use a more limited number of threads when fetching in parallel from the Compact Index API [#4670](https://github.com/rubygems/rubygems/pull/4670)
10
+ - Update TODO link in bundle gem template to https [#4671](https://github.com/rubygems/rubygems/pull/4671)
11
+
12
+ ## Bug fixes:
13
+
14
+ - Fix `bundle install --local` hitting the network when `cache_all_platforms` configured [#4677](https://github.com/rubygems/rubygems/pull/4677)
15
+
1
16
  # 2.2.20 (June 11, 2021)
2
17
 
3
18
  ## Enhancements:
@@ -198,7 +198,7 @@ module Bundler
198
198
 
199
199
  def frozen_bundle?
200
200
  frozen = settings[:deployment]
201
- frozen ||= settings[:frozen] unless feature_flag.deployment_means_frozen?
201
+ frozen ||= settings[:frozen]
202
202
  frozen
203
203
  end
204
204
 
@@ -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-06-11".freeze
8
- @git_commit_sha = "4c510a34a4".freeze
7
+ @built_at = "2021-06-23".freeze
8
+ @git_commit_sha = "0b5db72094".freeze
9
9
  @release = true
10
10
  # end ivars
11
11
 
@@ -33,12 +33,8 @@ module Bundler
33
33
 
34
34
  options[:local] = true if Bundler.app_cache.exist?
35
35
 
36
- if Bundler.feature_flag.deployment_means_frozen?
37
- Bundler.settings.set_command_option :deployment, true
38
- else
39
- Bundler.settings.set_command_option :deployment, true if options[:deployment]
40
- Bundler.settings.set_command_option :frozen, true if options[:frozen]
41
- end
36
+ Bundler.settings.set_command_option :deployment, true if options[:deployment]
37
+ Bundler.settings.set_command_option :frozen, true if options[:frozen]
42
38
  end
43
39
 
44
40
  # When install is called with --no-deployment, disable deployment mode
@@ -62,7 +58,10 @@ module Bundler
62
58
  definition.validate_runtime!
63
59
 
64
60
  installer = Installer.install(Bundler.root, definition, options)
65
- Bundler.load.cache if Bundler.app_cache.exist? && !options["no-cache"] && !Bundler.frozen_bundle?
61
+
62
+ Bundler.settings.temporary(:cache_all_platforms => options[:local] ? false : Bundler.settings[:cache_all_platforms]) do
63
+ Bundler.load.cache if Bundler.app_cache.exist? && !options["no-cache"] && !Bundler.frozen_bundle?
64
+ end
66
65
 
67
66
  Bundler.ui.confirm "Bundle complete! #{dependencies_count_for(definition)}, #{gems_installed_for(definition)}."
68
67
  Bundler::CLI::Common.output_without_groups_message(:install)
@@ -107,12 +107,14 @@ module Bundler
107
107
  end
108
108
 
109
109
  @locked_gem_sources = @locked_sources.select {|s| s.is_a?(Source::Rubygems) }
110
- @disable_multisource = @locked_gem_sources.all?(&:disable_multisource?)
110
+ @multisource_allowed = @locked_gem_sources.any?(&:multiple_remotes?) && (sources.aggregate_global_source? || Bundler.frozen_bundle?)
111
111
 
112
- unless @disable_multisource
113
- msg = "Your lockfile contains a single rubygems source section with multiple remotes, which is insecure. You should run `bundle update` or generate your lockfile from scratch."
112
+ if @multisource_allowed
113
+ unless sources.aggregate_global_source?
114
+ msg = "Your lockfile contains a single rubygems source section with multiple remotes, which is insecure. Make sure you run `bundle install` in non frozen mode and commit the result to make your lockfile secure."
114
115
 
115
- Bundler::SharedHelpers.major_deprecation 2, msg
116
+ Bundler::SharedHelpers.major_deprecation 2, msg
117
+ end
116
118
 
117
119
  @sources.merged_gem_lockfile_sections!
118
120
  end
@@ -156,8 +158,8 @@ module Bundler
156
158
  end
157
159
  end
158
160
 
159
- def disable_multisource?
160
- @disable_multisource
161
+ def multisource_allowed?
162
+ @multisource_allowed
161
163
  end
162
164
 
163
165
  def resolve_only_locally!
@@ -510,7 +512,7 @@ module Bundler
510
512
  private
511
513
 
512
514
  def precompute_source_requirements_for_indirect_dependencies?
513
- sources.non_global_rubygems_sources.all?(&:dependency_api_available?) && sources.no_aggregate_global_source?
515
+ sources.non_global_rubygems_sources.all?(&:dependency_api_available?) && !sources.aggregate_global_source?
514
516
  end
515
517
 
516
518
  def current_ruby_platform_locked?
@@ -627,7 +629,7 @@ module Bundler
627
629
  end
628
630
 
629
631
  def converge_rubygems_sources
630
- return false if disable_multisource?
632
+ return false unless multisource_allowed?
631
633
 
632
634
  return false if locked_gem_sources.empty?
633
635
 
@@ -31,7 +31,6 @@ module Bundler
31
31
  settings_flag(:auto_clean_without_path) { bundler_3_mode? }
32
32
  settings_flag(:cache_all) { bundler_3_mode? }
33
33
  settings_flag(:default_install_uses_path) { bundler_3_mode? }
34
- settings_flag(:deployment_means_frozen) { bundler_3_mode? }
35
34
  settings_flag(:forget_cli_options) { bundler_3_mode? }
36
35
  settings_flag(:global_gem_cache) { bundler_3_mode? }
37
36
  settings_flag(:path_relative_to_cwd) { bundler_3_mode? }
@@ -111,7 +111,7 @@ module Bundler
111
111
  def bundle_worker(func = nil)
112
112
  @bundle_worker ||= begin
113
113
  worker_name = "Compact Index (#{display_uri.host})"
114
- Bundler::Worker.new(Bundler.current_ruby.rbx? ? 1 : 25, worker_name, func)
114
+ Bundler::Worker.new(Bundler.settings.processor_count, worker_name, func)
115
115
  end
116
116
  @bundle_worker.tap do |worker|
117
117
  worker.instance_variable_set(:@func, func) if func
@@ -222,14 +222,7 @@ module Bundler
222
222
  # Parallelization has some issues on Windows, so it's not yet the default
223
223
  return 1 if Gem.win_platform?
224
224
 
225
- processor_count
226
- end
227
-
228
- def processor_count
229
- require "etc"
230
- Etc.nprocessors
231
- rescue StandardError
232
- 1
225
+ Bundler.settings.processor_count
233
226
  end
234
227
 
235
228
  def load_plugins
@@ -30,8 +30,10 @@ module Bundler
30
30
  @resolver = Molinillo::Resolver.new(self, self)
31
31
  @search_for = {}
32
32
  @base_dg = Molinillo::DependencyGraph.new
33
+ aggregate_global_source = @source_requirements[:default].is_a?(Source::RubygemsAggregate)
33
34
  @base.each do |ls|
34
35
  dep = Dependency.new(ls.name, ls.version)
36
+ ls.source = source_for(ls.name) unless aggregate_global_source
35
37
  @base_dg.add_vertex(ls.name, DepProxy.get_proxy(dep, ls.platform), true)
36
38
  end
37
39
  additional_base_requirements.each {|d| @base_dg.add_vertex(d.name, d) }
@@ -16,7 +16,6 @@ module Bundler
16
16
  clean
17
17
  default_install_uses_path
18
18
  deployment
19
- deployment_means_frozen
20
19
  disable_checksum_validation
21
20
  disable_exec_load
22
21
  disable_local_branch_check
@@ -210,6 +209,13 @@ module Bundler
210
209
  locations
211
210
  end
212
211
 
212
+ def processor_count
213
+ require "etc"
214
+ Etc.nprocessors
215
+ rescue StandardError
216
+ 1
217
+ end
218
+
213
219
  # for legacy reasons, in Bundler 2, we do not respect :disable_shared_gems
214
220
  def path
215
221
  configs.each do |_level, settings|
@@ -67,12 +67,12 @@ module Bundler
67
67
  o.is_a?(Rubygems) && (o.credless_remotes - credless_remotes).empty?
68
68
  end
69
69
 
70
- def disable_multisource?
71
- @remotes.size <= 1
70
+ def multiple_remotes?
71
+ @remotes.size > 1
72
72
  end
73
73
 
74
74
  def can_lock?(spec)
75
- return super if disable_multisource?
75
+ return super unless multiple_remotes?
76
76
  spec.source.is_a?(Rubygems)
77
77
  end
78
78
 
@@ -32,8 +32,8 @@ module Bundler
32
32
  @merged_gem_lockfile_sections = true
33
33
  end
34
34
 
35
- def no_aggregate_global_source?
36
- global_rubygems_source.remotes.size <= 1
35
+ def aggregate_global_source?
36
+ global_rubygems_source.multiple_remotes?
37
37
  end
38
38
 
39
39
  def add_path_source(options = {})
@@ -185,6 +185,8 @@ module Bundler
185
185
  end
186
186
 
187
187
  def equal_source?(source, other_source)
188
+ return source.include?(other_source) if source.is_a?(Source::Rubygems) && other_source.is_a?(Source::Rubygems) && !merged_gem_lockfile_sections?
189
+
188
190
  source == other_source
189
191
  end
190
192
 
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
16
16
  <%- end -%>
17
17
  spec.required_ruby_version = ">= <%= config[:required_ruby_version] %>"
18
18
 
19
- spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
19
+ spec.metadata["allowed_push_host"] = "TODO: Set to 'https://mygemserver.com'"
20
20
 
21
21
  spec.metadata["homepage_uri"] = spec.homepage
22
22
  spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: false
2
2
 
3
3
  module Bundler
4
- VERSION = "2.2.20".freeze
4
+ VERSION = "2.2.21".freeze
5
5
 
6
6
  def self.bundler_major_version
7
7
  @bundler_major_version ||= VERSION.split(".").first.to_i
data/lib/rubygems.rb CHANGED
@@ -8,7 +8,7 @@
8
8
  require 'rbconfig'
9
9
 
10
10
  module Gem
11
- VERSION = "3.2.20".freeze
11
+ VERSION = "3.2.21".freeze
12
12
  end
13
13
 
14
14
  # Must be first since it unloads the prelude from 1.9.2
@@ -320,7 +320,7 @@ if you believe they were disclosed to a third party.
320
320
  config = load_file(credentials_path).merge(host => api_key)
321
321
 
322
322
  dirname = File.dirname credentials_path
323
- Dir.mkdir(dirname) unless File.exist? dirname
323
+ FileUtils.mkdir_p(dirname) unless File.exist? dirname
324
324
 
325
325
  Gem.load_yaml
326
326
 
@@ -44,7 +44,7 @@ class Gem::Request
44
44
  end
45
45
 
46
46
  def self.configure_connection_for_https(connection, cert_files)
47
- raise Gem::Exception.new('OpenSSl is not available. Install OpenSSL and rebuild Ruby (preferred) or use non-HTTPS sources') unless Gem::HAVE_OPENSSL
47
+ raise Gem::Exception.new('OpenSSL is not available. Install OpenSSL and rebuild Ruby (preferred) or use non-HTTPS sources') unless Gem::HAVE_OPENSSL
48
48
 
49
49
  connection.use_ssl = true
50
50
  connection.verify_mode =
@@ -18,6 +18,8 @@ class Gem::Licenses
18
18
  AFL-2.1
19
19
  AFL-3.0
20
20
  AGPL-1.0
21
+ AGPL-1.0-only
22
+ AGPL-1.0-or-later
21
23
  AGPL-3.0
22
24
  AGPL-3.0-only
23
25
  AGPL-3.0-or-later
@@ -25,6 +27,7 @@ class Gem::Licenses
25
27
  AML
26
28
  AMPAS
27
29
  ANTLR-PD
30
+ ANTLR-PD-fallback
28
31
  APAFML
29
32
  APL-1.0
30
33
  APSL-1.0
@@ -48,29 +51,41 @@ class Gem::Licenses
48
51
  BSD-2-Clause-FreeBSD
49
52
  BSD-2-Clause-NetBSD
50
53
  BSD-2-Clause-Patent
54
+ BSD-2-Clause-Views
51
55
  BSD-3-Clause
52
56
  BSD-3-Clause-Attribution
53
57
  BSD-3-Clause-Clear
54
58
  BSD-3-Clause-LBNL
59
+ BSD-3-Clause-Modification
60
+ BSD-3-Clause-No-Military-License
55
61
  BSD-3-Clause-No-Nuclear-License
56
62
  BSD-3-Clause-No-Nuclear-License-2014
57
63
  BSD-3-Clause-No-Nuclear-Warranty
64
+ BSD-3-Clause-Open-MPI
58
65
  BSD-4-Clause
66
+ BSD-4-Clause-Shortened
59
67
  BSD-4-Clause-UC
60
68
  BSD-Protection
61
69
  BSD-Source-Code
62
70
  BSL-1.0
71
+ BUSL-1.1
63
72
  Bahyph
64
73
  Barr
65
74
  Beerware
66
75
  BitTorrent-1.0
67
76
  BitTorrent-1.1
77
+ BlueOak-1.0.0
68
78
  Borceux
79
+ C-UDA-1.0
80
+ CAL-1.0
81
+ CAL-1.0-Combined-Work-Exception
69
82
  CATOSL-1.1
70
83
  CC-BY-1.0
71
84
  CC-BY-2.0
72
85
  CC-BY-2.5
73
86
  CC-BY-3.0
87
+ CC-BY-3.0-AT
88
+ CC-BY-3.0-US
74
89
  CC-BY-4.0
75
90
  CC-BY-NC-1.0
76
91
  CC-BY-NC-2.0
@@ -81,6 +96,7 @@ class Gem::Licenses
81
96
  CC-BY-NC-ND-2.0
82
97
  CC-BY-NC-ND-2.5
83
98
  CC-BY-NC-ND-3.0
99
+ CC-BY-NC-ND-3.0-IGO
84
100
  CC-BY-NC-ND-4.0
85
101
  CC-BY-NC-SA-1.0
86
102
  CC-BY-NC-SA-2.0
@@ -94,12 +110,17 @@ class Gem::Licenses
94
110
  CC-BY-ND-4.0
95
111
  CC-BY-SA-1.0
96
112
  CC-BY-SA-2.0
113
+ CC-BY-SA-2.0-UK
114
+ CC-BY-SA-2.1-JP
97
115
  CC-BY-SA-2.5
98
116
  CC-BY-SA-3.0
117
+ CC-BY-SA-3.0-AT
99
118
  CC-BY-SA-4.0
119
+ CC-PDDC
100
120
  CC0-1.0
101
121
  CDDL-1.0
102
122
  CDDL-1.1
123
+ CDL-1.0
103
124
  CDLA-Permissive-1.0
104
125
  CDLA-Sharing-1.0
105
126
  CECILL-1.0
@@ -108,6 +129,11 @@ class Gem::Licenses
108
129
  CECILL-2.1
109
130
  CECILL-B
110
131
  CECILL-C
132
+ CERN-OHL-1.1
133
+ CERN-OHL-1.2
134
+ CERN-OHL-P-2.0
135
+ CERN-OHL-S-2.0
136
+ CERN-OHL-W-2.0
111
137
  CNRI-Jython
112
138
  CNRI-Python
113
139
  CNRI-Python-GPL-Compatible
@@ -123,12 +149,14 @@ class Gem::Licenses
123
149
  Cube
124
150
  D-FSL-1.0
125
151
  DOC
152
+ DRL-1.0
126
153
  DSDP
127
154
  Dotseqn
128
155
  ECL-1.0
129
156
  ECL-2.0
130
157
  EFL-1.0
131
158
  EFL-2.0
159
+ EPICS
132
160
  EPL-1.0
133
161
  EPL-2.0
134
162
  EUDatagrid
@@ -144,17 +172,32 @@ class Gem::Licenses
144
172
  FTL
145
173
  Fair
146
174
  Frameworx-1.0
175
+ FreeBSD-DOC
147
176
  FreeImage
177
+ GD
148
178
  GFDL-1.1
179
+ GFDL-1.1-invariants-only
180
+ GFDL-1.1-invariants-or-later
181
+ GFDL-1.1-no-invariants-only
182
+ GFDL-1.1-no-invariants-or-later
149
183
  GFDL-1.1-only
150
184
  GFDL-1.1-or-later
151
185
  GFDL-1.2
186
+ GFDL-1.2-invariants-only
187
+ GFDL-1.2-invariants-or-later
188
+ GFDL-1.2-no-invariants-only
189
+ GFDL-1.2-no-invariants-or-later
152
190
  GFDL-1.2-only
153
191
  GFDL-1.2-or-later
154
192
  GFDL-1.3
193
+ GFDL-1.3-invariants-only
194
+ GFDL-1.3-invariants-or-later
195
+ GFDL-1.3-no-invariants-only
196
+ GFDL-1.3-no-invariants-or-later
155
197
  GFDL-1.3-only
156
198
  GFDL-1.3-or-later
157
199
  GL2PS
200
+ GLWTPL
158
201
  GPL-1.0
159
202
  GPL-1.0+
160
203
  GPL-1.0-only
@@ -178,7 +221,10 @@ class Gem::Licenses
178
221
  Glide
179
222
  Glulxe
180
223
  HPND
224
+ HPND-sell-variant
225
+ HTMLTIDY
181
226
  HaskellReport
227
+ Hippocratic-2.1
182
228
  IBM-pibs
183
229
  ICU
184
230
  IJG
@@ -191,6 +237,7 @@ class Gem::Licenses
191
237
  Intel
192
238
  Intel-ACPI
193
239
  Interbase-1.0
240
+ JPNIC
194
241
  JSON
195
242
  JasPer-2.0
196
243
  LAL-1.2
@@ -221,11 +268,15 @@ class Gem::Licenses
221
268
  LiLiQ-R-1.1
222
269
  LiLiQ-Rplus-1.1
223
270
  Libpng
271
+ Linux-OpenIB
224
272
  MIT
273
+ MIT-0
225
274
  MIT-CMU
275
+ MIT-Modern-Variant
226
276
  MIT-advertising
227
277
  MIT-enna
228
278
  MIT-feh
279
+ MIT-open-group
229
280
  MITNFA
230
281
  MPL-1.0
231
282
  MPL-1.1
@@ -237,12 +288,18 @@ class Gem::Licenses
237
288
  MakeIndex
238
289
  MirOS
239
290
  Motosoto
291
+ MulanPSL-1.0
292
+ MulanPSL-2.0
240
293
  Multics
241
294
  Mup
295
+ NAIST-2003
242
296
  NASA-1.3
243
297
  NBPL-1.0
298
+ NCGL-UK-2.0
244
299
  NCSA
245
300
  NGPL
301
+ NIST-PD
302
+ NIST-PD-fallback
246
303
  NLOD-1.0
247
304
  NLPL
248
305
  NOSL
@@ -251,6 +308,7 @@ class Gem::Licenses
251
308
  NPOSL-3.0
252
309
  NRL
253
310
  NTP
311
+ NTP-0
254
312
  Naumen
255
313
  Net-SNMP
256
314
  NetCDF
@@ -258,11 +316,23 @@ class Gem::Licenses
258
316
  Nokia
259
317
  Noweb
260
318
  Nunit
319
+ O-UDA-1.0
261
320
  OCCT-PL
262
321
  OCLC-2.0
322
+ ODC-By-1.0
263
323
  ODbL-1.0
264
324
  OFL-1.0
325
+ OFL-1.0-RFN
326
+ OFL-1.0-no-RFN
265
327
  OFL-1.1
328
+ OFL-1.1-RFN
329
+ OFL-1.1-no-RFN
330
+ OGC-1.0
331
+ OGDL-Taiwan-1.0
332
+ OGL-Canada-2.0
333
+ OGL-UK-1.0
334
+ OGL-UK-2.0
335
+ OGL-UK-3.0
266
336
  OGTSL
267
337
  OLDAP-1.1
268
338
  OLDAP-1.2
@@ -292,7 +362,12 @@ class Gem::Licenses
292
362
  PDDL-1.0
293
363
  PHP-3.0
294
364
  PHP-3.01
365
+ PSF-2.0
366
+ Parity-6.0.0
367
+ Parity-7.0.0
295
368
  Plexus
369
+ PolyForm-Noncommercial-1.0.0
370
+ PolyForm-Small-Business-1.0.0
296
371
  PostgreSQL
297
372
  Python-2.0
298
373
  QPL-1.0
@@ -310,15 +385,21 @@ class Gem::Licenses
310
385
  SGI-B-1.0
311
386
  SGI-B-1.1
312
387
  SGI-B-2.0
388
+ SHL-0.5
389
+ SHL-0.51
313
390
  SISSL
314
391
  SISSL-1.2
315
392
  SMLNJ
316
393
  SMPPL
317
394
  SNIA
318
395
  SPL-1.0
396
+ SSH-OpenSSH
397
+ SSH-short
398
+ SSPL-1.0
319
399
  SWL
320
400
  Saxpath
321
401
  Sendmail
402
+ Sendmail-8.23
322
403
  SimPL-2.0
323
404
  Sleepycat
324
405
  Spencer-86
@@ -326,11 +407,15 @@ class Gem::Licenses
326
407
  Spencer-99
327
408
  StandardML-NJ
328
409
  SugarCRM-1.1.3
410
+ TAPR-OHL-1.0
329
411
  TCL
330
412
  TCP-wrappers
331
413
  TMate
332
414
  TORQUE-1.1
333
415
  TOSL
416
+ TU-Berlin-1.0
417
+ TU-Berlin-2.0
418
+ UCL-1.0
334
419
  UPL-1.0
335
420
  Unicode-DFS-2015
336
421
  Unicode-DFS-2016
@@ -360,16 +445,22 @@ class Gem::Licenses
360
445
  Zimbra-1.3
361
446
  Zimbra-1.4
362
447
  Zlib
448
+ blessing
363
449
  bzip2-1.0.5
364
450
  bzip2-1.0.6
451
+ copyleft-next-0.3.0
452
+ copyleft-next-0.3.1
365
453
  curl
366
454
  diffmark
367
455
  dvipdfm
368
456
  eCos-2.0
369
457
  eGenix
458
+ etalab-2.0
370
459
  gSOAP-1.3b
371
460
  gnuplot
372
461
  iMatix
462
+ libpng-2.0
463
+ libselinux-1.0
373
464
  libtiff
374
465
  mpich2
375
466
  psfrag
@@ -395,12 +486,26 @@ class Gem::Licenses
395
486
  Font-exception-2.0
396
487
  GCC-exception-2.0
397
488
  GCC-exception-3.1
489
+ GPL-3.0-linking-exception
490
+ GPL-3.0-linking-source-exception
491
+ GPL-CC-1.0
492
+ LGPL-3.0-linking-exception
493
+ LLVM-exception
398
494
  LZMA-exception
399
495
  Libtool-exception
400
496
  Linux-syscall-note
401
497
  Nokia-Qt-exception-1.1
402
498
  OCCT-exception-1.0
499
+ OCaml-LGPL-linking-exception
500
+ OpenJDK-assembly-exception-1.0
501
+ PS-or-PDF-font-exception-20170817
502
+ Qt-GPL-exception-1.0
503
+ Qt-LGPL-exception-1.1
403
504
  Qwt-exception-1.0
505
+ SHL-2.0
506
+ SHL-2.1
507
+ Swift-exception
508
+ Universal-FOSS-exception-1.0
404
509
  WxWindows-exception-3.1
405
510
  eCos-exception-2.0
406
511
  freertos-exception-2.0
@@ -413,10 +518,10 @@ class Gem::Licenses
413
518
 
414
519
  REGEXP = %r{
415
520
  \A
416
- (
521
+ (?:
417
522
  #{Regexp.union(LICENSE_IDENTIFIERS)}
418
523
  \+?
419
- (\s WITH \s #{Regexp.union(EXCEPTION_IDENTIFIERS)})?
524
+ (?:\s WITH \s #{Regexp.union(EXCEPTION_IDENTIFIERS)})?
420
525
  | #{NONSTANDARD}
421
526
  )
422
527
  \Z
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = "rubygems-update"
5
- s.version = "3.2.20"
5
+ s.version = "3.2.21"
6
6
  s.authors = ["Jim Weirich", "Chad Fowler", "Eric Hodel", "Luis Lavena", "Aaron Patterson", "Samuel Giddins", "André Arko", "Evan Phoenix", "Hiroshi SHIBATA"]
7
7
  s.email = ["", "", "drbrain@segment7.net", "luislavena@gmail.com", "aaron@tenderlovemaking.com", "segiddins@segiddins.me", "andre@arko.net", "evan@phx.io", "hsbt@ruby-lang.org"]
8
8
 
data/setup.rb CHANGED
@@ -11,8 +11,7 @@ if ENV['RUBYOPT'] or defined? Gem
11
11
  ENV.delete 'RUBYOPT'
12
12
 
13
13
  require 'rbconfig'
14
- cmd = [RbConfig.ruby, 'setup.rb', *ARGV].compact
15
- cmd[1,0] = "--disable-gems"
14
+ cmd = [RbConfig.ruby, '--disable-gems', 'setup.rb', *ARGV]
16
15
 
17
16
  exec(*cmd)
18
17
  end
@@ -155,7 +155,6 @@ class TestGemCommandsPushCommand < Gem::TestCase
155
155
  @host => @api_key,
156
156
  }
157
157
 
158
- FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
159
158
  File.open Gem.configuration.credentials_path, 'w' do |f|
160
159
  f.write keys.to_yaml
161
160
  end
@@ -190,7 +189,6 @@ class TestGemCommandsPushCommand < Gem::TestCase
190
189
  @host => @api_key,
191
190
  }
192
191
 
193
- FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
194
192
  File.open Gem.configuration.credentials_path, 'w' do |f|
195
193
  f.write keys.to_yaml
196
194
  end
@@ -232,7 +230,6 @@ class TestGemCommandsPushCommand < Gem::TestCase
232
230
  :rubygems_api_key => @api_key,
233
231
  }
234
232
 
235
- FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
236
233
  File.open Gem.configuration.credentials_path, 'w' do |f|
237
234
  f.write keys.to_yaml
238
235
  end
@@ -274,7 +271,6 @@ class TestGemCommandsPushCommand < Gem::TestCase
274
271
  @host => @api_key,
275
272
  }
276
273
 
277
- FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
278
274
  File.open Gem.configuration.credentials_path, 'w' do |f|
279
275
  f.write keys.to_yaml
280
276
  end
@@ -305,7 +301,6 @@ class TestGemCommandsPushCommand < Gem::TestCase
305
301
  host => api_key,
306
302
  }
307
303
 
308
- FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
309
304
  File.open Gem.configuration.credentials_path, 'w' do |f|
310
305
  f.write keys.to_yaml
311
306
  end
@@ -175,7 +175,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase
175
175
  assert_path_exist File.join(dir, 'bundler.rb')
176
176
  assert_path_exist File.join(dir, 'bundler/b.rb')
177
177
 
178
- assert_path_exist File.join(dir, 'bundler/templates/.circleci/config.yml') unless RUBY_ENGINE == "truffleruby" # https://github.com/oracle/truffleruby/issues/2116
178
+ assert_path_exist File.join(dir, 'bundler/templates/.circleci/config.yml')
179
179
  assert_path_exist File.join(dir, 'bundler/templates/.travis.yml')
180
180
  end
181
181
  end
@@ -272,7 +272,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase
272
272
 
273
273
  @cmd.remove_old_lib_files lib
274
274
 
275
- files_that_go.each {|file| assert_path_not_exist(file) unless file == old_bundler_ci && RUBY_ENGINE == "truffleruby" } # https://github.com/oracle/truffleruby/issues/2116
275
+ files_that_go.each {|file| assert_path_not_exist(file) unless file == old_bundler_ci }
276
276
 
277
277
  files_that_stay.each {|file| assert_path_exist file }
278
278
  end
@@ -26,6 +26,13 @@ class TestGemCommandsSigninCommand < Gem::TestCase
26
26
  assert_match %r{Signed in.}, sign_in_ui.output
27
27
  end
28
28
 
29
+ def test_execute_when_not_already_signed_in_and_not_preexisting_credentials_folder
30
+ FileUtils.rm Gem.configuration.credentials_path
31
+
32
+ sign_in_ui = util_capture { @cmd.execute }
33
+ assert_match %r{Signed in.}, sign_in_ui.output
34
+ end
35
+
29
36
  def test_execute_when_already_signed_in_with_same_host
30
37
  host = 'http://some-gemcutter-compatible-host.org'
31
38
 
@@ -35,8 +35,6 @@ class TestGemGemcutterUtilities < Gem::TestCase
35
35
  "http://rubygems.engineyard.com" => "EYKEY",
36
36
  }
37
37
 
38
- FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
39
-
40
38
  File.open Gem.configuration.credentials_path, 'w' do |f|
41
39
  f.write keys.to_yaml
42
40
  end
@@ -50,7 +48,6 @@ class TestGemGemcutterUtilities < Gem::TestCase
50
48
 
51
49
  def test_api_key
52
50
  keys = { :rubygems_api_key => 'KEY' }
53
- FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
54
51
 
55
52
  File.open Gem.configuration.credentials_path, 'w' do |f|
56
53
  f.write keys.to_yaml
@@ -63,7 +60,6 @@ class TestGemGemcutterUtilities < Gem::TestCase
63
60
 
64
61
  def test_api_key_override
65
62
  keys = { :rubygems_api_key => 'KEY', :other => 'OTHER' }
66
- FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
67
63
 
68
64
  File.open Gem.configuration.credentials_path, 'w' do |f|
69
65
  f.write keys.to_yaml
@@ -168,7 +164,6 @@ class TestGemGemcutterUtilities < Gem::TestCase
168
164
  api_key = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
169
165
  other_api_key = 'f46dbb18bb6a9c97cdc61b5b85c186a17403cdcbf'
170
166
 
171
- FileUtils.mkdir_p File.dirname(Gem.configuration.credentials_path)
172
167
  File.open Gem.configuration.credentials_path, 'w' do |f|
173
168
  f.write Hash[:other_api_key, other_api_key].to_yaml
174
169
  end
@@ -246,7 +241,6 @@ class TestGemGemcutterUtilities < Gem::TestCase
246
241
 
247
242
  def test_verify_api_key
248
243
  keys = {:other => 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'}
249
- FileUtils.mkdir_p File.dirname(Gem.configuration.credentials_path)
250
244
  File.open Gem.configuration.credentials_path, 'w' do |f|
251
245
  f.write keys.to_yaml
252
246
  end
@@ -679,8 +679,6 @@ class TestGemRequire < Gem::TestCase
679
679
  end
680
680
 
681
681
  def test_no_crash_when_overriding_warn_with_warning_module
682
- pend "https://github.com/oracle/truffleruby/issues/2109" if RUBY_ENGINE == "truffleruby"
683
-
684
682
  Dir.mktmpdir("warn_test") do |dir|
685
683
  File.write(dir + "/main.rb", "module Warning; def warn(str); super; end; end; warn 'Foo Bar'")
686
684
  _, err = capture_subprocess_io do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rubygems-update
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.20
4
+ version: 3.2.21
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jim Weirich
@@ -16,7 +16,7 @@ authors:
16
16
  autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
- date: 2021-06-11 00:00:00.000000000 Z
19
+ date: 2021-06-23 00:00:00.000000000 Z
20
20
  dependencies: []
21
21
  description: |-
22
22
  A package (also known as a library) contains a set of functionality
@@ -772,7 +772,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
772
772
  - !ruby/object:Gem::Version
773
773
  version: '0'
774
774
  requirements: []
775
- rubygems_version: 3.2.20
775
+ rubygems_version: 3.2.21
776
776
  signing_key:
777
777
  specification_version: 4
778
778
  summary: RubyGems is a package management framework for Ruby.