rubygems-update 3.2.0.rc.2 → 3.2.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/{History.txt → CHANGELOG.md} +520 -501
- data/Manifest.txt +62 -55
- data/POLICIES.md +4 -3
- data/Rakefile +23 -7
- data/bundler/CHANGELOG.md +84 -19
- data/bundler/UPGRADING.md +1 -1
- data/bundler/bundler.gemspec +1 -1
- data/bundler/lib/bundler.rb +11 -0
- data/bundler/lib/bundler/build_metadata.rb +2 -2
- data/bundler/lib/bundler/cli.rb +5 -5
- data/bundler/lib/bundler/cli/binstubs.rb +6 -2
- data/bundler/lib/bundler/cli/exec.rb +3 -3
- data/bundler/lib/bundler/cli/install.rb +14 -5
- data/bundler/lib/bundler/cli/outdated.rb +0 -2
- data/bundler/lib/bundler/cli/update.rb +1 -1
- data/bundler/lib/bundler/compact_index_client/cache.rb +5 -13
- data/bundler/lib/bundler/compact_index_client/gem_parser.rb +28 -0
- data/bundler/lib/bundler/compact_index_client/updater.rb +5 -5
- data/bundler/lib/bundler/definition.rb +23 -25
- data/bundler/lib/bundler/dependency.rb +3 -1
- data/bundler/lib/bundler/env.rb +1 -1
- data/bundler/lib/bundler/feature_flag.rb +0 -1
- data/bundler/lib/bundler/fetcher/index.rb +2 -3
- data/bundler/lib/bundler/friendly_errors.rb +15 -0
- data/bundler/lib/bundler/gem_helpers.rb +30 -24
- data/bundler/lib/bundler/index.rb +5 -1
- data/bundler/lib/bundler/injector.rb +9 -2
- data/bundler/lib/bundler/installer.rb +7 -5
- data/bundler/lib/bundler/lazy_specification.rb +20 -9
- data/bundler/lib/bundler/man/.document +1 -0
- data/bundler/{man → lib/bundler/man}/bundle-add.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-add.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-binstubs.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-binstubs.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-cache.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-cache.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-check.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-check.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-clean.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-clean.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-config.1 +2 -5
- data/bundler/{man → lib/bundler/man}/bundle-config.1.ronn +1 -9
- data/bundler/{man → lib/bundler/man}/bundle-doctor.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-doctor.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-exec.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-exec.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-gem.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-gem.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-info.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-info.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-init.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-init.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-inject.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-inject.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-install.1 +2 -2
- data/bundler/{man → lib/bundler/man}/bundle-install.1.ronn +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-list.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-list.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-lock.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-lock.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-open.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-open.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-outdated.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-outdated.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-platform.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-platform.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-pristine.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-pristine.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-remove.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-remove.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-show.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-show.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-update.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-update.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-viz.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-viz.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/gemfile.5 +1 -1
- data/bundler/{man → lib/bundler/man}/gemfile.5.ronn +0 -0
- data/bundler/lib/bundler/man/index.txt +25 -0
- data/bundler/lib/bundler/plugin/api/source.rb +1 -1
- data/bundler/lib/bundler/plugin/dsl.rb +1 -1
- data/bundler/lib/bundler/resolver.rb +25 -29
- data/bundler/lib/bundler/resolver/spec_group.rb +19 -25
- data/bundler/lib/bundler/rubygems_integration.rb +4 -6
- data/bundler/lib/bundler/settings.rb +0 -1
- data/bundler/lib/bundler/source/git/git_proxy.rb +28 -41
- data/bundler/lib/bundler/spec_set.rb +6 -8
- data/bundler/lib/bundler/stub_specification.rb +0 -2
- data/bundler/lib/bundler/templates/newgem/README.md.tt +0 -1
- data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +2 -2
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +6 -0
- data/bundler/lib/bundler/uri_credentials_filter.rb +2 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +34 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +2 -2
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +38 -40
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +12 -8
- data/bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +154 -0
- data/bundler/lib/bundler/vendored_tmpdir.rb +4 -0
- data/bundler/lib/bundler/version.rb +1 -1
- data/lib/rubygems.rb +6 -2
- data/lib/rubygems/available_set.rb +1 -1
- data/lib/rubygems/command_manager.rb +2 -2
- data/lib/rubygems/commands/build_command.rb +37 -20
- data/lib/rubygems/commands/cert_command.rb +1 -1
- data/lib/rubygems/commands/help_command.rb +2 -0
- data/lib/rubygems/commands/owner_command.rb +10 -3
- data/lib/rubygems/commands/pristine_command.rb +1 -1
- data/lib/rubygems/commands/push_command.rb +7 -4
- data/lib/rubygems/commands/query_command.rb +17 -0
- data/lib/rubygems/commands/server_command.rb +4 -0
- data/lib/rubygems/commands/setup_command.rb +26 -90
- data/lib/rubygems/commands/sources_command.rb +6 -2
- data/lib/rubygems/commands/specification_command.rb +6 -0
- data/lib/rubygems/commands/yank_command.rb +4 -5
- data/lib/rubygems/core_ext/kernel_require.rb +3 -0
- data/lib/rubygems/core_ext/kernel_warn.rb +6 -7
- data/lib/rubygems/defaults.rb +2 -2
- data/lib/rubygems/dependency.rb +1 -1
- data/lib/rubygems/dependency_installer.rb +5 -3
- data/lib/rubygems/ext/builder.rb +16 -35
- data/lib/rubygems/ext/cmake_builder.rb +5 -6
- data/lib/rubygems/ext/configure_builder.rb +5 -6
- data/lib/rubygems/ext/ext_conf_builder.rb +19 -14
- data/lib/rubygems/ext/rake_builder.rb +4 -4
- data/lib/rubygems/gemcutter_utilities.rb +101 -20
- data/lib/rubygems/indexer.rb +0 -1
- data/lib/rubygems/install_update_options.rb +2 -2
- data/lib/rubygems/installer.rb +12 -32
- data/lib/rubygems/installer_test_case.rb +7 -6
- data/lib/rubygems/name_tuple.rb +1 -1
- data/lib/rubygems/openssl.rb +4 -4
- data/lib/rubygems/package.rb +3 -2
- data/lib/rubygems/package/tar_header.rb +1 -1
- data/lib/rubygems/package/tar_test_case.rb +1 -1
- data/lib/rubygems/platform.rb +18 -7
- data/lib/rubygems/query_utils.rb +0 -9
- data/lib/rubygems/remote_fetcher.rb +5 -4
- data/lib/rubygems/request.rb +4 -3
- data/lib/rubygems/request_set.rb +2 -13
- data/lib/rubygems/request_set/gem_dependency_api.rb +4 -4
- data/lib/rubygems/requirement.rb +1 -1
- data/lib/rubygems/resolver.rb +7 -2
- data/lib/rubygems/resolver/activation_request.rb +9 -1
- data/lib/rubygems/resolver/api_set.rb +29 -20
- data/lib/rubygems/resolver/api_set/gem_parser.rb +20 -0
- data/lib/rubygems/resolver/api_specification.rb +8 -3
- data/lib/rubygems/resolver/best_set.rb +2 -2
- data/lib/rubygems/resolver/conflict.rb +1 -1
- data/lib/rubygems/resolver/dependency_request.rb +1 -1
- data/lib/rubygems/resolver/index_specification.rb +29 -0
- data/lib/rubygems/resolver/installer_set.rb +58 -9
- data/lib/rubygems/resolver/lock_set.rb +1 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo.rb +6 -5
- data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb +7 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +39 -5
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb +7 -6
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb +4 -3
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb +43 -10
- data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +75 -7
- data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb +3 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb +506 -165
- data/lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb +3 -2
- data/lib/rubygems/resolver/molinillo/lib/molinillo/state.rb +8 -4
- data/lib/rubygems/resolver/spec_specification.rb +14 -0
- data/lib/rubygems/resolver/specification.rb +13 -1
- data/lib/rubygems/s3_uri_signer.rb +1 -1
- data/lib/rubygems/security.rb +1 -2
- data/lib/rubygems/security/policy.rb +1 -1
- data/lib/rubygems/security/signer.rb +1 -1
- data/lib/rubygems/server.rb +7 -2
- data/lib/rubygems/source.rb +20 -9
- data/lib/rubygems/spec_fetcher.rb +1 -1
- data/lib/rubygems/specification.rb +8 -8
- data/lib/rubygems/ssl_certs/{index.rubygems.org → rubygems.org}/GlobalSignRootCA.pem +0 -0
- data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem +21 -0
- data/lib/rubygems/stub_specification.rb +1 -1
- data/lib/rubygems/test_case.rb +14 -27
- data/lib/rubygems/test_utilities.rb +6 -5
- data/lib/rubygems/uri_formatter.rb +2 -1
- data/lib/rubygems/version_option.rb +6 -0
- data/rubygems-update.gemspec +2 -2
- data/test/rubygems/data/null-required-rubygems-version.gemspec.rz +0 -0
- data/test/rubygems/test_bundled_ca.rb +9 -5
- data/test/rubygems/test_gem.rb +3 -3
- data/test/rubygems/test_gem_commands_build_command.rb +197 -5
- data/test/rubygems/test_gem_commands_cert_command.rb +2 -2
- data/test/rubygems/test_gem_commands_cleanup_command.rb +1 -1
- data/test/rubygems/test_gem_commands_contents_command.rb +2 -2
- data/test/rubygems/test_gem_commands_help_command.rb +15 -2
- data/test/rubygems/test_gem_commands_install_command.rb +132 -1
- data/test/rubygems/test_gem_commands_owner_command.rb +49 -1
- data/test/rubygems/test_gem_commands_pristine_command.rb +2 -2
- data/test/rubygems/test_gem_commands_push_command.rb +70 -5
- data/test/rubygems/test_gem_commands_query_command.rb +3 -3
- data/test/rubygems/test_gem_commands_setup_command.rb +20 -48
- data/test/rubygems/test_gem_commands_signin_command.rb +27 -3
- data/test/rubygems/test_gem_commands_sources_command.rb +60 -0
- data/test/rubygems/test_gem_commands_specification_command.rb +28 -0
- data/test/rubygems/test_gem_commands_update_command.rb +2 -2
- data/test/rubygems/test_gem_commands_yank_command.rb +31 -1
- data/test/rubygems/test_gem_dependency_installer.rb +63 -49
- data/test/rubygems/test_gem_dependency_list.rb +2 -2
- data/test/rubygems/test_gem_ext_builder.rb +16 -20
- data/test/rubygems/test_gem_ext_cmake_builder.rb +5 -13
- data/test/rubygems/test_gem_ext_configure_builder.rb +5 -11
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +9 -26
- data/test/rubygems/test_gem_ext_rake_builder.rb +30 -13
- data/test/rubygems/test_gem_gem_runner.rb +5 -4
- data/test/rubygems/test_gem_gemcutter_utilities.rb +3 -3
- data/test/rubygems/test_gem_install_update_options.rb +15 -3
- data/test/rubygems/test_gem_installer.rb +80 -71
- data/test/rubygems/test_gem_package.rb +8 -8
- data/test/rubygems/test_gem_package_old.rb +4 -4
- data/test/rubygems/test_gem_package_tar_writer.rb +1 -1
- data/test/rubygems/test_gem_platform.rb +63 -4
- data/test/rubygems/test_gem_remote_fetcher.rb +15 -19
- data/test/rubygems/test_gem_request.rb +2 -2
- data/test/rubygems/test_gem_request_set_lockfile.rb +4 -4
- data/test/rubygems/test_gem_resolver_api_set.rb +58 -55
- data/test/rubygems/test_gem_resolver_api_specification.rb +3 -3
- data/test/rubygems/test_gem_resolver_best_set.rb +26 -3
- data/test/rubygems/test_gem_resolver_conflict.rb +1 -1
- data/test/rubygems/test_gem_resolver_vendor_set.rb +1 -1
- data/test/rubygems/test_gem_security.rb +2 -2
- data/test/rubygems/test_gem_security_policy.rb +2 -2
- data/test/rubygems/test_gem_security_signer.rb +2 -2
- data/test/rubygems/test_gem_security_trust_dir.rb +2 -2
- data/test/rubygems/test_gem_source.rb +7 -2
- data/test/rubygems/test_gem_source_subpath_problem.rb +49 -0
- data/test/rubygems/test_gem_specification.rb +6 -7
- data/test/rubygems/test_gem_uninstaller.rb +7 -7
- data/test/rubygems/test_gem_validator.rb +1 -1
- data/test/rubygems/test_gem_version_option.rb +1 -1
- data/test/rubygems/test_require.rb +50 -9
- data/test/test_changelog_generator.rb +17 -0
- metadata +69 -86
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +0 -26
- data/lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -23
- data/lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -25
data/lib/rubygems/query_utils.rb
CHANGED
@@ -57,15 +57,6 @@ module Gem::QueryUtils
|
|
57
57
|
"--local --name-matches // --no-details --versions --no-installed"
|
58
58
|
end
|
59
59
|
|
60
|
-
def description # :nodoc:
|
61
|
-
<<-EOF
|
62
|
-
The query command is the basis for the list and search commands.
|
63
|
-
|
64
|
-
You should really use the list and search commands instead. This command
|
65
|
-
is too hard to use.
|
66
|
-
EOF
|
67
|
-
end
|
68
|
-
|
69
60
|
def execute
|
70
61
|
gem_names = Array(options[:name])
|
71
62
|
|
@@ -26,13 +26,15 @@ class Gem::RemoteFetcher
|
|
26
26
|
##
|
27
27
|
# The URI which was being accessed when the exception happened.
|
28
28
|
|
29
|
-
attr_accessor :uri
|
29
|
+
attr_accessor :uri, :original_uri
|
30
30
|
|
31
31
|
def initialize(message, uri)
|
32
32
|
super message
|
33
33
|
|
34
34
|
uri = parse_uri(uri)
|
35
35
|
|
36
|
+
@original_uri = uri.dup
|
37
|
+
|
36
38
|
uri.password = 'REDACTED' if uri.respond_to?(:password) && uri.password
|
37
39
|
|
38
40
|
@uri = uri.to_s
|
@@ -78,7 +80,6 @@ class Gem::RemoteFetcher
|
|
78
80
|
def initialize(proxy=nil, dns=nil, headers={})
|
79
81
|
require 'net/http'
|
80
82
|
require 'stringio'
|
81
|
-
require 'time'
|
82
83
|
require 'uri'
|
83
84
|
|
84
85
|
Socket.do_not_reverse_lookup = true
|
@@ -216,7 +217,7 @@ class Gem::RemoteFetcher
|
|
216
217
|
|
217
218
|
case response
|
218
219
|
when Net::HTTPOK, Net::HTTPNotModified then
|
219
|
-
response.uri = uri
|
220
|
+
response.uri = uri
|
220
221
|
head ? response : response.body
|
221
222
|
when Net::HTTPMovedPermanently, Net::HTTPFound, Net::HTTPSeeOther,
|
222
223
|
Net::HTTPTemporaryRedirect then
|
@@ -263,7 +264,7 @@ class Gem::RemoteFetcher
|
|
263
264
|
rescue Timeout::Error
|
264
265
|
raise UnknownHostError.new('timed out', uri)
|
265
266
|
rescue IOError, SocketError, SystemCallError,
|
266
|
-
*(OpenSSL::SSL::SSLError if
|
267
|
+
*(OpenSSL::SSL::SSLError if Gem::HAVE_OPENSSL) => e
|
267
268
|
if e.message =~ /getaddrinfo/
|
268
269
|
raise UnknownHostError.new('no such name', uri)
|
269
270
|
else
|
data/lib/rubygems/request.rb
CHANGED
@@ -1,6 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
require 'net/http'
|
3
|
-
require 'time'
|
4
3
|
require 'rubygems/user_interaction'
|
5
4
|
|
6
5
|
class Gem::Request
|
@@ -45,7 +44,8 @@ class Gem::Request
|
|
45
44
|
end
|
46
45
|
|
47
46
|
def self.configure_connection_for_https(connection, cert_files)
|
48
|
-
|
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
|
+
|
49
49
|
connection.use_ssl = true
|
50
50
|
connection.verify_mode =
|
51
51
|
Gem.configuration.ssl_verify_mode || OpenSSL::SSL::VERIFY_PEER
|
@@ -125,7 +125,7 @@ class Gem::Request
|
|
125
125
|
|
126
126
|
def connection_for(uri)
|
127
127
|
@connection_pool.checkout
|
128
|
-
rescue
|
128
|
+
rescue Gem::HAVE_OPENSSL ? OpenSSL::SSL::SSLError : Errno::EHOSTDOWN,
|
129
129
|
Errno::EHOSTDOWN => e
|
130
130
|
raise Gem::RemoteFetcher::FetchError.new(e.message, uri)
|
131
131
|
end
|
@@ -143,6 +143,7 @@ class Gem::Request
|
|
143
143
|
request.add_field 'Keep-Alive', '30'
|
144
144
|
|
145
145
|
if @last_modified
|
146
|
+
require 'time'
|
146
147
|
request.add_field 'If-Modified-Since', @last_modified.httpdate
|
147
148
|
end
|
148
149
|
|
data/lib/rubygems/request_set.rb
CHANGED
@@ -195,19 +195,8 @@ class Gem::RequestSet
|
|
195
195
|
yield req, installer if block_given?
|
196
196
|
end
|
197
197
|
rescue Gem::RuntimeRequirementNotMetError => e
|
198
|
-
|
199
|
-
|
200
|
-
s.required_ruby_version.satisfied_by?(Gem.ruby_version) &&
|
201
|
-
s.required_rubygems_version.satisfied_by?(Gem.rubygems_version) &&
|
202
|
-
Gem::Platform.installable?(s)
|
203
|
-
end
|
204
|
-
if recent_match
|
205
|
-
suggestion = "The last version of #{req.request} to support your Ruby & RubyGems was #{recent_match.version}. Try installing it with `gem install #{recent_match.name} -v #{recent_match.version}`"
|
206
|
-
suggestion += " and then running the current command again" unless @always_install.include?(req.spec.spec)
|
207
|
-
else
|
208
|
-
suggestion = "There are no versions of #{req.request} compatible with your Ruby & RubyGems"
|
209
|
-
suggestion += ". Maybe try installing an older version of the gem you're looking for?" unless @always_install.include?(req.spec.spec)
|
210
|
-
end
|
198
|
+
suggestion = "There are no versions of #{req.request} compatible with your Ruby & RubyGems"
|
199
|
+
suggestion += ". Maybe try installing an older version of the gem you're looking for?" unless @always_install.include?(req.spec.spec)
|
211
200
|
e.suggestion = suggestion
|
212
201
|
raise
|
213
202
|
end
|
@@ -88,7 +88,7 @@ class Gem::RequestSet::GemDependencyAPI
|
|
88
88
|
:truffleruby => Gem::Platform::RUBY,
|
89
89
|
:x64_mingw => x64_mingw,
|
90
90
|
:x64_mingw_20 => x64_mingw,
|
91
|
-
:x64_mingw_21 => x64_mingw
|
91
|
+
:x64_mingw_21 => x64_mingw,
|
92
92
|
}.freeze
|
93
93
|
|
94
94
|
gt_eq_0 = Gem::Requirement.new '>= 0'
|
@@ -379,7 +379,7 @@ class Gem::RequestSet::GemDependencyAPI
|
|
379
379
|
Gem::Requirement.create requirements
|
380
380
|
end
|
381
381
|
|
382
|
-
return unless gem_platforms options
|
382
|
+
return unless gem_platforms name, options
|
383
383
|
|
384
384
|
groups = gem_group name, options
|
385
385
|
|
@@ -532,7 +532,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
|
|
532
532
|
# Handles the platforms: option from +options+. Returns true if the
|
533
533
|
# platform matches the current platform.
|
534
534
|
|
535
|
-
def gem_platforms(options) # :nodoc:
|
535
|
+
def gem_platforms(name, options) # :nodoc:
|
536
536
|
platform_names = Array(options.delete :platform)
|
537
537
|
platform_names.concat Array(options.delete :platforms)
|
538
538
|
platform_names.concat @current_platforms if @current_platforms
|
@@ -543,7 +543,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
|
|
543
543
|
raise ArgumentError, "unknown platform #{platform_name.inspect}" unless
|
544
544
|
platform = PLATFORM_MAP[platform_name]
|
545
545
|
|
546
|
-
next false unless Gem::Platform.
|
546
|
+
next false unless Gem::Platform.match_gem? platform, name
|
547
547
|
|
548
548
|
if engines = ENGINE_MAP[platform_name]
|
549
549
|
next false unless engines.include? Gem.ruby_engine
|
data/lib/rubygems/requirement.rb
CHANGED
@@ -16,7 +16,7 @@ class Gem::Requirement
|
|
16
16
|
"<" => lambda {|v, r| v < r },
|
17
17
|
">=" => lambda {|v, r| v >= r },
|
18
18
|
"<=" => lambda {|v, r| v <= r },
|
19
|
-
"~>" => lambda {|v, r| v >= r && v.release < r.bump }
|
19
|
+
"~>" => lambda {|v, r| v >= r && v.release < r.bump },
|
20
20
|
}.freeze
|
21
21
|
|
22
22
|
SOURCE_SET_REQUIREMENT = Struct.new(:for_lockfile).new "!" # :nodoc:
|
data/lib/rubygems/resolver.rb
CHANGED
@@ -261,7 +261,12 @@ class Gem::Resolver
|
|
261
261
|
end
|
262
262
|
|
263
263
|
def requirement_satisfied_by?(requirement, activated, spec)
|
264
|
-
requirement.matches_spec? spec
|
264
|
+
matches_spec = requirement.matches_spec? spec
|
265
|
+
return matches_spec if @soft_missing
|
266
|
+
|
267
|
+
matches_spec &&
|
268
|
+
spec.spec.required_ruby_version.satisfied_by?(Gem.ruby_version) &&
|
269
|
+
spec.spec.required_rubygems_version.satisfied_by?(Gem.rubygems_version)
|
265
270
|
end
|
266
271
|
|
267
272
|
def name_for(dependency)
|
@@ -281,7 +286,7 @@ class Gem::Resolver
|
|
281
286
|
amount_constrained(dependency),
|
282
287
|
conflicts[name] ? 0 : 1,
|
283
288
|
activated.vertex_named(name).payload ? 0 : search_for(dependency).count,
|
284
|
-
i # for stable sort
|
289
|
+
i, # for stable sort
|
285
290
|
]
|
286
291
|
end
|
287
292
|
end
|
@@ -28,12 +28,20 @@ class Gem::Resolver::ActivationRequest
|
|
28
28
|
when Gem::Specification
|
29
29
|
@spec == other
|
30
30
|
when Gem::Resolver::ActivationRequest
|
31
|
-
@spec == other.spec
|
31
|
+
@spec == other.spec
|
32
32
|
else
|
33
33
|
false
|
34
34
|
end
|
35
35
|
end
|
36
36
|
|
37
|
+
def eql?(other)
|
38
|
+
self == other
|
39
|
+
end
|
40
|
+
|
41
|
+
def hash
|
42
|
+
@spec.hash
|
43
|
+
end
|
44
|
+
|
37
45
|
##
|
38
46
|
# Is this activation request for a development dependency?
|
39
47
|
|
@@ -4,6 +4,8 @@
|
|
4
4
|
# Returns instances of APISpecification.
|
5
5
|
|
6
6
|
class Gem::Resolver::APISet < Gem::Resolver::Set
|
7
|
+
autoload :GemParser, File.expand_path("api_set/gem_parser", __dir__)
|
8
|
+
|
7
9
|
##
|
8
10
|
# The URI for the dependency API this APISet uses.
|
9
11
|
|
@@ -24,13 +26,13 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
|
|
24
26
|
# API URL +dep_uri+ which is described at
|
25
27
|
# https://guides.rubygems.org/rubygems-org-api
|
26
28
|
|
27
|
-
def initialize(dep_uri = 'https://rubygems.org/
|
29
|
+
def initialize(dep_uri = 'https://index.rubygems.org/info/')
|
28
30
|
super()
|
29
31
|
|
30
32
|
dep_uri = URI dep_uri unless URI === dep_uri
|
31
33
|
|
32
34
|
@dep_uri = dep_uri
|
33
|
-
@uri = dep_uri + '
|
35
|
+
@uri = dep_uri + '..'
|
34
36
|
|
35
37
|
@data = Hash.new {|h,k| h[k] = [] }
|
36
38
|
@source = Gem::Source.new @uri
|
@@ -52,7 +54,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
|
|
52
54
|
end
|
53
55
|
|
54
56
|
versions(req.name).each do |ver|
|
55
|
-
if req.dependency.match? req.name, ver[:number]
|
57
|
+
if req.dependency.match? req.name, ver[:number], @prerelease
|
56
58
|
res << Gem::Resolver::APISpecification.new(self, ver)
|
57
59
|
end
|
58
60
|
end
|
@@ -75,20 +77,8 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
|
|
75
77
|
def prefetch_now # :nodoc:
|
76
78
|
needed, @to_fetch = @to_fetch, []
|
77
79
|
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
loaded = []
|
82
|
-
|
83
|
-
Marshal.load(str).each do |ver|
|
84
|
-
name = ver[:name]
|
85
|
-
|
86
|
-
@data[name] << ver
|
87
|
-
loaded << name
|
88
|
-
end
|
89
|
-
|
90
|
-
(needed - loaded).each do |missing|
|
91
|
-
@data[missing] = []
|
80
|
+
needed.sort.each do |name|
|
81
|
+
versions(name)
|
92
82
|
end
|
93
83
|
end
|
94
84
|
|
@@ -111,13 +101,32 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
|
|
111
101
|
return @data[name]
|
112
102
|
end
|
113
103
|
|
114
|
-
uri = @dep_uri +
|
104
|
+
uri = @dep_uri + name
|
115
105
|
str = Gem::RemoteFetcher.fetcher.fetch_path uri
|
116
106
|
|
117
|
-
|
118
|
-
|
107
|
+
lines(str).each do |ver|
|
108
|
+
number, platform, dependencies, requirements = parse_gem(ver)
|
109
|
+
|
110
|
+
platform ||= "ruby"
|
111
|
+
dependencies = dependencies.map {|dep_name, reqs| [dep_name, reqs.join(", ")] }
|
112
|
+
requirements = requirements.map {|req_name, reqs| [req_name.to_sym, reqs] }.to_h
|
113
|
+
|
114
|
+
@data[name] << { name: name, number: number, platform: platform, dependencies: dependencies, requirements: requirements }
|
119
115
|
end
|
120
116
|
|
121
117
|
@data[name]
|
122
118
|
end
|
119
|
+
|
120
|
+
private
|
121
|
+
|
122
|
+
def lines(str)
|
123
|
+
lines = str.split("\n")
|
124
|
+
header = lines.index("---")
|
125
|
+
header ? lines[header + 1..-1] : lines
|
126
|
+
end
|
127
|
+
|
128
|
+
def parse_gem(string)
|
129
|
+
@gem_parser ||= GemParser.new
|
130
|
+
@gem_parser.parse(string)
|
131
|
+
end
|
123
132
|
end
|
@@ -0,0 +1,20 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class Gem::Resolver::APISet::GemParser
|
4
|
+
def parse(line)
|
5
|
+
version_and_platform, rest = line.split(" ", 2)
|
6
|
+
version, platform = version_and_platform.split("-", 2)
|
7
|
+
dependencies, requirements = rest.split("|", 2).map {|s| s.split(",") } if rest
|
8
|
+
dependencies = dependencies ? dependencies.map {|d| parse_dependency(d) } : []
|
9
|
+
requirements = requirements ? requirements.map {|d| parse_dependency(d) } : []
|
10
|
+
[version, platform, dependencies, requirements]
|
11
|
+
end
|
12
|
+
|
13
|
+
private
|
14
|
+
|
15
|
+
def parse_dependency(string)
|
16
|
+
dependency = string.split(":")
|
17
|
+
dependency[-1] = dependency[-1].split("&") if dependency.size > 1
|
18
|
+
dependency
|
19
|
+
end
|
20
|
+
end
|
@@ -35,6 +35,8 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
|
|
35
35
|
@dependencies = api_data[:dependencies].map do |name, ver|
|
36
36
|
Gem::Dependency.new(name, ver.split(/\s*,\s*/)).freeze
|
37
37
|
end.freeze
|
38
|
+
@required_ruby_version = Gem::Requirement.new(api_data.dig(:requirements, :ruby)).freeze
|
39
|
+
@required_rubygems_version = Gem::Requirement.new(api_data.dig(:requirements, :rubygems)).freeze
|
38
40
|
end
|
39
41
|
|
40
42
|
def ==(other) # :nodoc:
|
@@ -42,8 +44,11 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
|
|
42
44
|
@set == other.set and
|
43
45
|
@name == other.name and
|
44
46
|
@version == other.version and
|
45
|
-
@platform == other.platform
|
46
|
-
|
47
|
+
@platform == other.platform
|
48
|
+
end
|
49
|
+
|
50
|
+
def hash
|
51
|
+
@set.hash ^ @name.hash ^ @version.hash ^ @platform.hash
|
47
52
|
end
|
48
53
|
|
49
54
|
def fetch_development_dependencies # :nodoc:
|
@@ -53,7 +58,7 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
|
|
53
58
|
end
|
54
59
|
|
55
60
|
def installable_platform? # :nodoc:
|
56
|
-
Gem::Platform.
|
61
|
+
Gem::Platform.match_gem? @platform, @name
|
57
62
|
end
|
58
63
|
|
59
64
|
def pretty_print(q) # :nodoc:
|
@@ -58,9 +58,9 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
|
|
58
58
|
# The calling method must retry the exception to repeat the lookup.
|
59
59
|
|
60
60
|
def replace_failed_api_set(error) # :nodoc:
|
61
|
-
uri = error.
|
61
|
+
uri = error.original_uri
|
62
62
|
uri = URI uri unless URI === uri
|
63
|
-
uri
|
63
|
+
uri = uri + "."
|
64
64
|
|
65
65
|
raise error unless api_set = @sets.find do |set|
|
66
66
|
Gem::Resolver::APISet === set and set.dep_uri == uri
|
@@ -33,6 +33,35 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
|
|
33
33
|
spec.dependencies
|
34
34
|
end
|
35
35
|
|
36
|
+
##
|
37
|
+
# The required_ruby_version constraint for this specification
|
38
|
+
|
39
|
+
def required_ruby_version
|
40
|
+
spec.required_ruby_version
|
41
|
+
end
|
42
|
+
|
43
|
+
##
|
44
|
+
# The required_rubygems_version constraint for this specification
|
45
|
+
#
|
46
|
+
# A fallback is included because the original version of the specification
|
47
|
+
# API didn't include that field, so some marshalled specs in the index have it
|
48
|
+
# set to +nil+.
|
49
|
+
|
50
|
+
def required_rubygems_version
|
51
|
+
spec.required_rubygems_version || Gem::Requirement.default
|
52
|
+
end
|
53
|
+
|
54
|
+
def ==(other)
|
55
|
+
self.class === other &&
|
56
|
+
@name == other.name &&
|
57
|
+
@version == other.version &&
|
58
|
+
@platform == other.platform
|
59
|
+
end
|
60
|
+
|
61
|
+
def hash
|
62
|
+
@name.hash ^ @version.hash ^ @platform.hash
|
63
|
+
end
|
64
|
+
|
36
65
|
def inspect # :nodoc:
|
37
66
|
'#<%s %s source %s>' % [self.class, full_name, @source]
|
38
67
|
end
|
@@ -25,6 +25,12 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
25
25
|
|
26
26
|
attr_reader :remote_set # :nodoc:
|
27
27
|
|
28
|
+
##
|
29
|
+
# Ignore ruby & rubygems specification constraints.
|
30
|
+
#
|
31
|
+
|
32
|
+
attr_accessor :force # :nodoc:
|
33
|
+
|
28
34
|
##
|
29
35
|
# Creates a new InstallerSet that will look for gems in +domain+.
|
30
36
|
|
@@ -32,7 +38,6 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
32
38
|
super()
|
33
39
|
|
34
40
|
@domain = domain
|
35
|
-
@remote = consider_remote?
|
36
41
|
|
37
42
|
@f = Gem::SpecFetcher.fetcher
|
38
43
|
|
@@ -42,6 +47,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
42
47
|
@local = {}
|
43
48
|
@local_source = Gem::Source::Local.new
|
44
49
|
@remote_set = Gem::Resolver::BestSet.new
|
50
|
+
@force = false
|
45
51
|
@specs = {}
|
46
52
|
end
|
47
53
|
|
@@ -64,15 +70,30 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
64
70
|
Gem::Platform.local === s.platform
|
65
71
|
end
|
66
72
|
|
67
|
-
|
68
|
-
|
69
|
-
exc.errors = errors
|
70
|
-
|
71
|
-
raise exc
|
73
|
+
found = found.sort_by do |s|
|
74
|
+
[s.version, s.platform == Gem::Platform::RUBY ? -1 : 1]
|
72
75
|
end
|
73
76
|
|
74
|
-
newest = found.
|
75
|
-
|
77
|
+
newest = found.last
|
78
|
+
|
79
|
+
unless @force
|
80
|
+
found_matching_metadata = found.select do |spec|
|
81
|
+
metadata_satisfied?(spec)
|
82
|
+
end
|
83
|
+
|
84
|
+
if found_matching_metadata.empty?
|
85
|
+
if newest
|
86
|
+
ensure_required_ruby_version_met(newest.spec)
|
87
|
+
ensure_required_rubygems_version_met(newest.spec)
|
88
|
+
else
|
89
|
+
exc = Gem::UnsatisfiableDependencyError.new request
|
90
|
+
exc.errors = errors
|
91
|
+
|
92
|
+
raise exc
|
93
|
+
end
|
94
|
+
else
|
95
|
+
newest = found_matching_metadata.last
|
96
|
+
end
|
76
97
|
end
|
77
98
|
|
78
99
|
@always_install << newest.spec
|
@@ -170,7 +191,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
170
191
|
always_install = @always_install.map {|s| s.full_name }
|
171
192
|
|
172
193
|
'#<%s domain: %s specs: %p always install: %p>' % [
|
173
|
-
self.class, @domain, @specs.keys, always_install
|
194
|
+
self.class, @domain, @specs.keys, always_install
|
174
195
|
]
|
175
196
|
end
|
176
197
|
|
@@ -222,4 +243,32 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
222
243
|
@domain = :local unless remote
|
223
244
|
end
|
224
245
|
end
|
246
|
+
|
247
|
+
private
|
248
|
+
|
249
|
+
def metadata_satisfied?(spec)
|
250
|
+
spec.required_ruby_version.satisfied_by?(Gem.ruby_version) &&
|
251
|
+
spec.required_rubygems_version.satisfied_by?(Gem.rubygems_version)
|
252
|
+
end
|
253
|
+
|
254
|
+
def ensure_required_ruby_version_met(spec) # :nodoc:
|
255
|
+
if rrv = spec.required_ruby_version
|
256
|
+
ruby_version = Gem.ruby_version
|
257
|
+
unless rrv.satisfied_by? ruby_version
|
258
|
+
raise Gem::RuntimeRequirementNotMetError,
|
259
|
+
"#{spec.full_name} requires Ruby version #{rrv}. The current ruby version is #{ruby_version}."
|
260
|
+
end
|
261
|
+
end
|
262
|
+
end
|
263
|
+
|
264
|
+
def ensure_required_rubygems_version_met(spec) # :nodoc:
|
265
|
+
if rrgv = spec.required_rubygems_version
|
266
|
+
unless rrgv.satisfied_by? Gem.rubygems_version
|
267
|
+
rg_version = Gem::VERSION
|
268
|
+
raise Gem::RuntimeRequirementNotMetError,
|
269
|
+
"#{spec.full_name} requires RubyGems version #{rrgv}. The current RubyGems version is #{rg_version}. " +
|
270
|
+
"Try 'gem update --system' to update RubyGems itself."
|
271
|
+
end
|
272
|
+
end
|
273
|
+
end
|
225
274
|
end
|