rubygems-update 3.3.7 → 3.4.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1419 -1036
- data/CONTRIBUTING.md +30 -7
- data/Manifest.txt +63 -31
- data/POLICIES.md +53 -18
- data/README.md +3 -6
- data/bin/gem +2 -5
- data/bin/update_rubygems +5 -5
- data/bundler/CHANGELOG.md +457 -1
- data/bundler/README.md +3 -6
- data/bundler/UPGRADING.md +11 -4
- data/bundler/bundler.gemspec +8 -10
- data/bundler/exe/bundle +2 -5
- data/bundler/exe/bundler +1 -1
- 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/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/info.rb +1 -1
- data/bundler/lib/bundler/cli/init.rb +6 -2
- data/bundler/lib/bundler/cli/install.rb +7 -5
- 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 +1 -1
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/viz.rb +1 -1
- data/bundler/lib/bundler/cli.rb +55 -10
- data/bundler/lib/bundler/compact_index_client/cache.rb +1 -1
- data/bundler/lib/bundler/compact_index_client/updater.rb +53 -39
- data/bundler/lib/bundler/constants.rb +1 -1
- data/bundler/lib/bundler/current_ruby.rb +18 -6
- data/bundler/lib/bundler/definition.rb +206 -129
- data/bundler/lib/bundler/dependency.rb +21 -66
- data/bundler/lib/bundler/digest.rb +1 -1
- data/bundler/lib/bundler/dsl.rb +13 -18
- data/bundler/lib/bundler/endpoint_specification.rb +6 -10
- data/bundler/lib/bundler/env.rb +1 -1
- data/bundler/lib/bundler/environment_preserver.rb +3 -2
- 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 +9 -11
- data/bundler/lib/bundler/fetcher/dependency.rb +1 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +2 -5
- data/bundler/lib/bundler/fetcher.rb +15 -14
- data/bundler/lib/bundler/force_platform.rb +18 -0
- data/bundler/lib/bundler/friendly_errors.rb +21 -7
- 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 +9 -4
- data/bundler/lib/bundler/inline.rb +9 -21
- data/bundler/lib/bundler/installer/gem_installer.rb +14 -1
- 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 -41
- data/bundler/lib/bundler/lazy_specification.rb +53 -48
- data/bundler/lib/bundler/lockfile_generator.rb +2 -2
- data/bundler/lib/bundler/lockfile_parser.rb +18 -14
- data/bundler/lib/bundler/man/bundle-add.1 +13 -5
- data/bundler/lib/bundler/man/bundle-add.1.ronn +10 -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 +30 -11
- data/bundler/lib/bundler/man/bundle-config.1.ronn +26 -14
- 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 +27 -37
- data/bundler/lib/bundler/man/bundle-gem.1.ronn +5 -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 +5 -30
- data/bundler/lib/bundler/man/bundle-install.1.ronn +6 -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 +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 +1 -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 +92 -81
- data/bundler/lib/bundler/man/gemfile.5.ronn +98 -85
- 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 +3 -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.rb +3 -1
- data/bundler/lib/bundler/process_lock.rb +1 -1
- data/bundler/lib/bundler/remote_specification.rb +8 -9
- data/bundler/lib/bundler/resolver/base.rb +77 -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 +42 -70
- data/bundler/lib/bundler/resolver.rb +328 -299
- 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 +131 -17
- data/bundler/lib/bundler/rubygems_gem_installer.rb +32 -20
- data/bundler/lib/bundler/rubygems_integration.rb +13 -35
- data/bundler/lib/bundler/runtime.rb +1 -6
- data/bundler/lib/bundler/settings.rb +2 -8
- data/bundler/lib/bundler/setup.rb +4 -1
- data/bundler/lib/bundler/shared_helpers.rb +12 -12
- data/bundler/lib/bundler/source/git/git_proxy.rb +209 -69
- data/bundler/lib/bundler/source/git.rb +22 -25
- data/bundler/lib/bundler/source/metadata.rb +2 -3
- 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 +75 -117
- data/bundler/lib/bundler/source.rb +3 -4
- data/bundler/lib/bundler/source_list.rb +12 -2
- data/bundler/lib/bundler/source_map.rb +15 -2
- data/bundler/lib/bundler/spec_set.rb +58 -34
- 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/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 +7 -11
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +2 -1
- 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 +11 -1
- 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 +9 -3
- data/bundler/lib/bundler/ui/shell.rb +35 -12
- data/bundler/lib/bundler/ui/silent.rb +21 -5
- 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 +155 -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/shell/basic.rb +1 -1
- data/bundler/lib/bundler/vendor/tsort/lib/tsort.rb +318 -319
- 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 +13 -7
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +10 -5
- 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 +39 -73
- data/lib/rubygems/available_set.rb +3 -3
- data/lib/rubygems/basic_specification.rb +4 -4
- data/lib/rubygems/bundler_version_finder.rb +1 -1
- data/lib/rubygems/command.rb +40 -32
- data/lib/rubygems/command_manager.rb +33 -14
- data/lib/rubygems/commands/build_command.rb +11 -8
- data/lib/rubygems/commands/cert_command.rb +33 -33
- data/lib/rubygems/commands/check_command.rb +20 -20
- data/lib/rubygems/commands/cleanup_command.rb +17 -17
- data/lib/rubygems/commands/contents_command.rb +13 -13
- data/lib/rubygems/commands/dependency_command.rb +16 -16
- 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 +9 -9
- 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 +28 -24
- data/lib/rubygems/commands/list_command.rb +3 -3
- 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 +37 -37
- data/lib/rubygems/commands/push_command.rb +8 -8
- data/lib/rubygems/commands/query_command.rb +8 -8
- data/lib/rubygems/commands/rdoc_command.rb +20 -19
- data/lib/rubygems/commands/search_command.rb +3 -3
- data/lib/rubygems/commands/server_command.rb +3 -3
- data/lib/rubygems/commands/setup_command.rb +99 -108
- 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 +14 -14
- data/lib/rubygems/commands/stale_command.rb +2 -2
- data/lib/rubygems/commands/uninstall_command.rb +40 -40
- data/lib/rubygems/commands/unpack_command.rb +13 -13
- data/lib/rubygems/commands/update_command.rb +49 -68
- 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 +54 -21
- data/lib/rubygems/core_ext/kernel_gem.rb +1 -6
- data/lib/rubygems/core_ext/kernel_require.rb +117 -114
- 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 -18
- data/lib/rubygems/dependency.rb +14 -11
- data/lib/rubygems/dependency_installer.rb +37 -37
- data/lib/rubygems/dependency_list.rb +6 -6
- data/lib/rubygems/deprecate.rb +2 -2
- data/lib/rubygems/doctor.rb +18 -18
- data/lib/rubygems/errors.rb +3 -3
- data/lib/rubygems/exceptions.rb +6 -8
- data/lib/rubygems/ext/build_error.rb +1 -1
- data/lib/rubygems/ext/builder.rb +27 -18
- 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 +36 -59
- data/lib/rubygems/ext/rake_builder.rb +3 -3
- data/lib/rubygems/ext.rb +7 -6
- data/lib/rubygems/gem_runner.rb +8 -12
- 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 +55 -55
- data/lib/rubygems/installer.rb +40 -50
- data/lib/rubygems/installer_uninstaller_utils.rb +2 -2
- data/lib/rubygems/local_remote_options.rb +19 -21
- data/lib/rubygems/mock_gem_ui.rb +2 -2
- data/lib/rubygems/name_tuple.rb +4 -4
- data/lib/rubygems/optparse/lib/optparse/ac.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse/date.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse/kwargs.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse/shellwords.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse/time.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse/uri.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse.rb +95 -17
- data/lib/rubygems/optparse.rb +1 -1
- data/lib/rubygems/package/file_source.rb +2 -2
- data/lib/rubygems/package/old.rb +8 -8
- data/lib/rubygems/package/tar_header.rb +61 -61
- 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 +66 -49
- data/lib/rubygems/package_task.rb +4 -4
- data/lib/rubygems/platform.rb +80 -51
- data/lib/rubygems/psych_tree.rb +1 -1
- data/lib/rubygems/query_utils.rb +36 -36
- data/lib/rubygems/rdoc.rb +2 -2
- data/lib/rubygems/remote_fetcher.rb +22 -22
- 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 +5 -5
- data/lib/rubygems/request_set.rb +17 -17
- data/lib/rubygems/requirement.rb +14 -14
- 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 +11 -16
- 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 +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 -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 +2 -2
- data/lib/rubygems/security/policies.rb +47 -47
- data/lib/rubygems/security/policy.rb +18 -18
- data/lib/rubygems/security/signer.rb +5 -5
- data/lib/rubygems/security/trust_dir.rb +4 -4
- data/lib/rubygems/security.rb +29 -42
- data/lib/rubygems/security_option.rb +5 -5
- 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 +18 -25
- data/lib/rubygems/source_list.rb +1 -5
- data/lib/rubygems/spec_fetcher.rb +11 -11
- data/lib/rubygems/specification.rb +175 -118
- data/lib/rubygems/specification_policy.rb +35 -16
- data/lib/rubygems/stub_specification.rb +8 -8
- data/lib/rubygems/text.rb +2 -2
- data/lib/rubygems/tsort/lib/tsort.rb +308 -310
- data/lib/rubygems/tsort.rb +1 -1
- data/lib/rubygems/uninstaller.rb +18 -18
- 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 +33 -19
- data/lib/rubygems/util/licenses.rb +3 -3
- data/lib/rubygems/util.rb +12 -16
- data/lib/rubygems/validator.rb +6 -6
- data/lib/rubygems/version.rb +17 -11
- data/lib/rubygems/version_option.rb +3 -3
- data/lib/rubygems.rb +96 -77
- data/rubygems-update.gemspec +3 -3
- data/setup.rb +10 -10
- 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 +183 -163
- 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 +3 -3
- data/test/rubygems/test_deprecate.rb +3 -3
- data/test/rubygems/test_exit.rb +8 -2
- data/test/rubygems/test_gem.rb +327 -694
- data/test/rubygems/test_gem_available_set.rb +21 -21
- data/test/rubygems/test_gem_bundler_version_finder.rb +5 -4
- data/test/rubygems/test_gem_command.rb +44 -44
- data/test/rubygems/test_gem_command_manager.rb +102 -31
- data/test/rubygems/test_gem_commands_build_command.rb +73 -63
- data/test/rubygems/test_gem_commands_cert_command.rb +97 -99
- 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 +37 -37
- 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 +153 -134
- 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 +4 -4
- 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 +93 -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 +2 -2
- data/test/rubygems/test_gem_commands_setup_command.rb +123 -94
- data/test/rubygems/test_gem_commands_signin_command.rb +153 -25
- 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 +75 -75
- data/test/rubygems/test_gem_commands_unpack_command.rb +31 -31
- data/test/rubygems/test_gem_commands_update_command.rb +145 -93
- data/test/rubygems/test_gem_commands_which_command.rb +6 -6
- data/test/rubygems/test_gem_commands_yank_command.rb +42 -42
- data/test/rubygems/test_gem_config_file.rb +93 -81
- data/test/rubygems/test_gem_dependency.rb +75 -73
- 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 +51 -52
- data/test/rubygems/test_gem_ext_rake_builder.rb +15 -15
- data/test/rubygems/test_gem_gem_runner.rb +9 -9
- 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 +16 -16
- data/test/rubygems/test_gem_installer.rb +371 -304
- 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 +244 -234
- 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 +14 -14
- 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 +157 -157
- data/test/rubygems/test_gem_request.rb +55 -55
- 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 -41
- data/test/rubygems/test_gem_resolver.rb +166 -99
- 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 +68 -68
- 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 +539 -474
- data/test/rubygems/test_gem_stream_ui.rb +19 -19
- data/test/rubygems/test_gem_stub_specification.rb +32 -32
- data/test/rubygems/test_gem_text.rb +1 -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 +23 -16
- data/test/rubygems/test_gem_version_option.rb +15 -15
- data/test/rubygems/test_kernel.rb +41 -47
- data/test/rubygems/test_project_sanity.rb +1 -1
- data/test/rubygems/test_remote_fetch_error.rb +6 -6
- data/test/rubygems/test_require.rb +129 -119
- data/test/rubygems/test_rubygems.rb +19 -16
- data/test/rubygems/utilities.rb +55 -33
- 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 +67 -35
- data/bundler/lib/bundler/dep_proxy.rb +0 -55
- data/bundler/lib/bundler/templates/gems.rb +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 -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/vendored_molinillo.rb +0 -4
- data/bundler/lib/bundler/version_ranges.rb +0 -122
- data/lib/rubygems/psych_additions.rb +0 -10
- data/test/rubygems/data/null-type.gemspec.rz +0 -0
- /data/bundler/lib/bundler/templates/newgem/ext/newgem/{extconf.rb.tt → extconf-c.rb.tt} +0 -0
data/test/rubygems/helper.rb
CHANGED
@@ -1,43 +1,28 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require
|
4
|
-
|
5
|
-
# If bundler gemspec exists, add to stubs
|
6
|
-
bundler_gemspec = File.expand_path("../../../bundler/bundler.gemspec", __FILE__)
|
7
|
-
if File.exist?(bundler_gemspec)
|
8
|
-
Gem::Specification.dirs.unshift File.dirname(bundler_gemspec)
|
9
|
-
Gem::Specification.class_variable_set :@@stubs, nil
|
10
|
-
Gem::Specification.stubs
|
11
|
-
Gem::Specification.dirs.shift
|
12
|
-
end
|
3
|
+
require "rubygems"
|
13
4
|
|
14
5
|
begin
|
15
|
-
gem
|
6
|
+
gem "test-unit", "~> 3.0"
|
16
7
|
rescue Gem::LoadError
|
17
8
|
end
|
18
9
|
|
19
|
-
|
20
|
-
require_relative '../../bundler/lib/bundler'
|
21
|
-
else
|
22
|
-
require 'bundler'
|
23
|
-
end
|
24
|
-
|
25
|
-
require 'test/unit'
|
10
|
+
require "test/unit"
|
26
11
|
|
27
12
|
ENV["JARS_SKIP"] = "true" if Gem.java_platform? # avoid unnecessary and noisy `jar-dependencies` post install hook
|
28
13
|
|
29
|
-
require
|
14
|
+
require "rubygems/deprecate"
|
30
15
|
|
31
|
-
require
|
32
|
-
require
|
33
|
-
require
|
34
|
-
require
|
35
|
-
require
|
36
|
-
require
|
37
|
-
require
|
38
|
-
require
|
39
|
-
require
|
40
|
-
require
|
16
|
+
require "fileutils"
|
17
|
+
require "pathname"
|
18
|
+
require "pp"
|
19
|
+
require "rubygems/package"
|
20
|
+
require "shellwords"
|
21
|
+
require "tmpdir"
|
22
|
+
require "uri"
|
23
|
+
require "zlib"
|
24
|
+
require "benchmark" # stdlib
|
25
|
+
require "rubygems/mock_gem_ui"
|
41
26
|
|
42
27
|
module Gem
|
43
28
|
|
@@ -119,6 +104,12 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
119
104
|
assert File.directory?(path), msg
|
120
105
|
end
|
121
106
|
|
107
|
+
def refute_directory_exists(path, msg = nil)
|
108
|
+
msg = build_message(msg, "Expected path '#{path}' not to be a directory")
|
109
|
+
assert_path_not_exist path
|
110
|
+
refute File.directory?(path), msg
|
111
|
+
end
|
112
|
+
|
122
113
|
# https://github.com/seattlerb/minitest/blob/21d9e804b63c619f602f3f4ece6c71b48974707a/lib/minitest/assertions.rb#L188
|
123
114
|
def _synchronize
|
124
115
|
yield
|
@@ -159,15 +150,15 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
159
150
|
# the original value when the block ends
|
160
151
|
|
161
152
|
def enable_shared(value)
|
162
|
-
enable_shared = RbConfig::CONFIG[
|
163
|
-
RbConfig::CONFIG[
|
153
|
+
enable_shared = RbConfig::CONFIG["ENABLE_SHARED"]
|
154
|
+
RbConfig::CONFIG["ENABLE_SHARED"] = value
|
164
155
|
|
165
156
|
yield
|
166
157
|
ensure
|
167
158
|
if enable_shared
|
168
|
-
RbConfig::CONFIG[
|
159
|
+
RbConfig::CONFIG["ENABLE_SHARED"] = enable_shared
|
169
160
|
else
|
170
|
-
RbConfig::CONFIG.delete
|
161
|
+
RbConfig::CONFIG.delete "ENABLE_SHARED"
|
171
162
|
end
|
172
163
|
end
|
173
164
|
|
@@ -176,20 +167,20 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
176
167
|
# original value when the block ends
|
177
168
|
#
|
178
169
|
def vendordir(value)
|
179
|
-
vendordir = RbConfig::CONFIG[
|
170
|
+
vendordir = RbConfig::CONFIG["vendordir"]
|
180
171
|
|
181
172
|
if value
|
182
|
-
RbConfig::CONFIG[
|
173
|
+
RbConfig::CONFIG["vendordir"] = value
|
183
174
|
else
|
184
|
-
RbConfig::CONFIG.delete
|
175
|
+
RbConfig::CONFIG.delete "vendordir"
|
185
176
|
end
|
186
177
|
|
187
178
|
yield
|
188
179
|
ensure
|
189
180
|
if vendordir
|
190
|
-
RbConfig::CONFIG[
|
181
|
+
RbConfig::CONFIG["vendordir"] = vendordir
|
191
182
|
else
|
192
|
-
RbConfig::CONFIG.delete
|
183
|
+
RbConfig::CONFIG.delete "vendordir"
|
193
184
|
end
|
194
185
|
end
|
195
186
|
|
@@ -199,21 +190,21 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
199
190
|
#
|
200
191
|
def bindir(value)
|
201
192
|
with_clean_path_to_ruby do
|
202
|
-
bindir = RbConfig::CONFIG[
|
193
|
+
bindir = RbConfig::CONFIG["bindir"]
|
203
194
|
|
204
195
|
if value
|
205
|
-
RbConfig::CONFIG[
|
196
|
+
RbConfig::CONFIG["bindir"] = value
|
206
197
|
else
|
207
|
-
RbConfig::CONFIG.delete
|
198
|
+
RbConfig::CONFIG.delete "bindir"
|
208
199
|
end
|
209
200
|
|
210
201
|
begin
|
211
202
|
yield
|
212
203
|
ensure
|
213
204
|
if bindir
|
214
|
-
RbConfig::CONFIG[
|
205
|
+
RbConfig::CONFIG["bindir"] = bindir
|
215
206
|
else
|
216
|
-
RbConfig::CONFIG.delete
|
207
|
+
RbConfig::CONFIG.delete "bindir"
|
217
208
|
end
|
218
209
|
end
|
219
210
|
end
|
@@ -224,20 +215,20 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
224
215
|
# original value when the block ends
|
225
216
|
#
|
226
217
|
def exeext(value)
|
227
|
-
exeext = RbConfig::CONFIG[
|
218
|
+
exeext = RbConfig::CONFIG["EXEEXT"]
|
228
219
|
|
229
220
|
if value
|
230
|
-
RbConfig::CONFIG[
|
221
|
+
RbConfig::CONFIG["EXEEXT"] = value
|
231
222
|
else
|
232
|
-
RbConfig::CONFIG.delete
|
223
|
+
RbConfig::CONFIG.delete "EXEEXT"
|
233
224
|
end
|
234
225
|
|
235
226
|
yield
|
236
227
|
ensure
|
237
228
|
if exeext
|
238
|
-
RbConfig::CONFIG[
|
229
|
+
RbConfig::CONFIG["EXEEXT"] = exeext
|
239
230
|
else
|
240
|
-
RbConfig::CONFIG.delete
|
231
|
+
RbConfig::CONFIG.delete "EXEEXT"
|
241
232
|
end
|
242
233
|
end
|
243
234
|
|
@@ -258,23 +249,23 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
258
249
|
end
|
259
250
|
end
|
260
251
|
|
261
|
-
targets <<
|
252
|
+
targets << "" if targets.empty?
|
262
253
|
|
263
254
|
targets
|
264
255
|
end
|
265
256
|
|
266
257
|
def assert_contains_make_command(target, output, msg = nil)
|
267
|
-
if output.
|
258
|
+
if output.include?("\n")
|
268
259
|
msg = build_message(msg,
|
269
260
|
"Expected output containing make command \"%s\", but was \n\nBEGIN_OF_OUTPUT\n%sEND_OF_OUTPUT" % [
|
270
|
-
(
|
261
|
+
("%s %s" % [make_command, target]).rstrip,
|
271
262
|
output,
|
272
263
|
]
|
273
264
|
)
|
274
265
|
else
|
275
266
|
msg = build_message(msg,
|
276
267
|
'Expected make command "%s", but was "%s"' % [
|
277
|
-
(
|
268
|
+
("%s %s" % [make_command, target]).rstrip,
|
278
269
|
output,
|
279
270
|
]
|
280
271
|
)
|
@@ -302,18 +293,24 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
302
293
|
# or <tt>i686-darwin8.10.1</tt> otherwise.
|
303
294
|
|
304
295
|
def setup
|
296
|
+
@orig_hooks = {}
|
305
297
|
@orig_env = ENV.to_hash
|
306
298
|
@tmp = File.expand_path("tmp")
|
307
299
|
|
308
300
|
FileUtils.mkdir_p @tmp
|
309
301
|
|
310
|
-
|
311
|
-
|
312
|
-
|
313
|
-
ENV[
|
314
|
-
ENV[
|
315
|
-
ENV[
|
316
|
-
ENV[
|
302
|
+
@tempdir = Dir.mktmpdir("test_rubygems_", @tmp)
|
303
|
+
@tempdir.tap(&Gem::UNTAINT)
|
304
|
+
|
305
|
+
ENV["GEM_VENDOR"] = nil
|
306
|
+
ENV["GEMRC"] = nil
|
307
|
+
ENV["XDG_CACHE_HOME"] = nil
|
308
|
+
ENV["XDG_CONFIG_HOME"] = nil
|
309
|
+
ENV["XDG_DATA_HOME"] = nil
|
310
|
+
ENV["XDG_STATE_HOME"] = nil
|
311
|
+
ENV["SOURCE_DATE_EPOCH"] = nil
|
312
|
+
ENV["BUNDLER_VERSION"] = nil
|
313
|
+
ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = "true"
|
317
314
|
|
318
315
|
@current_dir = Dir.pwd
|
319
316
|
@fetcher = nil
|
@@ -324,27 +321,23 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
324
321
|
# capture output
|
325
322
|
Gem::DefaultUserInteraction.ui = Gem::MockGemUi.new
|
326
323
|
|
327
|
-
@tempdir = Dir.mktmpdir("test_rubygems_", @tmp)
|
328
|
-
@tempdir.tap(&Gem::UNTAINT)
|
329
|
-
|
330
|
-
ENV["TMPDIR"] = @tempdir
|
331
|
-
|
332
324
|
@orig_SYSTEM_WIDE_CONFIG_FILE = Gem::ConfigFile::SYSTEM_WIDE_CONFIG_FILE
|
333
325
|
Gem::ConfigFile.send :remove_const, :SYSTEM_WIDE_CONFIG_FILE
|
334
326
|
Gem::ConfigFile.send :const_set, :SYSTEM_WIDE_CONFIG_FILE,
|
335
|
-
File.join(@tempdir,
|
327
|
+
File.join(@tempdir, "system-gemrc")
|
336
328
|
|
337
|
-
@gemhome = File.join @tempdir,
|
338
|
-
@userhome = File.join @tempdir,
|
339
|
-
|
329
|
+
@gemhome = File.join @tempdir, "gemhome"
|
330
|
+
@userhome = File.join @tempdir, "userhome"
|
331
|
+
@statehome = File.join @tempdir, "statehome"
|
332
|
+
ENV["GEM_SPEC_CACHE"] = File.join @tempdir, "spec_cache"
|
340
333
|
|
341
|
-
@orig_ruby = if ENV[
|
334
|
+
@orig_ruby = if ENV["RUBY"]
|
342
335
|
ruby = Gem.ruby
|
343
|
-
Gem.ruby = ENV[
|
336
|
+
Gem.ruby = ENV["RUBY"]
|
344
337
|
ruby
|
345
338
|
end
|
346
339
|
|
347
|
-
@git = ENV[
|
340
|
+
@git = ENV["GIT"] || "git#{RbConfig::CONFIG['EXEEXT']}"
|
348
341
|
|
349
342
|
Gem.ensure_gem_subdirectories @gemhome
|
350
343
|
Gem.ensure_default_gem_subdirectories @gemhome
|
@@ -365,11 +358,12 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
365
358
|
|
366
359
|
Dir.chdir @tempdir
|
367
360
|
|
368
|
-
ENV[
|
361
|
+
ENV["HOME"] = @userhome
|
369
362
|
Gem.instance_variable_set :@config_file, nil
|
370
363
|
Gem.instance_variable_set :@user_home, nil
|
371
364
|
Gem.instance_variable_set :@config_home, nil
|
372
365
|
Gem.instance_variable_set :@data_home, nil
|
366
|
+
Gem.instance_variable_set :@state_home, @statehome
|
373
367
|
Gem.instance_variable_set :@gemdeps, nil
|
374
368
|
Gem.instance_variable_set :@env_requirements_by_name, nil
|
375
369
|
Gem.send :remove_instance_variable, :@ruby_version if
|
@@ -377,12 +371,12 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
377
371
|
|
378
372
|
FileUtils.mkdir_p @userhome
|
379
373
|
|
380
|
-
ENV[
|
374
|
+
ENV["GEM_PRIVATE_KEY_PASSPHRASE"] = PRIVATE_KEY_PASSPHRASE
|
381
375
|
|
382
376
|
Gem.instance_variable_set(:@default_specifications_dir, nil)
|
383
377
|
if Gem.java_platform?
|
384
|
-
@orig_default_gem_home = RbConfig::CONFIG[
|
385
|
-
RbConfig::CONFIG[
|
378
|
+
@orig_default_gem_home = RbConfig::CONFIG["default_gem_home"]
|
379
|
+
RbConfig::CONFIG["default_gem_home"] = @gemhome
|
386
380
|
else
|
387
381
|
Gem.instance_variable_set(:@default_dir, @gemhome)
|
388
382
|
end
|
@@ -404,7 +398,6 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
404
398
|
Gem.loaded_specs.clear
|
405
399
|
Gem.instance_variable_set(:@activated_gem_paths, 0)
|
406
400
|
Gem.clear_default_specs
|
407
|
-
Bundler.reset!
|
408
401
|
|
409
402
|
Gem.configuration.verbose = true
|
410
403
|
Gem.configuration.update_sources = true
|
@@ -418,15 +411,14 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
418
411
|
Gem.searcher = nil
|
419
412
|
Gem::SpecFetcher.fetcher = nil
|
420
413
|
|
421
|
-
@orig_arch = RbConfig::CONFIG[
|
414
|
+
@orig_arch = RbConfig::CONFIG["arch"]
|
422
415
|
|
423
416
|
if win_platform?
|
424
|
-
util_set_arch
|
417
|
+
util_set_arch "i386-mswin32"
|
425
418
|
else
|
426
|
-
util_set_arch
|
419
|
+
util_set_arch "i686-darwin8.10.1"
|
427
420
|
end
|
428
421
|
|
429
|
-
@orig_hooks = {}
|
430
422
|
%w[post_install_hooks done_installing_hooks post_uninstall_hooks pre_uninstall_hooks pre_install_hooks pre_reset_hooks post_reset_hooks post_build_hooks].each do |name|
|
431
423
|
@orig_hooks[name] = Gem.send(name).dup
|
432
424
|
end
|
@@ -451,7 +443,7 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
451
443
|
end
|
452
444
|
end
|
453
445
|
|
454
|
-
RbConfig::CONFIG[
|
446
|
+
RbConfig::CONFIG["arch"] = @orig_arch
|
455
447
|
|
456
448
|
if defined? Gem::RemoteFetcher
|
457
449
|
Gem::RemoteFetcher.fetcher = nil
|
@@ -461,7 +453,7 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
461
453
|
|
462
454
|
FileUtils.rm_rf @tempdir
|
463
455
|
|
464
|
-
|
456
|
+
restore_env
|
465
457
|
|
466
458
|
Gem::ConfigFile.send :remove_const, :SYSTEM_WIDE_CONFIG_FILE
|
467
459
|
Gem::ConfigFile.send :const_set, :SYSTEM_WIDE_CONFIG_FILE,
|
@@ -469,13 +461,13 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
469
461
|
|
470
462
|
Gem.ruby = @orig_ruby if @orig_ruby
|
471
463
|
|
472
|
-
RbConfig::CONFIG[
|
473
|
-
RbConfig::CONFIG[
|
474
|
-
RbConfig::CONFIG[
|
464
|
+
RbConfig::CONFIG["mandir"] = @orig_mandir
|
465
|
+
RbConfig::CONFIG["sitelibdir"] = @orig_sitelibdir
|
466
|
+
RbConfig::CONFIG["bindir"] = @orig_bindir
|
475
467
|
|
476
468
|
Gem.instance_variable_set :@default_specifications_dir, nil
|
477
469
|
if Gem.java_platform?
|
478
|
-
RbConfig::CONFIG[
|
470
|
+
RbConfig::CONFIG["default_gem_home"] = @orig_default_gem_home
|
479
471
|
else
|
480
472
|
Gem.instance_variable_set :@default_dir, nil
|
481
473
|
end
|
@@ -491,9 +483,9 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
491
483
|
end
|
492
484
|
|
493
485
|
def credential_setup
|
494
|
-
@temp_cred = File.join(@userhome,
|
486
|
+
@temp_cred = File.join(@userhome, ".gem", "credentials")
|
495
487
|
FileUtils.mkdir_p File.dirname(@temp_cred)
|
496
|
-
File.write @temp_cred,
|
488
|
+
File.write @temp_cred, ":rubygems_api_key: 701229f217cdf23b1344c7b4b54ca97"
|
497
489
|
File.chmod 0600, @temp_cred
|
498
490
|
end
|
499
491
|
|
@@ -548,10 +540,10 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
548
540
|
#
|
549
541
|
# Yields the +specification+ to the block, if given
|
550
542
|
|
551
|
-
def git_gem(name =
|
543
|
+
def git_gem(name = "a", version = 1)
|
552
544
|
have_git?
|
553
545
|
|
554
|
-
directory = File.join
|
546
|
+
directory = File.join "git", name
|
555
547
|
directory = File.expand_path directory
|
556
548
|
|
557
549
|
git_spec = Gem::Specification.new name, version do |specification|
|
@@ -562,22 +554,22 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
562
554
|
|
563
555
|
gemspec = "#{name}.gemspec"
|
564
556
|
|
565
|
-
File.open File.join(directory, gemspec),
|
557
|
+
File.open File.join(directory, gemspec), "w" do |io|
|
566
558
|
io.write git_spec.to_ruby
|
567
559
|
end
|
568
560
|
|
569
561
|
head = nil
|
570
562
|
|
571
563
|
Dir.chdir directory do
|
572
|
-
unless File.exist?
|
573
|
-
system @git,
|
574
|
-
system @git,
|
575
|
-
system @git,
|
564
|
+
unless File.exist? ".git"
|
565
|
+
system @git, "init", "--quiet"
|
566
|
+
system @git, "config", "user.name", "RubyGems Tests"
|
567
|
+
system @git, "config", "user.email", "rubygems@example"
|
576
568
|
end
|
577
569
|
|
578
|
-
system @git,
|
579
|
-
system @git,
|
580
|
-
head = Gem::Util.popen(@git,
|
570
|
+
system @git, "add", gemspec
|
571
|
+
system @git, "commit", "-a", "-m", "a non-empty commit message", "--quiet"
|
572
|
+
head = Gem::Util.popen(@git, "rev-parse", "HEAD").strip
|
581
573
|
end
|
582
574
|
|
583
575
|
return name, git_spec.version, directory, head
|
@@ -589,13 +581,13 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
589
581
|
def have_git?
|
590
582
|
return if in_path? @git
|
591
583
|
|
592
|
-
pend
|
584
|
+
pend "cannot find git executable, use GIT environment variable to set"
|
593
585
|
end
|
594
586
|
|
595
587
|
def in_path?(executable) # :nodoc:
|
596
|
-
return true if %r{\A([A-Z]:|/)} =~ executable
|
588
|
+
return true if %r{\A([A-Z]:|/)} =~ executable && File.exist?(executable)
|
597
589
|
|
598
|
-
ENV[
|
590
|
+
ENV["PATH"].split(File::PATH_SEPARATOR).any? do |directory|
|
599
591
|
File.exist? File.join directory, executable
|
600
592
|
end
|
601
593
|
end
|
@@ -604,7 +596,7 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
604
596
|
# Builds and installs the Gem::Specification +spec+
|
605
597
|
|
606
598
|
def install_gem(spec, options = {})
|
607
|
-
require
|
599
|
+
require "rubygems/installer"
|
608
600
|
|
609
601
|
gem = spec.cache_file
|
610
602
|
|
@@ -618,7 +610,7 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
618
610
|
gem = File.join(@tempdir, File.basename(gem)).tap(&Gem::UNTAINT)
|
619
611
|
end
|
620
612
|
|
621
|
-
Gem::Installer.at(gem, options.merge({:wrappers => true})).install
|
613
|
+
Gem::Installer.at(gem, options.merge({ :wrappers => true })).install
|
622
614
|
end
|
623
615
|
|
624
616
|
##
|
@@ -631,7 +623,7 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
631
623
|
##
|
632
624
|
# Uninstalls the Gem::Specification +spec+
|
633
625
|
def uninstall_gem(spec)
|
634
|
-
require
|
626
|
+
require "rubygems/uninstaller"
|
635
627
|
|
636
628
|
Class.new(Gem::Uninstaller) do
|
637
629
|
def ask_if_ok(spec)
|
@@ -654,7 +646,7 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
654
646
|
# Reads a Marshal file at +path+
|
655
647
|
|
656
648
|
def read_cache(path)
|
657
|
-
File.open path.dup.tap(&Gem::UNTAINT),
|
649
|
+
File.open path.dup.tap(&Gem::UNTAINT), "rb" do |io|
|
658
650
|
Marshal.load io.read
|
659
651
|
end
|
660
652
|
end
|
@@ -674,7 +666,7 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
674
666
|
dir = File.dirname path
|
675
667
|
FileUtils.mkdir_p dir unless File.directory? dir
|
676
668
|
|
677
|
-
File.open path,
|
669
|
+
File.open path, "wb" do |io|
|
678
670
|
yield io if block_given?
|
679
671
|
end
|
680
672
|
|
@@ -717,16 +709,16 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
717
709
|
#
|
718
710
|
# Use this with #write_file to build an installed gem.
|
719
711
|
|
720
|
-
def quick_gem(name, version=
|
721
|
-
require
|
712
|
+
def quick_gem(name, version="2")
|
713
|
+
require "rubygems/specification"
|
722
714
|
|
723
715
|
spec = Gem::Specification.new do |s|
|
724
716
|
s.platform = Gem::Platform::RUBY
|
725
717
|
s.name = name
|
726
718
|
s.version = version
|
727
|
-
s.author =
|
728
|
-
s.email =
|
729
|
-
s.homepage =
|
719
|
+
s.author = "A User"
|
720
|
+
s.email = "example@example.com"
|
721
|
+
s.homepage = "http://example.com"
|
730
722
|
s.summary = "this is a summary"
|
731
723
|
s.description = "This is a test description"
|
732
724
|
|
@@ -757,7 +749,7 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
757
749
|
next if File.exist? file
|
758
750
|
FileUtils.mkdir_p File.dirname(file)
|
759
751
|
|
760
|
-
File.open file,
|
752
|
+
File.open file, "w" do |fp|
|
761
753
|
fp.puts "# #{file}"
|
762
754
|
end
|
763
755
|
end
|
@@ -843,15 +835,15 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
843
835
|
# or a +block+ can be given for full customization of the specification.
|
844
836
|
|
845
837
|
def util_spec(name, version = 2, deps = nil, *files) # :yields: specification
|
846
|
-
raise "deps or block, not both" if deps
|
838
|
+
raise "deps or block, not both" if deps && block_given?
|
847
839
|
|
848
840
|
spec = Gem::Specification.new do |s|
|
849
841
|
s.platform = Gem::Platform::RUBY
|
850
842
|
s.name = name
|
851
843
|
s.version = version
|
852
|
-
s.author =
|
853
|
-
s.email =
|
854
|
-
s.homepage =
|
844
|
+
s.author = "A User"
|
845
|
+
s.email = "example@example.com"
|
846
|
+
s.homepage = "http://example.com"
|
855
847
|
s.summary = "this is a summary"
|
856
848
|
s.description = "This is a test description"
|
857
849
|
|
@@ -862,7 +854,7 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
862
854
|
|
863
855
|
if deps
|
864
856
|
deps.keys.each do |n|
|
865
|
-
spec.add_dependency n, (deps[n] ||
|
857
|
+
spec.add_dependency n, (deps[n] || ">= 0")
|
866
858
|
end
|
867
859
|
end
|
868
860
|
|
@@ -889,7 +881,7 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
889
881
|
if deps
|
890
882
|
block = proc do |s|
|
891
883
|
deps.keys.each do |n|
|
892
|
-
s.add_dependency n, (deps[n] ||
|
884
|
+
s.add_dependency n, (deps[n] || ">= 0")
|
893
885
|
end
|
894
886
|
end
|
895
887
|
end
|
@@ -898,7 +890,7 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
898
890
|
|
899
891
|
util_build_gem spec
|
900
892
|
|
901
|
-
cache_file = File.join @tempdir,
|
893
|
+
cache_file = File.join @tempdir, "gems", "#{spec.original_name}.gem"
|
902
894
|
FileUtils.mkdir_p File.dirname cache_file
|
903
895
|
FileUtils.mv spec.cache_file, cache_file
|
904
896
|
FileUtils.rm spec.spec_file
|
@@ -940,11 +932,11 @@ class Gem::TestCase < Test::Unit::TestCase
|
|
940
932
|
# TODO: nuke this and fix tests. this should speed up a lot
|
941
933
|
|
942
934
|
def util_make_gems(prerelease = false)
|
943
|
-
@a1 = quick_gem
|
935
|
+
@a1 = quick_gem "a", "1" do |s|
|
944
936
|
s.files = %w[lib/code.rb]
|
945
937
|
s.require_paths = %w[lib]
|
946
938
|
s.date = Gem::Specification::TODAY - 86400
|
947
|
-
s.homepage =
|
939
|
+
s.homepage = "http://a.example.com"
|
948
940
|
s.email = %w[example@example.com example2@example.com]
|
949
941
|
s.authors = %w[Example Example2]
|
950
942
|
s.description = <<-DESC
|
@@ -961,27 +953,27 @@ Also, a list:
|
|
961
953
|
s.require_paths = %w[lib]
|
962
954
|
end
|
963
955
|
|
964
|
-
@a2 = quick_gem(
|
965
|
-
@a3a = quick_gem(
|
966
|
-
@a_evil9 = quick_gem(
|
967
|
-
@b2 = quick_gem(
|
968
|
-
@c1_2 = quick_gem(
|
969
|
-
@x = quick_gem(
|
970
|
-
@dep_x = quick_gem(
|
956
|
+
@a2 = quick_gem("a", "2", &init)
|
957
|
+
@a3a = quick_gem("a", "3.a", &init)
|
958
|
+
@a_evil9 = quick_gem("a_evil", "9", &init)
|
959
|
+
@b2 = quick_gem("b", "2", &init)
|
960
|
+
@c1_2 = quick_gem("c", "1.2", &init)
|
961
|
+
@x = quick_gem("x", "1", &init)
|
962
|
+
@dep_x = quick_gem("dep_x", "1") do |s|
|
971
963
|
s.files = %w[lib/code.rb]
|
972
964
|
s.require_paths = %w[lib]
|
973
|
-
s.add_dependency
|
965
|
+
s.add_dependency "x", ">= 1"
|
974
966
|
end
|
975
967
|
|
976
|
-
@pl1 = quick_gem
|
968
|
+
@pl1 = quick_gem "pl", "1" do |s| # l for legacy
|
977
969
|
s.files = %w[lib/code.rb]
|
978
970
|
s.require_paths = %w[lib]
|
979
|
-
s.platform = Gem::Platform.new
|
980
|
-
s.instance_variable_set :@original_platform,
|
971
|
+
s.platform = Gem::Platform.new "i386-linux"
|
972
|
+
s.instance_variable_set :@original_platform, "i386-linux"
|
981
973
|
end
|
982
974
|
|
983
975
|
if prerelease
|
984
|
-
@a2_pre = quick_gem(
|
976
|
+
@a2_pre = quick_gem("a", "2.a", &init)
|
985
977
|
write_file File.join(*%W[gems #{@a2_pre.original_name} lib code.rb])
|
986
978
|
util_build_gem @a2_pre
|
987
979
|
end
|
@@ -1007,7 +999,7 @@ Also, a list:
|
|
1007
999
|
# Set the platform to +arch+
|
1008
1000
|
|
1009
1001
|
def util_set_arch(arch)
|
1010
|
-
RbConfig::CONFIG[
|
1002
|
+
RbConfig::CONFIG["arch"] = arch
|
1011
1003
|
platform = Gem::Platform.new arch
|
1012
1004
|
|
1013
1005
|
Gem.instance_variable_set :@platforms, nil
|
@@ -1098,7 +1090,7 @@ Also, a list:
|
|
1098
1090
|
Zlib::Deflate.deflate data
|
1099
1091
|
end
|
1100
1092
|
|
1101
|
-
def util_set_RUBY_VERSION(version, patchlevel
|
1093
|
+
def util_set_RUBY_VERSION(version, patchlevel, revision, description, engine = "ruby", engine_version = nil)
|
1102
1094
|
if Gem.instance_variables.include? :@ruby_version
|
1103
1095
|
Gem.send :remove_instance_variable, :@ruby_version
|
1104
1096
|
end
|
@@ -1106,16 +1098,16 @@ Also, a list:
|
|
1106
1098
|
@RUBY_VERSION = RUBY_VERSION
|
1107
1099
|
@RUBY_PATCHLEVEL = RUBY_PATCHLEVEL if defined?(RUBY_PATCHLEVEL)
|
1108
1100
|
@RUBY_REVISION = RUBY_REVISION if defined?(RUBY_REVISION)
|
1109
|
-
@RUBY_DESCRIPTION = RUBY_DESCRIPTION
|
1101
|
+
@RUBY_DESCRIPTION = RUBY_DESCRIPTION
|
1110
1102
|
@RUBY_ENGINE = RUBY_ENGINE
|
1111
1103
|
@RUBY_ENGINE_VERSION = RUBY_ENGINE_VERSION if defined?(RUBY_ENGINE_VERSION)
|
1112
1104
|
|
1113
1105
|
util_clear_RUBY_VERSION
|
1114
1106
|
|
1115
1107
|
Object.const_set :RUBY_VERSION, version
|
1116
|
-
Object.const_set :RUBY_PATCHLEVEL, patchlevel
|
1117
|
-
Object.const_set :RUBY_REVISION, revision
|
1118
|
-
Object.const_set :RUBY_DESCRIPTION, description
|
1108
|
+
Object.const_set :RUBY_PATCHLEVEL, patchlevel
|
1109
|
+
Object.const_set :RUBY_REVISION, revision
|
1110
|
+
Object.const_set :RUBY_DESCRIPTION, description
|
1119
1111
|
Object.const_set :RUBY_ENGINE, engine
|
1120
1112
|
Object.const_set :RUBY_ENGINE_VERSION, engine_version if engine_version
|
1121
1113
|
end
|
@@ -1128,8 +1120,7 @@ Also, a list:
|
|
1128
1120
|
defined?(@RUBY_PATCHLEVEL)
|
1129
1121
|
Object.const_set :RUBY_REVISION, @RUBY_REVISION if
|
1130
1122
|
defined?(@RUBY_REVISION)
|
1131
|
-
Object.const_set :RUBY_DESCRIPTION, @RUBY_DESCRIPTION
|
1132
|
-
defined?(@RUBY_DESCRIPTION)
|
1123
|
+
Object.const_set :RUBY_DESCRIPTION, @RUBY_DESCRIPTION
|
1133
1124
|
Object.const_set :RUBY_ENGINE, @RUBY_ENGINE
|
1134
1125
|
Object.const_set :RUBY_ENGINE_VERSION, @RUBY_ENGINE_VERSION if
|
1135
1126
|
defined?(@RUBY_ENGINE_VERSION)
|
@@ -1177,7 +1168,7 @@ Also, a list:
|
|
1177
1168
|
# Borland) versus Cygwin, Mingw, etc.
|
1178
1169
|
|
1179
1170
|
def self.vc_windows?
|
1180
|
-
RUBY_PLATFORM.match(
|
1171
|
+
RUBY_PLATFORM.match("mswin")
|
1181
1172
|
end
|
1182
1173
|
|
1183
1174
|
##
|
@@ -1185,7 +1176,15 @@ Also, a list:
|
|
1185
1176
|
# Borland) versus Cygwin, Mingw, etc.
|
1186
1177
|
|
1187
1178
|
def vc_windows?
|
1188
|
-
RUBY_PLATFORM.match(
|
1179
|
+
RUBY_PLATFORM.match("mswin")
|
1180
|
+
end
|
1181
|
+
|
1182
|
+
##
|
1183
|
+
# Is this test being run on a ruby/ruby repository?
|
1184
|
+
#
|
1185
|
+
|
1186
|
+
def ruby_repo?
|
1187
|
+
!ENV["GEM_COMMAND"].nil?
|
1189
1188
|
end
|
1190
1189
|
|
1191
1190
|
##
|
@@ -1194,7 +1193,7 @@ Also, a list:
|
|
1194
1193
|
# other platforms, including Cygwin, it will return 'make'.
|
1195
1194
|
|
1196
1195
|
def self.make_command
|
1197
|
-
ENV["make"] || ENV["MAKE"] || (vc_windows? ?
|
1196
|
+
ENV["make"] || ENV["MAKE"] || (vc_windows? ? "nmake" : "make")
|
1198
1197
|
end
|
1199
1198
|
|
1200
1199
|
##
|
@@ -1203,14 +1202,14 @@ Also, a list:
|
|
1203
1202
|
# other platforms, including Cygwin, it will return 'make'.
|
1204
1203
|
|
1205
1204
|
def make_command
|
1206
|
-
ENV["make"] || ENV["MAKE"] || (vc_windows? ?
|
1205
|
+
ENV["make"] || ENV["MAKE"] || (vc_windows? ? "nmake" : "make")
|
1207
1206
|
end
|
1208
1207
|
|
1209
1208
|
##
|
1210
1209
|
# Returns whether or not the nmake command could be found.
|
1211
1210
|
|
1212
1211
|
def nmake_found?
|
1213
|
-
system(
|
1212
|
+
system("nmake /? 1>NUL 2>&1")
|
1214
1213
|
end
|
1215
1214
|
|
1216
1215
|
# In case we're building docs in a background process, this method waits for
|
@@ -1263,13 +1262,13 @@ Also, a list:
|
|
1263
1262
|
ruby = ENV["RUBY"]
|
1264
1263
|
return ruby if ruby
|
1265
1264
|
ruby = "ruby"
|
1266
|
-
rubyexe = "#{ruby}
|
1265
|
+
rubyexe = "#{ruby}#{RbConfig::CONFIG['EXEEXT']}"
|
1267
1266
|
|
1268
1267
|
3.times do
|
1269
|
-
if File.exist?
|
1268
|
+
if File.exist?(ruby) && File.executable?(ruby) && !File.directory?(ruby)
|
1270
1269
|
return File.expand_path(ruby)
|
1271
1270
|
end
|
1272
|
-
if File.exist?
|
1271
|
+
if File.exist?(rubyexe) && File.executable?(rubyexe)
|
1273
1272
|
return File.expand_path(rubyexe)
|
1274
1273
|
end
|
1275
1274
|
ruby = File.join("..", ruby)
|
@@ -1287,7 +1286,11 @@ Also, a list:
|
|
1287
1286
|
end
|
1288
1287
|
|
1289
1288
|
def rubygems_path
|
1290
|
-
$LOAD_PATH.find{|p| p == File.dirname($LOADED_FEATURES.find{|f| f.end_with?("/rubygems.rb") }) }
|
1289
|
+
$LOAD_PATH.find {|p| p == File.dirname($LOADED_FEATURES.find {|f| f.end_with?("/rubygems.rb") }) }
|
1290
|
+
end
|
1291
|
+
|
1292
|
+
def bundler_path
|
1293
|
+
$LOAD_PATH.find {|p| p == File.dirname($LOADED_FEATURES.find {|f| f.end_with?("/bundler.rb") }) }
|
1291
1294
|
end
|
1292
1295
|
|
1293
1296
|
def with_clean_path_to_ruby
|
@@ -1418,8 +1421,8 @@ Also, a list:
|
|
1418
1421
|
#
|
1419
1422
|
# Yields the +specification+ to the block, if given
|
1420
1423
|
|
1421
|
-
def vendor_gem(name =
|
1422
|
-
directory = File.join
|
1424
|
+
def vendor_gem(name = "a", version = 1)
|
1425
|
+
directory = File.join "vendor", name
|
1423
1426
|
|
1424
1427
|
FileUtils.mkdir_p directory
|
1425
1428
|
|
@@ -1432,12 +1435,12 @@ Also, a list:
|
|
1432
1435
|
#
|
1433
1436
|
# Yields the +specification+ to the block, if given
|
1434
1437
|
|
1435
|
-
def save_gemspec(name =
|
1438
|
+
def save_gemspec(name = "a", version = 1, directory = ".")
|
1436
1439
|
vendor_spec = Gem::Specification.new name, version do |specification|
|
1437
1440
|
yield specification if block_given?
|
1438
1441
|
end
|
1439
1442
|
|
1440
|
-
File.open File.join(directory, "#{name}.gemspec"),
|
1443
|
+
File.open File.join(directory, "#{name}.gemspec"), "w" do |io|
|
1441
1444
|
io.write vendor_spec.to_ruby
|
1442
1445
|
end
|
1443
1446
|
|
@@ -1551,25 +1554,42 @@ Also, a list:
|
|
1551
1554
|
# :stopdoc:
|
1552
1555
|
# only available in RubyGems tests
|
1553
1556
|
|
1554
|
-
PRIVATE_KEY_PASSPHRASE =
|
1557
|
+
PRIVATE_KEY_PASSPHRASE = "Foo bar"
|
1555
1558
|
|
1556
1559
|
begin
|
1557
|
-
PRIVATE_KEY = load_key
|
1558
|
-
PRIVATE_KEY_PATH = key_path
|
1560
|
+
PRIVATE_KEY = load_key "private"
|
1561
|
+
PRIVATE_KEY_PATH = key_path "private"
|
1559
1562
|
|
1560
1563
|
# ENCRYPTED_PRIVATE_KEY is PRIVATE_KEY encrypted with PRIVATE_KEY_PASSPHRASE
|
1561
|
-
ENCRYPTED_PRIVATE_KEY = load_key
|
1562
|
-
ENCRYPTED_PRIVATE_KEY_PATH = key_path
|
1564
|
+
ENCRYPTED_PRIVATE_KEY = load_key "encrypted_private", PRIVATE_KEY_PASSPHRASE
|
1565
|
+
ENCRYPTED_PRIVATE_KEY_PATH = key_path "encrypted_private"
|
1563
1566
|
|
1564
1567
|
PUBLIC_KEY = PRIVATE_KEY.public_key
|
1565
1568
|
|
1566
|
-
PUBLIC_CERT = load_cert
|
1567
|
-
PUBLIC_CERT_PATH = cert_path
|
1569
|
+
PUBLIC_CERT = load_cert "public"
|
1570
|
+
PUBLIC_CERT_PATH = cert_path "public"
|
1568
1571
|
rescue Errno::ENOENT
|
1569
1572
|
PRIVATE_KEY = nil
|
1570
1573
|
PUBLIC_KEY = nil
|
1571
1574
|
PUBLIC_CERT = nil
|
1572
1575
|
end if Gem::HAVE_OPENSSL
|
1576
|
+
|
1577
|
+
private
|
1578
|
+
|
1579
|
+
def restore_env
|
1580
|
+
unless Gem.win_platform?
|
1581
|
+
ENV.replace(@orig_env)
|
1582
|
+
return
|
1583
|
+
end
|
1584
|
+
|
1585
|
+
# Fallback logic for Windows below to workaround
|
1586
|
+
# https://bugs.ruby-lang.org/issues/16798. Can be dropped once all
|
1587
|
+
# supported rubies include the fix for that.
|
1588
|
+
|
1589
|
+
ENV.clear
|
1590
|
+
|
1591
|
+
@orig_env.each {|k, v| ENV[k] = v }
|
1592
|
+
end
|
1573
1593
|
end
|
1574
1594
|
|
1575
1595
|
# https://github.com/seattlerb/minitest/blob/13c48a03d84a2a87855a4de0c959f96800100357/lib/minitest/mock.rb#L192
|
@@ -1579,7 +1599,7 @@ class Object
|
|
1579
1599
|
|
1580
1600
|
metaclass = class << self; self; end
|
1581
1601
|
|
1582
|
-
if respond_to?
|
1602
|
+
if respond_to?(name) && !methods.map(&:to_s).include?(name.to_s)
|
1583
1603
|
metaclass.send :define_method, name do |*args|
|
1584
1604
|
super(*args)
|
1585
1605
|
end
|
@@ -1606,4 +1626,4 @@ class Object
|
|
1606
1626
|
end unless method_defined?(:stub) # lib/resolv/test_dns.rb also has the same method definition
|
1607
1627
|
end
|
1608
1628
|
|
1609
|
-
require_relative
|
1629
|
+
require_relative "utilities"
|