rubygems-update 3.2.30 → 3.4.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1666 -994
- data/CONTRIBUTING.md +71 -15
- data/Manifest.txt +93 -37
- data/POLICIES.md +65 -16
- data/README.md +28 -13
- data/UPGRADING.md +5 -81
- data/bin/gem +2 -10
- data/bin/update_rubygems +5 -5
- data/bundler/CHANGELOG.md +647 -1
- data/bundler/README.md +3 -6
- data/bundler/UPGRADING.md +11 -4
- data/bundler/bundler.gemspec +8 -10
- data/bundler/exe/bundle +7 -11
- data/bundler/exe/bundler +1 -1
- data/bundler/lib/bundler/.document +1 -0
- data/bundler/lib/bundler/build_metadata.rb +3 -3
- 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 +4 -2
- data/bundler/lib/bundler/cli/config.rb +10 -1
- data/bundler/lib/bundler/cli/console.rb +2 -2
- data/bundler/lib/bundler/cli/doctor.rb +10 -3
- data/bundler/lib/bundler/cli/gem.rb +136 -42
- data/bundler/lib/bundler/cli/info.rb +17 -3
- data/bundler/lib/bundler/cli/init.rb +6 -2
- data/bundler/lib/bundler/cli/install.rb +15 -33
- 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 +13 -6
- data/bundler/lib/bundler/cli/platform.rb +2 -2
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/update.rb +8 -4
- data/bundler/lib/bundler/cli/viz.rb +1 -1
- data/bundler/lib/bundler/cli.rb +67 -21
- data/bundler/lib/bundler/compact_index_client/cache.rb +1 -10
- data/bundler/lib/bundler/compact_index_client/updater.rb +53 -44
- data/bundler/lib/bundler/compact_index_client.rb +0 -6
- data/bundler/lib/bundler/constants.rb +1 -1
- data/bundler/lib/bundler/current_ruby.rb +18 -6
- data/bundler/lib/bundler/definition.rb +259 -242
- data/bundler/lib/bundler/dependency.rb +24 -71
- data/bundler/lib/bundler/digest.rb +1 -1
- data/bundler/lib/bundler/dsl.rb +29 -46
- data/bundler/lib/bundler/endpoint_specification.rb +15 -13
- data/bundler/lib/bundler/env.rb +2 -2
- data/bundler/lib/bundler/environment_preserver.rb +7 -3
- data/bundler/lib/bundler/errors.rb +15 -15
- data/bundler/lib/bundler/feature_flag.rb +0 -1
- data/bundler/lib/bundler/fetcher/base.rb +6 -8
- data/bundler/lib/bundler/fetcher/compact_index.rb +18 -25
- data/bundler/lib/bundler/fetcher/dependency.rb +2 -6
- data/bundler/lib/bundler/fetcher/downloader.rb +2 -5
- data/bundler/lib/bundler/fetcher/index.rb +0 -26
- data/bundler/lib/bundler/fetcher.rb +22 -29
- data/bundler/lib/bundler/force_platform.rb +18 -0
- data/bundler/lib/bundler/friendly_errors.rb +21 -7
- data/bundler/lib/bundler/gem_helper.rb +4 -4
- data/bundler/lib/bundler/gem_helpers.rb +9 -2
- data/bundler/lib/bundler/gem_version_promoter.rb +53 -98
- data/bundler/lib/bundler/graph.rb +3 -3
- data/bundler/lib/bundler/index.rb +13 -51
- data/bundler/lib/bundler/injector.rb +18 -4
- data/bundler/lib/bundler/inline.rb +9 -21
- data/bundler/lib/bundler/installer/gem_installer.rb +13 -5
- data/bundler/lib/bundler/installer/parallel_installer.rb +3 -33
- data/bundler/lib/bundler/installer/standalone.rb +42 -11
- data/bundler/lib/bundler/installer.rb +20 -44
- data/bundler/lib/bundler/lazy_specification.rb +72 -55
- data/bundler/lib/bundler/lockfile_generator.rb +3 -3
- data/bundler/lib/bundler/lockfile_parser.rb +28 -26
- data/bundler/lib/bundler/man/bundle-add.1 +21 -5
- data/bundler/lib/bundler/man/bundle-add.1.ronn +16 -4
- data/bundler/lib/bundler/man/bundle-binstubs.1 +1 -1
- data/bundler/lib/bundler/man/bundle-cache.1 +7 -1
- data/bundler/lib/bundler/man/bundle-cache.1.ronn +7 -0
- data/bundler/lib/bundler/man/bundle-check.1 +1 -1
- data/bundler/lib/bundler/man/bundle-clean.1 +2 -2
- data/bundler/lib/bundler/man/bundle-clean.1.ronn +1 -1
- data/bundler/lib/bundler/man/bundle-config.1 +34 -15
- data/bundler/lib/bundler/man/bundle-config.1.ronn +31 -19
- data/bundler/lib/bundler/man/bundle-console.1 +53 -0
- data/bundler/lib/bundler/man/bundle-console.1.ronn +44 -0
- data/bundler/lib/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/lib/bundler/man/bundle-exec.1 +6 -6
- data/bundler/lib/bundler/man/bundle-exec.1.ronn +6 -6
- data/bundler/lib/bundler/man/bundle-gem.1 +37 -34
- data/bundler/lib/bundler/man/bundle-gem.1.ronn +21 -5
- data/bundler/lib/bundler/man/bundle-help.1 +13 -0
- data/bundler/lib/bundler/man/bundle-help.1.ronn +12 -0
- 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 +5 -2
- data/bundler/lib/bundler/man/bundle-inject.1.ronn +3 -1
- data/bundler/lib/bundler/man/bundle-install.1 +6 -31
- data/bundler/lib/bundler/man/bundle-install.1.ronn +8 -31
- 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 +3 -10
- data/bundler/lib/bundler/man/bundle-outdated.1.ronn +1 -10
- data/bundler/lib/bundler/man/bundle-platform.1 +16 -6
- data/bundler/lib/bundler/man/bundle-platform.1.ronn +14 -7
- data/bundler/lib/bundler/man/bundle-plugin.1 +81 -0
- data/bundler/lib/bundler/man/bundle-plugin.1.ronn +59 -0
- 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 +2 -2
- data/bundler/lib/bundler/man/bundle-update.1.ronn +2 -1
- data/bundler/lib/bundler/man/bundle-version.1 +35 -0
- data/bundler/lib/bundler/man/bundle-version.1.ronn +24 -0
- data/bundler/lib/bundler/man/bundle-viz.1 +4 -1
- data/bundler/lib/bundler/man/bundle-viz.1.ronn +2 -0
- data/bundler/lib/bundler/man/bundle.1 +15 -10
- data/bundler/lib/bundler/man/bundle.1.ronn +12 -7
- data/bundler/lib/bundler/man/gemfile.5 +117 -80
- data/bundler/lib/bundler/man/gemfile.5.ronn +105 -84
- data/bundler/lib/bundler/man/index.txt +4 -0
- data/bundler/lib/bundler/match_metadata.rb +13 -0
- data/bundler/lib/bundler/match_platform.rb +0 -1
- data/bundler/lib/bundler/match_remote_metadata.rb +29 -0
- data/bundler/lib/bundler/mirror.rb +5 -7
- data/bundler/lib/bundler/plugin/api/source.rb +4 -9
- data/bundler/lib/bundler/plugin/index.rb +4 -4
- data/bundler/lib/bundler/plugin/installer/git.rb +0 -4
- data/bundler/lib/bundler/plugin/installer/rubygems.rb +0 -8
- data/bundler/lib/bundler/plugin/installer.rb +6 -3
- data/bundler/lib/bundler/plugin.rb +3 -1
- data/bundler/lib/bundler/process_lock.rb +1 -1
- data/bundler/lib/bundler/remote_specification.rb +7 -5
- data/bundler/lib/bundler/resolver/base.rb +109 -0
- 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 +43 -71
- data/bundler/lib/bundler/resolver.rb +332 -308
- data/bundler/lib/bundler/ruby_dsl.rb +1 -1
- data/bundler/lib/bundler/ruby_version.rb +5 -18
- data/bundler/lib/bundler/rubygems_ext.rb +144 -25
- data/bundler/lib/bundler/rubygems_gem_installer.rb +32 -20
- data/bundler/lib/bundler/rubygems_integration.rb +24 -95
- data/bundler/lib/bundler/runtime.rb +2 -7
- data/bundler/lib/bundler/self_manager.rb +168 -0
- data/bundler/lib/bundler/settings.rb +5 -10
- data/bundler/lib/bundler/setup.rb +4 -1
- data/bundler/lib/bundler/shared_helpers.rb +17 -25
- data/bundler/lib/bundler/source/git/git_proxy.rb +219 -71
- data/bundler/lib/bundler/source/git.rb +23 -26
- data/bundler/lib/bundler/source/metadata.rb +3 -4
- data/bundler/lib/bundler/source/path/installer.rb +1 -22
- data/bundler/lib/bundler/source/path.rb +7 -7
- data/bundler/lib/bundler/source/rubygems.rb +91 -130
- data/bundler/lib/bundler/source/rubygems_aggregate.rb +1 -1
- data/bundler/lib/bundler/source.rb +4 -5
- data/bundler/lib/bundler/source_list.rb +19 -31
- data/bundler/lib/bundler/source_map.rb +15 -2
- data/bundler/lib/bundler/spec_set.rb +63 -35
- data/bundler/lib/bundler/stub_specification.rb +5 -3
- data/bundler/lib/bundler/templates/Executable +3 -5
- data/bundler/lib/bundler/templates/Executable.bundler +6 -11
- data/bundler/lib/bundler/templates/Executable.standalone +4 -4
- data/bundler/lib/bundler/templates/Gemfile +0 -2
- data/bundler/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +8 -2
- data/bundler/lib/bundler/templates/newgem/README.md.tt +7 -11
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +27 -3
- 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-rust.rb.tt +6 -0
- 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 +13 -3
- data/bundler/lib/bundler/templates/newgem/gitignore.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +13 -4
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +22 -16
- data/bundler/lib/bundler/templates/newgem/sig/newgem.rbs.tt +8 -0
- data/bundler/lib/bundler/templates/newgem/standard.yml.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/test/minitest/{newgem_test.rb.tt → test_newgem.rb.tt} +1 -1
- data/bundler/lib/bundler/ui/shell.rb +36 -13
- data/bundler/lib/bundler/ui/silent.rb +21 -5
- data/bundler/lib/bundler/uri_normalizer.rb +23 -0
- data/bundler/lib/bundler/vendor/.document +1 -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 +1350 -408
- 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 +243 -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/actions/file_manipulation.rb +6 -6
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +1 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +6 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +6 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +9 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +19 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +23 -5
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/util.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
- data/bundler/lib/bundler/vendor/tsort/lib/tsort.rb +452 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/common.rb +76 -91
- data/bundler/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/generic.rb +32 -13
- data/bundler/lib/bundler/vendor/uri/lib/uri/http.rb +40 -3
- data/bundler/lib/bundler/vendor/uri/lib/uri/https.rb +2 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb +2 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -3
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +14 -21
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +11 -17
- data/bundler/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ws.rb +83 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/wss.rb +23 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri.rb +3 -3
- data/bundler/lib/bundler/vendored_persistent.rb +1 -33
- data/bundler/lib/bundler/{vendored_molinillo.rb → vendored_pub_grub.rb} +1 -1
- data/bundler/lib/bundler/{vendored_tmpdir.rb → vendored_tsort.rb} +1 -1
- data/bundler/lib/bundler/version.rb +5 -1
- data/bundler/lib/bundler/worker.rb +5 -7
- data/bundler/lib/bundler.rb +50 -77
- data/hide_lib_for_update/note.txt +0 -4
- data/lib/rubygems/available_set.rb +3 -3
- data/lib/rubygems/basic_specification.rb +12 -12
- data/lib/rubygems/bundler_version_finder.rb +14 -46
- data/lib/rubygems/command.rb +47 -39
- data/lib/rubygems/command_manager.rb +34 -13
- data/lib/rubygems/commands/build_command.rb +11 -8
- data/lib/rubygems/commands/cert_command.rb +39 -39
- data/lib/rubygems/commands/check_command.rb +20 -20
- data/lib/rubygems/commands/cleanup_command.rb +23 -23
- data/lib/rubygems/commands/contents_command.rb +13 -13
- data/lib/rubygems/commands/dependency_command.rb +35 -45
- data/lib/rubygems/commands/environment_command.rb +10 -7
- data/lib/rubygems/commands/exec_command.rb +248 -0
- data/lib/rubygems/commands/fetch_command.rb +32 -13
- data/lib/rubygems/commands/generate_index_command.rb +17 -17
- data/lib/rubygems/commands/help_command.rb +6 -6
- data/lib/rubygems/commands/info_command.rb +3 -3
- data/lib/rubygems/commands/install_command.rb +31 -24
- data/lib/rubygems/commands/list_command.rb +4 -4
- data/lib/rubygems/commands/lock_command.rb +4 -4
- data/lib/rubygems/commands/mirror_command.rb +3 -3
- data/lib/rubygems/commands/open_command.rb +9 -9
- data/lib/rubygems/commands/outdated_command.rb +5 -5
- data/lib/rubygems/commands/owner_command.rb +17 -12
- data/lib/rubygems/commands/pristine_command.rb +64 -49
- data/lib/rubygems/commands/push_command.rb +16 -16
- data/lib/rubygems/commands/query_command.rb +9 -9
- data/lib/rubygems/commands/rdoc_command.rb +26 -25
- data/lib/rubygems/commands/search_command.rb +4 -4
- data/lib/rubygems/commands/server_command.rb +16 -79
- data/lib/rubygems/commands/setup_command.rb +172 -173
- data/lib/rubygems/commands/signin_command.rb +9 -9
- data/lib/rubygems/commands/signout_command.rb +7 -7
- data/lib/rubygems/commands/sources_command.rb +22 -22
- data/lib/rubygems/commands/specification_command.rb +18 -18
- data/lib/rubygems/commands/stale_command.rb +2 -2
- data/lib/rubygems/commands/uninstall_command.rb +43 -40
- data/lib/rubygems/commands/unpack_command.rb +13 -13
- data/lib/rubygems/commands/update_command.rb +61 -72
- data/lib/rubygems/commands/which_command.rb +7 -7
- data/lib/rubygems/commands/yank_command.rb +11 -11
- data/lib/rubygems/compatibility.rb +4 -2
- data/lib/rubygems/config_file.rb +58 -25
- data/lib/rubygems/core_ext/kernel_gem.rb +1 -6
- data/lib/rubygems/core_ext/kernel_require.rb +108 -115
- data/lib/rubygems/core_ext/kernel_warn.rb +33 -37
- data/lib/rubygems/core_ext/tcpsocket_init.rb +1 -1
- data/lib/rubygems/defaults.rb +32 -36
- data/lib/rubygems/dependency.rb +20 -17
- data/lib/rubygems/dependency_installer.rb +37 -37
- data/lib/rubygems/dependency_list.rb +7 -7
- data/lib/rubygems/deprecate.rb +55 -8
- data/lib/rubygems/doctor.rb +21 -21
- data/lib/rubygems/errors.rb +3 -6
- data/lib/rubygems/exceptions.rb +35 -7
- data/lib/rubygems/ext/build_error.rb +1 -1
- data/lib/rubygems/ext/builder.rb +51 -22
- data/lib/rubygems/ext/cargo_builder/link_flag_converter.rb +27 -0
- data/lib/rubygems/ext/cargo_builder.rb +360 -0
- data/lib/rubygems/ext/cmake_builder.rb +2 -2
- data/lib/rubygems/ext/configure_builder.rb +1 -1
- data/lib/rubygems/ext/ext_conf_builder.rb +35 -59
- data/lib/rubygems/ext/rake_builder.rb +3 -3
- data/lib/rubygems/ext.rb +7 -6
- data/lib/rubygems/gem_runner.rb +12 -16
- data/lib/rubygems/gemcutter_utilities.rb +60 -21
- data/lib/rubygems/indexer.rb +30 -28
- data/lib/rubygems/install_default_message.rb +2 -2
- data/lib/rubygems/install_message.rb +2 -2
- data/lib/rubygems/install_update_options.rb +70 -61
- data/lib/rubygems/installer.rb +135 -87
- data/lib/rubygems/installer_uninstaller_utils.rb +2 -2
- data/lib/rubygems/local_remote_options.rb +22 -24
- data/lib/rubygems/mock_gem_ui.rb +2 -2
- data/lib/rubygems/name_tuple.rb +6 -7
- data/lib/rubygems/optparse/.document +1 -0
- data/lib/rubygems/optparse/COPYING +56 -0
- data/lib/rubygems/optparse/lib/optionparser.rb +2 -0
- data/lib/rubygems/optparse/lib/optparse/ac.rb +54 -0
- data/lib/rubygems/optparse/lib/optparse/date.rb +18 -0
- data/lib/rubygems/optparse/lib/optparse/kwargs.rb +22 -0
- data/lib/rubygems/optparse/lib/optparse/shellwords.rb +7 -0
- data/lib/rubygems/optparse/lib/optparse/time.rb +11 -0
- data/lib/rubygems/optparse/lib/optparse/uri.rb +7 -0
- data/lib/rubygems/optparse/lib/optparse/version.rb +71 -0
- data/lib/rubygems/optparse/lib/optparse.rb +2308 -0
- data/lib/rubygems/optparse.rb +3 -0
- data/lib/rubygems/package/file_source.rb +2 -2
- data/lib/rubygems/package/old.rb +9 -9
- data/lib/rubygems/package/tar_header.rb +62 -62
- data/lib/rubygems/package/tar_reader/entry.rb +90 -9
- data/lib/rubygems/package/tar_reader.rb +1 -29
- data/lib/rubygems/package/tar_writer.rb +7 -7
- data/lib/rubygems/package.rb +77 -60
- data/lib/rubygems/package_task.rb +4 -4
- data/lib/rubygems/path_support.rb +1 -6
- data/lib/rubygems/platform.rb +94 -61
- data/lib/rubygems/psych_tree.rb +1 -1
- data/lib/rubygems/query_utils.rb +49 -51
- data/lib/rubygems/rdoc.rb +2 -2
- data/lib/rubygems/remote_fetcher.rb +27 -27
- data/lib/rubygems/request/connection_pools.rb +4 -4
- data/lib/rubygems/request/http_pool.rb +1 -1
- data/lib/rubygems/request.rb +24 -24
- data/lib/rubygems/request_set/gem_dependency_api.rb +122 -123
- data/lib/rubygems/request_set/lockfile/parser.rb +26 -26
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +4 -4
- data/lib/rubygems/request_set/lockfile.rb +9 -9
- data/lib/rubygems/request_set.rb +18 -18
- data/lib/rubygems/requirement.rb +15 -15
- data/lib/rubygems/resolver/activation_request.rb +3 -3
- data/lib/rubygems/resolver/api_set.rb +4 -4
- data/lib/rubygems/resolver/api_specification.rb +6 -6
- data/lib/rubygems/resolver/best_set.rb +5 -5
- data/lib/rubygems/resolver/conflict.rb +10 -10
- data/lib/rubygems/resolver/dependency_request.rb +2 -2
- data/lib/rubygems/resolver/git_set.rb +2 -2
- data/lib/rubygems/resolver/git_specification.rb +6 -6
- data/lib/rubygems/resolver/index_set.rb +3 -3
- data/lib/rubygems/resolver/index_specification.rb +6 -5
- data/lib/rubygems/resolver/installed_specification.rb +4 -4
- data/lib/rubygems/resolver/installer_set.rb +21 -26
- data/lib/rubygems/resolver/local_specification.rb +2 -2
- data/lib/rubygems/resolver/lock_set.rb +4 -4
- data/lib/rubygems/resolver/lock_specification.rb +4 -4
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +3 -3
- 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 -1
- data/lib/rubygems/resolver/specification.rb +1 -1
- data/lib/rubygems/resolver/stats.rb +1 -1
- data/lib/rubygems/resolver/vendor_set.rb +1 -1
- data/lib/rubygems/resolver/vendor_specification.rb +3 -3
- data/lib/rubygems/resolver.rb +40 -40
- data/lib/rubygems/s3_uri_signer.rb +6 -6
- data/lib/rubygems/safe_yaml.rb +10 -10
- data/lib/rubygems/security/policies.rb +47 -47
- data/lib/rubygems/security/policy.rb +19 -21
- data/lib/rubygems/security/signer.rb +5 -5
- data/lib/rubygems/security/trust_dir.rb +4 -4
- data/lib/rubygems/security.rb +37 -43
- data/lib/rubygems/security_option.rb +7 -7
- data/lib/rubygems/source/git.rb +25 -24
- data/lib/rubygems/source/installed.rb +1 -1
- data/lib/rubygems/source/local.rb +2 -2
- data/lib/rubygems/source/specific_file.rb +1 -1
- data/lib/rubygems/source.rb +27 -32
- data/lib/rubygems/source_list.rb +5 -9
- data/lib/rubygems/spec_fetcher.rb +37 -37
- data/lib/rubygems/specification.rb +265 -211
- data/lib/rubygems/specification_policy.rb +49 -30
- data/lib/rubygems/stub_specification.rb +24 -27
- data/lib/rubygems/text.rb +22 -21
- data/lib/rubygems/tsort/.document +1 -0
- data/lib/rubygems/tsort/LICENSE.txt +22 -0
- data/lib/rubygems/tsort/lib/tsort.rb +452 -0
- data/lib/rubygems/tsort.rb +3 -0
- data/lib/rubygems/uninstaller.rb +29 -26
- data/lib/rubygems/unknown_command_spell_checker.rb +21 -0
- data/lib/rubygems/update_suggestion.rb +69 -0
- data/lib/rubygems/uri.rb +45 -30
- data/lib/rubygems/uri_formatter.rb +1 -1
- data/lib/rubygems/user_interaction.rb +42 -28
- data/lib/rubygems/util/licenses.rb +4 -2
- data/lib/rubygems/util.rb +12 -16
- data/lib/rubygems/validator.rb +6 -6
- data/lib/rubygems/version.rb +28 -17
- data/lib/rubygems/version_option.rb +5 -5
- data/lib/rubygems.rb +129 -117
- data/rubygems-update.gemspec +3 -3
- data/setup.rb +11 -16
- data/test/rubygems/alternate_cert.pem +14 -14
- data/test/rubygems/alternate_cert_32.pem +15 -15
- data/test/rubygems/alternate_key.pem +25 -25
- data/test/rubygems/bundler_test_gem.rb +419 -0
- data/test/rubygems/child_cert.pem +15 -16
- data/test/rubygems/child_cert_32.pem +15 -16
- data/test/rubygems/child_key.pem +25 -25
- data/test/rubygems/data/excon-0.7.7.gemspec.rz +0 -0
- data/test/rubygems/data/pry-0.4.7.gemspec.rz +0 -0
- data/test/rubygems/encrypted_private_key.pem +26 -26
- data/test/rubygems/expired_cert.pem +15 -15
- data/test/rubygems/future_cert.pem +15 -15
- data/test/rubygems/future_cert_32.pem +15 -15
- data/test/rubygems/grandchild_cert.pem +15 -16
- data/test/rubygems/grandchild_cert_32.pem +15 -16
- data/test/rubygems/grandchild_key.pem +25 -25
- data/test/rubygems/helper.rb +237 -207
- data/test/rubygems/installer_test_case.rb +13 -13
- data/test/rubygems/invalid_issuer_cert.pem +16 -16
- data/test/rubygems/invalid_issuer_cert_32.pem +16 -16
- data/test/rubygems/invalid_key.pem +25 -25
- data/test/rubygems/invalid_signer_cert.pem +15 -15
- data/test/rubygems/invalid_signer_cert_32.pem +15 -15
- data/test/rubygems/invalidchild_cert.pem +15 -16
- data/test/rubygems/invalidchild_cert_32.pem +15 -16
- data/test/rubygems/invalidchild_key.pem +25 -25
- data/test/rubygems/package/tar_test_case.rb +52 -17
- data/test/rubygems/packages/Bluebie-legs-0.6.2.gem +0 -0
- data/test/rubygems/plugin/exception/rubygems_plugin.rb +1 -1
- data/test/rubygems/plugin/standarderror/rubygems_plugin.rb +1 -1
- data/test/rubygems/private_key.pem +25 -25
- data/test/rubygems/public_cert.pem +16 -16
- data/test/rubygems/public_cert_32.pem +15 -15
- data/test/rubygems/public_key.pem +7 -7
- data/test/rubygems/rubygems_plugin.rb +2 -2
- data/test/rubygems/simple_gem.rb +1 -1
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +4 -4
- data/test/rubygems/test_bundled_ca.rb +11 -11
- data/test/rubygems/test_config.rb +5 -5
- data/test/rubygems/test_deprecate.rb +3 -3
- data/test/rubygems/test_exit.rb +17 -0
- data/test/rubygems/test_gem.rb +367 -757
- data/test/rubygems/test_gem_available_set.rb +21 -21
- data/test/rubygems/test_gem_bundler_version_finder.rb +27 -47
- data/test/rubygems/test_gem_command.rb +45 -45
- data/test/rubygems/test_gem_command_manager.rb +124 -27
- data/test/rubygems/test_gem_commands_build_command.rb +73 -63
- data/test/rubygems/test_gem_commands_cert_command.rb +105 -107
- data/test/rubygems/test_gem_commands_check_command.rb +4 -4
- data/test/rubygems/test_gem_commands_cleanup_command.rb +40 -40
- data/test/rubygems/test_gem_commands_contents_command.rb +28 -28
- data/test/rubygems/test_gem_commands_dependency_command.rb +36 -36
- data/test/rubygems/test_gem_commands_environment_command.rb +38 -14
- data/test/rubygems/test_gem_commands_exec_command.rb +851 -0
- data/test/rubygems/test_gem_commands_fetch_command.rb +159 -26
- data/test/rubygems/test_gem_commands_generate_index_command.rb +7 -7
- data/test/rubygems/test_gem_commands_help_command.rb +13 -13
- data/test/rubygems/test_gem_commands_info_command.rb +28 -2
- data/test/rubygems/test_gem_commands_install_command.rb +200 -132
- data/test/rubygems/test_gem_commands_list_command.rb +4 -4
- data/test/rubygems/test_gem_commands_lock_command.rb +10 -10
- data/test/rubygems/test_gem_commands_mirror.rb +2 -2
- data/test/rubygems/test_gem_commands_open_command.rb +5 -5
- data/test/rubygems/test_gem_commands_outdated_command.rb +9 -9
- data/test/rubygems/test_gem_commands_owner_command.rb +126 -45
- data/test/rubygems/test_gem_commands_pristine_command.rb +141 -92
- data/test/rubygems/test_gem_commands_push_command.rb +85 -59
- data/test/rubygems/test_gem_commands_query_command.rb +73 -73
- data/test/rubygems/test_gem_commands_search_command.rb +2 -2
- data/test/rubygems/test_gem_commands_server_command.rb +6 -48
- data/test/rubygems/test_gem_commands_setup_command.rb +169 -92
- data/test/rubygems/test_gem_commands_signin_command.rb +154 -26
- data/test/rubygems/test_gem_commands_signout_command.rb +3 -3
- data/test/rubygems/test_gem_commands_sources_command.rb +74 -25
- data/test/rubygems/test_gem_commands_specification_command.rb +32 -32
- data/test/rubygems/test_gem_commands_stale_command.rb +4 -4
- data/test/rubygems/test_gem_commands_uninstall_command.rb +99 -82
- data/test/rubygems/test_gem_commands_unpack_command.rb +31 -31
- data/test/rubygems/test_gem_commands_update_command.rb +202 -91
- data/test/rubygems/test_gem_commands_which_command.rb +6 -6
- data/test/rubygems/test_gem_commands_yank_command.rb +43 -43
- data/test/rubygems/test_gem_config_file.rb +93 -81
- data/test/rubygems/test_gem_dependency.rb +78 -80
- data/test/rubygems/test_gem_dependency_installer.rb +165 -165
- data/test/rubygems/test_gem_dependency_list.rb +47 -47
- data/test/rubygems/test_gem_dependency_resolution_error.rb +4 -4
- data/test/rubygems/test_gem_doctor.rb +26 -26
- data/test/rubygems/test_gem_ext_builder.rb +60 -62
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/.gitignore +1 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec +8 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock +233 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml +10 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/src/lib.rs +27 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb +1 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/.gitignore +1 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +247 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +10 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/rust_ruby_example.gemspec +8 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs +51 -0
- data/test/rubygems/test_gem_ext_cargo_builder.rb +166 -0
- data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb +33 -0
- data/test/rubygems/test_gem_ext_cargo_builder_unit.rb +60 -0
- data/test/rubygems/test_gem_ext_cmake_builder.rb +17 -15
- data/test/rubygems/test_gem_ext_configure_builder.rb +13 -13
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +53 -50
- data/test/rubygems/test_gem_ext_rake_builder.rb +15 -15
- data/test/rubygems/test_gem_gem_runner.rb +13 -8
- data/test/rubygems/test_gem_gemcutter_utilities.rb +71 -65
- data/test/rubygems/test_gem_impossible_dependencies_error.rb +4 -4
- data/test/rubygems/test_gem_indexer.rb +90 -67
- data/test/rubygems/test_gem_install_update_options.rb +18 -18
- data/test/rubygems/test_gem_installer.rb +511 -327
- data/test/rubygems/test_gem_local_remote_options.rb +10 -10
- data/test/rubygems/test_gem_name_tuple.rb +4 -4
- data/test/rubygems/test_gem_package.rb +246 -236
- data/test/rubygems/test_gem_package_old.rb +13 -13
- data/test/rubygems/test_gem_package_tar_header.rb +47 -47
- data/test/rubygems/test_gem_package_tar_reader.rb +55 -8
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +161 -16
- data/test/rubygems/test_gem_package_tar_writer.rb +76 -76
- data/test/rubygems/test_gem_package_task.rb +18 -18
- data/test/rubygems/test_gem_path_support.rb +15 -19
- data/test/rubygems/test_gem_platform.rb +335 -214
- data/test/rubygems/test_gem_rdoc.rb +14 -14
- data/test/rubygems/test_gem_remote_fetcher.rb +169 -154
- data/test/rubygems/test_gem_request.rb +65 -59
- data/test/rubygems/test_gem_request_connection_pools.rb +29 -29
- data/test/rubygems/test_gem_request_set.rb +100 -100
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +209 -211
- data/test/rubygems/test_gem_request_set_lockfile.rb +86 -86
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +58 -58
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +62 -62
- data/test/rubygems/test_gem_requirement.rb +47 -42
- data/test/rubygems/test_gem_resolver.rb +173 -106
- data/test/rubygems/test_gem_resolver_activation_request.rb +6 -6
- data/test/rubygems/test_gem_resolver_api_set.rb +33 -33
- data/test/rubygems/test_gem_resolver_api_specification.rb +47 -47
- data/test/rubygems/test_gem_resolver_best_set.rb +22 -22
- data/test/rubygems/test_gem_resolver_composed_set.rb +1 -1
- data/test/rubygems/test_gem_resolver_conflict.rb +12 -12
- data/test/rubygems/test_gem_resolver_dependency_request.rb +15 -15
- data/test/rubygems/test_gem_resolver_git_set.rb +21 -21
- data/test/rubygems/test_gem_resolver_git_specification.rb +21 -21
- data/test/rubygems/test_gem_resolver_index_set.rb +12 -12
- data/test/rubygems/test_gem_resolver_index_specification.rb +16 -16
- data/test/rubygems/test_gem_resolver_installed_specification.rb +5 -5
- data/test/rubygems/test_gem_resolver_installer_set.rb +79 -35
- data/test/rubygems/test_gem_resolver_local_specification.rb +7 -7
- data/test/rubygems/test_gem_resolver_lock_set.rb +12 -12
- data/test/rubygems/test_gem_resolver_lock_specification.rb +17 -17
- data/test/rubygems/test_gem_resolver_requirement_list.rb +1 -1
- data/test/rubygems/test_gem_resolver_specification.rb +8 -8
- data/test/rubygems/test_gem_resolver_vendor_set.rb +6 -6
- data/test/rubygems/test_gem_resolver_vendor_specification.rb +10 -10
- data/test/rubygems/test_gem_security.rb +69 -69
- data/test/rubygems/test_gem_security_policy.rb +72 -72
- data/test/rubygems/test_gem_security_signer.rb +34 -34
- data/test/rubygems/test_gem_security_trust_dir.rb +6 -6
- data/test/rubygems/test_gem_silent_ui.rb +38 -32
- data/test/rubygems/test_gem_source.rb +44 -44
- data/test/rubygems/test_gem_source_fetch_problem.rb +9 -9
- data/test/rubygems/test_gem_source_git.rb +69 -62
- data/test/rubygems/test_gem_source_installed.rb +16 -16
- data/test/rubygems/test_gem_source_list.rb +5 -5
- data/test/rubygems/test_gem_source_local.rb +14 -14
- data/test/rubygems/test_gem_source_lock.rb +31 -31
- data/test/rubygems/test_gem_source_specific_file.rb +17 -17
- data/test/rubygems/test_gem_source_subpath_problem.rb +7 -7
- data/test/rubygems/test_gem_source_vendor.rb +13 -13
- data/test/rubygems/test_gem_spec_fetcher.rb +72 -72
- data/test/rubygems/test_gem_specification.rb +560 -493
- data/test/rubygems/test_gem_stream_ui.rb +20 -20
- data/test/rubygems/test_gem_stub_specification.rb +32 -48
- data/test/rubygems/test_gem_text.rb +7 -1
- data/test/rubygems/test_gem_uninstaller.rb +113 -113
- data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +3 -3
- data/test/rubygems/test_gem_update_suggestion.rb +208 -0
- data/test/rubygems/test_gem_uri.rb +4 -4
- data/test/rubygems/test_gem_uri_formatter.rb +14 -14
- data/test/rubygems/test_gem_util.rb +23 -23
- data/test/rubygems/test_gem_validator.rb +8 -8
- data/test/rubygems/test_gem_version.rb +27 -16
- data/test/rubygems/test_gem_version_option.rb +15 -15
- data/test/rubygems/test_kernel.rb +42 -60
- data/test/rubygems/test_project_sanity.rb +2 -2
- data/test/rubygems/test_remote_fetch_error.rb +6 -6
- data/test/rubygems/test_require.rb +132 -174
- data/test/rubygems/test_rubygems.rb +42 -12
- data/test/rubygems/utilities.rb +59 -37
- data/test/rubygems/wrong_key_cert.pem +15 -15
- data/test/rubygems/wrong_key_cert_32.pem +15 -15
- data/test/test_changelog_generator.rb +1 -0
- metadata +97 -41
- data/bundler/lib/bundler/dep_proxy.rb +0 -55
- data/bundler/lib/bundler/gemdeps.rb +0 -29
- data/bundler/lib/bundler/psyched_yaml.rb +0 -22
- data/bundler/lib/bundler/templates/gems.rb +0 -8
- 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 -143
- 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/version_ranges.rb +0 -122
- data/lib/rubygems/psych_additions.rb +0 -10
- data/lib/rubygems/server.rb +0 -882
- data/test/rubygems/bogussources.rb +0 -9
- data/test/rubygems/data/null-type.gemspec.rz +0 -0
- data/test/rubygems/test_gem_server.rb +0 -608
- /data/bundler/lib/bundler/templates/newgem/ext/newgem/{extconf.rb.tt → extconf-c.rb.tt} +0 -0
@@ -0,0 +1,360 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# This class is used by rubygems to build Rust extensions. It is a thin-wrapper
|
4
|
+
# over the `cargo rustc` command which takes care of building Rust code in a way
|
5
|
+
# that Ruby can use.
|
6
|
+
class Gem::Ext::CargoBuilder < Gem::Ext::Builder
|
7
|
+
attr_accessor :spec, :runner, :profile
|
8
|
+
|
9
|
+
def initialize
|
10
|
+
require_relative "../command"
|
11
|
+
require_relative "cargo_builder/link_flag_converter"
|
12
|
+
|
13
|
+
@runner = self.class.method(:run)
|
14
|
+
@profile = :release
|
15
|
+
end
|
16
|
+
|
17
|
+
def build(extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = Dir.pwd)
|
18
|
+
require "tempfile"
|
19
|
+
require "fileutils"
|
20
|
+
|
21
|
+
# Where's the Cargo.toml of the crate we're building
|
22
|
+
cargo_toml = File.join(cargo_dir, "Cargo.toml")
|
23
|
+
# What's the crate's name
|
24
|
+
crate_name = cargo_crate_name(cargo_dir, cargo_toml, results)
|
25
|
+
|
26
|
+
begin
|
27
|
+
# Create a tmp dir to do the build in
|
28
|
+
tmp_dest = Dir.mktmpdir(".gem.", cargo_dir)
|
29
|
+
|
30
|
+
# Run the build
|
31
|
+
cmd = cargo_command(cargo_toml, tmp_dest, args, crate_name)
|
32
|
+
runner.call(cmd, results, "cargo", cargo_dir, build_env)
|
33
|
+
|
34
|
+
# Where do we expect Cargo to write the compiled library
|
35
|
+
dylib_path = cargo_dylib_path(tmp_dest, crate_name)
|
36
|
+
|
37
|
+
# Helpful error if we didn't find the compiled library
|
38
|
+
raise DylibNotFoundError, tmp_dest unless File.exist?(dylib_path)
|
39
|
+
|
40
|
+
# Cargo and Ruby differ on how the library should be named, rename from
|
41
|
+
# what Cargo outputs to what Ruby expects
|
42
|
+
dlext_name = "#{crate_name}.#{makefile_config("DLEXT")}"
|
43
|
+
dlext_path = File.join(File.dirname(dylib_path), dlext_name)
|
44
|
+
FileUtils.cp(dylib_path, dlext_path)
|
45
|
+
|
46
|
+
nesting = extension_nesting(extension)
|
47
|
+
|
48
|
+
# TODO: remove in RubyGems 4
|
49
|
+
if Gem.install_extension_in_lib && lib_dir
|
50
|
+
nested_lib_dir = File.join(lib_dir, nesting)
|
51
|
+
FileUtils.mkdir_p nested_lib_dir
|
52
|
+
FileUtils.cp_r dlext_path, nested_lib_dir, remove_destination: true
|
53
|
+
end
|
54
|
+
|
55
|
+
# move to final destination
|
56
|
+
nested_dest_path = File.join(dest_path, nesting)
|
57
|
+
FileUtils.mkdir_p nested_dest_path
|
58
|
+
FileUtils.cp_r dlext_path, nested_dest_path, remove_destination: true
|
59
|
+
ensure
|
60
|
+
# clean up intermediary build artifacts
|
61
|
+
FileUtils.rm_rf tmp_dest if tmp_dest
|
62
|
+
end
|
63
|
+
|
64
|
+
results
|
65
|
+
end
|
66
|
+
|
67
|
+
def build_env
|
68
|
+
build_env = rb_config_env
|
69
|
+
build_env["RUBY_STATIC"] = "true" if ruby_static? && ENV.key?("RUBY_STATIC")
|
70
|
+
cfg = "--cfg=rb_sys_gem --cfg=rubygems --cfg=rubygems_#{Gem::VERSION.tr(".", "_")}"
|
71
|
+
build_env["RUSTFLAGS"] = [ENV["RUSTFLAGS"], cfg].compact.join(" ")
|
72
|
+
build_env
|
73
|
+
end
|
74
|
+
|
75
|
+
def cargo_command(cargo_toml, dest_path, args = [], crate_name = nil)
|
76
|
+
require "shellwords"
|
77
|
+
|
78
|
+
cmd = []
|
79
|
+
cmd += [cargo, "rustc"]
|
80
|
+
cmd += ["--crate-type", "cdylib"]
|
81
|
+
cmd += ["--target", ENV["CARGO_BUILD_TARGET"]] if ENV["CARGO_BUILD_TARGET"]
|
82
|
+
cmd += ["--target-dir", dest_path]
|
83
|
+
cmd += ["--manifest-path", cargo_toml]
|
84
|
+
cmd += ["--lib"]
|
85
|
+
cmd += ["--profile", profile.to_s]
|
86
|
+
cmd += ["--locked"]
|
87
|
+
cmd += Gem::Command.build_args
|
88
|
+
cmd += args
|
89
|
+
cmd += ["--"]
|
90
|
+
cmd += [*cargo_rustc_args(dest_path, crate_name)]
|
91
|
+
cmd
|
92
|
+
end
|
93
|
+
|
94
|
+
private
|
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
|
+
|
117
|
+
def rb_config_env
|
118
|
+
result = {}
|
119
|
+
RbConfig::CONFIG.each {|k, v| result["RBCONFIG_#{k}"] = v }
|
120
|
+
result
|
121
|
+
end
|
122
|
+
|
123
|
+
def cargo_rustc_args(dest_dir, crate_name)
|
124
|
+
[
|
125
|
+
*linker_args,
|
126
|
+
*mkmf_libpath,
|
127
|
+
*rustc_dynamic_linker_flags(dest_dir, crate_name),
|
128
|
+
*rustc_lib_flags(dest_dir),
|
129
|
+
*platform_specific_rustc_args(dest_dir),
|
130
|
+
]
|
131
|
+
end
|
132
|
+
|
133
|
+
def platform_specific_rustc_args(dest_dir, flags = [])
|
134
|
+
if mingw_target?
|
135
|
+
# On mingw platforms, mkmf adds libruby to the linker flags
|
136
|
+
flags += libruby_args(dest_dir)
|
137
|
+
|
138
|
+
# Make sure ALSR is used on mingw
|
139
|
+
# see https://github.com/rust-lang/rust/pull/75406/files
|
140
|
+
flags += ["-C", "link-arg=-Wl,--dynamicbase"]
|
141
|
+
flags += ["-C", "link-arg=-Wl,--disable-auto-image-base"]
|
142
|
+
|
143
|
+
# If the gem is installed on a host with build tools installed, but is
|
144
|
+
# run on one that isn't the missing libraries will cause the extension
|
145
|
+
# to fail on start.
|
146
|
+
flags += ["-C", "link-arg=-static-libgcc"]
|
147
|
+
elsif darwin_target?
|
148
|
+
# Ventura does not always have this flag enabled
|
149
|
+
flags += ["-C", "link-arg=-Wl,-undefined,dynamic_lookup"]
|
150
|
+
end
|
151
|
+
|
152
|
+
flags
|
153
|
+
end
|
154
|
+
|
155
|
+
# We want to use the same linker that Ruby uses, so that the linker flags from
|
156
|
+
# mkmf work properly.
|
157
|
+
def linker_args
|
158
|
+
cc_flag = Shellwords.split(makefile_config("CC"))
|
159
|
+
linker = cc_flag.shift
|
160
|
+
link_args = cc_flag.flat_map {|a| ["-C", "link-arg=#{a}"] }
|
161
|
+
|
162
|
+
return mswin_link_args if linker == "cl"
|
163
|
+
|
164
|
+
["-C", "linker=#{linker}", *link_args]
|
165
|
+
end
|
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
|
+
|
175
|
+
def libruby_args(dest_dir)
|
176
|
+
libs = makefile_config(ruby_static? ? "LIBRUBYARG_STATIC" : "LIBRUBYARG_SHARED")
|
177
|
+
raw_libs = Shellwords.split(libs)
|
178
|
+
raw_libs.flat_map {|l| ldflag_to_link_modifier(l) }
|
179
|
+
end
|
180
|
+
|
181
|
+
def ruby_static?
|
182
|
+
return true if %w[1 true].include?(ENV["RUBY_STATIC"])
|
183
|
+
|
184
|
+
makefile_config("ENABLE_SHARED") == "no"
|
185
|
+
end
|
186
|
+
|
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)
|
193
|
+
end
|
194
|
+
|
195
|
+
def cargo_crate_name(cargo_dir, manifest_path, results)
|
196
|
+
require "open3"
|
197
|
+
Gem.load_yaml
|
198
|
+
|
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
|
205
|
+
|
206
|
+
unless status.success?
|
207
|
+
if Gem.configuration.really_verbose
|
208
|
+
puts output
|
209
|
+
else
|
210
|
+
results << output
|
211
|
+
end
|
212
|
+
|
213
|
+
exit_reason =
|
214
|
+
if status.exited?
|
215
|
+
", exit code #{status.exitstatus}"
|
216
|
+
elsif status.signaled?
|
217
|
+
", uncaught signal #{status.termsig}"
|
218
|
+
end
|
219
|
+
|
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("-", "_")
|
240
|
+
end
|
241
|
+
|
242
|
+
def normalize_path(path)
|
243
|
+
return path unless File::ALT_SEPARATOR
|
244
|
+
|
245
|
+
path.tr(File::ALT_SEPARATOR, File::SEPARATOR)
|
246
|
+
end
|
247
|
+
|
248
|
+
def rustc_dynamic_linker_flags(dest_dir, crate_name)
|
249
|
+
split_flags("DLDFLAGS")
|
250
|
+
.map {|arg| maybe_resolve_ldflag_variable(arg, dest_dir, crate_name) }
|
251
|
+
.compact
|
252
|
+
.flat_map {|arg| ldflag_to_link_modifier(arg) }
|
253
|
+
end
|
254
|
+
|
255
|
+
def rustc_lib_flags(dest_dir)
|
256
|
+
split_flags("LIBS").flat_map {|arg| ldflag_to_link_modifier(arg) }
|
257
|
+
end
|
258
|
+
|
259
|
+
def split_flags(var)
|
260
|
+
Shellwords.split(RbConfig::CONFIG.fetch(var, ""))
|
261
|
+
end
|
262
|
+
|
263
|
+
def ldflag_to_link_modifier(arg)
|
264
|
+
LinkFlagConverter.convert(arg)
|
265
|
+
end
|
266
|
+
|
267
|
+
def msvc_target?
|
268
|
+
makefile_config("target_os").include?("msvc")
|
269
|
+
end
|
270
|
+
|
271
|
+
def darwin_target?
|
272
|
+
makefile_config("target_os").include?("darwin")
|
273
|
+
end
|
274
|
+
|
275
|
+
def mingw_target?
|
276
|
+
makefile_config("target_os").include?("mingw")
|
277
|
+
end
|
278
|
+
|
279
|
+
def win_target?
|
280
|
+
target_platform = RbConfig::CONFIG["target_os"]
|
281
|
+
!!Gem::WIN_PATTERNS.find {|r| target_platform =~ r }
|
282
|
+
end
|
283
|
+
|
284
|
+
# Interpolate substitution vars in the arg (i.e. $(DEFFILE))
|
285
|
+
def maybe_resolve_ldflag_variable(input_arg, dest_dir, crate_name)
|
286
|
+
var_matches = input_arg.match(/\$\((\w+)\)/)
|
287
|
+
|
288
|
+
return input_arg unless var_matches
|
289
|
+
|
290
|
+
var_name = var_matches[1]
|
291
|
+
|
292
|
+
return input_arg if var_name.nil? || var_name.chomp.empty?
|
293
|
+
|
294
|
+
case var_name
|
295
|
+
# On windows, it is assumed that mkmf has setup an exports file for the
|
296
|
+
# extension, so we have to to create one ourselves.
|
297
|
+
when "DEFFILE"
|
298
|
+
write_deffile(dest_dir, crate_name)
|
299
|
+
else
|
300
|
+
RbConfig::CONFIG[var_name]
|
301
|
+
end
|
302
|
+
end
|
303
|
+
|
304
|
+
def write_deffile(dest_dir, crate_name)
|
305
|
+
deffile_path = File.join(dest_dir, "#{crate_name}-#{RbConfig::CONFIG["arch"]}.def")
|
306
|
+
export_prefix = makefile_config("EXPORT_PREFIX") || ""
|
307
|
+
|
308
|
+
File.open(deffile_path, "w") do |f|
|
309
|
+
f.puts "EXPORTS"
|
310
|
+
f.puts "#{export_prefix.strip}Init_#{crate_name}"
|
311
|
+
end
|
312
|
+
|
313
|
+
deffile_path
|
314
|
+
end
|
315
|
+
|
316
|
+
# We have to basically reimplement RbConfig::CONFIG['SOEXT'] here to support
|
317
|
+
# Ruby < 2.5
|
318
|
+
#
|
319
|
+
# @see https://github.com/ruby/ruby/blob/c87c027f18c005460746a74c07cd80ee355b16e4/configure.ac#L3185
|
320
|
+
def so_ext
|
321
|
+
return RbConfig::CONFIG["SOEXT"] if RbConfig::CONFIG.key?("SOEXT")
|
322
|
+
|
323
|
+
if win_target?
|
324
|
+
"dll"
|
325
|
+
elsif darwin_target?
|
326
|
+
"dylib"
|
327
|
+
else
|
328
|
+
"so"
|
329
|
+
end
|
330
|
+
end
|
331
|
+
|
332
|
+
# Corresponds to $(LIBPATH) in mkmf
|
333
|
+
def mkmf_libpath
|
334
|
+
["-L", "native=#{makefile_config("libdir")}"]
|
335
|
+
end
|
336
|
+
|
337
|
+
def makefile_config(var_name)
|
338
|
+
val = RbConfig::MAKEFILE_CONFIG[var_name]
|
339
|
+
|
340
|
+
return unless val
|
341
|
+
|
342
|
+
RbConfig.expand(val.dup)
|
343
|
+
end
|
344
|
+
|
345
|
+
# Error raised when no cdylib artifact was created
|
346
|
+
class DylibNotFoundError < StandardError
|
347
|
+
def initialize(dir)
|
348
|
+
files = Dir.glob(File.join(dir, "**", "*")).map {|f| "- #{f}" }.join "\n"
|
349
|
+
|
350
|
+
super <<~MSG
|
351
|
+
Dynamic library not found for Rust extension (in #{dir})
|
352
|
+
|
353
|
+
Make sure you set "crate-type" in Cargo.toml to "cdylib"
|
354
|
+
|
355
|
+
Found files:
|
356
|
+
#{files}
|
357
|
+
MSG
|
358
|
+
end
|
359
|
+
end
|
360
|
+
end
|
@@ -1,9 +1,9 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require_relative '../command'
|
3
2
|
|
4
3
|
class Gem::Ext::CmakeBuilder < Gem::Ext::Builder
|
5
4
|
def self.build(extension, dest_path, results, args=[], lib_dir=nil, cmake_dir=Dir.pwd)
|
6
|
-
unless File.exist?(File.join(cmake_dir,
|
5
|
+
unless File.exist?(File.join(cmake_dir, "Makefile"))
|
6
|
+
require_relative "../command"
|
7
7
|
cmd = ["cmake", ".", "-DCMAKE_INSTALL_PREFIX=#{dest_path}", *Gem::Command.build_args]
|
8
8
|
|
9
9
|
run cmd, results, class_name, cmake_dir
|
@@ -7,7 +7,7 @@
|
|
7
7
|
|
8
8
|
class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
|
9
9
|
def self.build(extension, dest_path, results, args=[], lib_dir=nil, configure_dir=Dir.pwd)
|
10
|
-
unless File.exist?(File.join(configure_dir,
|
10
|
+
unless File.exist?(File.join(configure_dir, "Makefile"))
|
11
11
|
cmd = ["sh", "./configure", "--prefix=#{dest_path}", *args]
|
12
12
|
|
13
13
|
run cmd, results, class_name, configure_dir
|
@@ -7,81 +7,57 @@
|
|
7
7
|
|
8
8
|
class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
|
9
9
|
def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=Dir.pwd)
|
10
|
-
require
|
11
|
-
require
|
10
|
+
require "fileutils"
|
11
|
+
require "tempfile"
|
12
12
|
|
13
13
|
tmp_dest = Dir.mktmpdir(".gem.", extension_dir)
|
14
14
|
|
15
15
|
# Some versions of `mktmpdir` return absolute paths, which will break make
|
16
|
-
# if the paths contain spaces.
|
17
|
-
# paths cause all C extension builds to fail.
|
16
|
+
# if the paths contain spaces.
|
18
17
|
#
|
19
|
-
# As such, we convert to a relative path
|
20
|
-
# Windows. This means that when using Ruby 1.9.x on Windows, paths with
|
21
|
-
# spaces do not work.
|
22
|
-
#
|
23
|
-
# Details: https://github.com/rubygems/rubygems/issues/977#issuecomment-171544940
|
18
|
+
# As such, we convert to a relative path.
|
24
19
|
tmp_dest_relative = get_relative_path(tmp_dest.clone, extension_dir)
|
25
20
|
|
26
|
-
|
27
|
-
siteconf.puts "require 'rbconfig'"
|
28
|
-
siteconf.puts "dest_path = #{tmp_dest_relative.dump}"
|
29
|
-
%w[sitearchdir sitelibdir].each do |dir|
|
30
|
-
siteconf.puts "RbConfig::MAKEFILE_CONFIG['#{dir}'] = dest_path"
|
31
|
-
siteconf.puts "RbConfig::CONFIG['#{dir}'] = dest_path"
|
32
|
-
end
|
33
|
-
|
34
|
-
siteconf.close
|
21
|
+
destdir = ENV["DESTDIR"]
|
35
22
|
|
36
|
-
|
23
|
+
begin
|
24
|
+
cmd = ruby << File.basename(extension)
|
25
|
+
cmd.push(*args)
|
37
26
|
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
"
|
44
|
-
|
45
|
-
|
46
|
-
begin
|
47
|
-
run(cmd, results, class_name, extension_dir) do |s, r|
|
48
|
-
mkmf_log = File.join(extension_dir, 'mkmf.log')
|
49
|
-
if File.exist? mkmf_log
|
50
|
-
unless s.success?
|
51
|
-
r << "To see why this extension failed to compile, please check" \
|
52
|
-
" the mkmf.log which can be found here:\n"
|
53
|
-
r << " " + File.join(dest_path, 'mkmf.log') + "\n"
|
54
|
-
end
|
55
|
-
FileUtils.mv mkmf_log, dest_path
|
56
|
-
end
|
27
|
+
run(cmd, results, class_name, extension_dir) do |s, r|
|
28
|
+
mkmf_log = File.join(extension_dir, "mkmf.log")
|
29
|
+
if File.exist? mkmf_log
|
30
|
+
unless s.success?
|
31
|
+
r << "To see why this extension failed to compile, please check" \
|
32
|
+
" the mkmf.log which can be found here:\n"
|
33
|
+
r << " " + File.join(dest_path, "mkmf.log") + "\n"
|
57
34
|
end
|
58
|
-
|
35
|
+
FileUtils.mv mkmf_log, dest_path
|
59
36
|
end
|
37
|
+
end
|
60
38
|
|
61
|
-
|
39
|
+
ENV["DESTDIR"] = nil
|
62
40
|
|
63
|
-
|
41
|
+
make dest_path, results, extension_dir, tmp_dest_relative
|
64
42
|
|
65
|
-
|
66
|
-
full_tmp_dest = File.join(extension_dir, tmp_dest_relative)
|
43
|
+
full_tmp_dest = File.join(extension_dir, tmp_dest_relative)
|
67
44
|
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
45
|
+
# TODO remove in RubyGems 4
|
46
|
+
if Gem.install_extension_in_lib && lib_dir
|
47
|
+
FileUtils.mkdir_p lib_dir
|
48
|
+
entries = Dir.entries(full_tmp_dest) - %w[. ..]
|
49
|
+
entries = entries.map {|entry| File.join full_tmp_dest, entry }
|
50
|
+
FileUtils.cp_r entries, lib_dir, :remove_destination => true
|
51
|
+
end
|
75
52
|
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
end
|
80
|
-
end
|
81
|
-
ensure
|
82
|
-
ENV["DESTDIR"] = destdir
|
83
|
-
siteconf.close!
|
53
|
+
FileUtils::Entry_.new(full_tmp_dest).traverse do |ent|
|
54
|
+
destent = ent.class.new(dest_path, ent.rel)
|
55
|
+
destent.exist? || FileUtils.mv(ent.path, destent.path)
|
84
56
|
end
|
57
|
+
|
58
|
+
make dest_path, results, extension_dir, tmp_dest_relative, ["clean"]
|
59
|
+
ensure
|
60
|
+
ENV["DESTDIR"] = destdir
|
85
61
|
end
|
86
62
|
|
87
63
|
results
|
@@ -92,7 +68,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
|
|
92
68
|
private
|
93
69
|
|
94
70
|
def self.get_relative_path(path, base)
|
95
|
-
path[0..base.length - 1] =
|
71
|
+
path[0..base.length - 1] = "." if path.start_with?(base)
|
96
72
|
path
|
97
73
|
end
|
98
74
|
end
|
@@ -11,16 +11,16 @@ class Gem::Ext::RakeBuilder < Gem::Ext::Builder
|
|
11
11
|
run([Gem.ruby, File.basename(extension), *args], results, class_name, extension_dir)
|
12
12
|
end
|
13
13
|
|
14
|
-
rake = ENV[
|
14
|
+
rake = ENV["rake"]
|
15
15
|
|
16
16
|
if rake
|
17
17
|
require "shellwords"
|
18
18
|
rake = rake.shellsplit
|
19
19
|
else
|
20
20
|
begin
|
21
|
-
rake =
|
21
|
+
rake = ruby << "-rrubygems" << Gem.bin_path("rake", "rake")
|
22
22
|
rescue Gem::Exception
|
23
|
-
rake = [Gem.default_exec_format %
|
23
|
+
rake = [Gem.default_exec_format % "rake"]
|
24
24
|
end
|
25
25
|
end
|
26
26
|
|
data/lib/rubygems/ext.rb
CHANGED
@@ -10,9 +10,10 @@
|
|
10
10
|
|
11
11
|
module Gem::Ext; end
|
12
12
|
|
13
|
-
require_relative
|
14
|
-
require_relative
|
15
|
-
require_relative
|
16
|
-
require_relative
|
17
|
-
require_relative
|
18
|
-
require_relative
|
13
|
+
require_relative "ext/build_error"
|
14
|
+
require_relative "ext/builder"
|
15
|
+
require_relative "ext/configure_builder"
|
16
|
+
require_relative "ext/ext_conf_builder"
|
17
|
+
require_relative "ext/rake_builder"
|
18
|
+
require_relative "ext/cmake_builder"
|
19
|
+
require_relative "ext/cargo_builder"
|
data/lib/rubygems/gem_runner.rb
CHANGED
@@ -5,14 +5,9 @@
|
|
5
5
|
# See LICENSE.txt for permissions.
|
6
6
|
#++
|
7
7
|
|
8
|
-
require_relative
|
9
|
-
require_relative
|
10
|
-
require_relative
|
11
|
-
|
12
|
-
##
|
13
|
-
# Load additional plugins from $LOAD_PATH
|
14
|
-
|
15
|
-
Gem.load_env_plugins rescue nil
|
8
|
+
require_relative "../rubygems"
|
9
|
+
require_relative "command_manager"
|
10
|
+
require_relative "deprecate"
|
16
11
|
|
17
12
|
##
|
18
13
|
# Run an instance of the gem program.
|
@@ -37,16 +32,19 @@ class Gem::GemRunner
|
|
37
32
|
|
38
33
|
do_configuration args
|
39
34
|
|
35
|
+
Gem.load_env_plugins rescue nil
|
36
|
+
Gem.load_plugins
|
37
|
+
|
40
38
|
cmd = @command_manager_class.instance
|
41
39
|
|
42
40
|
cmd.command_names.each do |command_name|
|
43
41
|
config_args = Gem.configuration[command_name]
|
44
42
|
config_args = case config_args
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
43
|
+
when String
|
44
|
+
config_args.split " "
|
45
|
+
else
|
46
|
+
Array(config_args)
|
47
|
+
end
|
50
48
|
Gem::Command.add_specific_extra_args command_name, config_args
|
51
49
|
end
|
52
50
|
|
@@ -58,7 +56,7 @@ class Gem::GemRunner
|
|
58
56
|
# other arguments in the list.
|
59
57
|
|
60
58
|
def extract_build_args(args) # :nodoc:
|
61
|
-
return [] unless offset = args.index(
|
59
|
+
return [] unless offset = args.index("--")
|
62
60
|
|
63
61
|
build_args = args.slice!(offset...args.length)
|
64
62
|
|
@@ -75,5 +73,3 @@ class Gem::GemRunner
|
|
75
73
|
Gem::Command.extra_args = Gem.configuration[:gem]
|
76
74
|
end
|
77
75
|
end
|
78
|
-
|
79
|
-
Gem.load_plugins
|