rubygems-update 3.0.9 → 3.1.0.pre1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +31 -8
- data/.travis.yml +9 -27
- data/CONTRIBUTING.md +13 -0
- data/History.txt +24 -28
- data/MAINTAINERS.txt +1 -6
- data/Manifest.txt +65 -15
- data/Rakefile +39 -23
- data/bin/gem +0 -6
- data/bundler/CHANGELOG.md +746 -570
- data/bundler/CODE_OF_CONDUCT.md +117 -23
- data/bundler/LICENSE.md +18 -19
- data/bundler/README.md +9 -8
- data/bundler/bundler.gemspec +8 -25
- data/bundler/exe/bundle +19 -3
- data/bundler/lib/bundler.rb +120 -67
- data/bundler/lib/bundler/build_metadata.rb +1 -3
- data/bundler/lib/bundler/capistrano.rb +4 -4
- data/bundler/lib/bundler/cli.rb +129 -121
- data/bundler/lib/bundler/cli/add.rb +27 -16
- data/bundler/lib/bundler/cli/common.rb +11 -12
- data/bundler/lib/bundler/cli/config.rb +161 -86
- data/bundler/lib/bundler/cli/console.rb +1 -1
- data/bundler/lib/bundler/cli/doctor.rb +4 -4
- data/bundler/lib/bundler/cli/exec.rb +4 -9
- data/bundler/lib/bundler/cli/gem.rb +5 -5
- data/bundler/lib/bundler/cli/info.rb +17 -5
- data/bundler/lib/bundler/cli/init.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +11 -10
- data/bundler/lib/bundler/cli/issue.rb +3 -3
- data/bundler/lib/bundler/cli/open.rb +10 -6
- data/bundler/lib/bundler/cli/outdated.rb +85 -81
- data/bundler/lib/bundler/cli/package.rb +8 -9
- data/bundler/lib/bundler/cli/plugin.rb +9 -2
- data/bundler/lib/bundler/cli/pristine.rb +1 -1
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/update.rb +31 -11
- data/bundler/lib/bundler/compact_index_client.rb +25 -9
- data/bundler/lib/bundler/compact_index_client/updater.rb +2 -6
- data/bundler/lib/bundler/current_ruby.rb +9 -7
- data/bundler/lib/bundler/definition.rb +35 -26
- data/bundler/lib/bundler/dependency.rb +16 -4
- data/bundler/lib/bundler/deployment.rb +1 -1
- data/bundler/lib/bundler/dsl.rb +15 -39
- data/bundler/lib/bundler/env.rb +8 -13
- data/bundler/lib/bundler/environment_preserver.rb +0 -1
- data/bundler/lib/bundler/feature_flag.rb +23 -34
- data/bundler/lib/bundler/fetcher.rb +14 -11
- data/bundler/lib/bundler/fetcher/compact_index.rb +26 -12
- data/bundler/lib/bundler/fetcher/dependency.rb +1 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +4 -1
- data/bundler/lib/bundler/fetcher/index.rb +4 -2
- data/bundler/lib/bundler/friendly_errors.rb +4 -5
- data/bundler/lib/bundler/gem_helper.rb +39 -24
- data/bundler/lib/bundler/gem_helpers.rb +2 -4
- data/bundler/lib/bundler/gem_tasks.rb +1 -1
- data/bundler/lib/bundler/gem_version_promoter.rb +3 -3
- data/bundler/lib/bundler/graph.rb +2 -2
- data/bundler/lib/bundler/injector.rb +10 -8
- data/bundler/lib/bundler/inline.rb +19 -18
- data/bundler/lib/bundler/installer.rb +7 -14
- data/bundler/lib/bundler/installer/gem_installer.rb +5 -1
- data/bundler/lib/bundler/installer/parallel_installer.rb +4 -8
- data/bundler/lib/bundler/installer/standalone.rb +1 -2
- data/bundler/lib/bundler/lazy_specification.rb +2 -2
- data/bundler/lib/bundler/lockfile_parser.rb +13 -21
- data/bundler/lib/bundler/match_platform.rb +1 -1
- data/bundler/lib/bundler/plugin.rb +42 -29
- data/bundler/lib/bundler/plugin/api.rb +1 -1
- data/bundler/lib/bundler/plugin/api/source.rb +2 -2
- data/bundler/lib/bundler/plugin/index.rb +14 -3
- data/bundler/lib/bundler/plugin/installer.rb +28 -15
- data/bundler/lib/bundler/psyched_yaml.rb +1 -1
- data/bundler/lib/bundler/resolver.rb +72 -24
- data/bundler/lib/bundler/resolver/spec_group.rb +3 -2
- data/bundler/lib/bundler/retry.rb +2 -2
- data/bundler/lib/bundler/ruby_version.rb +4 -19
- data/bundler/lib/bundler/rubygems_ext.rb +10 -66
- data/bundler/lib/bundler/rubygems_gem_installer.rb +1 -8
- data/bundler/lib/bundler/rubygems_integration.rb +144 -395
- data/bundler/lib/bundler/runtime.rb +2 -9
- data/bundler/lib/bundler/settings.rb +15 -47
- data/bundler/lib/bundler/setup.rb +6 -5
- data/bundler/lib/bundler/shared_helpers.rb +58 -71
- data/bundler/lib/bundler/similarity_detector.rb +2 -2
- data/bundler/lib/bundler/source.rb +5 -5
- data/bundler/lib/bundler/source/git.rb +19 -12
- data/bundler/lib/bundler/source/git/git_proxy.rb +35 -39
- data/bundler/lib/bundler/source/metadata.rb +7 -2
- data/bundler/lib/bundler/source/path.rb +13 -8
- data/bundler/lib/bundler/source/rubygems.rb +11 -5
- data/bundler/lib/bundler/source/rubygems/remote.rb +1 -2
- data/bundler/lib/bundler/source_list.rb +9 -12
- data/bundler/lib/bundler/spec_set.rb +23 -12
- data/bundler/lib/bundler/stub_specification.rb +18 -30
- data/bundler/lib/bundler/templates/Executable.bundler +23 -14
- data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +3 -3
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +8 -2
- data/bundler/lib/bundler/templates/newgem/README.md.tt +4 -3
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +6 -27
- data/bundler/lib/bundler/templates/newgem/test/test_helper.rb.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -1
- data/bundler/lib/bundler/ui.rb +3 -3
- data/bundler/lib/bundler/ui/rg_proxy.rb +1 -1
- data/bundler/lib/bundler/ui/shell.rb +4 -8
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +161 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +66 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +176 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +3 -0
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +151 -48
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils/version.rb +5 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +6 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +2 -2
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +6 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +30 -8
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +4 -4
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +2 -2
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +248 -279
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb +40 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +53 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb +79 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +7 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +21 -11
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +11 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +16 -17
- data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +82 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/group.rb +3 -3
- data/bundler/lib/bundler/vendor/thor/lib/thor/line_editor.rb +2 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser.rb +4 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +7 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/runner.rb +6 -6
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +4 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +52 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/html.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/vendored_fileutils.rb +1 -6
- data/bundler/lib/bundler/vendored_molinillo.rb +1 -1
- data/bundler/lib/bundler/vendored_persistent.rb +7 -5
- data/bundler/lib/bundler/vendored_thor.rb +2 -2
- data/bundler/lib/bundler/version.rb +1 -20
- data/bundler/lib/bundler/version_ranges.rb +51 -5
- data/bundler/lib/bundler/vlad.rb +2 -2
- data/bundler/lib/bundler/worker.rb +1 -3
- data/bundler/lib/bundler/yaml_serializer.rb +2 -3
- data/bundler/man/bundle-add.1 +66 -0
- data/bundler/man/bundle-add.1.txt +58 -0
- data/bundler/man/bundle-add.ronn +7 -1
- data/bundler/man/bundle-binstubs.1 +40 -0
- data/bundler/man/bundle-binstubs.1.txt +48 -0
- data/bundler/man/bundle-binstubs.ronn +1 -1
- data/bundler/man/bundle-check.1 +31 -0
- data/bundler/man/bundle-check.1.txt +33 -0
- data/bundler/man/bundle-clean.1 +24 -0
- data/bundler/man/bundle-clean.1.txt +26 -0
- data/bundler/man/bundle-config.1 +497 -0
- data/bundler/man/bundle-config.1.txt +528 -0
- data/bundler/man/bundle-config.ronn +42 -40
- data/bundler/man/bundle-doctor.1 +44 -0
- data/bundler/man/bundle-doctor.1.txt +44 -0
- data/bundler/man/bundle-exec.1 +165 -0
- data/bundler/man/bundle-exec.1.txt +178 -0
- data/bundler/man/bundle-exec.ronn +1 -1
- data/bundler/man/bundle-gem.1 +80 -0
- data/bundler/man/bundle-gem.1.txt +91 -0
- data/bundler/man/bundle-info.1 +20 -0
- data/bundler/man/bundle-info.1.txt +21 -0
- data/bundler/man/bundle-init.1 +25 -0
- data/bundler/man/bundle-init.1.txt +34 -0
- data/bundler/man/bundle-init.ronn +1 -1
- data/bundler/man/bundle-inject.1 +33 -0
- data/bundler/man/bundle-inject.1.txt +32 -0
- data/bundler/man/bundle-install.1 +311 -0
- data/bundler/man/bundle-install.1.txt +401 -0
- data/bundler/man/bundle-install.ronn +9 -4
- data/bundler/man/bundle-list.1 +50 -0
- data/bundler/man/bundle-list.1.txt +43 -0
- data/bundler/man/bundle-lock.1 +84 -0
- data/bundler/man/bundle-lock.1.txt +93 -0
- data/bundler/man/bundle-open.1 +32 -0
- data/bundler/man/bundle-open.1.txt +29 -0
- data/bundler/man/bundle-outdated.1 +155 -0
- data/bundler/man/bundle-outdated.1.txt +131 -0
- data/bundler/man/bundle-package.1 +55 -0
- data/bundler/man/bundle-package.1.txt +79 -0
- data/bundler/man/bundle-platform.1 +61 -0
- data/bundler/man/bundle-platform.1.txt +57 -0
- data/bundler/man/bundle-pristine.1 +34 -0
- data/bundler/man/bundle-pristine.1.txt +44 -0
- data/bundler/man/bundle-remove.1 +31 -0
- data/bundler/man/bundle-remove.1.txt +34 -0
- data/bundler/man/bundle-show.1 +23 -0
- data/bundler/man/bundle-show.1.txt +27 -0
- data/bundler/man/bundle-update.1 +394 -0
- data/bundler/man/bundle-update.1.txt +390 -0
- data/bundler/man/bundle-update.ronn +3 -3
- data/bundler/man/bundle-viz.1 +39 -0
- data/bundler/man/bundle-viz.1.txt +39 -0
- data/bundler/man/bundle.1 +136 -0
- data/bundler/man/bundle.1.txt +116 -0
- data/bundler/man/bundle.ronn +2 -2
- data/bundler/man/gemfile.5 +686 -0
- data/bundler/man/gemfile.5.ronn +14 -18
- data/bundler/man/gemfile.5.txt +649 -0
- data/bundler/man/index.txt +25 -0
- data/lib/rubygems.rb +80 -48
- data/lib/rubygems/available_set.rb +1 -0
- data/lib/rubygems/basic_specification.rb +17 -6
- data/lib/rubygems/bundler_version_finder.rb +5 -0
- data/lib/rubygems/command.rb +34 -5
- data/lib/rubygems/command_manager.rb +0 -6
- data/lib/rubygems/commands/build_command.rb +21 -8
- data/lib/rubygems/commands/cert_command.rb +0 -1
- data/lib/rubygems/commands/cleanup_command.rb +7 -7
- data/lib/rubygems/commands/contents_command.rb +3 -3
- data/lib/rubygems/commands/dependency_command.rb +4 -3
- data/lib/rubygems/commands/environment_command.rb +0 -3
- data/lib/rubygems/commands/info_command.rb +2 -0
- data/lib/rubygems/commands/install_command.rb +12 -52
- data/lib/rubygems/commands/lock_command.rb +2 -2
- data/lib/rubygems/commands/mirror_command.rb +1 -0
- data/lib/rubygems/commands/open_command.rb +2 -1
- data/lib/rubygems/commands/outdated_command.rb +1 -0
- data/lib/rubygems/commands/owner_command.rb +2 -7
- data/lib/rubygems/commands/pristine_command.rb +3 -0
- data/lib/rubygems/commands/push_command.rb +4 -6
- data/lib/rubygems/commands/query_command.rb +94 -80
- data/lib/rubygems/commands/rdoc_command.rb +1 -0
- data/lib/rubygems/commands/setup_command.rb +10 -8
- data/lib/rubygems/commands/signin_command.rb +1 -0
- data/lib/rubygems/commands/specification_command.rb +1 -0
- data/lib/rubygems/commands/stale_command.rb +2 -0
- data/lib/rubygems/commands/uninstall_command.rb +1 -0
- data/lib/rubygems/commands/unpack_command.rb +2 -29
- data/lib/rubygems/commands/update_command.rb +14 -14
- data/lib/rubygems/commands/which_command.rb +1 -0
- data/lib/rubygems/commands/yank_command.rb +8 -2
- data/lib/rubygems/compatibility.rb +4 -4
- data/lib/rubygems/config_file.rb +28 -23
- data/lib/rubygems/core_ext/kernel_gem.rb +2 -5
- data/lib/rubygems/core_ext/kernel_require.rb +29 -2
- data/lib/rubygems/core_ext/kernel_warn.rb +10 -4
- data/lib/rubygems/defaults.rb +10 -17
- data/lib/rubygems/dependency.rb +21 -6
- data/lib/rubygems/dependency_installer.rb +19 -102
- data/lib/rubygems/dependency_list.rb +11 -10
- data/lib/rubygems/deprecate.rb +5 -5
- data/lib/rubygems/errors.rb +11 -2
- data/lib/rubygems/exceptions.rb +9 -0
- data/lib/rubygems/ext/builder.rb +24 -43
- data/lib/rubygems/ext/cmake_builder.rb +2 -0
- data/lib/rubygems/ext/ext_conf_builder.rb +11 -9
- data/lib/rubygems/ext/rake_builder.rb +1 -1
- data/lib/rubygems/gemcutter_utilities.rb +19 -26
- data/lib/rubygems/indexer.rb +9 -5
- data/lib/rubygems/installer.rb +26 -13
- data/lib/rubygems/installer_test_case.rb +86 -38
- data/lib/rubygems/local_remote_options.rb +1 -1
- data/lib/rubygems/mock_gem_ui.rb +4 -1
- data/lib/rubygems/name_tuple.rb +1 -0
- data/lib/rubygems/package.rb +37 -9
- data/lib/rubygems/package/tar_writer.rb +4 -4
- data/lib/rubygems/path_support.rb +2 -0
- data/lib/rubygems/platform.rb +2 -1
- data/lib/rubygems/psych_tree.rb +2 -0
- data/lib/rubygems/remote_fetcher.rb +5 -1
- data/lib/rubygems/request.rb +5 -3
- data/lib/rubygems/request/connection_pools.rb +4 -4
- data/lib/rubygems/request/http_pool.rb +1 -0
- data/lib/rubygems/request/https_pool.rb +2 -0
- data/lib/rubygems/request_set.rb +2 -2
- data/lib/rubygems/request_set/gem_dependency_api.rb +2 -2
- data/lib/rubygems/request_set/lockfile.rb +5 -2
- data/lib/rubygems/request_set/lockfile/parser.rb +4 -2
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +2 -0
- data/lib/rubygems/requirement.rb +20 -18
- data/lib/rubygems/resolver.rb +4 -5
- data/lib/rubygems/resolver/activation_request.rb +19 -49
- data/lib/rubygems/resolver/best_set.rb +2 -2
- data/lib/rubygems/resolver/conflict.rb +0 -5
- data/lib/rubygems/resolver/installer_set.rb +3 -3
- data/lib/rubygems/resolver/lock_set.rb +1 -1
- data/lib/rubygems/resolver/lock_specification.rb +2 -2
- data/lib/rubygems/resolver/requirement_list.rb +1 -0
- data/lib/rubygems/resolver/specification.rb +1 -0
- data/lib/rubygems/resolver/stats.rb +2 -0
- data/lib/rubygems/security/signer.rb +3 -2
- data/lib/rubygems/server.rb +5 -4
- data/lib/rubygems/source_list.rb +1 -0
- data/lib/rubygems/spec_fetcher.rb +3 -16
- data/lib/rubygems/specification.rb +69 -133
- data/lib/rubygems/specification_policy.rb +7 -2
- data/{bundler/lib/bundler → lib/rubygems}/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem +0 -0
- data/{bundler/lib/bundler → lib/rubygems}/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -0
- data/{bundler/lib/bundler → lib/rubygems}/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -0
- data/lib/rubygems/stub_specification.rb +5 -2
- data/lib/rubygems/syck_hack.rb +2 -0
- data/lib/rubygems/test_case.rb +78 -227
- data/lib/rubygems/test_utilities.rb +17 -6
- data/lib/rubygems/text.rb +2 -3
- data/lib/rubygems/uninstaller.rb +15 -15
- data/lib/rubygems/user_interaction.rb +9 -1
- data/lib/rubygems/util.rb +5 -41
- data/lib/rubygems/util/licenses.rb +398 -396
- data/lib/rubygems/util/list.rb +2 -0
- data/lib/rubygems/validator.rb +9 -29
- data/lib/rubygems/version.rb +5 -3
- data/rubygems-update.gemspec +3 -3
- data/test/rubygems/plugin/load/rubygems_plugin.rb +2 -0
- data/test/rubygems/test_bundled_ca.rb +4 -7
- data/test/rubygems/test_deprecate.rb +3 -0
- data/test/rubygems/test_gem.rb +183 -176
- data/test/rubygems/test_gem_available_set.rb +3 -2
- data/test/rubygems/test_gem_bundler_version_finder.rb +3 -1
- data/test/rubygems/test_gem_command.rb +94 -5
- data/test/rubygems/test_gem_command_manager.rb +5 -13
- data/test/rubygems/test_gem_commands_build_command.rb +142 -4
- data/test/rubygems/test_gem_commands_cert_command.rb +15 -1
- data/test/rubygems/test_gem_commands_cleanup_command.rb +22 -6
- data/test/rubygems/test_gem_commands_dependency_command.rb +1 -1
- data/test/rubygems/test_gem_commands_environment_command.rb +1 -11
- data/test/rubygems/test_gem_commands_help_command.rb +2 -0
- data/test/rubygems/test_gem_commands_info_command.rb +1 -0
- data/test/rubygems/test_gem_commands_install_command.rb +207 -2
- data/test/rubygems/test_gem_commands_mirror.rb +1 -0
- data/test/rubygems/test_gem_commands_outdated_command.rb +1 -0
- data/test/rubygems/test_gem_commands_owner_command.rb +4 -5
- data/test/rubygems/test_gem_commands_pristine_command.rb +56 -4
- data/test/rubygems/test_gem_commands_push_command.rb +19 -14
- data/test/rubygems/test_gem_commands_query_command.rb +27 -2
- data/test/rubygems/test_gem_commands_setup_command.rb +62 -37
- data/test/rubygems/test_gem_commands_signin_command.rb +5 -4
- data/test/rubygems/test_gem_commands_sources_command.rb +20 -6
- data/test/rubygems/test_gem_commands_uninstall_command.rb +107 -50
- data/test/rubygems/test_gem_commands_update_command.rb +86 -23
- data/test/rubygems/test_gem_commands_yank_command.rb +46 -1
- data/test/rubygems/test_gem_config_file.rb +9 -2
- data/test/rubygems/test_gem_dependency.rb +6 -0
- data/test/rubygems/test_gem_dependency_installer.rb +67 -36
- data/test/rubygems/test_gem_dependency_list.rb +21 -14
- data/test/rubygems/test_gem_ext_builder.rb +5 -1
- data/test/rubygems/test_gem_ext_cmake_builder.rb +2 -0
- data/test/rubygems/test_gem_ext_configure_builder.rb +8 -0
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +12 -0
- data/test/rubygems/test_gem_ext_rake_builder.rb +2 -0
- data/test/rubygems/test_gem_gemcutter_utilities.rb +8 -8
- data/test/rubygems/test_gem_indexer.rb +31 -40
- data/test/rubygems/test_gem_install_update_options.rb +31 -17
- data/test/rubygems/test_gem_installer.rb +383 -223
- data/test/rubygems/test_gem_package.rb +99 -14
- data/test/rubygems/test_gem_package_old.rb +57 -54
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +6 -5
- data/test/rubygems/test_gem_package_tar_writer.rb +11 -6
- data/test/rubygems/test_gem_path_support.rb +19 -13
- data/test/rubygems/test_gem_platform.rb +4 -2
- data/test/rubygems/test_gem_rdoc.rb +1 -0
- data/test/rubygems/test_gem_remote_fetcher.rb +29 -16
- data/test/rubygems/test_gem_request.rb +19 -4
- data/test/rubygems/test_gem_request_connection_pools.rb +6 -2
- data/test/rubygems/test_gem_request_set.rb +33 -8
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +1 -1
- data/test/rubygems/test_gem_request_set_lockfile.rb +1 -0
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +2 -1
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +2 -0
- data/test/rubygems/test_gem_requirement.rb +7 -1
- data/test/rubygems/test_gem_resolver.rb +67 -23
- data/test/rubygems/test_gem_resolver_activation_request.rb +3 -32
- data/test/rubygems/test_gem_resolver_conflict.rb +0 -4
- data/test/rubygems/test_gem_resolver_git_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_index_specification.rb +7 -2
- data/test/rubygems/test_gem_resolver_installed_specification.rb +0 -1
- data/test/rubygems/test_gem_resolver_installer_set.rb +3 -1
- data/test/rubygems/test_gem_resolver_specification.rb +2 -0
- data/test/rubygems/test_gem_security.rb +6 -2
- data/test/rubygems/test_gem_security_signer.rb +1 -0
- data/test/rubygems/test_gem_server.rb +7 -2
- data/test/rubygems/test_gem_silent_ui.rb +1 -0
- data/test/rubygems/test_gem_source.rb +7 -7
- data/test/rubygems/test_gem_source_fetch_problem.rb +1 -0
- data/test/rubygems/test_gem_source_git.rb +4 -9
- data/test/rubygems/test_gem_source_installed.rb +6 -6
- data/test/rubygems/test_gem_source_list.rb +1 -0
- data/test/rubygems/test_gem_source_local.rb +5 -4
- data/test/rubygems/test_gem_source_lock.rb +12 -12
- data/test/rubygems/test_gem_source_specific_file.rb +7 -6
- data/test/rubygems/test_gem_source_vendor.rb +4 -4
- data/test/rubygems/test_gem_specification.rb +75 -43
- data/test/rubygems/test_gem_stream_ui.rb +2 -0
- data/test/rubygems/test_gem_stub_specification.rb +3 -1
- data/test/rubygems/test_gem_text.rb +1 -0
- data/test/rubygems/test_gem_uninstaller.rb +31 -10
- data/test/rubygems/test_gem_util.rb +6 -4
- data/test/rubygems/test_gem_validator.rb +3 -4
- data/test/rubygems/test_gem_version.rb +16 -8
- data/test/rubygems/test_kernel.rb +1 -0
- data/test/rubygems/test_rake_package.rb +26 -0
- data/test/rubygems/test_remote_fetch_error.rb +1 -0
- data/test/rubygems/test_require.rb +107 -3
- data/util/bisect +31 -0
- data/util/ci.sh +50 -0
- data/util/generate_spdx_license_list.rb +4 -2
- data/util/rubocop +2 -2
- data/util/update_bundled_ca_certificates.rb +3 -1
- metadata +97 -25
- data/appveyor.yml +0 -43
- data/bundler/CONTRIBUTING.md +0 -17
- data/bundler/exe/bundle_ruby +0 -60
- data/bundler/lib/bundler/cli/cache.rb +0 -36
- data/bundler/lib/bundler/compatibility_guard.rb +0 -14
- data/bundler/lib/bundler/ssl_certs/.document +0 -1
- data/bundler/lib/bundler/ssl_certs/certificate_manager.rb +0 -66
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/faster.rb +0 -27
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb +0 -129
- data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem +0 -21
- data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem +0 -21
- data/util/ci +0 -82
@@ -1,7 +1,11 @@
|
|
1
1
|
require 'delegate'
|
2
2
|
require 'uri'
|
3
|
+
require 'rubygems/user_interaction'
|
3
4
|
|
4
5
|
class Gem::SpecificationPolicy < SimpleDelegator
|
6
|
+
|
7
|
+
include Gem::UserInteraction
|
8
|
+
|
5
9
|
VALID_NAME_PATTERN = /\A[a-zA-Z0-9\.\-\_]+\z/.freeze # :nodoc:
|
6
10
|
|
7
11
|
SPECIAL_CHARACTERS = /\A[#{Regexp.escape('.-_')}]+/.freeze # :nodoc:
|
@@ -300,7 +304,7 @@ duplicate dependency on #{dep}, (#{prev.requirement}) use:
|
|
300
304
|
end
|
301
305
|
|
302
306
|
def validate_licenses
|
303
|
-
licenses.each
|
307
|
+
licenses.each do |license|
|
304
308
|
if license.length > 64
|
305
309
|
error "each license must be 64 characters or less"
|
306
310
|
end
|
@@ -314,7 +318,7 @@ http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard li
|
|
314
318
|
message += "Did you mean #{suggestions.map { |s| "'#{s}'"}.join(', ')}?\n" unless suggestions.nil?
|
315
319
|
warning(message)
|
316
320
|
end
|
317
|
-
|
321
|
+
end
|
318
322
|
|
319
323
|
warning <<-warning if licenses.empty?
|
320
324
|
licenses is empty, but is recommended. Use a license identifier from
|
@@ -404,4 +408,5 @@ http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard li
|
|
404
408
|
def help_text # :nodoc:
|
405
409
|
"See http://guides.rubygems.org/specification-reference/ for help"
|
406
410
|
end
|
411
|
+
|
407
412
|
end
|
File without changes
|
File without changes
|
File without changes
|
@@ -5,6 +5,7 @@
|
|
5
5
|
# information.
|
6
6
|
|
7
7
|
class Gem::StubSpecification < Gem::BasicSpecification
|
8
|
+
|
8
9
|
# :nodoc:
|
9
10
|
PREFIX = "# stub: ".freeze
|
10
11
|
|
@@ -12,6 +13,7 @@ class Gem::StubSpecification < Gem::BasicSpecification
|
|
12
13
|
OPEN_MODE = 'r:UTF-8:-'.freeze
|
13
14
|
|
14
15
|
class StubLine # :nodoc: all
|
16
|
+
|
15
17
|
attr_reader :name, :version, :platform, :require_paths, :extensions,
|
16
18
|
:full_name
|
17
19
|
|
@@ -50,10 +52,11 @@ class Gem::StubSpecification < Gem::BasicSpecification
|
|
50
52
|
end
|
51
53
|
|
52
54
|
path_list = parts.last
|
53
|
-
@require_paths = REQUIRE_PATH_LIST[path_list] || path_list.split("\0".freeze).map!
|
55
|
+
@require_paths = REQUIRE_PATH_LIST[path_list] || path_list.split("\0".freeze).map! do |x|
|
54
56
|
REQUIRE_PATHS[x] || x
|
55
|
-
|
57
|
+
end
|
56
58
|
end
|
59
|
+
|
57
60
|
end
|
58
61
|
|
59
62
|
def self.default_gemspec_stub(filename, base_dir, gems_dir)
|
data/lib/rubygems/syck_hack.rb
CHANGED
data/lib/rubygems/test_case.rb
CHANGED
@@ -1,17 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
# TODO: $SAFE = 1
|
3
2
|
|
4
|
-
|
5
|
-
gem 'minitest', '~> 5.0'
|
6
|
-
rescue NoMethodError, Gem::LoadError
|
7
|
-
# for ruby tests
|
8
|
-
end
|
9
|
-
|
10
|
-
if defined? Gem::QuickLoader
|
11
|
-
Gem::QuickLoader.load_full_rubygems_library
|
12
|
-
else
|
13
|
-
require 'rubygems'
|
14
|
-
end
|
3
|
+
require 'rubygems'
|
15
4
|
|
16
5
|
# If bundler gemspec exists, add to stubs
|
17
6
|
bundler_gemspec = File.expand_path("../../../bundler/bundler.gemspec", __FILE__)
|
@@ -23,7 +12,7 @@ if File.exist?(bundler_gemspec)
|
|
23
12
|
end
|
24
13
|
|
25
14
|
begin
|
26
|
-
gem 'minitest'
|
15
|
+
gem 'minitest', '~> 5.0'
|
27
16
|
rescue Gem::LoadError
|
28
17
|
end
|
29
18
|
|
@@ -37,16 +26,8 @@ begin
|
|
37
26
|
rescue LoadError
|
38
27
|
end
|
39
28
|
|
40
|
-
|
41
|
-
# them while we're testing rubygems, and thus we can't actually load them.
|
42
|
-
unless Gem::Dependency.new('rdoc', '>= 3.10').matching_specs.empty?
|
43
|
-
gem 'rdoc'
|
44
|
-
gem 'json'
|
45
|
-
end
|
29
|
+
require 'bundler'
|
46
30
|
|
47
|
-
if Gem::USE_BUNDLER_FOR_GEMDEPS
|
48
|
-
require 'bundler'
|
49
|
-
end
|
50
31
|
require 'minitest/autorun'
|
51
32
|
|
52
33
|
require 'rubygems/deprecate'
|
@@ -102,8 +83,6 @@ end
|
|
102
83
|
# gem-related behavior in a sandbox. Through RubyGemTestCase you can install
|
103
84
|
# and uninstall gems, fetch remote gems through a stub fetcher and be assured
|
104
85
|
# your normal set of gems is not affected.
|
105
|
-
#
|
106
|
-
# Tests are always run at a safe level of 1.
|
107
86
|
|
108
87
|
class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase)
|
109
88
|
|
@@ -163,6 +142,28 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
163
142
|
end
|
164
143
|
end
|
165
144
|
|
145
|
+
##
|
146
|
+
# Sets the vendordir entry in RbConfig::CONFIG to +value+ and restores the
|
147
|
+
# original value when the block ends
|
148
|
+
#
|
149
|
+
def vendordir(value)
|
150
|
+
vendordir = RbConfig::CONFIG['vendordir']
|
151
|
+
|
152
|
+
if value
|
153
|
+
RbConfig::CONFIG['vendordir'] = value
|
154
|
+
else
|
155
|
+
RbConfig::CONFIG.delete 'vendordir'
|
156
|
+
end
|
157
|
+
|
158
|
+
yield
|
159
|
+
ensure
|
160
|
+
if vendordir
|
161
|
+
RbConfig::CONFIG['vendordir'] = vendordir
|
162
|
+
else
|
163
|
+
RbConfig::CONFIG.delete 'vendordir'
|
164
|
+
end
|
165
|
+
end
|
166
|
+
|
166
167
|
# TODO: move to minitest
|
167
168
|
def refute_path_exists(path, msg = nil)
|
168
169
|
msg = message(msg) { "Expected path '#{path}' to not exist" }
|
@@ -199,19 +200,19 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
199
200
|
|
200
201
|
def assert_contains_make_command(target, output, msg = nil)
|
201
202
|
if output.match(/\n/)
|
202
|
-
msg = message(msg)
|
203
|
+
msg = message(msg) do
|
203
204
|
'Expected output containing make command "%s": %s' % [
|
204
205
|
('%s %s' % [make_command, target]).rstrip,
|
205
206
|
output.inspect
|
206
207
|
]
|
207
|
-
|
208
|
+
end
|
208
209
|
else
|
209
|
-
msg = message(msg)
|
210
|
+
msg = message(msg) do
|
210
211
|
'Expected make command "%s": %s' % [
|
211
212
|
('%s %s' % [make_command, target]).rstrip,
|
212
213
|
output.inspect
|
213
214
|
]
|
214
|
-
|
215
|
+
end
|
215
216
|
end
|
216
217
|
|
217
218
|
assert scan_make_command_lines(output).any? { |line|
|
@@ -231,10 +232,6 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
231
232
|
undef_method :default_test if instance_methods.include? 'default_test' or
|
232
233
|
instance_methods.include? :default_test
|
233
234
|
|
234
|
-
@@project_dir = Dir.pwd.untaint unless defined?(@@project_dir)
|
235
|
-
|
236
|
-
@@initial_reset = false
|
237
|
-
|
238
235
|
##
|
239
236
|
# #setup prepares a sandboxed location to install gems. All installs are
|
240
237
|
# directed to a temporary directory. All install plugins are removed.
|
@@ -242,24 +239,11 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
242
239
|
# If the +RUBY+ environment variable is set the given path is used for
|
243
240
|
# Gem::ruby. The local platform is set to <tt>i386-mswin32</tt> for Windows
|
244
241
|
# or <tt>i686-darwin8.10.1</tt> otherwise.
|
245
|
-
#
|
246
|
-
# If the +KEEP_FILES+ environment variable is set the files will not be
|
247
|
-
# removed from <tt>/tmp/test_rubygems_#{$$}.#{Time.now.to_i}</tt>.
|
248
242
|
|
249
243
|
def setup
|
250
244
|
super
|
251
245
|
|
252
|
-
@
|
253
|
-
@orig_gem_path = ENV['GEM_PATH']
|
254
|
-
@orig_gem_vendor = ENV['GEM_VENDOR']
|
255
|
-
@orig_gem_spec_cache = ENV['GEM_SPEC_CACHE']
|
256
|
-
@orig_rubygems_gemdeps = ENV['RUBYGEMS_GEMDEPS']
|
257
|
-
@orig_bundle_gemfile = ENV['BUNDLE_GEMFILE']
|
258
|
-
@orig_rubygems_host = ENV['RUBYGEMS_HOST']
|
259
|
-
ENV.keys.find_all { |k| k.start_with?('GEM_REQUIREMENT_') }.each do |k|
|
260
|
-
ENV.delete k
|
261
|
-
end
|
262
|
-
@orig_gem_env_requirements = ENV.to_hash
|
246
|
+
@orig_env = ENV.to_hash
|
263
247
|
|
264
248
|
ENV['GEM_VENDOR'] = nil
|
265
249
|
ENV['GEMRC'] = nil
|
@@ -268,37 +252,20 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
268
252
|
@current_dir = Dir.pwd
|
269
253
|
@fetcher = nil
|
270
254
|
|
271
|
-
if Gem::USE_BUNDLER_FOR_GEMDEPS
|
272
|
-
Bundler.ui = Bundler::UI::Silent.new
|
273
|
-
end
|
274
255
|
@back_ui = Gem::DefaultUserInteraction.ui
|
275
256
|
@ui = Gem::MockGemUi.new
|
276
257
|
# This needs to be a new instance since we call use_ui(@ui) when we want to
|
277
258
|
# capture output
|
278
259
|
Gem::DefaultUserInteraction.ui = Gem::MockGemUi.new
|
279
260
|
|
280
|
-
tmpdir = File.
|
261
|
+
tmpdir = File.realpath Dir.tmpdir
|
281
262
|
tmpdir.untaint
|
282
263
|
|
283
|
-
|
284
|
-
@tempdir = File.join(tmpdir, "test_rubygems_#{$$}.#{Time.now.to_i}")
|
285
|
-
else
|
286
|
-
@tempdir = File.join(tmpdir, "test_rubygems_#{$$}")
|
287
|
-
end
|
264
|
+
@tempdir = File.join(tmpdir, "test_rubygems_#{$$}")
|
288
265
|
@tempdir.untaint
|
289
266
|
|
290
267
|
FileUtils.mkdir_p @tempdir
|
291
268
|
|
292
|
-
# This makes the tempdir consistent on OS X.
|
293
|
-
# File.expand_path Dir.tmpdir #=> "/var/..."
|
294
|
-
# Dir.chdir Dir.tmpdir do File.expand_path '.' end #=> "/private/var/..."
|
295
|
-
# TODO use File#realpath above instead of #expand_path once 1.8 support is
|
296
|
-
# dropped.
|
297
|
-
Dir.chdir @tempdir do
|
298
|
-
@tempdir = File.expand_path '.'
|
299
|
-
@tempdir.untaint
|
300
|
-
end
|
301
|
-
|
302
269
|
# This makes the tempdir consistent on Windows.
|
303
270
|
# Dir.tmpdir may return short path name, but Dir[Dir.tmpdir] returns long
|
304
271
|
# path name. https://bugs.ruby-lang.org/issues/10819
|
@@ -325,8 +292,8 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
325
292
|
Gem.ensure_gem_subdirectories @gemhome
|
326
293
|
|
327
294
|
@orig_LOAD_PATH = $LOAD_PATH.dup
|
328
|
-
$LOAD_PATH.map!
|
329
|
-
expand_path = File.expand_path(s)
|
295
|
+
$LOAD_PATH.map! do |s|
|
296
|
+
expand_path = File.realpath(s) rescue File.expand_path(s)
|
330
297
|
if expand_path != s
|
331
298
|
expand_path.untaint
|
332
299
|
if s.instance_variable_defined?(:@gem_prelude_index)
|
@@ -336,11 +303,10 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
336
303
|
s = expand_path
|
337
304
|
end
|
338
305
|
s
|
339
|
-
|
306
|
+
end
|
340
307
|
|
341
308
|
Dir.chdir @tempdir
|
342
309
|
|
343
|
-
@orig_ENV_HOME = ENV['HOME']
|
344
310
|
ENV['HOME'] = @userhome
|
345
311
|
Gem.instance_variable_set :@user_home, nil
|
346
312
|
Gem.instance_variable_set :@gemdeps, nil
|
@@ -351,33 +317,26 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
351
317
|
FileUtils.mkdir_p @gemhome
|
352
318
|
FileUtils.mkdir_p @userhome
|
353
319
|
|
354
|
-
@orig_gem_private_key_passphrase = ENV['GEM_PRIVATE_KEY_PASSPHRASE']
|
355
320
|
ENV['GEM_PRIVATE_KEY_PASSPHRASE'] = PRIVATE_KEY_PASSPHRASE
|
356
321
|
|
357
322
|
@default_dir = File.join @tempdir, 'default'
|
358
323
|
@default_spec_dir = File.join @default_dir, "specifications", "default"
|
359
|
-
Gem.
|
360
|
-
|
361
|
-
|
362
|
-
# We use Gem::Specification.reset the first time only so that if there
|
363
|
-
# are unresolved deps that leak into the whole test suite, they're at least
|
364
|
-
# reported once.
|
365
|
-
if @@initial_reset
|
366
|
-
Gem::Specification.unresolved_deps.clear # done to avoid cross-test warnings
|
324
|
+
if Gem.java_platform?
|
325
|
+
@orig_default_gem_home = RbConfig::CONFIG['default_gem_home']
|
326
|
+
RbConfig::CONFIG['default_gem_home'] = @default_dir
|
367
327
|
else
|
368
|
-
|
369
|
-
Gem::Specification.reset
|
328
|
+
Gem.instance_variable_set(:@default_dir, @default_dir)
|
370
329
|
end
|
330
|
+
FileUtils.mkdir_p @default_spec_dir
|
331
|
+
|
332
|
+
Gem::Specification.unresolved_deps.clear
|
371
333
|
Gem.use_paths(@gemhome)
|
372
334
|
|
373
335
|
Gem::Security.reset
|
374
336
|
|
375
337
|
Gem.loaded_specs.clear
|
376
338
|
Gem.clear_default_specs
|
377
|
-
|
378
|
-
if Gem::USE_BUNDLER_FOR_GEMDEPS
|
379
|
-
Bundler.reset!
|
380
|
-
end
|
339
|
+
Bundler.reset!
|
381
340
|
|
382
341
|
Gem.configuration.verbose = true
|
383
342
|
Gem.configuration.update_sources = true
|
@@ -390,8 +349,6 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
390
349
|
|
391
350
|
Gem.searcher = nil
|
392
351
|
Gem::SpecFetcher.fetcher = nil
|
393
|
-
@orig_BASERUBY = RbConfig::CONFIG['BASERUBY']
|
394
|
-
RbConfig::CONFIG['BASERUBY'] = RbConfig::CONFIG['ruby_install_name']
|
395
352
|
|
396
353
|
@orig_arch = RbConfig::CONFIG['arch']
|
397
354
|
|
@@ -412,7 +369,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
412
369
|
|
413
370
|
##
|
414
371
|
# #teardown restores the process to its original state and removes the
|
415
|
-
# tempdir
|
372
|
+
# tempdir
|
416
373
|
|
417
374
|
def teardown
|
418
375
|
$LOAD_PATH.replace @orig_LOAD_PATH if @orig_LOAD_PATH
|
@@ -429,11 +386,6 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
429
386
|
end
|
430
387
|
end
|
431
388
|
|
432
|
-
if @orig_BASERUBY
|
433
|
-
RbConfig::CONFIG['BASERUBY'] = @orig_BASERUBY
|
434
|
-
else
|
435
|
-
RbConfig::CONFIG.delete('BASERUBY')
|
436
|
-
end
|
437
389
|
RbConfig::CONFIG['arch'] = @orig_arch
|
438
390
|
|
439
391
|
if defined? Gem::RemoteFetcher
|
@@ -442,33 +394,18 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
442
394
|
|
443
395
|
Dir.chdir @current_dir
|
444
396
|
|
445
|
-
FileUtils.rm_rf @tempdir
|
397
|
+
FileUtils.rm_rf @tempdir
|
446
398
|
|
447
|
-
ENV.
|
448
|
-
@orig_gem_env_requirements.each do |k,v|
|
449
|
-
ENV[k] = v
|
450
|
-
end
|
451
|
-
|
452
|
-
ENV['GEM_HOME'] = @orig_gem_home
|
453
|
-
ENV['GEM_PATH'] = @orig_gem_path
|
454
|
-
ENV['GEM_VENDOR'] = @orig_gem_vendor
|
455
|
-
ENV['GEM_SPEC_CACHE'] = @orig_gem_spec_cache
|
456
|
-
ENV['RUBYGEMS_GEMDEPS'] = @orig_rubygems_gemdeps
|
457
|
-
ENV['BUNDLE_GEMFILE'] = @orig_bundle_gemfile
|
458
|
-
ENV['RUBYGEMS_HOST'] = @orig_rubygems_host
|
399
|
+
ENV.replace(@orig_env)
|
459
400
|
|
460
401
|
Gem.ruby = @orig_ruby if @orig_ruby
|
461
402
|
|
462
|
-
if
|
463
|
-
|
403
|
+
if Gem.java_platform?
|
404
|
+
RbConfig::CONFIG['default_gem_home'] = @orig_default_gem_home
|
464
405
|
else
|
465
|
-
|
406
|
+
Gem.instance_variable_set :@default_dir, nil
|
466
407
|
end
|
467
408
|
|
468
|
-
Gem.instance_variable_set :@default_dir, nil
|
469
|
-
|
470
|
-
ENV['GEM_PRIVATE_KEY_PASSPHRASE'] = @orig_gem_private_key_passphrase
|
471
|
-
|
472
409
|
Gem::Specification._clear_load_cache
|
473
410
|
Gem::Specification.unresolved_deps.clear
|
474
411
|
Gem::refresh
|
@@ -608,23 +545,11 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
608
545
|
def uninstall_gem(spec)
|
609
546
|
require 'rubygems/uninstaller'
|
610
547
|
|
611
|
-
Class.new(Gem::Uninstaller)
|
548
|
+
Class.new(Gem::Uninstaller) do
|
612
549
|
def ask_if_ok(spec)
|
613
550
|
true
|
614
551
|
end
|
615
|
-
|
616
|
-
end
|
617
|
-
|
618
|
-
##
|
619
|
-
# creates a temporary directory with hax
|
620
|
-
# TODO: deprecate and remove
|
621
|
-
|
622
|
-
def create_tmpdir
|
623
|
-
tmpdir = nil
|
624
|
-
Dir.chdir Dir.tmpdir do tmpdir = Dir.pwd end # HACK OSX /private/tmp
|
625
|
-
tmpdir = File.join tmpdir, "test_rubygems_#{$$}"
|
626
|
-
FileUtils.mkdir_p tmpdir
|
627
|
-
return tmpdir
|
552
|
+
end.new(spec.name, :executables => true, :user_install => true).uninstall
|
628
553
|
end
|
629
554
|
|
630
555
|
##
|
@@ -704,22 +629,13 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
704
629
|
io.write spec.to_ruby_for_cache
|
705
630
|
end
|
706
631
|
|
707
|
-
spec.loaded_from =
|
632
|
+
spec.loaded_from = written_path
|
708
633
|
|
709
634
|
Gem::Specification.reset
|
710
635
|
|
711
636
|
return spec
|
712
637
|
end
|
713
638
|
|
714
|
-
##
|
715
|
-
# TODO: remove in RubyGems 4.0
|
716
|
-
|
717
|
-
def quick_spec(name, version = '2') # :nodoc:
|
718
|
-
util_spec name, version
|
719
|
-
end
|
720
|
-
deprecate :quick_spec, :util_spec, 2018, 12
|
721
|
-
|
722
|
-
|
723
639
|
##
|
724
640
|
# Builds a gem from +spec+ and places it in <tt>File.join @gemhome,
|
725
641
|
# 'cache'</tt>. Automatically creates files based on +spec.files+
|
@@ -732,7 +648,10 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
732
648
|
spec.files.each do |file|
|
733
649
|
next if File.exist? file
|
734
650
|
FileUtils.mkdir_p File.dirname(file)
|
735
|
-
|
651
|
+
|
652
|
+
File.open file, 'w' do |fp|
|
653
|
+
fp.puts "# #{file}"
|
654
|
+
end
|
736
655
|
end
|
737
656
|
|
738
657
|
use_ui Gem::MockGemUi.new do
|
@@ -760,11 +679,6 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
760
679
|
Gem::Specification.reset
|
761
680
|
end
|
762
681
|
|
763
|
-
def util_clear_default_gems
|
764
|
-
FileUtils.rm_rf @default_spec_dir
|
765
|
-
FileUtils.mkdir @default_spec_dir
|
766
|
-
end
|
767
|
-
|
768
682
|
##
|
769
683
|
# Install the provided specs
|
770
684
|
|
@@ -818,52 +732,6 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
818
732
|
$LOADED_FEATURES.replace old_loaded_features
|
819
733
|
end
|
820
734
|
|
821
|
-
##
|
822
|
-
# new_spec is deprecated as it is never used.
|
823
|
-
#
|
824
|
-
# TODO: remove in RubyGems 4.0
|
825
|
-
|
826
|
-
def new_spec(name, version, deps = nil, *files) # :nodoc:
|
827
|
-
require 'rubygems/specification'
|
828
|
-
|
829
|
-
spec = Gem::Specification.new do |s|
|
830
|
-
s.platform = Gem::Platform::RUBY
|
831
|
-
s.name = name
|
832
|
-
s.version = version
|
833
|
-
s.author = 'A User'
|
834
|
-
s.email = 'example@example.com'
|
835
|
-
s.homepage = 'http://example.com'
|
836
|
-
s.summary = "this is a summary"
|
837
|
-
s.description = "This is a test description"
|
838
|
-
|
839
|
-
Array(deps).each do |n, req|
|
840
|
-
s.add_dependency n, (req || '>= 0')
|
841
|
-
end
|
842
|
-
|
843
|
-
s.files.push(*files) unless files.empty?
|
844
|
-
|
845
|
-
yield s if block_given?
|
846
|
-
end
|
847
|
-
|
848
|
-
spec.loaded_from = spec.spec_file
|
849
|
-
|
850
|
-
unless files.empty?
|
851
|
-
write_file spec.spec_file do |io|
|
852
|
-
io.write spec.to_ruby_for_cache
|
853
|
-
end
|
854
|
-
|
855
|
-
util_build_gem spec
|
856
|
-
|
857
|
-
cache_file = File.join @tempdir, 'gems', "#{spec.full_name}.gem"
|
858
|
-
FileUtils.mkdir_p File.dirname cache_file
|
859
|
-
FileUtils.mv spec.cache_file, cache_file
|
860
|
-
FileUtils.rm spec.spec_file
|
861
|
-
end
|
862
|
-
|
863
|
-
spec
|
864
|
-
end
|
865
|
-
deprecate :new_spec, :none, 2018, 12
|
866
|
-
|
867
735
|
def new_default_spec(name, version, deps = nil, *files)
|
868
736
|
spec = util_spec name, version, deps
|
869
737
|
|
@@ -871,6 +739,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
871
739
|
spec.files = files
|
872
740
|
|
873
741
|
lib_dir = File.join(@tempdir, "default_gems", "lib")
|
742
|
+
lib_dir.instance_variable_set(:@gem_prelude_index, lib_dir)
|
874
743
|
$LOAD_PATH.unshift(lib_dir)
|
875
744
|
files.each do |file|
|
876
745
|
rb_path = File.join(lib_dir, file)
|
@@ -926,8 +795,6 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
|
|
926
795
|
FileUtils.rm spec.spec_file
|
927
796
|
end
|
928
797
|
|
929
|
-
Gem::Specification.reset
|
930
|
-
|
931
798
|
return spec
|
932
799
|
end
|
933
800
|
|
@@ -1028,7 +895,7 @@ Also, a list:
|
|
1028
895
|
s.add_dependency 'x', '>= 1'
|
1029
896
|
end
|
1030
897
|
|
1031
|
-
@pl1
|
898
|
+
@pl1 = quick_gem 'pl', '1' do |s| # l for legacy
|
1032
899
|
s.files = %w[lib/code.rb]
|
1033
900
|
s.require_paths = %w[lib]
|
1034
901
|
s.platform = Gem::Platform.new 'i386-linux'
|
@@ -1073,31 +940,6 @@ Also, a list:
|
|
1073
940
|
platform
|
1074
941
|
end
|
1075
942
|
|
1076
|
-
##
|
1077
|
-
# Sets up a fake fetcher using the gems from #util_make_gems. Optionally
|
1078
|
-
# additional +prerelease+ gems may be included.
|
1079
|
-
#
|
1080
|
-
# Gems created by this method may be fetched using Gem::RemoteFetcher.
|
1081
|
-
|
1082
|
-
def util_setup_fake_fetcher(prerelease = false)
|
1083
|
-
require 'zlib'
|
1084
|
-
require 'socket'
|
1085
|
-
require 'rubygems/remote_fetcher'
|
1086
|
-
|
1087
|
-
@fetcher = Gem::FakeFetcher.new
|
1088
|
-
|
1089
|
-
util_make_gems(prerelease)
|
1090
|
-
Gem::Specification.reset
|
1091
|
-
|
1092
|
-
@all_gems = [@a1, @a2, @a3a, @a_evil9, @b2, @c1_2].sort
|
1093
|
-
@all_gem_names = @all_gems.map { |gem| gem.full_name }
|
1094
|
-
|
1095
|
-
gem_names = [@a1.full_name, @a2.full_name, @a3a.full_name, @b2.full_name]
|
1096
|
-
@gem_names = gem_names.sort.join("\n")
|
1097
|
-
|
1098
|
-
Gem::RemoteFetcher.fetcher = @fetcher
|
1099
|
-
end
|
1100
|
-
|
1101
943
|
##
|
1102
944
|
# Add +spec+ to +@fetcher+ serving the data in the file +path+.
|
1103
945
|
# +repo+ indicates which repo to make +spec+ appear to be in.
|
@@ -1109,7 +951,6 @@ Also, a list:
|
|
1109
951
|
|
1110
952
|
##
|
1111
953
|
# Sets up Gem::SpecFetcher to return information from the gems in +specs+.
|
1112
|
-
# Best used with +@all_gems+ from #util_setup_fake_fetcher.
|
1113
954
|
|
1114
955
|
def util_setup_spec_fetcher(*specs)
|
1115
956
|
all_specs = Gem::Specification.to_a + specs
|
@@ -1176,8 +1017,7 @@ Also, a list:
|
|
1176
1017
|
end
|
1177
1018
|
|
1178
1019
|
def util_set_RUBY_VERSION(version, patchlevel = nil, revision = nil, description = nil, engine = "ruby", engine_version = nil)
|
1179
|
-
if Gem.instance_variables.include? :@ruby_version
|
1180
|
-
Gem.instance_variables.include? '@ruby_version'
|
1020
|
+
if Gem.instance_variables.include? :@ruby_version
|
1181
1021
|
Gem.send :remove_instance_variable, :@ruby_version
|
1182
1022
|
end
|
1183
1023
|
|
@@ -1236,6 +1076,20 @@ Also, a list:
|
|
1236
1076
|
Gem.win_platform?
|
1237
1077
|
end
|
1238
1078
|
|
1079
|
+
##
|
1080
|
+
# Is this test being run on a Java platform?
|
1081
|
+
|
1082
|
+
def self.java_platform?
|
1083
|
+
Gem.java_platform?
|
1084
|
+
end
|
1085
|
+
|
1086
|
+
##
|
1087
|
+
# Is this test being run on a Java platform?
|
1088
|
+
|
1089
|
+
def java_platform?
|
1090
|
+
Gem.java_platform?
|
1091
|
+
end
|
1092
|
+
|
1239
1093
|
##
|
1240
1094
|
# Returns whether or not we're on a version of Ruby built with VC++ (or
|
1241
1095
|
# Borland) versus Cygwin, Mingw, etc.
|
@@ -1350,11 +1204,13 @@ Also, a list:
|
|
1350
1204
|
end
|
1351
1205
|
|
1352
1206
|
class << self
|
1207
|
+
|
1353
1208
|
# :nodoc:
|
1354
1209
|
##
|
1355
1210
|
# Return the join path, with escaping backticks, dollars, and
|
1356
1211
|
# double-quotes. Unlike `shellescape`, equal-sign is not escaped.
|
1357
1212
|
private
|
1213
|
+
|
1358
1214
|
def escape_path(*path)
|
1359
1215
|
path = File.join(*path)
|
1360
1216
|
if %r'\A[-+:/=@,.\w]+\z' =~ path
|
@@ -1363,6 +1219,7 @@ Also, a list:
|
|
1363
1219
|
"\"#{path.gsub(/[`$"]/, '\\&')}\""
|
1364
1220
|
end
|
1365
1221
|
end
|
1222
|
+
|
1366
1223
|
end
|
1367
1224
|
|
1368
1225
|
@@ruby = rubybin
|
@@ -1536,6 +1393,7 @@ Also, a list:
|
|
1536
1393
|
|
1537
1394
|
def prefetch(reqs) # :nodoc:
|
1538
1395
|
end
|
1396
|
+
|
1539
1397
|
end
|
1540
1398
|
|
1541
1399
|
##
|
@@ -1584,7 +1442,7 @@ Also, a list:
|
|
1584
1442
|
# :stopdoc:
|
1585
1443
|
# only available in RubyGems tests
|
1586
1444
|
|
1587
|
-
PRIVATE_KEY_PASSPHRASE
|
1445
|
+
PRIVATE_KEY_PASSPHRASE = 'Foo bar'.freeze
|
1588
1446
|
|
1589
1447
|
begin
|
1590
1448
|
PRIVATE_KEY = load_key 'private'
|
@@ -1633,10 +1491,3 @@ rescue LoadError, Gem::LoadError
|
|
1633
1491
|
end
|
1634
1492
|
|
1635
1493
|
require 'rubygems/test_utilities'
|
1636
|
-
tmpdirs = []
|
1637
|
-
tmpdirs << (ENV['GEM_HOME'] = Dir.mktmpdir("home"))
|
1638
|
-
tmpdirs << (ENV['GEM_PATH'] = Dir.mktmpdir("path"))
|
1639
|
-
pid = $$
|
1640
|
-
END {tmpdirs.each {|dir| Dir.rmdir(dir)} if $$ == pid}
|
1641
|
-
Gem.clear_paths
|
1642
|
-
Gem.loaded_specs.clear
|