rubygems-update 3.4.18 → 3.4.20
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +48 -0
- data/POLICIES.md +2 -2
- data/bundler/CHANGELOG.md +45 -0
- data/bundler/lib/bundler/build_metadata.rb +2 -2
- data/bundler/lib/bundler/cli/binstubs.rb +1 -1
- data/bundler/lib/bundler/cli/info.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +1 -1
- data/bundler/lib/bundler/cli/outdated.rb +1 -1
- data/bundler/lib/bundler/cli/platform.rb +7 -5
- data/bundler/lib/bundler/cli/update.rb +1 -0
- data/bundler/lib/bundler/definition.rb +25 -20
- data/bundler/lib/bundler/dsl.rb +1 -1
- data/bundler/lib/bundler/env.rb +1 -1
- data/bundler/lib/bundler/fetcher/base.rb +2 -2
- data/bundler/lib/bundler/fetcher/compact_index.rb +4 -8
- data/bundler/lib/bundler/fetcher/dependency.rb +1 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +2 -0
- data/bundler/lib/bundler/fetcher/index.rb +1 -2
- data/bundler/lib/bundler/fetcher.rb +42 -31
- data/bundler/lib/bundler/friendly_errors.rb +1 -1
- data/bundler/lib/bundler/gem_helper.rb +3 -4
- data/bundler/lib/bundler/index.rb +62 -31
- data/bundler/lib/bundler/installer/parallel_installer.rb +1 -1
- data/bundler/lib/bundler/installer/standalone.rb +8 -1
- data/bundler/lib/bundler/lockfile_parser.rb +3 -15
- data/bundler/lib/bundler/man/bundle-add.1 +1 -1
- data/bundler/lib/bundler/man/bundle-binstubs.1 +1 -1
- data/bundler/lib/bundler/man/bundle-cache.1 +1 -1
- data/bundler/lib/bundler/man/bundle-check.1 +1 -1
- data/bundler/lib/bundler/man/bundle-clean.1 +1 -1
- data/bundler/lib/bundler/man/bundle-config.1 +1 -1
- data/bundler/lib/bundler/man/bundle-console.1 +1 -1
- data/bundler/lib/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/lib/bundler/man/bundle-exec.1 +1 -1
- data/bundler/lib/bundler/man/bundle-gem.1 +1 -1
- data/bundler/lib/bundler/man/bundle-help.1 +1 -1
- data/bundler/lib/bundler/man/bundle-info.1 +3 -3
- data/bundler/lib/bundler/man/bundle-info.1.ronn +3 -3
- data/bundler/lib/bundler/man/bundle-init.1 +1 -1
- data/bundler/lib/bundler/man/bundle-inject.1 +1 -1
- data/bundler/lib/bundler/man/bundle-install.1 +1 -1
- data/bundler/lib/bundler/man/bundle-list.1 +1 -1
- data/bundler/lib/bundler/man/bundle-lock.1 +1 -1
- data/bundler/lib/bundler/man/bundle-open.1 +1 -1
- data/bundler/lib/bundler/man/bundle-outdated.1 +1 -1
- data/bundler/lib/bundler/man/bundle-platform.1 +1 -1
- data/bundler/lib/bundler/man/bundle-plugin.1 +1 -1
- data/bundler/lib/bundler/man/bundle-pristine.1 +1 -1
- data/bundler/lib/bundler/man/bundle-remove.1 +1 -1
- data/bundler/lib/bundler/man/bundle-show.1 +1 -1
- data/bundler/lib/bundler/man/bundle-update.1 +1 -1
- data/bundler/lib/bundler/man/bundle-version.1 +1 -1
- data/bundler/lib/bundler/man/bundle-viz.1 +1 -1
- data/bundler/lib/bundler/man/bundle.1 +1 -1
- data/bundler/lib/bundler/man/gemfile.5 +25 -1
- data/bundler/lib/bundler/man/gemfile.5.ronn +10 -0
- data/bundler/lib/bundler/plugin/index.rb +1 -1
- data/bundler/lib/bundler/plugin.rb +1 -1
- data/bundler/lib/bundler/resolver.rb +18 -3
- data/bundler/lib/bundler/retry.rb +1 -1
- data/bundler/lib/bundler/ruby_dsl.rb +27 -0
- data/bundler/lib/bundler/ruby_version.rb +2 -2
- data/bundler/lib/bundler/rubygems_integration.rb +1 -1
- data/bundler/lib/bundler/self_manager.rb +2 -0
- data/bundler/lib/bundler/settings.rb +37 -13
- data/bundler/lib/bundler/source/git/git_proxy.rb +14 -2
- data/bundler/lib/bundler/source/git.rb +7 -0
- data/bundler/lib/bundler/source/rubygems.rb +22 -25
- data/bundler/lib/bundler/source_list.rb +0 -4
- data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +1 -1
- data/bundler/lib/bundler/ui/rg_proxy.rb +1 -1
- data/bundler/lib/bundler/version.rb +1 -1
- data/bundler/lib/bundler.rb +1 -1
- data/lib/rubygems/available_set.rb +1 -1
- data/lib/rubygems/basic_specification.rb +2 -2
- data/lib/rubygems/bundler_version_finder.rb +1 -1
- data/lib/rubygems/command.rb +16 -19
- data/lib/rubygems/commands/cert_command.rb +1 -1
- data/lib/rubygems/commands/dependency_command.rb +3 -4
- data/lib/rubygems/commands/owner_command.rb +8 -10
- data/lib/rubygems/commands/uninstall_command.rb +6 -7
- data/lib/rubygems/commands/unpack_command.rb +4 -6
- data/lib/rubygems/config_file.rb +1 -1
- data/lib/rubygems/core_ext/kernel_gem.rb +1 -1
- data/lib/rubygems/core_ext/kernel_warn.rb +4 -5
- data/lib/rubygems/dependency_installer.rb +8 -12
- data/lib/rubygems/deprecate.rb +2 -2
- data/lib/rubygems/gemcutter_utilities.rb +3 -4
- data/lib/rubygems/installer.rb +9 -11
- data/lib/rubygems/name_tuple.rb +1 -1
- data/lib/rubygems/package/tar_reader/entry.rb +18 -20
- data/lib/rubygems/package/tar_reader.rb +0 -5
- data/lib/rubygems/package.rb +11 -6
- data/lib/rubygems/query_utils.rb +1 -1
- data/lib/rubygems/request_set/gem_dependency_api.rb +1 -1
- data/lib/rubygems/request_set/lockfile/parser.rb +1 -1
- data/lib/rubygems/resolver/activation_request.rb +2 -4
- data/lib/rubygems/resolver/installed_specification.rb +1 -1
- data/lib/rubygems/resolver/local_specification.rb +1 -1
- data/lib/rubygems/s3_uri_signer.rb +1 -1
- data/lib/rubygems/security/trust_dir.rb +4 -6
- data/lib/rubygems/security.rb +1 -1
- data/lib/rubygems/source/local.rb +34 -37
- data/lib/rubygems/source.rb +2 -2
- data/lib/rubygems/source_list.rb +2 -2
- data/lib/rubygems/spec_fetcher.rb +29 -33
- data/lib/rubygems/specification.rb +36 -28
- data/lib/rubygems/specification_policy.rb +33 -32
- data/lib/rubygems/stub_specification.rb +13 -10
- data/lib/rubygems/uninstaller.rb +1 -1
- data/lib/rubygems/user_interaction.rb +4 -4
- data/lib/rubygems/util/licenses.rb +115 -0
- data/lib/rubygems/validator.rb +5 -7
- data/lib/rubygems.rb +6 -9
- data/rubygems-update.gemspec +4 -4
- data/test/rubygems/helper.rb +18 -20
- data/test/rubygems/test_gem.rb +4 -4
- data/test/rubygems/test_gem_commands_build_command.rb +2 -1
- data/test/rubygems/test_gem_commands_stale_command.rb +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock +28 -12
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +16 -14
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +1 -1
- data/test/rubygems/test_gem_indexer.rb +1 -1
- data/test/rubygems/test_gem_package.rb +117 -2
- data/test/rubygems/test_gem_package_tar_header.rb +7 -7
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +53 -1
- data/test/rubygems/test_gem_package_tar_writer.rb +13 -13
- data/test/rubygems/test_gem_remote_fetcher.rb +21 -25
- data/test/rubygems/test_gem_requirement.rb +1 -1
- data/test/rubygems/test_gem_specification.rb +42 -6
- data/test/rubygems/test_gem_update_suggestion.rb +14 -20
- data/test/rubygems/test_require.rb +4 -6
- data/test/rubygems/utilities.rb +2 -2
- metadata +31 -5
@@ -163,13 +163,11 @@ class Gem::DependencyInstaller
|
|
163
163
|
|
164
164
|
specs = []
|
165
165
|
tuples.each do |tup, source|
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
specs << [spec, source]
|
172
|
-
end
|
166
|
+
spec = source.fetch_spec(tup)
|
167
|
+
rescue Gem::RemoteFetcher::FetchError => e
|
168
|
+
errors << Gem::SourceFetchProblem.new(source, e)
|
169
|
+
else
|
170
|
+
specs << [spec, source]
|
173
171
|
end
|
174
172
|
|
175
173
|
if @errors
|
@@ -296,11 +294,9 @@ class Gem::DependencyInstaller
|
|
296
294
|
version = src.spec.version if version == Gem::Requirement.default
|
297
295
|
elsif dep_or_name =~ /\.gem$/
|
298
296
|
Dir[dep_or_name].each do |name|
|
299
|
-
|
300
|
-
|
301
|
-
|
302
|
-
rescue Gem::Package::FormatError
|
303
|
-
end
|
297
|
+
src = Gem::Source::SpecificFile.new name
|
298
|
+
installer_set.add_local dep_or_name, src.spec, src
|
299
|
+
rescue Gem::Package::FormatError
|
304
300
|
end
|
305
301
|
# else This is a dependency. InstallerSet handles this case
|
306
302
|
end
|
data/lib/rubygems/deprecate.rb
CHANGED
@@ -104,7 +104,7 @@ module Gem::Deprecate
|
|
104
104
|
old = "_deprecated_#{name}"
|
105
105
|
alias_method old, name
|
106
106
|
define_method name do |*args, &block|
|
107
|
-
klass = self.
|
107
|
+
klass = self.is_a? Module
|
108
108
|
target = klass ? "#{self}." : "#{self.class}#"
|
109
109
|
msg = [ "NOTE: #{target}#{name} is deprecated",
|
110
110
|
repl == :none ? " with no replacement" : "; use #{repl} instead",
|
@@ -129,7 +129,7 @@ module Gem::Deprecate
|
|
129
129
|
old = "_deprecated_#{name}"
|
130
130
|
alias_method old, name
|
131
131
|
define_method name do |*args, &block|
|
132
|
-
klass = self.
|
132
|
+
klass = self.is_a? Module
|
133
133
|
target = klass ? "#{self}." : "#{self.class}#"
|
134
134
|
msg = [ "NOTE: #{target}#{name} is deprecated",
|
135
135
|
replacement == :none ? " with no replacement" : "; use #{replacement} instead",
|
@@ -73,8 +73,7 @@ module Gem::GemcutterUtilities
|
|
73
73
|
@host ||=
|
74
74
|
begin
|
75
75
|
env_rubygems_host = ENV["RUBYGEMS_HOST"]
|
76
|
-
env_rubygems_host = nil if
|
77
|
-
env_rubygems_host && env_rubygems_host.empty?
|
76
|
+
env_rubygems_host = nil if env_rubygems_host&.empty?
|
78
77
|
|
79
78
|
env_rubygems_host || configured_host
|
80
79
|
end
|
@@ -121,7 +120,7 @@ module Gem::GemcutterUtilities
|
|
121
120
|
end
|
122
121
|
|
123
122
|
def mfa_unauthorized?(response)
|
124
|
-
response.
|
123
|
+
response.is_a?(Net::HTTPUnauthorized) && response.body.start_with?("You have enabled multifactor authentication")
|
125
124
|
end
|
126
125
|
|
127
126
|
def update_scope(scope)
|
@@ -368,6 +367,6 @@ module Gem::GemcutterUtilities
|
|
368
367
|
end
|
369
368
|
|
370
369
|
def api_key_forbidden?(response)
|
371
|
-
response.
|
370
|
+
response.is_a?(Net::HTTPForbidden) && response.body.start_with?("The API key doesn't have access")
|
372
371
|
end
|
373
372
|
end
|
data/lib/rubygems/installer.rb
CHANGED
@@ -357,25 +357,23 @@ class Gem::Installer
|
|
357
357
|
|
358
358
|
def run_pre_install_hooks # :nodoc:
|
359
359
|
Gem.pre_install_hooks.each do |hook|
|
360
|
-
|
361
|
-
|
360
|
+
next unless hook.call(self) == false
|
361
|
+
location = " at #{$1}" if hook.inspect =~ /[ @](.*:\d+)/
|
362
362
|
|
363
|
-
|
364
|
-
|
365
|
-
end
|
363
|
+
message = "pre-install hook#{location} failed for #{spec.full_name}"
|
364
|
+
raise Gem::InstallError, message
|
366
365
|
end
|
367
366
|
end
|
368
367
|
|
369
368
|
def run_post_build_hooks # :nodoc:
|
370
369
|
Gem.post_build_hooks.each do |hook|
|
371
|
-
|
372
|
-
|
370
|
+
next unless hook.call(self) == false
|
371
|
+
FileUtils.rm_rf gem_dir
|
373
372
|
|
374
|
-
|
373
|
+
location = " at #{$1}" if hook.inspect =~ /[ @](.*:\d+)/
|
375
374
|
|
376
|
-
|
377
|
-
|
378
|
-
end
|
375
|
+
message = "post-build hook#{location} failed for #{spec.full_name}"
|
376
|
+
raise Gem::InstallError, message
|
379
377
|
end
|
380
378
|
end
|
381
379
|
|
data/lib/rubygems/name_tuple.rb
CHANGED
@@ -100,9 +100,7 @@ class Gem::Package::TarReader::Entry
|
|
100
100
|
# Read one byte from the tar entry
|
101
101
|
|
102
102
|
def getc
|
103
|
-
|
104
|
-
|
105
|
-
return nil if @read >= @header.size
|
103
|
+
return nil if eof?
|
106
104
|
|
107
105
|
ret = @io.getc
|
108
106
|
@read += 1 if ret
|
@@ -155,30 +153,28 @@ class Gem::Package::TarReader::Entry
|
|
155
153
|
alias length size
|
156
154
|
|
157
155
|
##
|
158
|
-
# Reads +
|
159
|
-
# nil
|
160
|
-
|
161
|
-
def read(len = nil)
|
162
|
-
check_closed
|
163
|
-
|
164
|
-
len ||= @header.size - @read
|
156
|
+
# Reads +maxlen+ bytes from the tar file entry, or the rest of the entry if nil
|
165
157
|
|
166
|
-
|
158
|
+
def read(maxlen = nil)
|
159
|
+
if eof?
|
160
|
+
return maxlen.to_i.zero? ? "" : nil
|
161
|
+
end
|
167
162
|
|
168
|
-
max_read = [
|
163
|
+
max_read = [maxlen, @header.size - @read].compact.min
|
169
164
|
|
170
165
|
ret = @io.read max_read
|
166
|
+
if ret.nil?
|
167
|
+
return maxlen ? nil : "" # IO.read returns nil on EOF with len argument
|
168
|
+
end
|
171
169
|
@read += ret.size
|
172
170
|
|
173
171
|
ret
|
174
172
|
end
|
175
173
|
|
176
|
-
def readpartial(maxlen
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
raise EOFError if maxlen > 0 && @read >= @header.size
|
174
|
+
def readpartial(maxlen, outbuf = "".b)
|
175
|
+
if eof? && maxlen > 0
|
176
|
+
raise EOFError, "end of file reached"
|
177
|
+
end
|
182
178
|
|
183
179
|
max_read = [maxlen, @header.size - @read].min
|
184
180
|
|
@@ -212,6 +208,8 @@ class Gem::Package::TarReader::Entry
|
|
212
208
|
|
213
209
|
pending = new_pos - @io.pos
|
214
210
|
|
211
|
+
return 0 if pending == 0
|
212
|
+
|
215
213
|
if @io.respond_to?(:seek)
|
216
214
|
begin
|
217
215
|
# avoid reading if the @io supports seeking
|
@@ -229,8 +227,8 @@ class Gem::Package::TarReader::Entry
|
|
229
227
|
end
|
230
228
|
|
231
229
|
while pending > 0 do
|
232
|
-
size_read = @io.read([pending, 4096].min)
|
233
|
-
raise
|
230
|
+
size_read = @io.read([pending, 4096].min)&.size
|
231
|
+
raise(EOFError, "end of file reached") if size_read.nil?
|
234
232
|
pending -= size_read
|
235
233
|
end
|
236
234
|
|
data/lib/rubygems/package.rb
CHANGED
@@ -268,7 +268,7 @@ class Gem::Package
|
|
268
268
|
|
269
269
|
tar.add_file_simple file, stat.mode, stat.size do |dst_io|
|
270
270
|
File.open file, "rb" do |src_io|
|
271
|
-
dst_io.write src_io.read
|
271
|
+
dst_io.write src_io.read 16_384 until src_io.eof?
|
272
272
|
end
|
273
273
|
end
|
274
274
|
end
|
@@ -347,6 +347,8 @@ EOM
|
|
347
347
|
return @contents
|
348
348
|
end
|
349
349
|
end
|
350
|
+
rescue Zlib::GzipFile::Error, EOFError, Gem::Package::TarInvalidError => e
|
351
|
+
raise Gem::Package::FormatError.new e.message, @gem
|
350
352
|
end
|
351
353
|
|
352
354
|
##
|
@@ -363,7 +365,7 @@ EOM
|
|
363
365
|
algorithms.each do |algorithm|
|
364
366
|
digester = Gem::Security.create_digest(algorithm)
|
365
367
|
|
366
|
-
digester << entry.
|
368
|
+
digester << entry.readpartial(16_384) until entry.eof?
|
367
369
|
|
368
370
|
entry.rewind
|
369
371
|
|
@@ -395,6 +397,8 @@ EOM
|
|
395
397
|
return # ignore further entries
|
396
398
|
end
|
397
399
|
end
|
400
|
+
rescue Zlib::GzipFile::Error, EOFError, Gem::Package::TarInvalidError => e
|
401
|
+
raise Gem::Package::FormatError.new e.message, @gem
|
398
402
|
end
|
399
403
|
|
400
404
|
##
|
@@ -409,6 +413,8 @@ EOM
|
|
409
413
|
# extracted.
|
410
414
|
|
411
415
|
def extract_tar_gz(io, destination_dir, pattern = "*") # :nodoc:
|
416
|
+
destination_dir = File.realpath(destination_dir)
|
417
|
+
|
412
418
|
directories = []
|
413
419
|
symlinks = []
|
414
420
|
|
@@ -617,8 +623,7 @@ EOM
|
|
617
623
|
|
618
624
|
verify_checksums @digests, @checksums
|
619
625
|
|
620
|
-
@security_policy
|
621
|
-
@security_policy
|
626
|
+
@security_policy&.verify_signatures @spec, @digests, @signatures
|
622
627
|
|
623
628
|
true
|
624
629
|
rescue Gem::Security::Exception
|
@@ -627,7 +632,7 @@ EOM
|
|
627
632
|
raise
|
628
633
|
rescue Errno::ENOENT => e
|
629
634
|
raise Gem::Package::FormatError.new e.message
|
630
|
-
rescue Gem::Package::TarInvalidError => e
|
635
|
+
rescue Zlib::GzipFile::Error, EOFError, Gem::Package::TarInvalidError => e
|
631
636
|
raise Gem::Package::FormatError.new e.message, @gem
|
632
637
|
end
|
633
638
|
|
@@ -703,7 +708,7 @@ EOM
|
|
703
708
|
|
704
709
|
def verify_gz(entry) # :nodoc:
|
705
710
|
Zlib::GzipReader.wrap entry do |gzio|
|
706
|
-
gzio.read
|
711
|
+
gzio.read 16_384 until gzio.eof? # gzip checksum verification
|
707
712
|
end
|
708
713
|
rescue Zlib::GzipFile::Error => e
|
709
714
|
raise Gem::Package::FormatError.new(e.message, entry.full_name)
|
data/lib/rubygems/query_utils.rb
CHANGED
@@ -357,7 +357,7 @@ class Gem::RequestSet::GemDependencyAPI
|
|
357
357
|
# Use the given tag for git:, gist: and github: dependencies.
|
358
358
|
|
359
359
|
def gem(name, *requirements)
|
360
|
-
options = requirements.pop if requirements.last.
|
360
|
+
options = requirements.pop if requirements.last.is_a?(Hash)
|
361
361
|
options ||= {}
|
362
362
|
|
363
363
|
options[:git] = @current_repository if @current_repository
|
@@ -59,10 +59,8 @@ class Gem::Resolver::ActivationRequest
|
|
59
59
|
if @spec.respond_to? :sources
|
60
60
|
exception = nil
|
61
61
|
path = @spec.sources.find do |source|
|
62
|
-
|
63
|
-
|
64
|
-
rescue exception
|
65
|
-
end
|
62
|
+
source.download full_spec, path
|
63
|
+
rescue exception
|
66
64
|
end
|
67
65
|
return path if path
|
68
66
|
raise exception if exception
|
@@ -25,7 +25,7 @@ class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification
|
|
25
25
|
def installable_platform?
|
26
26
|
# BACKCOMPAT If the file is coming out of a specified file, then we
|
27
27
|
# ignore the platform. This code can be removed in RG 3.0.
|
28
|
-
return true if @source.
|
28
|
+
return true if @source.is_a? Gem::Source::SpecificFile
|
29
29
|
|
30
30
|
super
|
31
31
|
end
|
@@ -8,7 +8,7 @@ class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification
|
|
8
8
|
# Returns +true+ if this gem is installable for the current platform.
|
9
9
|
|
10
10
|
def installable_platform?
|
11
|
-
return true if @source.
|
11
|
+
return true if @source.is_a? Gem::Source::SpecificFile
|
12
12
|
|
13
13
|
super
|
14
14
|
end
|
@@ -34,7 +34,7 @@ class Gem::S3URISigner
|
|
34
34
|
|
35
35
|
##
|
36
36
|
# Signs S3 URI using query-params according to the reference: https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html
|
37
|
-
def sign(expiration =
|
37
|
+
def sign(expiration = 86_400)
|
38
38
|
s3_config = fetch_s3_config
|
39
39
|
|
40
40
|
current_time = Time.now.utc
|
@@ -45,13 +45,11 @@ class Gem::Security::TrustDir
|
|
45
45
|
glob = File.join @dir, "*.pem"
|
46
46
|
|
47
47
|
Dir[glob].each do |certificate_file|
|
48
|
-
|
49
|
-
certificate = load_certificate certificate_file
|
48
|
+
certificate = load_certificate certificate_file
|
50
49
|
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
end
|
50
|
+
yield certificate, certificate_file
|
51
|
+
rescue OpenSSL::X509::CertificateError
|
52
|
+
next # HACK warn
|
55
53
|
end
|
56
54
|
end
|
57
55
|
|
data/lib/rubygems/security.rb
CHANGED
@@ -41,36 +41,34 @@ class Gem::Source::Local < Gem::Source
|
|
41
41
|
@specs = {}
|
42
42
|
|
43
43
|
Dir["*.gem"].each do |file|
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
unless pkg.spec.version.prerelease?
|
55
|
-
names << pkg.spec.name_tuple
|
56
|
-
end
|
57
|
-
when :prerelease
|
58
|
-
if pkg.spec.version.prerelease?
|
59
|
-
names << pkg.spec.name_tuple
|
60
|
-
end
|
61
|
-
when :latest
|
62
|
-
tup = pkg.spec.name_tuple
|
63
|
-
|
64
|
-
cur = names.find {|x| x.name == tup.name }
|
65
|
-
if !cur
|
66
|
-
names << tup
|
67
|
-
elsif cur.version < tup.version
|
68
|
-
names.delete cur
|
69
|
-
names << tup
|
70
|
-
end
|
71
|
-
else
|
44
|
+
pkg = Gem::Package.new(file)
|
45
|
+
rescue SystemCallError, Gem::Package::FormatError
|
46
|
+
# ignore
|
47
|
+
else
|
48
|
+
tup = pkg.spec.name_tuple
|
49
|
+
@specs[tup] = [File.expand_path(file), pkg]
|
50
|
+
|
51
|
+
case type
|
52
|
+
when :released
|
53
|
+
unless pkg.spec.version.prerelease?
|
72
54
|
names << pkg.spec.name_tuple
|
73
55
|
end
|
56
|
+
when :prerelease
|
57
|
+
if pkg.spec.version.prerelease?
|
58
|
+
names << pkg.spec.name_tuple
|
59
|
+
end
|
60
|
+
when :latest
|
61
|
+
tup = pkg.spec.name_tuple
|
62
|
+
|
63
|
+
cur = names.find {|x| x.name == tup.name }
|
64
|
+
if !cur
|
65
|
+
names << tup
|
66
|
+
elsif cur.version < tup.version
|
67
|
+
names.delete cur
|
68
|
+
names << tup
|
69
|
+
end
|
70
|
+
else
|
71
|
+
names << pkg.spec.name_tuple
|
74
72
|
end
|
75
73
|
end
|
76
74
|
|
@@ -85,15 +83,14 @@ class Gem::Source::Local < Gem::Source
|
|
85
83
|
found = []
|
86
84
|
|
87
85
|
@specs.each do |n, data|
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
end
|
86
|
+
next unless n.name == gem_name
|
87
|
+
s = data[1].spec
|
88
|
+
|
89
|
+
if version.satisfied_by?(s.version)
|
90
|
+
if prerelease
|
91
|
+
found << s
|
92
|
+
elsif !s.version.prerelease? || version.prerelease?
|
93
|
+
found << s
|
97
94
|
end
|
98
95
|
end
|
99
96
|
end
|
data/lib/rubygems/source.rb
CHANGED
@@ -44,12 +44,12 @@ class Gem::Source
|
|
44
44
|
Gem::Source::Vendor then
|
45
45
|
-1
|
46
46
|
when Gem::Source then
|
47
|
-
|
47
|
+
unless @uri
|
48
48
|
return 0 unless other.uri
|
49
49
|
return 1
|
50
50
|
end
|
51
51
|
|
52
|
-
return -1
|
52
|
+
return -1 unless other.uri
|
53
53
|
|
54
54
|
# Returning 1 here ensures that when sorting a list of sources, the
|
55
55
|
# original ordering of sources supplied by the user is preserved.
|
data/lib/rubygems/source_list.rb
CHANGED
@@ -126,7 +126,7 @@ class Gem::SourceList
|
|
126
126
|
# Gem::Source or a source URI.
|
127
127
|
|
128
128
|
def include?(other)
|
129
|
-
if other.
|
129
|
+
if other.is_a? Gem::Source
|
130
130
|
@sources.include? other
|
131
131
|
else
|
132
132
|
@sources.find {|x| x.uri.to_s == other.to_s }
|
@@ -137,7 +137,7 @@ class Gem::SourceList
|
|
137
137
|
# Deletes +source+ from the source list which may be a Gem::Source or a URI.
|
138
138
|
|
139
139
|
def delete(source)
|
140
|
-
if source.
|
140
|
+
if source.is_a? Gem::Source
|
141
141
|
@sources.delete source
|
142
142
|
else
|
143
143
|
@sources.delete_if {|x| x.uri.to_s == source.to_s }
|
@@ -155,13 +155,11 @@ class Gem::SpecFetcher
|
|
155
155
|
|
156
156
|
specs = []
|
157
157
|
tuples.each do |tup, source|
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
specs << [spec, source]
|
164
|
-
end
|
158
|
+
spec = source.fetch_spec(tup)
|
159
|
+
rescue Gem::RemoteFetcher::FetchError => e
|
160
|
+
errors << Gem::SourceFetchProblem.new(source, e)
|
161
|
+
else
|
162
|
+
specs << [spec, source]
|
165
163
|
end
|
166
164
|
|
167
165
|
return [specs, errors]
|
@@ -215,34 +213,32 @@ class Gem::SpecFetcher
|
|
215
213
|
list = {}
|
216
214
|
|
217
215
|
@sources.each_source do |source|
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
tuples_for(source, :prerelease)
|
238
|
-
else
|
239
|
-
raise Gem::Exception, "Unknown type - :#{type}"
|
240
|
-
end
|
241
|
-
rescue Gem::RemoteFetcher::FetchError => e
|
242
|
-
errors << Gem::SourceFetchProblem.new(source, e)
|
216
|
+
names = case type
|
217
|
+
when :latest
|
218
|
+
tuples_for source, :latest
|
219
|
+
when :released
|
220
|
+
tuples_for source, :released
|
221
|
+
when :complete
|
222
|
+
names =
|
223
|
+
tuples_for(source, :prerelease, true) +
|
224
|
+
tuples_for(source, :released)
|
225
|
+
|
226
|
+
names.sort
|
227
|
+
when :abs_latest
|
228
|
+
names =
|
229
|
+
tuples_for(source, :prerelease, true) +
|
230
|
+
tuples_for(source, :latest)
|
231
|
+
|
232
|
+
names.sort
|
233
|
+
when :prerelease
|
234
|
+
tuples_for(source, :prerelease)
|
243
235
|
else
|
244
|
-
|
236
|
+
raise Gem::Exception, "Unknown type - :#{type}"
|
245
237
|
end
|
238
|
+
rescue Gem::RemoteFetcher::FetchError => e
|
239
|
+
errors << Gem::SourceFetchProblem.new(source, e)
|
240
|
+
else
|
241
|
+
list[source] = names
|
246
242
|
end
|
247
243
|
|
248
244
|
[list, errors]
|