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
@@ -1,6 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require_relative
|
3
|
-
require
|
2
|
+
require_relative "helper"
|
3
|
+
require "rubygems"
|
4
4
|
|
5
5
|
class TestGemRequire < Gem::TestCase
|
6
6
|
class Latch
|
@@ -24,16 +24,6 @@ class TestGemRequire < Gem::TestCase
|
|
24
24
|
end
|
25
25
|
end
|
26
26
|
|
27
|
-
def setup
|
28
|
-
super
|
29
|
-
|
30
|
-
@old_loaded_features = $LOADED_FEATURES.dup
|
31
|
-
assert_raise LoadError do
|
32
|
-
require 'test_gem_require_a'
|
33
|
-
end
|
34
|
-
$LOADED_FEATURES.replace @old_loaded_features
|
35
|
-
end
|
36
|
-
|
37
27
|
def assert_require(path)
|
38
28
|
assert require(path), "'#{path}' was already required"
|
39
29
|
end
|
@@ -45,26 +35,26 @@ class TestGemRequire < Gem::TestCase
|
|
45
35
|
def test_respect_loaded_features_caching_like_standard_require
|
46
36
|
dir = Dir.mktmpdir("test_require", @tempdir)
|
47
37
|
|
48
|
-
lp1 = File.join dir,
|
49
|
-
foo1 = File.join lp1,
|
38
|
+
lp1 = File.join dir, "foo1"
|
39
|
+
foo1 = File.join lp1, "foo.rb"
|
50
40
|
|
51
41
|
FileUtils.mkdir_p lp1
|
52
|
-
File.open(foo1,
|
42
|
+
File.open(foo1, "w") {|f| f.write "class Object; HELLO = 'foo1' end" }
|
53
43
|
|
54
44
|
lp = $LOAD_PATH.dup
|
55
45
|
|
56
46
|
$LOAD_PATH.unshift lp1
|
57
|
-
assert_require
|
47
|
+
assert_require "foo"
|
58
48
|
assert_equal "foo1", ::Object::HELLO
|
59
49
|
|
60
|
-
lp2 = File.join dir,
|
61
|
-
foo2 = File.join lp2,
|
50
|
+
lp2 = File.join dir, "foo2"
|
51
|
+
foo2 = File.join lp2, "foo.rb"
|
62
52
|
|
63
53
|
FileUtils.mkdir_p lp2
|
64
|
-
File.open(foo2,
|
54
|
+
File.open(foo2, "w") {|f| f.write "class Object; HELLO = 'foo2' end" }
|
65
55
|
|
66
56
|
$LOAD_PATH.unshift lp2
|
67
|
-
refute_require
|
57
|
+
refute_require "foo"
|
68
58
|
assert_equal "foo1", ::Object::HELLO
|
69
59
|
ensure
|
70
60
|
$LOAD_PATH.replace lp
|
@@ -73,32 +63,29 @@ class TestGemRequire < Gem::TestCase
|
|
73
63
|
|
74
64
|
# Providing -I on the commandline should always beat gems
|
75
65
|
def test_dash_i_beats_gems
|
76
|
-
a1 = util_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
|
77
|
-
b1 = util_spec "b", "1", {"c" => "> 0"}, "lib/b/c.rb"
|
66
|
+
a1 = util_spec "a", "1", { "b" => "= 1" }, "lib/test_gem_require_a.rb"
|
67
|
+
b1 = util_spec "b", "1", { "c" => "> 0" }, "lib/b/c.rb"
|
78
68
|
c1 = util_spec "c", "1", nil, "lib/c/c.rb"
|
79
69
|
c2 = util_spec "c", "2", nil, "lib/c/c.rb"
|
80
70
|
|
81
71
|
install_specs c1, c2, b1, a1
|
82
72
|
|
83
73
|
dir = Dir.mktmpdir("test_require", @tempdir)
|
84
|
-
dash_i_arg = File.join dir,
|
74
|
+
dash_i_arg = File.join dir, "lib"
|
85
75
|
|
86
|
-
c_rb = File.join dash_i_arg,
|
76
|
+
c_rb = File.join dash_i_arg, "b", "c.rb"
|
87
77
|
|
88
78
|
FileUtils.mkdir_p File.dirname c_rb
|
89
|
-
File.open(c_rb,
|
90
|
-
|
91
|
-
lp = $LOAD_PATH.dup
|
79
|
+
File.open(c_rb, "w") {|f| f.write "class Object; HELLO = 'world' end" }
|
92
80
|
|
93
81
|
# Pretend to provide a commandline argument that overrides a file in gem b
|
94
82
|
$LOAD_PATH.unshift dash_i_arg
|
95
83
|
|
96
|
-
assert_require
|
97
|
-
assert_require
|
84
|
+
assert_require "test_gem_require_a"
|
85
|
+
assert_require "b/c" # this should be required from -I
|
98
86
|
assert_equal "world", ::Object::HELLO
|
99
87
|
assert_equal %w[a-1 b-1], loaded_spec_names
|
100
88
|
ensure
|
101
|
-
$LOAD_PATH.replace lp
|
102
89
|
Object.send :remove_const, :HELLO if Object.const_defined? :HELLO
|
103
90
|
end
|
104
91
|
|
@@ -115,34 +102,31 @@ class TestGemRequire < Gem::TestCase
|
|
115
102
|
|
116
103
|
# Providing -I on the commandline should always beat gems
|
117
104
|
def test_dash_i_beats_default_gems
|
118
|
-
a1 = new_default_spec "a", "1", {"b" => "= 1"}, "test_gem_require_a.rb"
|
119
|
-
b1 = new_default_spec "b", "1", {"c" => "> 0"}, "b/c.rb"
|
105
|
+
a1 = new_default_spec "a", "1", { "b" => "= 1" }, "test_gem_require_a.rb"
|
106
|
+
b1 = new_default_spec "b", "1", { "c" => "> 0" }, "b/c.rb"
|
120
107
|
c1 = new_default_spec "c", "1", nil, "c/c.rb"
|
121
108
|
c2 = new_default_spec "c", "2", nil, "c/c.rb"
|
122
109
|
|
123
110
|
install_default_gems c1, c2, b1, a1
|
124
111
|
|
125
112
|
dir = Dir.mktmpdir("test_require", @tempdir)
|
126
|
-
dash_i_arg = File.join dir,
|
113
|
+
dash_i_arg = File.join dir, "lib"
|
127
114
|
|
128
|
-
c_rb = File.join dash_i_arg,
|
115
|
+
c_rb = File.join dash_i_arg, "c", "c.rb"
|
129
116
|
|
130
117
|
FileUtils.mkdir_p File.dirname c_rb
|
131
|
-
File.open(c_rb,
|
118
|
+
File.open(c_rb, "w") {|f| f.write "class Object; HELLO = 'world' end" }
|
132
119
|
|
133
|
-
assert_require
|
134
|
-
|
135
|
-
lp = $LOAD_PATH.dup
|
120
|
+
assert_require "test_gem_require_a"
|
136
121
|
|
137
122
|
# Pretend to provide a commandline argument that overrides a file in gem b
|
138
123
|
$LOAD_PATH.unshift dash_i_arg
|
139
124
|
|
140
|
-
assert_require
|
141
|
-
assert_require
|
125
|
+
assert_require "b/c"
|
126
|
+
assert_require "c/c" # this should be required from -I
|
142
127
|
assert_equal "world", ::Object::HELLO
|
143
128
|
assert_equal %w[a-1 b-1], loaded_spec_names
|
144
129
|
ensure
|
145
|
-
$LOAD_PATH.replace lp
|
146
130
|
Object.send :remove_const, :HELLO if Object.const_defined? :HELLO
|
147
131
|
end
|
148
132
|
|
@@ -150,19 +134,13 @@ class TestGemRequire < Gem::TestCase
|
|
150
134
|
pend "extensions don't quite work on jruby" if Gem.java_platform?
|
151
135
|
pend "not installed yet" unless RbConfig::TOPDIR
|
152
136
|
|
153
|
-
dash_i_ext_arg = util_install_extension_file(
|
154
|
-
dash_i_lib_arg = util_install_ruby_file(
|
155
|
-
|
156
|
-
lp = $LOAD_PATH.dup
|
137
|
+
dash_i_ext_arg = util_install_extension_file("a")
|
138
|
+
dash_i_lib_arg = util_install_ruby_file("a")
|
157
139
|
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
assert_match(/a\.rb$/, $LOADED_FEATURES.last)
|
163
|
-
ensure
|
164
|
-
$LOAD_PATH.replace lp
|
165
|
-
end
|
140
|
+
$LOAD_PATH.unshift dash_i_lib_arg
|
141
|
+
$LOAD_PATH.unshift dash_i_ext_arg
|
142
|
+
assert_require "a"
|
143
|
+
assert_match(/a\.rb$/, $LOADED_FEATURES.last)
|
166
144
|
end
|
167
145
|
|
168
146
|
def test_concurrent_require
|
@@ -174,8 +152,8 @@ class TestGemRequire < Gem::TestCase
|
|
174
152
|
|
175
153
|
install_specs a1, b1
|
176
154
|
|
177
|
-
t1 = create_sync_thread{ assert_require "a#{$$}" }
|
178
|
-
t2 = create_sync_thread{ assert_require "b#{$$}" }
|
155
|
+
t1 = create_sync_thread { assert_require "a#{$$}" }
|
156
|
+
t2 = create_sync_thread { assert_require "b#{$$}" }
|
179
157
|
|
180
158
|
# wait until both files are waiting on the exit latch
|
181
159
|
FILE_ENTERED_LATCH.await
|
@@ -191,13 +169,13 @@ class TestGemRequire < Gem::TestCase
|
|
191
169
|
end
|
192
170
|
|
193
171
|
def test_require_is_not_lazy_with_exact_req
|
194
|
-
a1 = util_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
|
172
|
+
a1 = util_spec "a", "1", { "b" => "= 1" }, "lib/test_gem_require_a.rb"
|
195
173
|
b1 = util_spec "b", "1", nil, "lib/b/c.rb"
|
196
174
|
b2 = util_spec "b", "2", nil, "lib/b/c.rb"
|
197
175
|
|
198
176
|
install_specs b1, b2, a1
|
199
177
|
|
200
|
-
assert_require
|
178
|
+
assert_require "test_gem_require_a"
|
201
179
|
assert_equal %w[a-1 b-1], loaded_spec_names
|
202
180
|
assert_equal unresolved_names, []
|
203
181
|
|
@@ -206,13 +184,13 @@ class TestGemRequire < Gem::TestCase
|
|
206
184
|
end
|
207
185
|
|
208
186
|
def test_require_is_lazy_with_inexact_req
|
209
|
-
a1 = util_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
|
187
|
+
a1 = util_spec "a", "1", { "b" => ">= 1" }, "lib/test_gem_require_a.rb"
|
210
188
|
b1 = util_spec "b", "1", nil, "lib/b/c.rb"
|
211
189
|
b2 = util_spec "b", "2", nil, "lib/b/c.rb"
|
212
190
|
|
213
191
|
install_specs b1, b2, a1
|
214
192
|
|
215
|
-
assert_require
|
193
|
+
assert_require "test_gem_require_a"
|
216
194
|
assert_equal %w[a-1], loaded_spec_names
|
217
195
|
assert_equal unresolved_names, ["b (>= 1)"]
|
218
196
|
|
@@ -221,12 +199,12 @@ class TestGemRequire < Gem::TestCase
|
|
221
199
|
end
|
222
200
|
|
223
201
|
def test_require_is_not_lazy_with_one_possible
|
224
|
-
a1 = util_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
|
202
|
+
a1 = util_spec "a", "1", { "b" => ">= 1" }, "lib/test_gem_require_a.rb"
|
225
203
|
b1 = util_spec "b", "1", nil, "lib/b/c.rb"
|
226
204
|
|
227
205
|
install_specs b1, a1
|
228
206
|
|
229
|
-
assert_require
|
207
|
+
assert_require "test_gem_require_a"
|
230
208
|
assert_equal %w[a-1 b-1], loaded_spec_names
|
231
209
|
assert_equal unresolved_names, []
|
232
210
|
|
@@ -239,7 +217,7 @@ class TestGemRequire < Gem::TestCase
|
|
239
217
|
|
240
218
|
install_specs a1
|
241
219
|
|
242
|
-
assert_require Pathname.new
|
220
|
+
assert_require Pathname.new "test_gem_require_a"
|
243
221
|
assert_equal %w[a-1], loaded_spec_names
|
244
222
|
assert_equal unresolved_names, []
|
245
223
|
end
|
@@ -252,7 +230,7 @@ class TestGemRequire < Gem::TestCase
|
|
252
230
|
|
253
231
|
pend "not installed yet" unless RbConfig::TOPDIR
|
254
232
|
|
255
|
-
lib_dir = File.expand_path("
|
233
|
+
lib_dir = File.expand_path("../lib", __dir__)
|
256
234
|
rubylibdir = File.realdirpath(RbConfig::CONFIG["rubylibdir"])
|
257
235
|
if rubylibdir == lib_dir
|
258
236
|
# testing in the ruby repository where RubyGems' lib/ == stdlib lib/
|
@@ -263,20 +241,20 @@ class TestGemRequire < Gem::TestCase
|
|
263
241
|
load_path_changed = true
|
264
242
|
end
|
265
243
|
|
266
|
-
require
|
244
|
+
require "benchmark" # the stdlib
|
267
245
|
|
268
|
-
a1 = util_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
|
246
|
+
a1 = util_spec "a", "1", { "b" => ">= 1" }, "lib/test_gem_require_a.rb"
|
269
247
|
b1 = util_spec "b", "1", nil, "lib/benchmark.rb"
|
270
248
|
b2 = util_spec "b", "2", nil, "lib/benchmark.rb"
|
271
249
|
|
272
250
|
install_specs b1, b2, a1
|
273
251
|
|
274
252
|
# Activates a-1, but not b-1 and b-2
|
275
|
-
assert_require
|
253
|
+
assert_require "test_gem_require_a"
|
276
254
|
assert_equal %w[a-1], loaded_spec_names
|
277
|
-
assert $LOAD_PATH.include? a1.
|
278
|
-
refute $LOAD_PATH.include? b1.
|
279
|
-
refute $LOAD_PATH.include? b2.
|
255
|
+
assert $LOAD_PATH.include? a1.full_require_paths[0]
|
256
|
+
refute $LOAD_PATH.include? b1.full_require_paths[0]
|
257
|
+
refute $LOAD_PATH.include? b2.full_require_paths[0]
|
280
258
|
|
281
259
|
assert_equal unresolved_names, ["b (>= 1)"]
|
282
260
|
|
@@ -285,15 +263,15 @@ class TestGemRequire < Gem::TestCase
|
|
285
263
|
# though b-2 is earlier in $LOAD_PATH it already loaded a benchmark.rb file
|
286
264
|
# and that still exists in $LOAD_PATH (further down),
|
287
265
|
# and as a result #gem_original_require returns false.
|
288
|
-
refute require(
|
266
|
+
refute require("benchmark"), "the benchmark stdlib should be recognized as already loaded"
|
289
267
|
|
290
|
-
assert_includes $LOAD_PATH, b2.
|
268
|
+
assert_includes $LOAD_PATH, b2.full_require_paths[0]
|
291
269
|
assert_includes $LOAD_PATH, rubylibdir
|
292
270
|
message = proc {
|
293
271
|
"this test relies on the b-2 gem lib/ to be before stdlib to make sense\n" +
|
294
|
-
|
272
|
+
$LOAD_PATH.pretty_inspect
|
295
273
|
}
|
296
|
-
assert_operator $LOAD_PATH.index(b2.
|
274
|
+
assert_operator $LOAD_PATH.index(b2.full_require_paths[0]), :<, $LOAD_PATH.index(rubylibdir), message
|
297
275
|
|
298
276
|
# We detected that we should activate b-2, so we did so, but
|
299
277
|
# then #gem_original_require decided "I've already got some benchmark.rb" loaded.
|
@@ -318,7 +296,7 @@ class TestGemRequire < Gem::TestCase
|
|
318
296
|
|
319
297
|
install_specs a2
|
320
298
|
|
321
|
-
refute_require
|
299
|
+
refute_require "a"
|
322
300
|
|
323
301
|
assert_equal %w[a-1], loaded_spec_names
|
324
302
|
end
|
@@ -400,7 +378,7 @@ class TestGemRequire < Gem::TestCase
|
|
400
378
|
|
401
379
|
# Load default ruby gems fresh as if we've just started a ruby script.
|
402
380
|
Gem::Specification.reset
|
403
|
-
require
|
381
|
+
require "rubygems"
|
404
382
|
Gem::Specification.stubs
|
405
383
|
|
406
384
|
# Remove an old default gem version directly from disk as if someone ran
|
@@ -409,9 +387,9 @@ class TestGemRequire < Gem::TestCase
|
|
409
387
|
FileUtils.rm_rf(File.join @gemhome, "specifications", "default", "#{b1.full_name}.gemspec")
|
410
388
|
|
411
389
|
# Require gems that have not been removed.
|
412
|
-
assert_require
|
390
|
+
assert_require "a/b"
|
413
391
|
assert_equal %w[a-1.0], loaded_spec_names
|
414
|
-
assert_require
|
392
|
+
assert_require "b/d"
|
415
393
|
assert_equal %w[a-1.0 b-2.0], loaded_spec_names
|
416
394
|
end
|
417
395
|
|
@@ -466,8 +444,7 @@ class TestGemRequire < Gem::TestCase
|
|
466
444
|
end
|
467
445
|
|
468
446
|
def test_realworld_default_gem
|
469
|
-
|
470
|
-
pend "this test can't work under ruby-core setup" if testing_ruby_repo || java_platform?
|
447
|
+
omit "this test can't work under ruby-core setup" if ruby_repo?
|
471
448
|
|
472
449
|
cmd = <<-RUBY
|
473
450
|
$stderr = $stdout
|
@@ -480,8 +457,7 @@ class TestGemRequire < Gem::TestCase
|
|
480
457
|
end
|
481
458
|
|
482
459
|
def test_realworld_upgraded_default_gem
|
483
|
-
|
484
|
-
pend "this test can't work under ruby-core setup" if testing_ruby_repo
|
460
|
+
omit "this test can't work under ruby-core setup" if ruby_repo?
|
485
461
|
|
486
462
|
newer_json = util_spec("json", "999.99.9", nil, ["lib/json.rb"])
|
487
463
|
install_gem newer_json
|
@@ -495,7 +471,7 @@ class TestGemRequire < Gem::TestCase
|
|
495
471
|
RUBY
|
496
472
|
File.write(path, code)
|
497
473
|
|
498
|
-
output = Gem::Util.popen({
|
474
|
+
output = Gem::Util.popen({ "GEM_HOME" => @gemhome }, *ruby_with_rubygems_in_load_path, path).strip
|
499
475
|
assert $?.success?
|
500
476
|
refute_empty output
|
501
477
|
assert_equal "999.99.9", output.lines[0].chomp
|
@@ -566,11 +542,11 @@ class TestGemRequire < Gem::TestCase
|
|
566
542
|
silence_warnings do
|
567
543
|
class << ::Gem
|
568
544
|
alias old_try_activate try_activate
|
569
|
-
def try_activate(*); raise
|
545
|
+
def try_activate(*); raise "raised from try_activate"; end
|
570
546
|
end
|
571
547
|
end
|
572
548
|
|
573
|
-
require
|
549
|
+
require "does_not_exist_for_try_activate_test"
|
574
550
|
rescue RuntimeError => e
|
575
551
|
assert_match(/raised from try_activate/, e.message)
|
576
552
|
assert Kernel::RUBYGEMS_ACTIVATION_MONITOR.try_enter, "require monitor was not unlocked when try_activate raised"
|
@@ -609,124 +585,106 @@ class TestGemRequire < Gem::TestCase
|
|
609
585
|
end
|
610
586
|
|
611
587
|
def test_require_bundler
|
612
|
-
b1 = util_spec(
|
613
|
-
b2a = util_spec(
|
588
|
+
b1 = util_spec("bundler", "1", nil, "lib/bundler/setup.rb")
|
589
|
+
b2a = util_spec("bundler", "2.a", nil, "lib/bundler/setup.rb")
|
614
590
|
install_specs b1, b2a
|
615
591
|
|
616
592
|
require "rubygems/bundler_version_finder"
|
617
593
|
$:.clear
|
618
|
-
assert_require
|
594
|
+
assert_require "bundler/setup"
|
619
595
|
assert_equal %w[bundler-2.a], loaded_spec_names
|
620
596
|
assert_empty unresolved_names
|
621
597
|
end
|
622
598
|
|
623
|
-
|
624
|
-
|
625
|
-
|
626
|
-
|
627
|
-
|
628
|
-
|
629
|
-
|
630
|
-
gem('bundler')
|
631
|
-
end
|
632
|
-
assert_match "Could not find 'bundler' (55) required by reason.", e.message
|
633
|
-
end
|
634
|
-
end
|
635
|
-
|
636
|
-
def test_require_bundler_with_bundler_version
|
637
|
-
Gem::BundlerVersionFinder.stub(:bundler_version_with_reason, ["1", "reason"]) do
|
638
|
-
b1 = util_spec('bundler', '1.999999999', nil, "lib/bundler/setup.rb")
|
639
|
-
b2 = util_spec('bundler', '2', nil, "lib/bundler/setup.rb")
|
640
|
-
install_specs b1, b2
|
641
|
-
|
642
|
-
$:.clear
|
643
|
-
assert_require 'bundler/setup'
|
644
|
-
assert_equal %w[bundler-1.999999999], loaded_spec_names
|
645
|
-
end
|
646
|
-
end
|
647
|
-
|
648
|
-
# uplevel is 2.5+ only
|
649
|
-
if RUBY_VERSION >= "2.5"
|
650
|
-
["", "Kernel."].each do |prefix|
|
651
|
-
define_method "test_no_kernel_require_in_#{prefix.tr(".", "_")}warn_with_uplevel" do
|
652
|
-
Dir.mktmpdir("warn_test") do |dir|
|
653
|
-
File.write(dir + "/sub.rb", "#{prefix}warn 'uplevel', 'test', uplevel: 1\n")
|
654
|
-
File.write(dir + "/main.rb", "require 'sub'\n")
|
655
|
-
_, err = capture_subprocess_io do
|
656
|
-
system(*ruby_with_rubygems_in_load_path, "-w", "--disable=gems", "-C", dir, "-I", dir, "main.rb")
|
657
|
-
end
|
658
|
-
assert_match(/main\.rb:1: warning: uplevel\ntest\n$/, err)
|
659
|
-
_, err = capture_subprocess_io do
|
660
|
-
system(*ruby_with_rubygems_in_load_path, "-w", "--enable=gems", "-C", dir, "-I", dir, "main.rb")
|
661
|
-
end
|
662
|
-
assert_match(/main\.rb:1: warning: uplevel\ntest\n$/, err)
|
599
|
+
["", "Kernel."].each do |prefix|
|
600
|
+
define_method "test_no_kernel_require_in_#{prefix.tr(".", "_")}warn_with_uplevel" do
|
601
|
+
Dir.mktmpdir("warn_test") do |dir|
|
602
|
+
File.write(dir + "/sub.rb", "#{prefix}warn 'uplevel', 'test', uplevel: 1\n")
|
603
|
+
File.write(dir + "/main.rb", "require 'sub'\n")
|
604
|
+
_, err = capture_subprocess_io do
|
605
|
+
system(*ruby_with_rubygems_in_load_path, "-w", "--disable=gems", "-C", dir, "-I", dir, "main.rb")
|
663
606
|
end
|
664
|
-
|
665
|
-
|
666
|
-
|
667
|
-
Dir.mktmpdir("warn_test") do |dir|
|
668
|
-
File.write(dir + "/main.rb", "#{prefix}warn({x:1}, {y:2}, [])\n")
|
669
|
-
_, err = capture_subprocess_io do
|
670
|
-
system(*ruby_with_rubygems_in_load_path, "-w", "--disable=gems", "-C", dir, "main.rb")
|
671
|
-
end
|
672
|
-
assert_match(/{:x=>1}\n{:y=>2}\n$/, err)
|
673
|
-
_, err = capture_subprocess_io do
|
674
|
-
system(*ruby_with_rubygems_in_load_path, "-w", "--enable=gems", "-C", dir, "main.rb")
|
675
|
-
end
|
676
|
-
assert_match(/{:x=>1}\n{:y=>2}\n$/, err)
|
607
|
+
assert_match(/main\.rb:1: warning: uplevel\ntest\n$/, err)
|
608
|
+
_, err = capture_subprocess_io do
|
609
|
+
system(*ruby_with_rubygems_in_load_path, "-w", "--enable=gems", "-C", dir, "-I", dir, "main.rb")
|
677
610
|
end
|
611
|
+
assert_match(/main\.rb:1: warning: uplevel\ntest\n$/, err)
|
678
612
|
end
|
679
613
|
end
|
680
614
|
|
681
|
-
|
615
|
+
define_method "test_no_other_behavioral_changes_with_#{prefix.tr(".", "_")}warn" do
|
682
616
|
Dir.mktmpdir("warn_test") do |dir|
|
683
|
-
File.write(dir + "/main.rb", "
|
617
|
+
File.write(dir + "/main.rb", "#{prefix}warn({x:1}, {y:2}, [])\n")
|
684
618
|
_, err = capture_subprocess_io do
|
685
619
|
system(*ruby_with_rubygems_in_load_path, "-w", "--disable=gems", "-C", dir, "main.rb")
|
686
620
|
end
|
687
|
-
assert_match(/
|
621
|
+
assert_match(/{:x=>1}\n{:y=>2}\n$/, err)
|
688
622
|
_, err = capture_subprocess_io do
|
689
623
|
system(*ruby_with_rubygems_in_load_path, "-w", "--enable=gems", "-C", dir, "main.rb")
|
690
624
|
end
|
691
|
-
assert_match(/
|
625
|
+
assert_match(/{:x=>1}\n{:y=>2}\n$/, err)
|
692
626
|
end
|
693
627
|
end
|
628
|
+
end
|
694
629
|
|
695
|
-
|
696
|
-
|
697
|
-
|
698
|
-
|
699
|
-
|
700
|
-
|
701
|
-
|
702
|
-
|
703
|
-
|
704
|
-
|
705
|
-
|
706
|
-
|
707
|
-
|
630
|
+
def test_no_crash_when_overriding_warn_with_warning_module
|
631
|
+
Dir.mktmpdir("warn_test") do |dir|
|
632
|
+
File.write(dir + "/main.rb", "module Warning; def warn(str); super; end; end; warn 'Foo Bar'")
|
633
|
+
_, err = capture_subprocess_io do
|
634
|
+
system(*ruby_with_rubygems_in_load_path, "-w", "--disable=gems", "-C", dir, "main.rb")
|
635
|
+
end
|
636
|
+
assert_match(/Foo Bar\n$/, err)
|
637
|
+
_, err = capture_subprocess_io do
|
638
|
+
system(*ruby_with_rubygems_in_load_path, "-w", "--enable=gems", "-C", dir, "main.rb")
|
639
|
+
end
|
640
|
+
assert_match(/Foo Bar\n$/, err)
|
641
|
+
end
|
642
|
+
end
|
708
643
|
|
709
|
-
|
710
|
-
|
711
|
-
|
712
|
-
|
713
|
-
|
714
|
-
|
644
|
+
def test_expected_backtrace_location_when_inheriting_from_basic_object_and_including_kernel
|
645
|
+
Dir.mktmpdir("warn_test") do |dir|
|
646
|
+
File.write(dir + "/main.rb", "\nrequire 'sub'\n")
|
647
|
+
File.write(dir + "/sub.rb", <<-'RUBY')
|
648
|
+
require 'rubygems'
|
649
|
+
class C < BasicObject
|
650
|
+
include ::Kernel
|
651
|
+
def deprecated
|
652
|
+
warn "This is a deprecated method", uplevel: 2
|
653
|
+
end
|
715
654
|
end
|
716
|
-
|
655
|
+
C.new.deprecated
|
656
|
+
RUBY
|
657
|
+
|
658
|
+
_, err = capture_subprocess_io do
|
659
|
+
system(*ruby_with_rubygems_in_load_path, "-w", "--disable=gems", "-C", dir, "-I", dir, "main.rb")
|
660
|
+
end
|
661
|
+
assert_match(/main\.rb:2: warning: This is a deprecated method$/, err)
|
662
|
+
_, err = capture_subprocess_io do
|
663
|
+
system(*ruby_with_rubygems_in_load_path, "-w", "--enable=gems", "-C", dir, "-I", dir, "main.rb")
|
717
664
|
end
|
665
|
+
assert_match(/main\.rb:2: warning: This is a deprecated method$/, err)
|
718
666
|
end
|
719
667
|
end
|
720
668
|
|
721
|
-
|
669
|
+
def test_require_does_not_crash_when_utilizing_bundler_version_finder
|
670
|
+
a1 = util_spec "a", "1.1", { "bundler" => ">= 0" }
|
671
|
+
a2 = util_spec "a", "1.2", { "bundler" => ">= 0" }
|
672
|
+
b1 = util_spec "bundler", "2.3.7"
|
673
|
+
b2 = util_spec "bundler", "2.3.24"
|
674
|
+
c = util_spec "c", "1", { "a" => [">= 1.1", "< 99.0"] }, "lib/test_gem_require_c.rb"
|
722
675
|
|
723
|
-
|
724
|
-
|
725
|
-
|
726
|
-
|
727
|
-
|
676
|
+
install_specs a1, a2, b1, b2, c
|
677
|
+
|
678
|
+
cmd = <<-RUBY
|
679
|
+
require "test_gem_require_c"
|
680
|
+
require "json"
|
681
|
+
RUBY
|
682
|
+
out = Gem::Util.popen({ "GEM_HOME" => @gemhome }, *ruby_with_rubygems_in_load_path, "-e", cmd)
|
683
|
+
assert_predicate $?, :success?, "Require failed due to #{out}"
|
728
684
|
end
|
729
685
|
|
686
|
+
private
|
687
|
+
|
730
688
|
def util_install_extension_file(name)
|
731
689
|
spec = quick_gem name
|
732
690
|
util_build_gem spec
|
@@ -750,13 +708,13 @@ class TestGemRequire < Gem::TestCase
|
|
750
708
|
|
751
709
|
spec.files += ["extconf.rb", "depend", "#{name}.c"]
|
752
710
|
|
753
|
-
|
754
|
-
assert_path_not_exist
|
711
|
+
extension_file = File.join(spec.extension_dir, "#{name}.#{RbConfig::CONFIG["DLEXT"]}")
|
712
|
+
assert_path_not_exist extension_file
|
755
713
|
|
756
714
|
path = Gem::Package.build spec
|
757
715
|
installer = Gem::Installer.at path
|
758
716
|
installer.install
|
759
|
-
assert_path_exist
|
717
|
+
assert_path_exist extension_file
|
760
718
|
|
761
719
|
spec.gem_dir
|
762
720
|
end
|
@@ -768,7 +726,7 @@ class TestGemRequire < Gem::TestCase
|
|
768
726
|
a_rb = File.join dash_i_lib_arg, "#{name}.rb"
|
769
727
|
|
770
728
|
FileUtils.mkdir_p File.dirname a_rb
|
771
|
-
File.open(a_rb,
|
729
|
+
File.open(a_rb, "w") {|f| f.write "# #{name}.rb" }
|
772
730
|
|
773
731
|
dash_i_lib_arg
|
774
732
|
end
|