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
@@ -34,6 +34,10 @@ class Gem::Commands::SourcesCommand < Gem::Command
|
|
34
34
|
options[:update] = value
|
35
35
|
end
|
36
36
|
|
37
|
+
add_option '-f', '--[no-]force', "Do not show any confirmation prompts and behave as if 'yes' was always answered" do |value, options|
|
38
|
+
options[:force] = value
|
39
|
+
end
|
40
|
+
|
37
41
|
add_proxy_option
|
38
42
|
end
|
39
43
|
|
@@ -71,7 +75,7 @@ class Gem::Commands::SourcesCommand < Gem::Command
|
|
71
75
|
Do you want to add this source?
|
72
76
|
QUESTION
|
73
77
|
|
74
|
-
terminate_interaction 1 unless ask_yes_no
|
78
|
+
terminate_interaction 1 unless options[:force] || ask_yes_no(question)
|
75
79
|
end
|
76
80
|
end
|
77
81
|
|
@@ -86,7 +90,7 @@ https://rubygems.org is recommended for security over #{uri}
|
|
86
90
|
Do you want to add this insecure source?
|
87
91
|
QUESTION
|
88
92
|
|
89
|
-
terminate_interaction 1 unless ask_yes_no
|
93
|
+
terminate_interaction 1 unless options[:force] || ask_yes_no(question)
|
90
94
|
end
|
91
95
|
end
|
92
96
|
|
@@ -126,6 +126,12 @@ Specific fields in the specification can be extracted in YAML format:
|
|
126
126
|
terminate_interaction 1
|
127
127
|
end
|
128
128
|
|
129
|
+
platform = get_platform_from_requirements(options)
|
130
|
+
|
131
|
+
if platform
|
132
|
+
specs = specs.select{|s| s.platform.to_s == platform }
|
133
|
+
end
|
134
|
+
|
129
135
|
unless options[:all]
|
130
136
|
specs = [specs.max_by {|s| s.version }]
|
131
137
|
end
|
@@ -47,7 +47,7 @@ data you will need to change them immediately and yank your gem.
|
|
47
47
|
def execute
|
48
48
|
@host = options[:host]
|
49
49
|
|
50
|
-
sign_in @host
|
50
|
+
sign_in @host, scope: get_yank_scope
|
51
51
|
|
52
52
|
version = get_version_from_requirements(options[:version])
|
53
53
|
platform = get_platform_from_requirements(options)
|
@@ -72,9 +72,8 @@ data you will need to change them immediately and yank your gem.
|
|
72
72
|
|
73
73
|
def yank_api_request(method, version, platform, api)
|
74
74
|
name = get_one_gem_name
|
75
|
-
response = rubygems_api_request(method, api, host) do |request|
|
75
|
+
response = rubygems_api_request(method, api, host, scope: get_yank_scope) do |request|
|
76
76
|
request.add_field("Authorization", api_key)
|
77
|
-
request.add_field("OTP", options[:otp]) if options[:otp]
|
78
77
|
|
79
78
|
data = {
|
80
79
|
'gem_name' => name,
|
@@ -93,7 +92,7 @@ data you will need to change them immediately and yank your gem.
|
|
93
92
|
nil
|
94
93
|
end
|
95
94
|
|
96
|
-
def
|
97
|
-
|
95
|
+
def get_yank_scope
|
96
|
+
:yank_rubygem
|
98
97
|
end
|
99
98
|
end
|
@@ -17,6 +17,8 @@ module Kernel
|
|
17
17
|
private :gem_original_require
|
18
18
|
end
|
19
19
|
|
20
|
+
file = Gem::KERNEL_WARN_IGNORES_INTERNAL_ENTRIES ? "<internal:#{__FILE__}>" : __FILE__
|
21
|
+
module_eval <<'RUBY', file, __LINE__ + 1
|
20
22
|
##
|
21
23
|
# When RubyGems is required, Kernel#require is replaced with our own which
|
22
24
|
# is capable of loading gems on demand.
|
@@ -166,6 +168,7 @@ module Kernel
|
|
166
168
|
end
|
167
169
|
end
|
168
170
|
end
|
171
|
+
RUBY
|
169
172
|
|
170
173
|
private :require
|
171
174
|
|
@@ -1,12 +1,12 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
# `uplevel` keyword argument of Kernel#warn is available since ruby 2.5.
|
4
|
-
if RUBY_VERSION >= "2.5"
|
4
|
+
if RUBY_VERSION >= "2.5" && !Gem::KERNEL_WARN_IGNORES_INTERNAL_ENTRIES
|
5
5
|
|
6
6
|
module Kernel
|
7
7
|
rubygems_path = "#{__dir__}/" # Frames to be skipped start with this path.
|
8
8
|
|
9
|
-
original_warn =
|
9
|
+
original_warn = instance_method(:warn)
|
10
10
|
|
11
11
|
remove_method :warn
|
12
12
|
|
@@ -17,9 +17,9 @@ if RUBY_VERSION >= "2.5"
|
|
17
17
|
module_function define_method(:warn) {|*messages, **kw|
|
18
18
|
unless uplevel = kw[:uplevel]
|
19
19
|
if Gem.java_platform?
|
20
|
-
return original_warn.call(*messages)
|
20
|
+
return original_warn.bind(self).call(*messages)
|
21
21
|
else
|
22
|
-
return original_warn.call(*messages, **kw)
|
22
|
+
return original_warn.bind(self).call(*messages, **kw)
|
23
23
|
end
|
24
24
|
end
|
25
25
|
|
@@ -45,11 +45,10 @@ if RUBY_VERSION >= "2.5"
|
|
45
45
|
end
|
46
46
|
end
|
47
47
|
end
|
48
|
-
uplevel = start
|
48
|
+
kw[:uplevel] = start
|
49
49
|
end
|
50
50
|
|
51
|
-
kw
|
52
|
-
original_warn.call(*messages, **kw)
|
51
|
+
original_warn.bind(self).call(*messages, **kw)
|
53
52
|
}
|
54
53
|
end
|
55
54
|
end
|
data/lib/rubygems/defaults.rb
CHANGED
@@ -38,13 +38,13 @@ module Gem
|
|
38
38
|
[
|
39
39
|
File.dirname(RbConfig::CONFIG['sitedir']),
|
40
40
|
'Gems',
|
41
|
-
RbConfig::CONFIG['ruby_version']
|
41
|
+
RbConfig::CONFIG['ruby_version'],
|
42
42
|
]
|
43
43
|
else
|
44
44
|
[
|
45
45
|
RbConfig::CONFIG['rubylibprefix'],
|
46
46
|
'gems',
|
47
|
-
RbConfig::CONFIG['ruby_version']
|
47
|
+
RbConfig::CONFIG['ruby_version'],
|
48
48
|
]
|
49
49
|
end
|
50
50
|
|
data/lib/rubygems/dependency.rb
CHANGED
@@ -27,7 +27,7 @@ class Gem::DependencyInstaller
|
|
27
27
|
:wrappers => true,
|
28
28
|
:build_args => nil,
|
29
29
|
:build_docs_in_background => false,
|
30
|
-
:install_as_default => false
|
30
|
+
:install_as_default => false,
|
31
31
|
}.freeze
|
32
32
|
|
33
33
|
##
|
@@ -283,10 +283,10 @@ class Gem::DependencyInstaller
|
|
283
283
|
request_set.development_shallow = @dev_shallow
|
284
284
|
request_set.soft_missing = @force
|
285
285
|
request_set.prerelease = @prerelease
|
286
|
-
request_set.remote = false unless consider_remote?
|
287
286
|
|
288
287
|
installer_set = Gem::Resolver::InstallerSet.new @domain
|
289
|
-
installer_set.ignore_installed = @only_install_dir
|
288
|
+
installer_set.ignore_installed = (@minimal_deps == false) || @only_install_dir
|
289
|
+
installer_set.force = @force
|
290
290
|
|
291
291
|
if consider_local?
|
292
292
|
if dep_or_name =~ /\.gem$/ and File.file? dep_or_name
|
@@ -307,6 +307,7 @@ class Gem::DependencyInstaller
|
|
307
307
|
|
308
308
|
dependency =
|
309
309
|
if spec = installer_set.local?(dep_or_name)
|
310
|
+
installer_set.remote = nil if spec.dependencies.none?
|
310
311
|
Gem::Dependency.new spec.name, version
|
311
312
|
elsif String === dep_or_name
|
312
313
|
Gem::Dependency.new dep_or_name, version
|
@@ -321,6 +322,7 @@ class Gem::DependencyInstaller
|
|
321
322
|
installer_set.add_always_install dependency
|
322
323
|
|
323
324
|
request_set.always_install = installer_set.always_install
|
325
|
+
request_set.remote = installer_set.consider_remote?
|
324
326
|
|
325
327
|
if @ignore_dependencies
|
326
328
|
installer_set.ignore_dependencies = true
|
data/lib/rubygems/ext/builder.rb
CHANGED
@@ -10,14 +10,6 @@ require_relative '../user_interaction'
|
|
10
10
|
class Gem::Ext::Builder
|
11
11
|
include Gem::UserInteraction
|
12
12
|
|
13
|
-
##
|
14
|
-
# The builder shells-out to run various commands after changing the
|
15
|
-
# directory. This means multiple installations cannot be allowed to build
|
16
|
-
# extensions in parallel as they may change each other's directories leading
|
17
|
-
# to broken extensions or failed installations.
|
18
|
-
|
19
|
-
CHDIR_MUTEX = Mutex.new # :nodoc:
|
20
|
-
|
21
13
|
attr_accessor :build_args # :nodoc:
|
22
14
|
|
23
15
|
def self.class_name
|
@@ -25,8 +17,8 @@ class Gem::Ext::Builder
|
|
25
17
|
$1.downcase
|
26
18
|
end
|
27
19
|
|
28
|
-
def self.make(dest_path, results)
|
29
|
-
unless File.exist? 'Makefile'
|
20
|
+
def self.make(dest_path, results, make_dir = Dir.pwd)
|
21
|
+
unless File.exist? File.join(make_dir, 'Makefile')
|
30
22
|
raise Gem::InstallError, 'Makefile not found'
|
31
23
|
end
|
32
24
|
|
@@ -37,39 +29,39 @@ class Gem::Ext::Builder
|
|
37
29
|
make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
|
38
30
|
end
|
39
31
|
|
40
|
-
destdir = '
|
32
|
+
destdir = 'DESTDIR=%s' % ENV['DESTDIR']
|
41
33
|
|
42
34
|
['clean', '', 'install'].each do |target|
|
43
35
|
# Pass DESTDIR via command line to override what's in MAKEFLAGS
|
44
36
|
cmd = [
|
45
37
|
make_program,
|
46
38
|
destdir,
|
47
|
-
target
|
48
|
-
].
|
39
|
+
target,
|
40
|
+
].reject(&:empty?)
|
49
41
|
begin
|
50
|
-
run(cmd, results, "make #{target}".rstrip)
|
42
|
+
run(cmd, results, "make #{target}".rstrip, make_dir)
|
51
43
|
rescue Gem::InstallError
|
52
44
|
raise unless target == 'clean' # ignore clean failure
|
53
45
|
end
|
54
46
|
end
|
55
47
|
end
|
56
48
|
|
57
|
-
def self.run(command, results, command_name = nil)
|
49
|
+
def self.run(command, results, command_name = nil, dir = Dir.pwd)
|
58
50
|
verbose = Gem.configuration.really_verbose
|
59
51
|
|
60
52
|
begin
|
61
53
|
rubygems_gemdeps, ENV['RUBYGEMS_GEMDEPS'] = ENV['RUBYGEMS_GEMDEPS'], nil
|
62
54
|
if verbose
|
63
|
-
puts("current directory: #{
|
55
|
+
puts("current directory: #{dir}")
|
64
56
|
p(command)
|
65
57
|
end
|
66
|
-
results << "current directory: #{
|
67
|
-
results <<
|
58
|
+
results << "current directory: #{dir}"
|
59
|
+
results << command.shelljoin
|
68
60
|
|
69
61
|
require "open3"
|
70
62
|
# Set $SOURCE_DATE_EPOCH for the subprocess.
|
71
63
|
env = {'SOURCE_DATE_EPOCH' => Gem.source_date_epoch_string}
|
72
|
-
output, status = Open3.capture2e(env, *command)
|
64
|
+
output, status = Open3.capture2e(env, *command, :chdir => dir)
|
73
65
|
if verbose
|
74
66
|
puts output
|
75
67
|
else
|
@@ -161,22 +153,10 @@ EOF
|
|
161
153
|
begin
|
162
154
|
FileUtils.mkdir_p dest_path
|
163
155
|
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
results = builder.build(extension, dest_path,
|
169
|
-
results, @build_args, lib_dir)
|
170
|
-
|
171
|
-
verbose { results.join("\n") }
|
172
|
-
ensure
|
173
|
-
begin
|
174
|
-
Dir.chdir pwd
|
175
|
-
rescue SystemCallError
|
176
|
-
Dir.chdir dest_path
|
177
|
-
end
|
178
|
-
end
|
179
|
-
end
|
156
|
+
results = builder.build(extension, dest_path,
|
157
|
+
results, @build_args, lib_dir, extension_dir)
|
158
|
+
|
159
|
+
verbose { results.join("\n") }
|
180
160
|
|
181
161
|
write_gem_make_out results.join "\n"
|
182
162
|
rescue => e
|
@@ -201,6 +181,7 @@ EOF
|
|
201
181
|
|
202
182
|
dest_path = @spec.extension_dir
|
203
183
|
|
184
|
+
require "fileutils"
|
204
185
|
FileUtils.rm_f @spec.gem_build_complete_path
|
205
186
|
|
206
187
|
@spec.extensions.each do |extension|
|
@@ -2,15 +2,14 @@
|
|
2
2
|
require_relative '../command'
|
3
3
|
|
4
4
|
class Gem::Ext::CmakeBuilder < Gem::Ext::Builder
|
5
|
-
def self.build(extension, dest_path, results, args=[], lib_dir=nil)
|
6
|
-
unless File.exist?('Makefile')
|
7
|
-
cmd = "cmake . -DCMAKE_INSTALL_PREFIX=#{dest_path}"
|
8
|
-
cmd << " #{Gem::Command.build_args.join ' '}" unless Gem::Command.build_args.empty?
|
5
|
+
def self.build(extension, dest_path, results, args=[], lib_dir=nil, cmake_dir=Dir.pwd)
|
6
|
+
unless File.exist?(File.join(cmake_dir, 'Makefile'))
|
7
|
+
cmd = ["cmake", ".", "-DCMAKE_INSTALL_PREFIX=#{dest_path}", *Gem::Command.build_args]
|
9
8
|
|
10
|
-
run cmd, results
|
9
|
+
run cmd, results, class_name, cmake_dir
|
11
10
|
end
|
12
11
|
|
13
|
-
make dest_path, results
|
12
|
+
make dest_path, results, cmake_dir
|
14
13
|
|
15
14
|
results
|
16
15
|
end
|
@@ -6,15 +6,14 @@
|
|
6
6
|
#++
|
7
7
|
|
8
8
|
class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
|
9
|
-
def self.build(extension, dest_path, results, args=[], lib_dir=nil)
|
10
|
-
unless File.exist?('Makefile')
|
11
|
-
cmd = "sh ./configure --prefix=#{dest_path}"
|
12
|
-
cmd << " #{args.join ' '}" unless args.empty?
|
9
|
+
def self.build(extension, dest_path, results, args=[], lib_dir=nil, configure_dir=Dir.pwd)
|
10
|
+
unless File.exist?(File.join(configure_dir, 'Makefile'))
|
11
|
+
cmd = ["sh", "./configure", "--prefix=#{dest_path}", *args]
|
13
12
|
|
14
|
-
run cmd, results
|
13
|
+
run cmd, results, class_name, configure_dir
|
15
14
|
end
|
16
15
|
|
17
|
-
make dest_path, results
|
16
|
+
make dest_path, results, configure_dir
|
18
17
|
|
19
18
|
results
|
20
19
|
end
|
@@ -8,11 +8,11 @@
|
|
8
8
|
require 'shellwords'
|
9
9
|
|
10
10
|
class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
|
11
|
-
def self.build(extension, dest_path, results, args=[], lib_dir=nil)
|
11
|
+
def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=Dir.pwd)
|
12
12
|
require 'fileutils'
|
13
13
|
require 'tempfile'
|
14
14
|
|
15
|
-
tmp_dest = Dir.mktmpdir(".gem.",
|
15
|
+
tmp_dest = Dir.mktmpdir(".gem.", extension_dir)
|
16
16
|
|
17
17
|
# Some versions of `mktmpdir` return absolute paths, which will break make
|
18
18
|
# if the paths contain spaces. However, on Ruby 1.9.x on Windows, relative
|
@@ -23,9 +23,9 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
|
|
23
23
|
# spaces do not work.
|
24
24
|
#
|
25
25
|
# Details: https://github.com/rubygems/rubygems/issues/977#issuecomment-171544940
|
26
|
-
tmp_dest = get_relative_path(tmp_dest)
|
26
|
+
tmp_dest = get_relative_path(tmp_dest, extension_dir)
|
27
27
|
|
28
|
-
Tempfile.open %w[siteconf .rb],
|
28
|
+
Tempfile.open %w[siteconf .rb], extension_dir do |siteconf|
|
29
29
|
siteconf.puts "require 'rbconfig'"
|
30
30
|
siteconf.puts "dest_path = #{tmp_dest.dump}"
|
31
31
|
%w[sitearchdir sitelibdir].each do |dir|
|
@@ -38,19 +38,22 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
|
|
38
38
|
destdir = ENV["DESTDIR"]
|
39
39
|
|
40
40
|
begin
|
41
|
+
# workaround for https://github.com/oracle/truffleruby/issues/2115
|
42
|
+
siteconf_path = RUBY_ENGINE == "truffleruby" ? siteconf.path.dup : siteconf.path
|
41
43
|
cmd = Gem.ruby.shellsplit << "-I" << File.expand_path("../../..", __FILE__) <<
|
42
|
-
"-r" << get_relative_path(
|
44
|
+
"-r" << get_relative_path(siteconf_path, extension_dir) << File.basename(extension)
|
43
45
|
cmd.push(*args)
|
44
46
|
|
45
47
|
begin
|
46
|
-
run(cmd, results) do |s, r|
|
47
|
-
|
48
|
+
run(cmd, results, class_name, extension_dir) do |s, r|
|
49
|
+
mkmf_log = File.join(extension_dir, 'mkmf.log')
|
50
|
+
if File.exist? mkmf_log
|
48
51
|
unless s.success?
|
49
52
|
r << "To see why this extension failed to compile, please check" \
|
50
53
|
" the mkmf.log which can be found here:\n"
|
51
54
|
r << " " + File.join(dest_path, 'mkmf.log') + "\n"
|
52
55
|
end
|
53
|
-
FileUtils.mv
|
56
|
+
FileUtils.mv mkmf_log, dest_path
|
54
57
|
end
|
55
58
|
end
|
56
59
|
siteconf.unlink
|
@@ -58,18 +61,20 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
|
|
58
61
|
|
59
62
|
ENV["DESTDIR"] = nil
|
60
63
|
|
61
|
-
make dest_path, results
|
64
|
+
make dest_path, results, extension_dir
|
62
65
|
|
63
66
|
if tmp_dest
|
67
|
+
full_tmp_dest = File.join(extension_dir, tmp_dest)
|
68
|
+
|
64
69
|
# TODO remove in RubyGems 3
|
65
70
|
if Gem.install_extension_in_lib and lib_dir
|
66
71
|
FileUtils.mkdir_p lib_dir
|
67
|
-
entries = Dir.entries(
|
68
|
-
entries = entries.map {|entry| File.join
|
72
|
+
entries = Dir.entries(full_tmp_dest) - %w[. ..]
|
73
|
+
entries = entries.map {|entry| File.join full_tmp_dest, entry }
|
69
74
|
FileUtils.cp_r entries, lib_dir, :remove_destination => true
|
70
75
|
end
|
71
76
|
|
72
|
-
FileUtils::Entry_.new(
|
77
|
+
FileUtils::Entry_.new(full_tmp_dest).traverse do |ent|
|
73
78
|
destent = ent.class.new(dest_path, ent.rel)
|
74
79
|
destent.exist? or FileUtils.mv(ent.path, destent.path)
|
75
80
|
end
|
@@ -87,8 +92,8 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
|
|
87
92
|
|
88
93
|
private
|
89
94
|
|
90
|
-
def self.get_relative_path(path)
|
91
|
-
path[0..
|
95
|
+
def self.get_relative_path(path, base)
|
96
|
+
path[0..base.length - 1] = '.' if path.start_with?(base)
|
92
97
|
path
|
93
98
|
end
|
94
99
|
end
|
@@ -8,9 +8,9 @@
|
|
8
8
|
require "shellwords"
|
9
9
|
|
10
10
|
class Gem::Ext::RakeBuilder < Gem::Ext::Builder
|
11
|
-
def self.build(extension, dest_path, results, args=[], lib_dir=nil)
|
11
|
+
def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=Dir.pwd)
|
12
12
|
if File.basename(extension) =~ /mkrf_conf/i
|
13
|
-
run([Gem.ruby, File.basename(extension), *args], results)
|
13
|
+
run([Gem.ruby, File.basename(extension), *args], results, class_name, extension_dir)
|
14
14
|
end
|
15
15
|
|
16
16
|
rake = ENV['rake']
|
@@ -19,14 +19,14 @@ class Gem::Ext::RakeBuilder < Gem::Ext::Builder
|
|
19
19
|
rake = rake.shellsplit
|
20
20
|
else
|
21
21
|
begin
|
22
|
-
rake = [Gem.ruby, "-I#{File.expand_path("
|
22
|
+
rake = [Gem.ruby, "-I#{File.expand_path("../..", __dir__)}", "-rrubygems", Gem.bin_path('rake', 'rake')]
|
23
23
|
rescue Gem::Exception
|
24
24
|
rake = [Gem.default_exec_format % 'rake']
|
25
25
|
end
|
26
26
|
end
|
27
27
|
|
28
28
|
rake_args = ["RUBYARCHDIR=#{dest_path}", "RUBYLIBDIR=#{dest_path}", *args]
|
29
|
-
run(rake + rake_args, results)
|
29
|
+
run(rake + rake_args, results, class_name, extension_dir)
|
30
30
|
|
31
31
|
results
|
32
32
|
end
|