rubygems-update 3.3.26 → 3.4.18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1334 -1088
- data/CONTRIBUTING.md +31 -8
- data/Manifest.txt +49 -35
- data/POLICIES.md +15 -13
- data/README.md +19 -6
- data/bundler/CHANGELOG.md +290 -1
- data/bundler/README.md +3 -6
- data/bundler/UPGRADING.md +1 -1
- data/bundler/bundler.gemspec +2 -2
- data/bundler/exe/bundle +5 -16
- data/bundler/lib/bundler/build_metadata.rb +2 -2
- data/bundler/lib/bundler/cli/add.rb +1 -1
- data/bundler/lib/bundler/cli/binstubs.rb +5 -1
- data/bundler/lib/bundler/cli/check.rb +1 -1
- data/bundler/lib/bundler/cli/common.rb +1 -0
- data/bundler/lib/bundler/cli/console.rb +2 -2
- data/bundler/lib/bundler/cli/doctor.rb +4 -6
- data/bundler/lib/bundler/cli/gem.rb +62 -40
- data/bundler/lib/bundler/cli/init.rb +2 -2
- data/bundler/lib/bundler/cli/install.rb +2 -3
- data/bundler/lib/bundler/cli/lock.rb +8 -5
- data/bundler/lib/bundler/cli/open.rb +6 -4
- data/bundler/lib/bundler/cli/outdated.rb +1 -3
- data/bundler/lib/bundler/cli/viz.rb +1 -1
- data/bundler/lib/bundler/cli.rb +45 -2
- data/bundler/lib/bundler/compact_index_client/cache.rb +1 -1
- data/bundler/lib/bundler/compact_index_client/updater.rb +40 -39
- data/bundler/lib/bundler/constants.rb +1 -1
- data/bundler/lib/bundler/current_ruby.rb +2 -0
- data/bundler/lib/bundler/definition.rb +163 -82
- data/bundler/lib/bundler/dependency.rb +13 -12
- data/bundler/lib/bundler/digest.rb +1 -1
- data/bundler/lib/bundler/dsl.rb +3 -3
- data/bundler/lib/bundler/endpoint_specification.rb +0 -4
- data/bundler/lib/bundler/env.rb +1 -1
- data/bundler/lib/bundler/environment_preserver.rb +3 -2
- data/bundler/lib/bundler/errors.rb +1 -11
- data/bundler/lib/bundler/feature_flag.rb +0 -1
- data/bundler/lib/bundler/fetcher/compact_index.rb +9 -11
- data/bundler/lib/bundler/fetcher/dependency.rb +2 -6
- data/bundler/lib/bundler/fetcher/downloader.rb +2 -5
- data/bundler/lib/bundler/fetcher.rb +4 -8
- data/bundler/lib/bundler/force_platform.rb +18 -0
- data/bundler/lib/bundler/friendly_errors.rb +0 -3
- data/bundler/lib/bundler/gem_version_promoter.rb +52 -86
- data/bundler/lib/bundler/graph.rb +3 -3
- data/bundler/lib/bundler/index.rb +7 -15
- data/bundler/lib/bundler/injector.rb +2 -2
- data/bundler/lib/bundler/inline.rb +8 -10
- data/bundler/lib/bundler/installer/parallel_installer.rb +3 -33
- data/bundler/lib/bundler/installer/standalone.rb +12 -8
- data/bundler/lib/bundler/installer.rb +10 -24
- data/bundler/lib/bundler/lazy_specification.rb +42 -42
- data/bundler/lib/bundler/lockfile_generator.rb +2 -2
- data/bundler/lib/bundler/lockfile_parser.rb +17 -16
- 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 +3 -3
- data/bundler/lib/bundler/man/bundle-cache.1.ronn +2 -2
- 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 +2 -5
- data/bundler/lib/bundler/man/bundle-config.1.ronn +1 -4
- 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 +5 -5
- data/bundler/lib/bundler/man/bundle-exec.1.ronn +5 -5
- data/bundler/lib/bundler/man/bundle-gem.1 +27 -37
- data/bundler/lib/bundler/man/bundle-gem.1.ronn +5 -5
- data/bundler/lib/bundler/man/bundle-help.1 +1 -1
- data/bundler/lib/bundler/man/bundle-info.1 +1 -1
- data/bundler/lib/bundler/man/bundle-init.1 +5 -1
- data/bundler/lib/bundler/man/bundle-init.1.ronn +2 -0
- data/bundler/lib/bundler/man/bundle-inject.1 +1 -1
- data/bundler/lib/bundler/man/bundle-install.1 +1 -30
- data/bundler/lib/bundler/man/bundle-install.1.ronn +0 -29
- 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 +22 -2
- data/bundler/lib/bundler/man/bundle-open.1.ronn +9 -1
- data/bundler/lib/bundler/man/bundle-outdated.1 +13 -9
- data/bundler/lib/bundler/man/bundle-outdated.1.ronn +12 -9
- data/bundler/lib/bundler/man/bundle-platform.1 +2 -2
- data/bundler/lib/bundler/man/bundle-platform.1.ronn +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 +2 -2
- data/bundler/lib/bundler/man/gemfile.5.ronn +1 -1
- data/bundler/lib/bundler/mirror.rb +5 -7
- data/bundler/lib/bundler/plugin/index.rb +4 -4
- data/bundler/lib/bundler/plugin/installer/rubygems.rb +0 -4
- data/bundler/lib/bundler/plugin/installer.rb +5 -2
- data/bundler/lib/bundler/plugin.rb +1 -1
- data/bundler/lib/bundler/remote_specification.rb +2 -6
- data/bundler/lib/bundler/resolver/base.rb +72 -15
- data/bundler/lib/bundler/resolver/candidate.rb +94 -0
- data/bundler/lib/bundler/resolver/incompatibility.rb +15 -0
- data/bundler/lib/bundler/resolver/package.rb +72 -0
- data/bundler/lib/bundler/resolver/root.rb +25 -0
- data/bundler/lib/bundler/resolver/spec_group.rb +26 -36
- data/bundler/lib/bundler/resolver.rb +324 -277
- data/bundler/lib/bundler/ruby_version.rb +1 -1
- data/bundler/lib/bundler/rubygems_ext.rb +16 -9
- data/bundler/lib/bundler/rubygems_gem_installer.rb +4 -2
- data/bundler/lib/bundler/rubygems_integration.rb +10 -14
- data/bundler/lib/bundler/runtime.rb +2 -6
- data/bundler/lib/bundler/safe_marshal.rb +31 -0
- data/bundler/lib/bundler/settings.rb +4 -10
- data/bundler/lib/bundler/setup.rb +4 -1
- data/bundler/lib/bundler/shared_helpers.rb +2 -1
- data/bundler/lib/bundler/source/git/git_proxy.rb +237 -74
- data/bundler/lib/bundler/source/git.rb +48 -30
- data/bundler/lib/bundler/source/metadata.rb +0 -1
- data/bundler/lib/bundler/source/path/installer.rb +1 -22
- data/bundler/lib/bundler/source/path.rb +6 -6
- data/bundler/lib/bundler/source/rubygems.rb +26 -81
- data/bundler/lib/bundler/source.rb +1 -1
- data/bundler/lib/bundler/source_list.rb +8 -2
- data/bundler/lib/bundler/spec_set.rb +22 -14
- data/bundler/lib/bundler/templates/Executable +1 -1
- data/bundler/lib/bundler/templates/Executable.bundler +5 -10
- data/bundler/lib/bundler/templates/Executable.standalone +2 -0
- data/bundler/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/README.md.tt +6 -4
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +12 -1
- data/bundler/lib/bundler/templates/newgem/bin/console.tt +0 -4
- data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +12 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-c.rb.tt +10 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
- data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +10 -0
- data/bundler/lib/bundler/templates/newgem/gitignore.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +8 -0
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +9 -2
- data/bundler/lib/bundler/ui/shell.rb +35 -12
- data/bundler/lib/bundler/ui/silent.rb +21 -5
- data/bundler/lib/bundler/uri_normalizer.rb +23 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +3 -3
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +0 -1
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +3 -1
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1351 -409
- data/bundler/lib/bundler/vendor/net-http-persistent/README.rdoc +1 -1
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +1 -1
- data/bundler/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +150 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +60 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +129 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +411 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +248 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/common.rb +64 -16
- data/bundler/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/generic.rb +27 -7
- data/bundler/lib/bundler/vendor/uri/lib/uri/http.rb +40 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/https.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +15 -9
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +11 -6
- data/bundler/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ws.rb +1 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/wss.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri.rb +3 -2
- data/bundler/lib/bundler/vendored_persistent.rb +1 -33
- data/bundler/lib/bundler/{vendored_tmpdir.rb → vendored_pub_grub.rb} +1 -1
- data/bundler/lib/bundler/version.rb +5 -1
- data/bundler/lib/bundler/worker.rb +5 -7
- data/bundler/lib/bundler.rb +21 -72
- data/{bin → exe}/gem +3 -4
- data/{bin → exe}/update_rubygems +8 -6
- data/lib/rubygems/available_set.rb +1 -0
- data/lib/rubygems/basic_specification.rb +1 -0
- data/lib/rubygems/bundler_version_finder.rb +1 -1
- data/lib/rubygems/command.rb +16 -7
- data/lib/rubygems/command_manager.rb +23 -8
- data/lib/rubygems/commands/build_command.rb +4 -0
- data/lib/rubygems/commands/cert_command.rb +1 -0
- data/lib/rubygems/commands/check_command.rb +1 -0
- data/lib/rubygems/commands/cleanup_command.rb +1 -0
- data/lib/rubygems/commands/contents_command.rb +1 -0
- data/lib/rubygems/commands/dependency_command.rb +1 -0
- data/lib/rubygems/commands/environment_command.rb +1 -0
- data/lib/rubygems/commands/exec_command.rb +249 -0
- data/lib/rubygems/commands/fetch_command.rb +2 -1
- data/lib/rubygems/commands/generate_index_command.rb +1 -0
- data/lib/rubygems/commands/help_command.rb +4 -3
- data/lib/rubygems/commands/install_command.rb +8 -3
- data/lib/rubygems/commands/list_command.rb +1 -0
- data/lib/rubygems/commands/lock_command.rb +1 -0
- data/lib/rubygems/commands/mirror_command.rb +1 -0
- data/lib/rubygems/commands/open_command.rb +1 -0
- data/lib/rubygems/commands/outdated_command.rb +1 -0
- data/lib/rubygems/commands/owner_command.rb +6 -3
- data/lib/rubygems/commands/pristine_command.rb +10 -0
- data/lib/rubygems/commands/push_command.rb +1 -0
- data/lib/rubygems/commands/query_command.rb +1 -0
- data/lib/rubygems/commands/rdoc_command.rb +4 -2
- data/lib/rubygems/commands/search_command.rb +1 -0
- data/lib/rubygems/commands/server_command.rb +1 -0
- data/lib/rubygems/commands/setup_command.rb +4 -3
- data/lib/rubygems/commands/signin_command.rb +1 -0
- data/lib/rubygems/commands/signout_command.rb +1 -0
- data/lib/rubygems/commands/sources_command.rb +1 -0
- data/lib/rubygems/commands/specification_command.rb +1 -0
- data/lib/rubygems/commands/stale_command.rb +1 -0
- data/lib/rubygems/commands/uninstall_command.rb +4 -0
- data/lib/rubygems/commands/unpack_command.rb +2 -1
- data/lib/rubygems/commands/update_command.rb +2 -7
- data/lib/rubygems/commands/which_command.rb +1 -0
- data/lib/rubygems/commands/yank_command.rb +1 -0
- data/lib/rubygems/config_file.rb +34 -0
- data/lib/rubygems/core_ext/kernel_gem.rb +0 -5
- data/lib/rubygems/core_ext/kernel_require.rb +108 -114
- data/lib/rubygems/core_ext/kernel_warn.rb +33 -37
- data/lib/rubygems/core_ext/tcpsocket_init.rb +2 -0
- data/lib/rubygems/defaults.rb +17 -2
- data/lib/rubygems/dependency.rb +6 -2
- data/lib/rubygems/dependency_installer.rb +25 -24
- data/lib/rubygems/dependency_list.rb +1 -0
- data/lib/rubygems/deprecate.rb +3 -2
- data/lib/rubygems/doctor.rb +1 -0
- data/lib/rubygems/errors.rb +1 -0
- data/lib/rubygems/exceptions.rb +11 -3
- data/lib/rubygems/ext/build_error.rb +1 -0
- data/lib/rubygems/ext/builder.rb +23 -7
- data/lib/rubygems/ext/cargo_builder/link_flag_converter.rb +9 -5
- data/lib/rubygems/ext/cargo_builder.rb +145 -110
- data/lib/rubygems/ext/configure_builder.rb +1 -0
- data/lib/rubygems/ext/ext_conf_builder.rb +4 -2
- data/lib/rubygems/ext/rake_builder.rb +5 -3
- data/lib/rubygems/ext.rb +1 -0
- data/lib/rubygems/gem_runner.rb +1 -0
- data/lib/rubygems/gemcutter_utilities/webauthn_listener/response.rb +163 -0
- data/lib/rubygems/gemcutter_utilities/webauthn_listener.rb +105 -0
- data/lib/rubygems/gemcutter_utilities/webauthn_poller.rb +78 -0
- data/lib/rubygems/gemcutter_utilities.rb +53 -6
- data/lib/rubygems/indexer.rb +2 -1
- data/lib/rubygems/install_default_message.rb +1 -0
- data/lib/rubygems/install_message.rb +1 -0
- data/lib/rubygems/install_update_options.rb +1 -0
- data/lib/rubygems/installer.rb +22 -6
- data/lib/rubygems/local_remote_options.rb +1 -0
- data/lib/rubygems/mock_gem_ui.rb +1 -0
- data/lib/rubygems/name_tuple.rb +1 -0
- data/lib/rubygems/optparse/lib/optparse.rb +20 -15
- data/lib/rubygems/package/digest_io.rb +1 -0
- data/lib/rubygems/package/file_source.rb +1 -0
- data/lib/rubygems/package/io_source.rb +1 -0
- data/lib/rubygems/package/old.rb +1 -0
- data/lib/rubygems/package/source.rb +1 -0
- data/lib/rubygems/package/tar_header.rb +13 -12
- data/lib/rubygems/package/tar_reader/entry.rb +89 -7
- data/lib/rubygems/package/tar_reader.rb +1 -28
- data/lib/rubygems/package/tar_writer.rb +1 -0
- data/lib/rubygems/package.rb +1 -0
- data/lib/rubygems/package_task.rb +1 -0
- data/lib/rubygems/path_support.rb +1 -0
- data/lib/rubygems/platform.rb +4 -5
- data/lib/rubygems/psych_tree.rb +1 -0
- data/lib/rubygems/rdoc.rb +1 -0
- data/lib/rubygems/remote_fetcher.rb +1 -0
- data/lib/rubygems/request/http_pool.rb +1 -0
- data/lib/rubygems/request/https_pool.rb +1 -0
- data/lib/rubygems/request.rb +1 -0
- data/lib/rubygems/request_set/gem_dependency_api.rb +105 -105
- data/lib/rubygems/request_set/lockfile/parser.rb +1 -0
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +2 -0
- data/lib/rubygems/request_set/lockfile.rb +1 -0
- data/lib/rubygems/request_set.rb +3 -2
- data/lib/rubygems/requirement.rb +9 -8
- data/lib/rubygems/resolver/activation_request.rb +1 -0
- data/lib/rubygems/resolver/api_set.rb +1 -0
- data/lib/rubygems/resolver/api_specification.rb +1 -0
- data/lib/rubygems/resolver/best_set.rb +1 -0
- data/lib/rubygems/resolver/composed_set.rb +1 -0
- data/lib/rubygems/resolver/conflict.rb +1 -0
- data/lib/rubygems/resolver/current_set.rb +1 -0
- data/lib/rubygems/resolver/dependency_request.rb +1 -0
- data/lib/rubygems/resolver/git_set.rb +1 -0
- data/lib/rubygems/resolver/git_specification.rb +1 -0
- data/lib/rubygems/resolver/index_set.rb +1 -0
- data/lib/rubygems/resolver/index_specification.rb +1 -0
- data/lib/rubygems/resolver/installed_specification.rb +1 -0
- data/lib/rubygems/resolver/installer_set.rb +5 -2
- data/lib/rubygems/resolver/local_specification.rb +1 -0
- data/lib/rubygems/resolver/lock_set.rb +1 -0
- data/lib/rubygems/resolver/lock_specification.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +1 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +32 -26
- data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +1 -1
- data/lib/rubygems/resolver/molinillo.rb +1 -0
- data/lib/rubygems/resolver/requirement_list.rb +1 -0
- data/lib/rubygems/resolver/set.rb +1 -0
- data/lib/rubygems/resolver/source_set.rb +2 -0
- data/lib/rubygems/resolver/spec_specification.rb +1 -0
- data/lib/rubygems/resolver/specification.rb +1 -0
- data/lib/rubygems/resolver/stats.rb +2 -1
- data/lib/rubygems/resolver/vendor_set.rb +1 -0
- data/lib/rubygems/resolver/vendor_specification.rb +1 -0
- data/lib/rubygems/resolver.rb +1 -0
- data/lib/rubygems/s3_uri_signer.rb +4 -2
- data/lib/rubygems/safe_yaml.rb +2 -0
- data/lib/rubygems/security/policies.rb +41 -40
- data/lib/rubygems/security/policy.rb +1 -0
- data/lib/rubygems/security/signer.rb +1 -0
- data/lib/rubygems/security/trust_dir.rb +2 -1
- data/lib/rubygems/security.rb +4 -16
- data/lib/rubygems/security_option.rb +1 -0
- data/lib/rubygems/shellwords.rb +3 -0
- data/lib/rubygems/source/git.rb +1 -1
- data/lib/rubygems/source/installed.rb +1 -0
- data/lib/rubygems/source/local.rb +1 -0
- data/lib/rubygems/source/lock.rb +1 -0
- data/lib/rubygems/source/specific_file.rb +1 -0
- data/lib/rubygems/source/vendor.rb +1 -0
- data/lib/rubygems/source.rb +2 -2
- data/lib/rubygems/spec_fetcher.rb +1 -0
- data/lib/rubygems/specification.rb +58 -52
- data/lib/rubygems/specification_policy.rb +21 -0
- data/lib/rubygems/stub_specification.rb +10 -8
- data/lib/rubygems/text.rb +2 -2
- data/lib/rubygems/tsort/lib/tsort.rb +308 -310
- data/lib/rubygems/uninstaller.rb +1 -0
- data/lib/rubygems/update_suggestion.rb +69 -0
- data/lib/rubygems/user_interaction.rb +2 -0
- data/lib/rubygems/util/licenses.rb +3 -2
- data/lib/rubygems/util/list.rb +1 -0
- data/lib/rubygems/util.rb +2 -5
- data/lib/rubygems/validator.rb +2 -1
- data/lib/rubygems/version.rb +2 -2
- data/lib/rubygems/version_option.rb +1 -0
- data/lib/rubygems.rb +32 -11
- data/rubygems-update.gemspec +6 -4
- data/setup.rb +1 -0
- data/test/rubygems/bad_rake.rb +1 -0
- data/test/rubygems/bundler_test_gem.rb +421 -0
- data/test/rubygems/fake_certlib/openssl.rb +1 -0
- data/test/rubygems/good_rake.rb +1 -0
- data/test/rubygems/helper.rb +23 -6
- data/test/rubygems/installer_test_case.rb +1 -0
- data/test/rubygems/multifactor_auth_utilities.rb +111 -0
- data/test/rubygems/package/tar_test_case.rb +51 -15
- data/test/rubygems/plugin/exception/rubygems_plugin.rb +1 -0
- data/test/rubygems/plugin/load/rubygems_plugin.rb +1 -0
- data/test/rubygems/plugin/standarderror/rubygems_plugin.rb +1 -0
- data/test/rubygems/rubygems/commands/crash_command.rb +1 -0
- data/test/rubygems/rubygems_plugin.rb +1 -0
- data/test/rubygems/simple_gem.rb +2 -1
- data/test/rubygems/specifications/bar-0.0.2.gemspec +2 -0
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +2 -0
- data/test/rubygems/test_bundled_ca.rb +3 -2
- data/test/rubygems/test_config.rb +2 -1
- data/test/rubygems/test_deprecate.rb +2 -1
- data/test/rubygems/test_exit.rb +7 -1
- data/test/rubygems/test_gem.rb +41 -421
- data/test/rubygems/test_gem_available_set.rb +1 -0
- data/test/rubygems/test_gem_bundler_version_finder.rb +5 -3
- data/test/rubygems/test_gem_command.rb +1 -0
- data/test/rubygems/test_gem_command_manager.rb +67 -1
- data/test/rubygems/test_gem_commands_build_command.rb +11 -0
- data/test/rubygems/test_gem_commands_cert_command.rb +1 -0
- data/test/rubygems/test_gem_commands_check_command.rb +1 -0
- data/test/rubygems/test_gem_commands_cleanup_command.rb +1 -0
- data/test/rubygems/test_gem_commands_contents_command.rb +1 -0
- data/test/rubygems/test_gem_commands_dependency_command.rb +1 -0
- data/test/rubygems/test_gem_commands_environment_command.rb +1 -0
- data/test/rubygems/test_gem_commands_exec_command.rb +853 -0
- data/test/rubygems/test_gem_commands_fetch_command.rb +1 -0
- data/test/rubygems/test_gem_commands_generate_index_command.rb +1 -0
- data/test/rubygems/test_gem_commands_help_command.rb +1 -0
- data/test/rubygems/test_gem_commands_info_command.rb +1 -0
- data/test/rubygems/test_gem_commands_install_command.rb +21 -1
- data/test/rubygems/test_gem_commands_list_command.rb +1 -0
- data/test/rubygems/test_gem_commands_lock_command.rb +1 -0
- data/test/rubygems/test_gem_commands_mirror.rb +1 -0
- data/test/rubygems/test_gem_commands_open_command.rb +1 -0
- data/test/rubygems/test_gem_commands_outdated_command.rb +1 -0
- data/test/rubygems/test_gem_commands_owner_command.rb +103 -7
- data/test/rubygems/test_gem_commands_pristine_command.rb +50 -1
- data/test/rubygems/test_gem_commands_push_command.rb +110 -6
- data/test/rubygems/test_gem_commands_query_command.rb +1 -0
- data/test/rubygems/test_gem_commands_search_command.rb +1 -0
- data/test/rubygems/test_gem_commands_server_command.rb +1 -0
- data/test/rubygems/test_gem_commands_setup_command.rb +4 -11
- data/test/rubygems/test_gem_commands_signin_command.rb +1 -0
- data/test/rubygems/test_gem_commands_sources_command.rb +1 -0
- data/test/rubygems/test_gem_commands_specification_command.rb +1 -0
- data/test/rubygems/test_gem_commands_stale_command.rb +1 -0
- data/test/rubygems/test_gem_commands_uninstall_command.rb +32 -14
- data/test/rubygems/test_gem_commands_unpack_command.rb +1 -0
- data/test/rubygems/test_gem_commands_update_command.rb +7 -6
- data/test/rubygems/test_gem_commands_which_command.rb +1 -0
- data/test/rubygems/test_gem_commands_yank_command.rb +120 -1
- data/test/rubygems/test_gem_config_file.rb +2 -1
- data/test/rubygems/test_gem_dependency.rb +3 -0
- data/test/rubygems/test_gem_dependency_installer.rb +35 -0
- data/test/rubygems/test_gem_dependency_list.rb +1 -0
- data/test/rubygems/test_gem_dependency_resolution_error.rb +1 -0
- data/test/rubygems/test_gem_doctor.rb +1 -0
- data/test/rubygems/test_gem_ext_builder.rb +7 -8
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec +4 -4
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/{Cargo.lock → ext/custom_name_lib/Cargo.lock} +22 -32
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/{Cargo.toml → ext/custom_name_lib/Cargo.toml} +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/{src → ext/custom_name_lib/src}/lib.rs +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb +3 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +36 -32
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/rust_ruby_example.gemspec +2 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs +12 -0
- data/test/rubygems/test_gem_ext_cargo_builder.rb +33 -44
- data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb +17 -16
- data/test/rubygems/test_gem_ext_cargo_builder_unit.rb +5 -20
- data/test/rubygems/test_gem_ext_cmake_builder.rb +1 -0
- data/test/rubygems/test_gem_ext_configure_builder.rb +1 -0
- data/test/rubygems/test_gem_ext_rake_builder.rb +1 -0
- data/test/rubygems/test_gem_gem_runner.rb +8 -2
- data/test/rubygems/test_gem_gemcutter_utilities.rb +130 -48
- data/test/rubygems/test_gem_impossible_dependencies_error.rb +1 -0
- data/test/rubygems/test_gem_indexer.rb +40 -20
- data/test/rubygems/test_gem_install_update_options.rb +1 -0
- data/test/rubygems/test_gem_installer.rb +120 -5
- data/test/rubygems/test_gem_local_remote_options.rb +1 -0
- data/test/rubygems/test_gem_name_tuple.rb +1 -0
- data/test/rubygems/test_gem_package.rb +0 -25
- data/test/rubygems/test_gem_package_old.rb +1 -0
- data/test/rubygems/test_gem_package_tar_header.rb +14 -13
- data/test/rubygems/test_gem_package_tar_reader.rb +49 -1
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +152 -6
- data/test/rubygems/test_gem_package_tar_writer.rb +1 -0
- data/test/rubygems/test_gem_package_task.rb +1 -0
- data/test/rubygems/test_gem_path_support.rb +1 -0
- data/test/rubygems/test_gem_platform.rb +60 -60
- data/test/rubygems/test_gem_rdoc.rb +1 -0
- data/test/rubygems/test_gem_remote_fetcher.rb +6 -5
- data/test/rubygems/test_gem_request.rb +10 -4
- data/test/rubygems/test_gem_request_connection_pools.rb +1 -0
- data/test/rubygems/test_gem_request_set.rb +3 -2
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +11 -10
- data/test/rubygems/test_gem_request_set_lockfile.rb +1 -0
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +7 -6
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +1 -0
- data/test/rubygems/test_gem_requirement.rb +2 -1
- data/test/rubygems/test_gem_resolver.rb +1 -0
- data/test/rubygems/test_gem_resolver_activation_request.rb +1 -0
- data/test/rubygems/test_gem_resolver_api_set.rb +13 -12
- data/test/rubygems/test_gem_resolver_api_specification.rb +20 -19
- data/test/rubygems/test_gem_resolver_best_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_composed_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_conflict.rb +1 -0
- data/test/rubygems/test_gem_resolver_dependency_request.rb +1 -0
- data/test/rubygems/test_gem_resolver_git_set.rb +10 -9
- data/test/rubygems/test_gem_resolver_git_specification.rb +3 -2
- data/test/rubygems/test_gem_resolver_index_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_index_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_installed_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_installer_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_local_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_lock_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_lock_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_requirement_list.rb +1 -0
- data/test/rubygems/test_gem_resolver_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_vendor_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_vendor_specification.rb +1 -0
- data/test/rubygems/test_gem_security.rb +1 -0
- data/test/rubygems/test_gem_security_policy.rb +10 -10
- data/test/rubygems/test_gem_security_signer.rb +1 -0
- data/test/rubygems/test_gem_security_trust_dir.rb +3 -2
- data/test/rubygems/test_gem_silent_ui.rb +1 -0
- data/test/rubygems/test_gem_source.rb +2 -1
- data/test/rubygems/test_gem_source_fetch_problem.rb +1 -0
- data/test/rubygems/test_gem_source_git.rb +14 -12
- data/test/rubygems/test_gem_source_installed.rb +2 -1
- data/test/rubygems/test_gem_source_list.rb +1 -0
- data/test/rubygems/test_gem_source_local.rb +1 -0
- data/test/rubygems/test_gem_source_lock.rb +4 -3
- data/test/rubygems/test_gem_source_specific_file.rb +1 -0
- data/test/rubygems/test_gem_source_subpath_problem.rb +1 -0
- data/test/rubygems/test_gem_source_vendor.rb +2 -1
- data/test/rubygems/test_gem_spec_fetcher.rb +1 -0
- data/test/rubygems/test_gem_specification.rb +95 -39
- data/test/rubygems/test_gem_stream_ui.rb +34 -3
- data/test/rubygems/test_gem_stub_specification.rb +1 -0
- data/test/rubygems/test_gem_text.rb +1 -0
- data/test/rubygems/test_gem_uninstaller.rb +6 -5
- data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +1 -0
- data/test/rubygems/test_gem_update_suggestion.rb +209 -0
- data/test/rubygems/test_gem_uri.rb +2 -0
- data/test/rubygems/test_gem_uri_formatter.rb +1 -0
- data/test/rubygems/test_gem_util.rb +1 -0
- data/test/rubygems/test_gem_version.rb +3 -2
- data/test/rubygems/test_gem_version_option.rb +1 -0
- data/test/rubygems/test_kernel.rb +12 -17
- data/test/rubygems/test_project_sanity.rb +32 -3
- data/test/rubygems/test_remote_fetch_error.rb +2 -1
- data/test/rubygems/test_require.rb +70 -55
- data/test/rubygems/test_rubygems.rb +2 -0
- data/test/rubygems/test_webauthn_listener.rb +143 -0
- data/test/rubygems/test_webauthn_listener_response.rb +93 -0
- data/test/rubygems/test_webauthn_poller.rb +124 -0
- data/test/rubygems/utilities.rb +45 -3
- data/test/test_changelog_generator.rb +1 -1
- metadata +59 -43
- data/bundler/lib/bundler/templates/gems.rb +0 -5
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +0 -5
- data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -6
- data/bundler/lib/bundler/vendor/molinillo/LICENSE +0 -9
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -88
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -164
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -255
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -149
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -112
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -839
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -11
- data/bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +0 -154
- data/bundler/lib/bundler/vendored_molinillo.rb +0 -4
- data/bundler/lib/bundler/version_ranges.rb +0 -122
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/build.rb +0 -21
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/build.rb +0 -21
@@ -3,20 +3,24 @@
|
|
3
3
|
class Gem::Ext::CargoBuilder < Gem::Ext::Builder
|
4
4
|
# Converts Ruby link flags into something cargo understands
|
5
5
|
class LinkFlagConverter
|
6
|
+
FILTERED_PATTERNS = [
|
7
|
+
/compress-debug-sections/, # Not supported by all linkers, and not required for Rust
|
8
|
+
].freeze
|
9
|
+
|
6
10
|
def self.convert(arg)
|
11
|
+
return [] if FILTERED_PATTERNS.any? {|p| p.match?(arg) }
|
12
|
+
|
7
13
|
case arg.chomp
|
8
14
|
when /^-L\s*(.+)$/
|
9
15
|
["-L", "native=#{$1}"]
|
10
16
|
when /^--library=(\w+\S+)$/, /^-l\s*(\w+\S+)$/
|
11
17
|
["-l", $1]
|
12
|
-
when /^-l\s
|
13
|
-
["-l",
|
14
|
-
when /^-l\s*:lib(\S+).(so|dylib|dll)$/
|
15
|
-
["-l", "dylib=#{$1}"]
|
18
|
+
when /^-l\s*([^:\s])+/ # -lfoo, but not -l:libfoo.a
|
19
|
+
["-l", $1]
|
16
20
|
when /^-F\s*(.*)$/
|
17
21
|
["-l", "framework=#{$1}"]
|
18
22
|
else
|
19
|
-
["-C", "
|
23
|
+
["-C", "link-args=#{arg}"]
|
20
24
|
end
|
21
25
|
end
|
22
26
|
end
|
@@ -1,35 +1,67 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require_relative "../shellwords"
|
4
|
+
|
3
5
|
# This class is used by rubygems to build Rust extensions. It is a thin-wrapper
|
4
6
|
# over the `cargo rustc` command which takes care of building Rust code in a way
|
5
7
|
# that Ruby can use.
|
6
8
|
class Gem::Ext::CargoBuilder < Gem::Ext::Builder
|
7
9
|
attr_accessor :spec, :runner, :profile
|
8
10
|
|
9
|
-
def initialize
|
11
|
+
def initialize
|
10
12
|
require_relative "../command"
|
11
13
|
require_relative "cargo_builder/link_flag_converter"
|
12
14
|
|
13
|
-
@spec = spec
|
14
15
|
@runner = self.class.method(:run)
|
15
16
|
@profile = :release
|
16
17
|
end
|
17
18
|
|
18
|
-
def build(
|
19
|
+
def build(extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = Dir.pwd)
|
20
|
+
require "tempfile"
|
19
21
|
require "fileutils"
|
20
|
-
require "shellwords"
|
21
22
|
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
23
|
+
# Where's the Cargo.toml of the crate we're building
|
24
|
+
cargo_toml = File.join(cargo_dir, "Cargo.toml")
|
25
|
+
# What's the crate's name
|
26
|
+
crate_name = cargo_crate_name(cargo_dir, cargo_toml, results)
|
27
|
+
|
28
|
+
begin
|
29
|
+
# Create a tmp dir to do the build in
|
30
|
+
tmp_dest = Dir.mktmpdir(".gem.", cargo_dir)
|
31
|
+
|
32
|
+
# Run the build
|
33
|
+
cmd = cargo_command(cargo_toml, tmp_dest, args, crate_name)
|
34
|
+
runner.call(cmd, results, "cargo", cargo_dir, build_env)
|
35
|
+
|
36
|
+
# Where do we expect Cargo to write the compiled library
|
37
|
+
dylib_path = cargo_dylib_path(tmp_dest, crate_name)
|
38
|
+
|
39
|
+
# Helpful error if we didn't find the compiled library
|
40
|
+
raise DylibNotFoundError, tmp_dest unless File.exist?(dylib_path)
|
28
41
|
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
42
|
+
# Cargo and Ruby differ on how the library should be named, rename from
|
43
|
+
# what Cargo outputs to what Ruby expects
|
44
|
+
dlext_name = "#{crate_name}.#{makefile_config("DLEXT")}"
|
45
|
+
dlext_path = File.join(File.dirname(dylib_path), dlext_name)
|
46
|
+
FileUtils.cp(dylib_path, dlext_path)
|
47
|
+
|
48
|
+
nesting = extension_nesting(extension)
|
49
|
+
|
50
|
+
# TODO: remove in RubyGems 4
|
51
|
+
if Gem.install_extension_in_lib && lib_dir
|
52
|
+
nested_lib_dir = File.join(lib_dir, nesting)
|
53
|
+
FileUtils.mkdir_p nested_lib_dir
|
54
|
+
FileUtils.cp_r dlext_path, nested_lib_dir, remove_destination: true
|
55
|
+
end
|
56
|
+
|
57
|
+
# move to final destination
|
58
|
+
nested_dest_path = File.join(dest_path, nesting)
|
59
|
+
FileUtils.mkdir_p nested_dest_path
|
60
|
+
FileUtils.cp_r dlext_path, nested_dest_path, remove_destination: true
|
61
|
+
ensure
|
62
|
+
# clean up intermediary build artifacts
|
63
|
+
FileUtils.rm_rf tmp_dest if tmp_dest
|
64
|
+
end
|
33
65
|
|
34
66
|
results
|
35
67
|
end
|
@@ -37,45 +69,64 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
|
|
37
69
|
def build_env
|
38
70
|
build_env = rb_config_env
|
39
71
|
build_env["RUBY_STATIC"] = "true" if ruby_static? && ENV.key?("RUBY_STATIC")
|
40
|
-
|
72
|
+
cfg = "--cfg=rb_sys_gem --cfg=rubygems --cfg=rubygems_#{Gem::VERSION.tr(".", "_")}"
|
73
|
+
build_env["RUSTFLAGS"] = [ENV["RUSTFLAGS"], cfg].compact.join(" ")
|
41
74
|
build_env
|
42
75
|
end
|
43
76
|
|
44
|
-
def cargo_command(
|
45
|
-
manifest = File.join(cargo_dir, "Cargo.toml")
|
46
|
-
cargo = ENV.fetch("CARGO", "cargo")
|
47
|
-
|
77
|
+
def cargo_command(cargo_toml, dest_path, args = [], crate_name = nil)
|
48
78
|
cmd = []
|
49
79
|
cmd += [cargo, "rustc"]
|
80
|
+
cmd += ["--crate-type", "cdylib"]
|
50
81
|
cmd += ["--target", ENV["CARGO_BUILD_TARGET"]] if ENV["CARGO_BUILD_TARGET"]
|
51
82
|
cmd += ["--target-dir", dest_path]
|
52
|
-
cmd += ["--manifest-path",
|
83
|
+
cmd += ["--manifest-path", cargo_toml]
|
53
84
|
cmd += ["--lib"]
|
54
85
|
cmd += ["--profile", profile.to_s]
|
55
|
-
cmd += ["--locked"]
|
86
|
+
cmd += ["--locked"]
|
56
87
|
cmd += Gem::Command.build_args
|
57
88
|
cmd += args
|
58
89
|
cmd += ["--"]
|
59
|
-
cmd += [*cargo_rustc_args(dest_path)]
|
90
|
+
cmd += [*cargo_rustc_args(dest_path, crate_name)]
|
60
91
|
cmd
|
61
92
|
end
|
62
93
|
|
63
94
|
private
|
64
95
|
|
96
|
+
def cargo
|
97
|
+
ENV.fetch("CARGO", "cargo")
|
98
|
+
end
|
99
|
+
|
100
|
+
# returns the directory nesting of the extension, ignoring the first part, so
|
101
|
+
# "ext/foo/bar/Cargo.toml" becomes "foo/bar"
|
102
|
+
def extension_nesting(extension)
|
103
|
+
parts = extension.to_s.split(Regexp.union([File::SEPARATOR, File::ALT_SEPARATOR].compact))
|
104
|
+
|
105
|
+
parts = parts.each_with_object([]) do |segment, final|
|
106
|
+
next if segment == "."
|
107
|
+
if segment == ".."
|
108
|
+
raise Gem::InstallError, "extension outside of gem root" if final.empty?
|
109
|
+
next final.pop
|
110
|
+
end
|
111
|
+
final << segment
|
112
|
+
end
|
113
|
+
|
114
|
+
File.join(parts[1...-1])
|
115
|
+
end
|
116
|
+
|
65
117
|
def rb_config_env
|
66
118
|
result = {}
|
67
119
|
RbConfig::CONFIG.each {|k, v| result["RBCONFIG_#{k}"] = v }
|
68
120
|
result
|
69
121
|
end
|
70
122
|
|
71
|
-
def cargo_rustc_args(dest_dir)
|
123
|
+
def cargo_rustc_args(dest_dir, crate_name)
|
72
124
|
[
|
73
125
|
*linker_args,
|
74
126
|
*mkmf_libpath,
|
75
|
-
*rustc_dynamic_linker_flags(dest_dir),
|
127
|
+
*rustc_dynamic_linker_flags(dest_dir, crate_name),
|
76
128
|
*rustc_lib_flags(dest_dir),
|
77
129
|
*platform_specific_rustc_args(dest_dir),
|
78
|
-
*debug_flags,
|
79
130
|
]
|
80
131
|
end
|
81
132
|
|
@@ -104,14 +155,23 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
|
|
104
155
|
# We want to use the same linker that Ruby uses, so that the linker flags from
|
105
156
|
# mkmf work properly.
|
106
157
|
def linker_args
|
107
|
-
# Have to handle CC="cl /nologo" on mswin
|
108
158
|
cc_flag = Shellwords.split(makefile_config("CC"))
|
109
159
|
linker = cc_flag.shift
|
110
160
|
link_args = cc_flag.flat_map {|a| ["-C", "link-arg=#{a}"] }
|
111
161
|
|
162
|
+
return mswin_link_args if linker == "cl"
|
163
|
+
|
112
164
|
["-C", "linker=#{linker}", *link_args]
|
113
165
|
end
|
114
166
|
|
167
|
+
def mswin_link_args
|
168
|
+
args = []
|
169
|
+
args += ["-l", makefile_config("LIBRUBYARG_SHARED").chomp(".lib")]
|
170
|
+
args += split_flags("LIBS").flat_map {|lib| ["-l", lib.chomp(".lib")] }
|
171
|
+
args += split_flags("LOCAL_LIBS").flat_map {|lib| ["-l", lib.chomp(".lib")] }
|
172
|
+
args
|
173
|
+
end
|
174
|
+
|
115
175
|
def libruby_args(dest_dir)
|
116
176
|
libs = makefile_config(ruby_static? ? "LIBRUBYARG_STATIC" : "LIBRUBYARG_SHARED")
|
117
177
|
raw_libs = Shellwords.split(libs)
|
@@ -124,42 +184,70 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
|
|
124
184
|
makefile_config("ENABLE_SHARED") == "no"
|
125
185
|
end
|
126
186
|
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
187
|
+
def cargo_dylib_path(dest_path, crate_name)
|
188
|
+
prefix = so_ext == "dll" ? "" : "lib"
|
189
|
+
path_parts = [dest_path]
|
190
|
+
path_parts << ENV["CARGO_BUILD_TARGET"] if ENV["CARGO_BUILD_TARGET"]
|
191
|
+
path_parts += ["release", "#{prefix}#{crate_name}.#{so_ext}"]
|
192
|
+
File.join(*path_parts)
|
132
193
|
end
|
133
194
|
|
134
|
-
def
|
135
|
-
|
195
|
+
def cargo_crate_name(cargo_dir, manifest_path, results)
|
196
|
+
require "open3"
|
197
|
+
Gem.load_yaml
|
136
198
|
|
137
|
-
|
199
|
+
output, status =
|
200
|
+
begin
|
201
|
+
Open3.capture2e(cargo, "metadata", "--no-deps", "--format-version", "1", :chdir => cargo_dir)
|
202
|
+
rescue => error
|
203
|
+
raise Gem::InstallError, "cargo metadata failed #{error.message}"
|
204
|
+
end
|
138
205
|
|
139
|
-
|
140
|
-
|
206
|
+
unless status.success?
|
207
|
+
if Gem.configuration.really_verbose
|
208
|
+
puts output
|
209
|
+
else
|
210
|
+
results << output
|
211
|
+
end
|
141
212
|
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
213
|
+
exit_reason =
|
214
|
+
if status.exited?
|
215
|
+
", exit code #{status.exitstatus}"
|
216
|
+
elsif status.signaled?
|
217
|
+
", uncaught signal #{status.termsig}"
|
218
|
+
end
|
147
219
|
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
220
|
+
raise Gem::InstallError, "cargo metadata failed#{exit_reason}"
|
221
|
+
end
|
222
|
+
|
223
|
+
# cargo metadata output is specified as json, but with the
|
224
|
+
# --format-version 1 option the output is compatible with YAML, so we can
|
225
|
+
# avoid the json dependency
|
226
|
+
metadata = Gem::SafeYAML.safe_load(output)
|
227
|
+
package = metadata["packages"].find {|pkg| normalize_path(pkg["manifest_path"]) == manifest_path }
|
228
|
+
unless package
|
229
|
+
found = metadata["packages"].map {|md| "#{md["name"]} at #{md["manifest_path"]}" }
|
230
|
+
raise Gem::InstallError, <<-EOF
|
231
|
+
failed to determine cargo package name
|
232
|
+
|
233
|
+
looking for: #{manifest_path}
|
234
|
+
|
235
|
+
found:
|
236
|
+
#{found.join("\n")}
|
237
|
+
EOF
|
238
|
+
end
|
239
|
+
package["name"].tr("-", "_")
|
154
240
|
end
|
155
241
|
|
156
|
-
def
|
157
|
-
|
242
|
+
def normalize_path(path)
|
243
|
+
return path unless File::ALT_SEPARATOR
|
244
|
+
|
245
|
+
path.tr(File::ALT_SEPARATOR, File::SEPARATOR)
|
158
246
|
end
|
159
247
|
|
160
|
-
def rustc_dynamic_linker_flags(dest_dir)
|
248
|
+
def rustc_dynamic_linker_flags(dest_dir, crate_name)
|
161
249
|
split_flags("DLDFLAGS")
|
162
|
-
.map {|arg| maybe_resolve_ldflag_variable(arg, dest_dir) }
|
250
|
+
.map {|arg| maybe_resolve_ldflag_variable(arg, dest_dir, crate_name) }
|
163
251
|
.compact
|
164
252
|
.flat_map {|arg| ldflag_to_link_modifier(arg) }
|
165
253
|
end
|
@@ -193,8 +281,8 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
|
|
193
281
|
!!Gem::WIN_PATTERNS.find {|r| target_platform =~ r }
|
194
282
|
end
|
195
283
|
|
196
|
-
# Interpolate
|
197
|
-
def maybe_resolve_ldflag_variable(input_arg, dest_dir)
|
284
|
+
# Interpolate substitution vars in the arg (i.e. $(DEFFILE))
|
285
|
+
def maybe_resolve_ldflag_variable(input_arg, dest_dir, crate_name)
|
198
286
|
var_matches = input_arg.match(/\$\((\w+)\)/)
|
199
287
|
|
200
288
|
return input_arg unless var_matches
|
@@ -207,19 +295,19 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
|
|
207
295
|
# On windows, it is assumed that mkmf has setup an exports file for the
|
208
296
|
# extension, so we have to to create one ourselves.
|
209
297
|
when "DEFFILE"
|
210
|
-
write_deffile(dest_dir)
|
298
|
+
write_deffile(dest_dir, crate_name)
|
211
299
|
else
|
212
300
|
RbConfig::CONFIG[var_name]
|
213
301
|
end
|
214
302
|
end
|
215
303
|
|
216
|
-
def write_deffile(dest_dir)
|
217
|
-
deffile_path = File.join(dest_dir, "#{
|
304
|
+
def write_deffile(dest_dir, crate_name)
|
305
|
+
deffile_path = File.join(dest_dir, "#{crate_name}-#{RbConfig::CONFIG["arch"]}.def")
|
218
306
|
export_prefix = makefile_config("EXPORT_PREFIX") || ""
|
219
307
|
|
220
308
|
File.open(deffile_path, "w") do |f|
|
221
309
|
f.puts "EXPORTS"
|
222
|
-
f.puts "#{export_prefix.strip}Init_#{
|
310
|
+
f.puts "#{export_prefix.strip}Init_#{crate_name}"
|
223
311
|
end
|
224
312
|
|
225
313
|
deffile_path
|
@@ -254,59 +342,6 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
|
|
254
342
|
RbConfig.expand(val.dup)
|
255
343
|
end
|
256
344
|
|
257
|
-
# Good balance between binary size and debugability
|
258
|
-
def debug_flags
|
259
|
-
return [] if profile == :dev
|
260
|
-
|
261
|
-
["-C", "debuginfo=1"]
|
262
|
-
end
|
263
|
-
|
264
|
-
# Copied from ExtConfBuilder
|
265
|
-
def finalize_directory(dest_path, lib_dir, extension_dir)
|
266
|
-
require "fileutils"
|
267
|
-
require "tempfile"
|
268
|
-
|
269
|
-
ext_path = final_extension_path(dest_path)
|
270
|
-
|
271
|
-
begin
|
272
|
-
tmp_dest = Dir.mktmpdir(".gem.", extension_dir)
|
273
|
-
|
274
|
-
# Some versions of `mktmpdir` return absolute paths, which will break make
|
275
|
-
# if the paths contain spaces.
|
276
|
-
#
|
277
|
-
# As such, we convert to a relative path.
|
278
|
-
tmp_dest_relative = get_relative_path(tmp_dest.clone, extension_dir)
|
279
|
-
|
280
|
-
full_tmp_dest = File.join(extension_dir, tmp_dest_relative)
|
281
|
-
|
282
|
-
# TODO: remove in RubyGems 4
|
283
|
-
if Gem.install_extension_in_lib && lib_dir
|
284
|
-
FileUtils.mkdir_p lib_dir
|
285
|
-
FileUtils.cp_r ext_path, lib_dir, remove_destination: true
|
286
|
-
end
|
287
|
-
|
288
|
-
FileUtils::Entry_.new(full_tmp_dest).traverse do |ent|
|
289
|
-
destent = ent.class.new(dest_path, ent.rel)
|
290
|
-
destent.exist? || FileUtils.mv(ent.path, destent.path)
|
291
|
-
end
|
292
|
-
ensure
|
293
|
-
FileUtils.rm_rf tmp_dest if tmp_dest
|
294
|
-
end
|
295
|
-
end
|
296
|
-
|
297
|
-
def get_relative_path(path, base)
|
298
|
-
path[0..base.length - 1] = "." if path.start_with?(base)
|
299
|
-
path
|
300
|
-
end
|
301
|
-
|
302
|
-
def profile_target_directory
|
303
|
-
case profile
|
304
|
-
when :release then "release"
|
305
|
-
when :dev then "debug"
|
306
|
-
else raise "unknown target directory for profile: #{profile}"
|
307
|
-
end
|
308
|
-
end
|
309
|
-
|
310
345
|
# Error raised when no cdylib artifact was created
|
311
346
|
class DylibNotFoundError < StandardError
|
312
347
|
def initialize(dir)
|
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
#--
|
3
4
|
# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
|
4
5
|
# All rights reserved.
|
@@ -21,8 +22,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
|
|
21
22
|
destdir = ENV["DESTDIR"]
|
22
23
|
|
23
24
|
begin
|
24
|
-
|
25
|
-
cmd = Gem.ruby.shellsplit << "-I" << File.expand_path("../..", __dir__) << File.basename(extension)
|
25
|
+
cmd = ruby << File.basename(extension)
|
26
26
|
cmd.push(*args)
|
27
27
|
|
28
28
|
run(cmd, results, class_name, extension_dir) do |s, r|
|
@@ -55,6 +55,8 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
|
|
55
55
|
destent = ent.class.new(dest_path, ent.rel)
|
56
56
|
destent.exist? || FileUtils.mv(ent.path, destent.path)
|
57
57
|
end
|
58
|
+
|
59
|
+
make dest_path, results, extension_dir, tmp_dest_relative, ["clean"]
|
58
60
|
ensure
|
59
61
|
ENV["DESTDIR"] = destdir
|
60
62
|
end
|
@@ -1,4 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative "../shellwords"
|
4
|
+
|
2
5
|
#--
|
3
6
|
# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
|
4
7
|
# All rights reserved.
|
@@ -14,11 +17,10 @@ class Gem::Ext::RakeBuilder < Gem::Ext::Builder
|
|
14
17
|
rake = ENV["rake"]
|
15
18
|
|
16
19
|
if rake
|
17
|
-
|
18
|
-
rake = rake.shellsplit
|
20
|
+
rake = Shellwords.split(rake)
|
19
21
|
else
|
20
22
|
begin
|
21
|
-
rake =
|
23
|
+
rake = ruby << "-rrubygems" << Gem.bin_path("rake", "rake")
|
22
24
|
rescue Gem::Exception
|
23
25
|
rake = [Gem.default_exec_format % "rake"]
|
24
26
|
end
|
data/lib/rubygems/ext.rb
CHANGED
data/lib/rubygems/gem_runner.rb
CHANGED
@@ -0,0 +1,163 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
##
|
4
|
+
# The WebauthnListener Response class is used by the WebauthnListener to create
|
5
|
+
# responses to be sent to the Gem host. It creates a Net::HTTPResponse instance
|
6
|
+
# when initialized and can be converted to the appropriate format to be sent by a socket using `to_s`.
|
7
|
+
# Net::HTTPResponse instances cannot be directly sent over a socket.
|
8
|
+
#
|
9
|
+
# Types of response classes:
|
10
|
+
# - OkResponse
|
11
|
+
# - NoContentResponse
|
12
|
+
# - BadRequestResponse
|
13
|
+
# - NotFoundResponse
|
14
|
+
# - MethodNotAllowedResponse
|
15
|
+
#
|
16
|
+
# Example usage:
|
17
|
+
#
|
18
|
+
# server = TCPServer.new(0)
|
19
|
+
# socket = server.accept
|
20
|
+
#
|
21
|
+
# response = OkResponse.for("https://rubygems.example")
|
22
|
+
# socket.print response.to_s
|
23
|
+
# socket.close
|
24
|
+
#
|
25
|
+
|
26
|
+
module Gem::GemcutterUtilities
|
27
|
+
class WebauthnListener
|
28
|
+
class Response
|
29
|
+
attr_reader :http_response
|
30
|
+
|
31
|
+
def self.for(host)
|
32
|
+
new(host)
|
33
|
+
end
|
34
|
+
|
35
|
+
def initialize(host)
|
36
|
+
@host = host
|
37
|
+
|
38
|
+
build_http_response
|
39
|
+
end
|
40
|
+
|
41
|
+
def to_s
|
42
|
+
status_line = "HTTP/#{@http_response.http_version} #{@http_response.code} #{@http_response.message}\r\n"
|
43
|
+
headers = @http_response.to_hash.map {|header, value| "#{header}: #{value.join(", ")}\r\n" }.join + "\r\n"
|
44
|
+
body = @http_response.body ? "#{@http_response.body}\n" : ""
|
45
|
+
|
46
|
+
status_line + headers + body
|
47
|
+
end
|
48
|
+
|
49
|
+
private
|
50
|
+
|
51
|
+
# Must be implemented in subclasses
|
52
|
+
def code
|
53
|
+
raise NotImplementedError
|
54
|
+
end
|
55
|
+
|
56
|
+
def reason_phrase
|
57
|
+
raise NotImplementedError
|
58
|
+
end
|
59
|
+
|
60
|
+
def body; end
|
61
|
+
|
62
|
+
def build_http_response
|
63
|
+
response_class = Net::HTTPResponse::CODE_TO_OBJ[code.to_s]
|
64
|
+
@http_response = response_class.new("1.1", code, reason_phrase)
|
65
|
+
@http_response.instance_variable_set(:@read, true)
|
66
|
+
|
67
|
+
add_connection_header
|
68
|
+
add_access_control_headers
|
69
|
+
add_body
|
70
|
+
end
|
71
|
+
|
72
|
+
def add_connection_header
|
73
|
+
@http_response["connection"] = "close"
|
74
|
+
end
|
75
|
+
|
76
|
+
def add_access_control_headers
|
77
|
+
@http_response["access-control-allow-origin"] = @host
|
78
|
+
@http_response["access-control-allow-methods"] = "POST"
|
79
|
+
@http_response["access-control-allow-headers"] = %w[Content-Type Authorization x-csrf-token]
|
80
|
+
end
|
81
|
+
|
82
|
+
def add_body
|
83
|
+
return unless body
|
84
|
+
@http_response["content-type"] = "text/plain; charset=utf-8"
|
85
|
+
@http_response["content-length"] = body.bytesize
|
86
|
+
@http_response.instance_variable_set(:@body, body)
|
87
|
+
end
|
88
|
+
end
|
89
|
+
|
90
|
+
class OkResponse < Response
|
91
|
+
private
|
92
|
+
|
93
|
+
def code
|
94
|
+
200
|
95
|
+
end
|
96
|
+
|
97
|
+
def reason_phrase
|
98
|
+
"OK"
|
99
|
+
end
|
100
|
+
|
101
|
+
def body
|
102
|
+
"success"
|
103
|
+
end
|
104
|
+
end
|
105
|
+
|
106
|
+
class NoContentResponse < Response
|
107
|
+
private
|
108
|
+
|
109
|
+
def code
|
110
|
+
204
|
111
|
+
end
|
112
|
+
|
113
|
+
def reason_phrase
|
114
|
+
"No Content"
|
115
|
+
end
|
116
|
+
end
|
117
|
+
|
118
|
+
class BadRequestResponse < Response
|
119
|
+
private
|
120
|
+
|
121
|
+
def code
|
122
|
+
400
|
123
|
+
end
|
124
|
+
|
125
|
+
def reason_phrase
|
126
|
+
"Bad Request"
|
127
|
+
end
|
128
|
+
|
129
|
+
def body
|
130
|
+
"missing code parameter"
|
131
|
+
end
|
132
|
+
end
|
133
|
+
|
134
|
+
class NotFoundResponse < Response
|
135
|
+
private
|
136
|
+
|
137
|
+
def code
|
138
|
+
404
|
139
|
+
end
|
140
|
+
|
141
|
+
def reason_phrase
|
142
|
+
"Not Found"
|
143
|
+
end
|
144
|
+
end
|
145
|
+
|
146
|
+
class MethodNotAllowedResponse < Response
|
147
|
+
private
|
148
|
+
|
149
|
+
def code
|
150
|
+
405
|
151
|
+
end
|
152
|
+
|
153
|
+
def reason_phrase
|
154
|
+
"Method Not Allowed"
|
155
|
+
end
|
156
|
+
|
157
|
+
def add_access_control_headers
|
158
|
+
super
|
159
|
+
@http_response["allow"] = %w[GET OPTIONS]
|
160
|
+
end
|
161
|
+
end
|
162
|
+
end
|
163
|
+
end
|