rubygems-update 3.2.0.rc.2 → 3.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/History.txt +54 -51
- data/Manifest.txt +32 -29
- data/Rakefile +3 -1
- data/bundler/CHANGELOG.md +35 -1
- data/bundler/UPGRADING.md +1 -1
- data/bundler/lib/bundler.rb +4 -0
- data/bundler/lib/bundler/build_metadata.rb +2 -2
- data/bundler/lib/bundler/cli.rb +5 -2
- data/bundler/lib/bundler/cli/binstubs.rb +6 -2
- data/bundler/lib/bundler/cli/exec.rb +3 -3
- data/bundler/lib/bundler/cli/outdated.rb +2 -4
- data/bundler/lib/bundler/compact_index_client/updater.rb +5 -5
- data/bundler/lib/bundler/definition.rb +4 -9
- 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/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 +5 -7
- data/bundler/lib/bundler/man/.document +1 -0
- data/bundler/{man → lib/bundler/man}/bundle-add.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-binstubs.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-cache.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-check.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-clean.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-config.1.ronn +1 -9
- data/bundler/{man → lib/bundler/man}/bundle-doctor.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-exec.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-gem.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-info.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-init.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-inject.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-install.1.ronn +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-list.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-lock.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-open.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-outdated.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-platform.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-pristine.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-remove.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-show.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-update.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-viz.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/bundle.1.ronn +0 -0
- data/bundler/{man → lib/bundler/man}/gemfile.5.ronn +0 -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 +2 -3
- data/bundler/lib/bundler/rubygems_integration.rb +4 -0
- data/bundler/lib/bundler/settings.rb +0 -1
- data/bundler/lib/bundler/source/git/git_proxy.rb +1 -1
- data/bundler/lib/bundler/spec_set.rb +1 -0
- 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 +4 -7
- 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/bundler/man/bundle-add.1 +1 -1
- data/bundler/man/bundle-binstubs.1 +1 -1
- data/bundler/man/bundle-cache.1 +1 -1
- data/bundler/man/bundle-check.1 +1 -1
- data/bundler/man/bundle-clean.1 +1 -1
- data/bundler/man/bundle-config.1 +2 -5
- data/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/man/bundle-exec.1 +1 -1
- data/bundler/man/bundle-gem.1 +1 -1
- data/bundler/man/bundle-info.1 +1 -1
- data/bundler/man/bundle-init.1 +1 -1
- data/bundler/man/bundle-inject.1 +1 -1
- data/bundler/man/bundle-install.1 +2 -2
- data/bundler/man/bundle-list.1 +1 -1
- data/bundler/man/bundle-lock.1 +1 -1
- data/bundler/man/bundle-open.1 +1 -1
- data/bundler/man/bundle-outdated.1 +1 -1
- data/bundler/man/bundle-platform.1 +1 -1
- data/bundler/man/bundle-pristine.1 +1 -1
- data/bundler/man/bundle-remove.1 +1 -1
- data/bundler/man/bundle-show.1 +1 -1
- data/bundler/man/bundle-update.1 +1 -1
- data/bundler/man/bundle-viz.1 +1 -1
- data/bundler/man/bundle.1 +1 -1
- data/bundler/man/gemfile.5 +1 -1
- data/bundler/man/index.txt +25 -0
- 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 -2
- data/lib/rubygems/commands/pristine_command.rb +1 -1
- data/lib/rubygems/commands/push_command.rb +7 -3
- 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 +25 -45
- 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 -4
- 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 +4 -3
- data/lib/rubygems/ext/builder.rb +13 -32
- data/lib/rubygems/ext/cmake_builder.rb +4 -4
- data/lib/rubygems/ext/configure_builder.rb +4 -4
- data/lib/rubygems/ext/ext_conf_builder.rb +19 -14
- data/lib/rubygems/ext/rake_builder.rb +3 -3
- data/lib/rubygems/gemcutter_utilities.rb +90 -14
- data/lib/rubygems/indexer.rb +0 -1
- data/lib/rubygems/install_update_options.rb +2 -2
- data/lib/rubygems/installer.rb +12 -9
- 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 +1 -2
- data/lib/rubygems/request.rb +4 -3
- data/lib/rubygems/request_set/gem_dependency_api.rb +4 -4
- data/lib/rubygems/requirement.rb +1 -1
- data/lib/rubygems/resolver.rb +1 -1
- data/lib/rubygems/resolver/activation_request.rb +9 -1
- data/lib/rubygems/resolver/api_specification.rb +5 -1
- data/lib/rubygems/resolver/conflict.rb +1 -1
- data/lib/rubygems/resolver/dependency_request.rb +1 -1
- data/lib/rubygems/resolver/index_specification.rb +11 -0
- data/lib/rubygems/resolver/installer_set.rb +1 -2
- 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/specification.rb +1 -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 +1 -1
- data/lib/rubygems/source.rb +10 -4
- 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 +13 -26
- data/lib/rubygems/uri_formatter.rb +2 -1
- data/lib/rubygems/version_option.rb +6 -0
- data/rubygems-update.gemspec +1 -1
- 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 +1 -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 +31 -5
- data/test/rubygems/test_gem_commands_query_command.rb +3 -3
- data/test/rubygems/test_gem_commands_setup_command.rb +13 -18
- 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 +36 -2
- data/test/rubygems/test_gem_dependency_list.rb +2 -2
- data/test/rubygems/test_gem_ext_builder.rb +10 -14
- data/test/rubygems/test_gem_ext_cmake_builder.rb +3 -9
- data/test/rubygems/test_gem_ext_configure_builder.rb +3 -9
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +9 -26
- data/test/rubygems/test_gem_ext_rake_builder.rb +5 -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 +74 -11
- 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 +14 -18
- 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 +8 -8
- 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 +5 -0
- data/test/rubygems/test_gem_source_subpath_problem.rb +49 -0
- data/test/rubygems/test_gem_specification.rb +5 -4
- 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
- metadata +35 -32
- 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/package.rb
CHANGED
@@ -44,7 +44,6 @@
|
|
44
44
|
require "rubygems"
|
45
45
|
require 'rubygems/security'
|
46
46
|
require 'rubygems/user_interaction'
|
47
|
-
require 'zlib'
|
48
47
|
|
49
48
|
class Gem::Package
|
50
49
|
include Gem::UserInteraction
|
@@ -186,6 +185,8 @@ class Gem::Package
|
|
186
185
|
# Creates a new package that will read or write to the file +gem+.
|
187
186
|
|
188
187
|
def initialize(gem, security_policy) # :notnew:
|
188
|
+
require 'zlib'
|
189
|
+
|
189
190
|
@gem = gem
|
190
191
|
|
191
192
|
@build_time = Gem.source_date_epoch
|
@@ -297,7 +298,7 @@ class Gem::Package
|
|
297
298
|
|
298
299
|
setup_signer(
|
299
300
|
signer_options: {
|
300
|
-
expiration_length_days: Gem.configuration.cert_expiration_length_days
|
301
|
+
expiration_length_days: Gem.configuration.cert_expiration_length_days,
|
301
302
|
}
|
302
303
|
)
|
303
304
|
|
@@ -90,7 +90,7 @@ class Gem::Package::TarTestCase < Gem::TestCase
|
|
90
90
|
ASCIIZ("wheel", 32), # char gname[32]; ASCIIZ
|
91
91
|
Z(to_oct(0, 7)), # char devmajor[8]; 0 padded, octal, null
|
92
92
|
Z(to_oct(0, 7)), # char devminor[8]; 0 padded, octal, null
|
93
|
-
ASCIIZ(dname, 155)
|
93
|
+
ASCIIZ(dname, 155), # char prefix[155]; ASCII + (Z unless filled)
|
94
94
|
]
|
95
95
|
|
96
96
|
h = arr.join
|
data/lib/rubygems/platform.rb
CHANGED
@@ -9,11 +9,7 @@ require "rubygems/deprecate"
|
|
9
9
|
class Gem::Platform
|
10
10
|
@local = nil
|
11
11
|
|
12
|
-
attr_accessor :cpu
|
13
|
-
|
14
|
-
attr_accessor :os
|
15
|
-
|
16
|
-
attr_accessor :version
|
12
|
+
attr_accessor :cpu, :os, :version
|
17
13
|
|
18
14
|
def self.local
|
19
15
|
arch = RbConfig::CONFIG['arch']
|
@@ -22,18 +18,33 @@ class Gem::Platform
|
|
22
18
|
end
|
23
19
|
|
24
20
|
def self.match(platform)
|
25
|
-
Gem.platforms
|
21
|
+
match_platforms?(platform, Gem.platforms)
|
22
|
+
end
|
23
|
+
|
24
|
+
def self.match_platforms?(platform, platforms)
|
25
|
+
platforms.any? do |local_platform|
|
26
26
|
platform.nil? or
|
27
27
|
local_platform == platform or
|
28
28
|
(local_platform != Gem::Platform::RUBY and local_platform =~ platform)
|
29
29
|
end
|
30
30
|
end
|
31
|
+
private_class_method :match_platforms?
|
32
|
+
|
33
|
+
def self.match_spec?(spec)
|
34
|
+
match_gem?(spec.platform, spec.name)
|
35
|
+
end
|
36
|
+
|
37
|
+
def self.match_gem?(platform, gem_name)
|
38
|
+
# Note: this method might be redefined by Ruby implementations to
|
39
|
+
# customize behavior per RUBY_ENGINE, gem_name or other criteria.
|
40
|
+
match_platforms?(platform, Gem.platforms)
|
41
|
+
end
|
31
42
|
|
32
43
|
def self.installable?(spec)
|
33
44
|
if spec.respond_to? :installable_platform?
|
34
45
|
spec.installable_platform?
|
35
46
|
else
|
36
|
-
|
47
|
+
match_spec? spec
|
37
48
|
end
|
38
49
|
end
|
39
50
|
|
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
|
|
@@ -78,7 +78,6 @@ class Gem::RemoteFetcher
|
|
78
78
|
def initialize(proxy=nil, dns=nil, headers={})
|
79
79
|
require 'net/http'
|
80
80
|
require 'stringio'
|
81
|
-
require 'time'
|
82
81
|
require 'uri'
|
83
82
|
|
84
83
|
Socket.do_not_reverse_lookup = true
|
@@ -263,7 +262,7 @@ class Gem::RemoteFetcher
|
|
263
262
|
rescue Timeout::Error
|
264
263
|
raise UnknownHostError.new('timed out', uri)
|
265
264
|
rescue IOError, SocketError, SystemCallError,
|
266
|
-
*(OpenSSL::SSL::SSLError if
|
265
|
+
*(OpenSSL::SSL::SSLError if Gem::HAVE_OPENSSL) => e
|
267
266
|
if e.message =~ /getaddrinfo/
|
268
267
|
raise UnknownHostError.new('no such name', uri)
|
269
268
|
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
|
|
@@ -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
@@ -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
|
|
@@ -46,6 +46,10 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
|
|
46
46
|
@dependencies == other.dependencies
|
47
47
|
end
|
48
48
|
|
49
|
+
def hash
|
50
|
+
@set.hash ^ @name.hash ^ @version.hash ^ @platform.hash ^ @dependencies.hash
|
51
|
+
end
|
52
|
+
|
49
53
|
def fetch_development_dependencies # :nodoc:
|
50
54
|
spec = source.fetch_spec Gem::NameTuple.new @name, @version, @platform
|
51
55
|
|
@@ -53,7 +57,7 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
|
|
53
57
|
end
|
54
58
|
|
55
59
|
def installable_platform? # :nodoc:
|
56
|
-
Gem::Platform.
|
60
|
+
Gem::Platform.match_gem? @platform, @name
|
57
61
|
end
|
58
62
|
|
59
63
|
def pretty_print(q) # :nodoc:
|
@@ -33,6 +33,17 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
|
|
33
33
|
spec.dependencies
|
34
34
|
end
|
35
35
|
|
36
|
+
def ==(other)
|
37
|
+
self.class === other &&
|
38
|
+
@name == other.name &&
|
39
|
+
@version == other.version &&
|
40
|
+
@platform == other.platform
|
41
|
+
end
|
42
|
+
|
43
|
+
def hash
|
44
|
+
@name.hash ^ @version.hash ^ @platform.hash
|
45
|
+
end
|
46
|
+
|
36
47
|
def inspect # :nodoc:
|
37
48
|
'#<%s %s source %s>' % [self.class, full_name, @source]
|
38
49
|
end
|
@@ -32,7 +32,6 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
32
32
|
super()
|
33
33
|
|
34
34
|
@domain = domain
|
35
|
-
@remote = consider_remote?
|
36
35
|
|
37
36
|
@f = Gem::SpecFetcher.fetcher
|
38
37
|
|
@@ -170,7 +169,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
170
169
|
always_install = @always_install.map {|s| s.full_name }
|
171
170
|
|
172
171
|
'#<%s domain: %s specs: %p always install: %p>' % [
|
173
|
-
self.class, @domain, @specs.keys, always_install
|
172
|
+
self.class, @domain, @specs.keys, always_install
|
174
173
|
]
|
175
174
|
end
|
176
175
|
|
@@ -28,7 +28,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
|
|
28
28
|
def add(name, version, platform) # :nodoc:
|
29
29
|
version = Gem::Version.new version
|
30
30
|
specs = [
|
31
|
-
Gem::Resolver::LockSpecification.new(self, name, version, @sources, platform)
|
31
|
+
Gem::Resolver::LockSpecification.new(self, name, version, @sources, platform),
|
32
32
|
]
|
33
33
|
|
34
34
|
@specs.concat specs
|
@@ -1,9 +1,10 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
2
|
+
|
3
|
+
require_relative 'molinillo/gem_metadata'
|
4
|
+
require_relative 'molinillo/errors'
|
5
|
+
require_relative 'molinillo/resolver'
|
6
|
+
require_relative 'molinillo/modules/ui'
|
7
|
+
require_relative 'molinillo/modules/specification_provider'
|
7
8
|
|
8
9
|
# Gem::Resolver::Molinillo is a generic dependency resolution algorithm.
|
9
10
|
module Gem::Resolver::Molinillo
|
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
module Gem::Resolver::Molinillo
|
3
4
|
# @!visibility private
|
4
5
|
module Delegates
|
@@ -45,6 +46,12 @@ module Gem::Resolver::Molinillo
|
|
45
46
|
current_state = state || Gem::Resolver::Molinillo::ResolutionState.empty
|
46
47
|
current_state.conflicts
|
47
48
|
end
|
49
|
+
|
50
|
+
# (see Gem::Resolver::Molinillo::ResolutionState#unused_unwind_options)
|
51
|
+
def unused_unwind_options
|
52
|
+
current_state = state || Gem::Resolver::Molinillo::ResolutionState.empty
|
53
|
+
current_state.unused_unwind_options
|
54
|
+
end
|
48
55
|
end
|
49
56
|
end
|
50
57
|
end
|
@@ -1,9 +1,10 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require 'set'
|
3
4
|
require 'tsort'
|
4
5
|
|
5
|
-
|
6
|
-
|
6
|
+
require_relative 'dependency_graph/log'
|
7
|
+
require_relative 'dependency_graph/vertex'
|
7
8
|
|
8
9
|
module Gem::Resolver::Molinillo
|
9
10
|
# A directed acyclic graph that is tuned to hold named dependencies
|
@@ -123,6 +124,7 @@ module Gem::Resolver::Molinillo
|
|
123
124
|
dot.join("\n")
|
124
125
|
end
|
125
126
|
|
127
|
+
# @param [DependencyGraph] other
|
126
128
|
# @return [Boolean] whether the two dependency graphs are equal, determined
|
127
129
|
# by a recursive traversal of each {#root_vertices} and its
|
128
130
|
# {Vertex#successors}
|
@@ -147,8 +149,8 @@ module Gem::Resolver::Molinillo
|
|
147
149
|
vertex = add_vertex(name, payload, root)
|
148
150
|
vertex.explicit_requirements << requirement if root
|
149
151
|
parent_names.each do |parent_name|
|
150
|
-
|
151
|
-
add_edge(
|
152
|
+
parent_vertex = vertex_named(parent_name)
|
153
|
+
add_edge(parent_vertex, vertex, requirement)
|
152
154
|
end
|
153
155
|
vertex
|
154
156
|
end
|
@@ -189,7 +191,7 @@ module Gem::Resolver::Molinillo
|
|
189
191
|
# @return [Edge] the added edge
|
190
192
|
def add_edge(origin, destination, requirement)
|
191
193
|
if destination.path_to?(origin)
|
192
|
-
raise CircularDependencyError.new(
|
194
|
+
raise CircularDependencyError.new(path(destination, origin))
|
193
195
|
end
|
194
196
|
add_edge_no_circular(origin, destination, requirement)
|
195
197
|
end
|
@@ -218,5 +220,37 @@ module Gem::Resolver::Molinillo
|
|
218
220
|
def add_edge_no_circular(origin, destination, requirement)
|
219
221
|
log.add_edge_no_circular(self, origin.name, destination.name, requirement)
|
220
222
|
end
|
223
|
+
|
224
|
+
# Returns the path between two vertices
|
225
|
+
# @raise [ArgumentError] if there is no path between the vertices
|
226
|
+
# @param [Vertex] from
|
227
|
+
# @param [Vertex] to
|
228
|
+
# @return [Array<Vertex>] the shortest path from `from` to `to`
|
229
|
+
def path(from, to)
|
230
|
+
distances = Hash.new(vertices.size + 1)
|
231
|
+
distances[from.name] = 0
|
232
|
+
predecessors = {}
|
233
|
+
each do |vertex|
|
234
|
+
vertex.successors.each do |successor|
|
235
|
+
if distances[successor.name] > distances[vertex.name] + 1
|
236
|
+
distances[successor.name] = distances[vertex.name] + 1
|
237
|
+
predecessors[successor] = vertex
|
238
|
+
end
|
239
|
+
end
|
240
|
+
end
|
241
|
+
|
242
|
+
path = [to]
|
243
|
+
while before = predecessors[to]
|
244
|
+
path << before
|
245
|
+
to = before
|
246
|
+
break if to == from
|
247
|
+
end
|
248
|
+
|
249
|
+
unless path.last.equal?(from)
|
250
|
+
raise ArgumentError, "There is no path from #{from.name} to #{to.name}"
|
251
|
+
end
|
252
|
+
|
253
|
+
path.reverse
|
254
|
+
end
|
221
255
|
end
|
222
256
|
end
|