rubygems-update 3.1.3 → 3.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CODE_OF_CONDUCT.md +55 -19
- data/CONTRIBUTING.md +25 -11
- data/History.txt +395 -186
- data/Manifest.txt +44 -77
- data/POLICIES.md +2 -9
- data/README.md +5 -5
- data/Rakefile +44 -82
- data/bin/update_rubygems +1 -1
- data/bundler/CHANGELOG.md +1563 -1426
- data/bundler/README.md +6 -8
- data/bundler/UPGRADING.md +18 -32
- data/bundler/bundler.gemspec +3 -3
- data/bundler/exe/bundle +3 -0
- data/bundler/lib/bundler.rb +25 -7
- data/bundler/lib/bundler/build_metadata.rb +4 -12
- data/bundler/lib/bundler/cli.rb +58 -21
- data/bundler/lib/bundler/cli/add.rb +1 -1
- data/bundler/lib/bundler/cli/binstubs.rb +6 -2
- data/bundler/lib/bundler/cli/cache.rb +1 -7
- data/bundler/lib/bundler/cli/clean.rb +1 -1
- data/bundler/lib/bundler/cli/common.rb +14 -0
- data/bundler/lib/bundler/cli/console.rb +1 -1
- data/bundler/lib/bundler/cli/doctor.rb +1 -1
- data/bundler/lib/bundler/cli/exec.rb +4 -4
- data/bundler/lib/bundler/cli/fund.rb +36 -0
- data/bundler/lib/bundler/cli/gem.rb +84 -11
- data/bundler/lib/bundler/cli/info.rb +15 -4
- data/bundler/lib/bundler/cli/init.rb +2 -2
- data/bundler/lib/bundler/cli/inject.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +9 -16
- data/bundler/lib/bundler/cli/issue.rb +2 -2
- data/bundler/lib/bundler/cli/list.rb +12 -10
- data/bundler/lib/bundler/cli/outdated.rb +88 -67
- data/bundler/lib/bundler/cli/plugin.rb +10 -0
- data/bundler/lib/bundler/cli/pristine.rb +5 -0
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/update.rb +2 -0
- data/bundler/lib/bundler/compact_index_client.rb +1 -1
- data/bundler/lib/bundler/compact_index_client/cache.rb +1 -1
- data/bundler/lib/bundler/compact_index_client/updater.rb +5 -5
- data/bundler/lib/bundler/definition.rb +47 -61
- data/bundler/lib/bundler/dep_proxy.rb +1 -1
- data/bundler/lib/bundler/dependency.rb +0 -9
- data/bundler/lib/bundler/dsl.rb +5 -9
- data/bundler/lib/bundler/endpoint_specification.rb +1 -1
- data/bundler/lib/bundler/env.rb +1 -1
- data/bundler/lib/bundler/environment_preserver.rb +26 -2
- data/bundler/lib/bundler/errors.rb +1 -0
- data/bundler/lib/bundler/feature_flag.rb +0 -3
- data/bundler/lib/bundler/fetcher.rb +4 -3
- data/bundler/lib/bundler/fetcher/base.rb +1 -1
- data/bundler/lib/bundler/fetcher/compact_index.rb +1 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +1 -1
- data/bundler/lib/bundler/fetcher/index.rb +3 -4
- data/bundler/lib/bundler/friendly_errors.rb +22 -13
- data/bundler/lib/bundler/gem_helper.rb +32 -17
- data/bundler/lib/bundler/gem_helpers.rb +6 -1
- data/bundler/lib/bundler/gem_version_promoter.rb +2 -2
- data/bundler/lib/bundler/graph.rb +1 -1
- data/bundler/lib/bundler/index.rb +6 -2
- data/bundler/lib/bundler/injector.rb +22 -4
- data/bundler/lib/bundler/inline.rb +1 -1
- data/bundler/lib/bundler/installer.rb +35 -32
- data/bundler/lib/bundler/installer/gem_installer.rb +3 -3
- data/bundler/lib/bundler/installer/parallel_installer.rb +10 -10
- data/bundler/lib/bundler/installer/standalone.rb +2 -2
- data/bundler/lib/bundler/lazy_specification.rb +20 -9
- data/bundler/lib/bundler/lockfile_generator.rb +1 -1
- data/bundler/lib/bundler/lockfile_parser.rb +1 -1
- data/bundler/lib/bundler/man/.document +1 -0
- data/bundler/{man/bundle-add.ronn → lib/bundler/man/bundle-add.1.ronn} +0 -0
- data/bundler/{man/bundle-binstubs.ronn → lib/bundler/man/bundle-binstubs.1.ronn} +2 -4
- data/bundler/{man/bundle-cache.ronn → lib/bundler/man/bundle-cache.1.ronn} +0 -0
- data/bundler/{man/bundle-check.ronn → lib/bundler/man/bundle-check.1.ronn} +0 -0
- data/bundler/{man/bundle-clean.ronn → lib/bundler/man/bundle-clean.1.ronn} +0 -0
- data/bundler/{man/bundle-config.ronn → lib/bundler/man/bundle-config.1.ronn} +19 -30
- data/bundler/{man/bundle-doctor.ronn → lib/bundler/man/bundle-doctor.1.ronn} +0 -0
- data/bundler/{man/bundle-exec.ronn → lib/bundler/man/bundle-exec.1.ronn} +0 -0
- data/bundler/{man/bundle-gem.ronn → lib/bundler/man/bundle-gem.1.ronn} +30 -7
- data/bundler/{man/bundle-info.ronn → lib/bundler/man/bundle-info.1.ronn} +0 -0
- data/bundler/{man/bundle-init.ronn → lib/bundler/man/bundle-init.1.ronn} +0 -0
- data/bundler/{man/bundle-inject.ronn → lib/bundler/man/bundle-inject.1.ronn} +0 -0
- data/bundler/{man/bundle-install.ronn → lib/bundler/man/bundle-install.1.ronn} +25 -3
- data/bundler/{man/bundle-list.ronn → lib/bundler/man/bundle-list.1.ronn} +6 -6
- data/bundler/{man/bundle-lock.ronn → lib/bundler/man/bundle-lock.1.ronn} +0 -0
- data/bundler/{man/bundle-open.ronn → lib/bundler/man/bundle-open.1.ronn} +0 -0
- data/bundler/{man/bundle-outdated.ronn → lib/bundler/man/bundle-outdated.1.ronn} +0 -0
- data/bundler/{man/bundle-platform.ronn → lib/bundler/man/bundle-platform.1.ronn} +0 -0
- data/bundler/{man/bundle-pristine.ronn → lib/bundler/man/bundle-pristine.1.ronn} +0 -0
- data/bundler/{man/bundle-remove.ronn → lib/bundler/man/bundle-remove.1.ronn} +0 -0
- data/bundler/{man/bundle-show.ronn → lib/bundler/man/bundle-show.1.ronn} +0 -0
- data/bundler/{man/bundle-update.ronn → lib/bundler/man/bundle-update.1.ronn} +0 -0
- data/bundler/{man/bundle-viz.ronn → lib/bundler/man/bundle-viz.1.ronn} +0 -0
- data/bundler/{man/bundle.ronn → lib/bundler/man/bundle.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/gemfile.5.ronn +4 -4
- data/bundler/lib/bundler/mirror.rb +2 -2
- data/bundler/lib/bundler/plugin.rb +30 -5
- data/bundler/lib/bundler/plugin/api/source.rb +1 -1
- data/bundler/lib/bundler/plugin/dsl.rb +1 -1
- data/bundler/lib/bundler/plugin/index.rb +10 -1
- data/bundler/lib/bundler/plugin/installer.rb +1 -1
- data/bundler/lib/bundler/plugin/installer/rubygems.rb +1 -1
- data/bundler/lib/bundler/plugin/source_list.rb +1 -1
- data/bundler/lib/bundler/psyched_yaml.rb +0 -15
- data/bundler/lib/bundler/remote_specification.rb +5 -2
- data/bundler/lib/bundler/resolver.rb +32 -10
- data/bundler/lib/bundler/resolver/spec_group.rb +27 -6
- data/bundler/lib/bundler/retry.rb +1 -1
- data/bundler/lib/bundler/ruby_version.rb +1 -1
- data/bundler/lib/bundler/rubygems_ext.rb +53 -9
- data/bundler/lib/bundler/rubygems_gem_installer.rb +3 -9
- data/bundler/lib/bundler/rubygems_integration.rb +25 -54
- data/bundler/lib/bundler/runtime.rb +4 -14
- data/bundler/lib/bundler/settings.rb +49 -46
- data/bundler/lib/bundler/shared_helpers.rb +2 -2
- data/bundler/lib/bundler/similarity_detector.rb +1 -1
- data/bundler/lib/bundler/source.rb +1 -1
- data/bundler/lib/bundler/source/git.rb +5 -5
- data/bundler/lib/bundler/source/git/git_proxy.rb +57 -60
- data/bundler/lib/bundler/source/path.rb +7 -3
- data/bundler/lib/bundler/source/path/installer.rb +8 -10
- data/bundler/lib/bundler/source/rubygems.rb +13 -16
- data/bundler/lib/bundler/source/rubygems/remote.rb +1 -1
- data/bundler/lib/bundler/source_list.rb +2 -2
- data/bundler/lib/bundler/spec_set.rb +2 -1
- data/bundler/lib/bundler/stub_specification.rb +17 -5
- data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +57 -47
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +9 -1
- data/bundler/lib/bundler/templates/newgem/README.md.tt +1 -2
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +19 -5
- data/bundler/lib/bundler/templates/newgem/bin/console.tt +1 -0
- data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +13 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +18 -0
- data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +9 -0
- data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +4 -2
- data/bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +14 -6
- data/bundler/lib/bundler/templates/newgem/rubocop.yml.tt +10 -0
- data/bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +2 -1
- data/bundler/lib/bundler/templates/newgem/test/{newgem_test.rb.tt → minitest/newgem_test.rb.tt} +2 -0
- data/bundler/lib/bundler/templates/newgem/test/{test_helper.rb.tt → minitest/test_helper.rb.tt} +2 -0
- data/bundler/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt +15 -0
- data/bundler/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt +6 -0
- data/bundler/lib/bundler/ui/shell.rb +5 -5
- data/bundler/lib/bundler/uri_credentials_filter.rb +3 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +34 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +2 -2
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +38 -40
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +75 -189
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +0 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +2 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +9 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +154 -0
- data/bundler/lib/bundler/vendored_persistent.rb +0 -7
- data/bundler/lib/bundler/vendored_tmpdir.rb +4 -0
- data/bundler/lib/bundler/version.rb +1 -1
- data/bundler/lib/bundler/worker.rb +1 -1
- data/bundler/lib/bundler/yaml_serializer.rb +1 -1
- data/bundler/man/bundle-add.1 +1 -1
- data/bundler/man/bundle-binstubs.1 +5 -3
- data/bundler/man/bundle-cache.1 +1 -1
- data/bundler/man/bundle-check.1 +1 -1
- data/bundler/man/bundle-clean.1 +1 -1
- data/bundler/man/bundle-config.1 +16 -25
- data/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/man/bundle-exec.1 +1 -1
- data/bundler/man/bundle-gem.1 +25 -3
- data/bundler/man/bundle-info.1 +1 -1
- data/bundler/man/bundle-init.1 +1 -1
- data/bundler/man/bundle-inject.1 +1 -1
- data/bundler/man/bundle-install.1 +30 -3
- data/bundler/man/bundle-list.1 +7 -7
- data/bundler/man/bundle-lock.1 +1 -1
- data/bundler/man/bundle-open.1 +1 -1
- data/bundler/man/bundle-outdated.1 +1 -1
- data/bundler/man/bundle-platform.1 +1 -1
- data/bundler/man/bundle-pristine.1 +1 -1
- data/bundler/man/bundle-remove.1 +1 -1
- data/bundler/man/bundle-show.1 +1 -1
- data/bundler/man/bundle-update.1 +1 -1
- data/bundler/man/bundle-viz.1 +1 -1
- data/bundler/man/bundle.1 +1 -1
- data/bundler/man/gemfile.5 +4 -4
- data/lib/rubygems.rb +88 -164
- data/lib/rubygems/available_set.rb +4 -6
- data/lib/rubygems/basic_specification.rb +11 -9
- data/lib/rubygems/bundler_version_finder.rb +14 -9
- data/lib/rubygems/command.rb +17 -17
- data/lib/rubygems/command_manager.rb +5 -6
- data/lib/rubygems/commands/build_command.rb +40 -20
- data/lib/rubygems/commands/cert_command.rb +2 -10
- data/lib/rubygems/commands/check_command.rb +0 -2
- data/lib/rubygems/commands/cleanup_command.rb +11 -7
- data/lib/rubygems/commands/contents_command.rb +4 -6
- data/lib/rubygems/commands/dependency_command.rb +6 -8
- data/lib/rubygems/commands/environment_command.rb +1 -3
- data/lib/rubygems/commands/fetch_command.rb +2 -4
- data/lib/rubygems/commands/generate_index_command.rb +0 -2
- data/lib/rubygems/commands/help_command.rb +4 -4
- data/lib/rubygems/commands/info_command.rb +8 -5
- data/lib/rubygems/commands/install_command.rb +3 -5
- data/lib/rubygems/commands/list_command.rb +8 -7
- data/lib/rubygems/commands/lock_command.rb +1 -3
- data/lib/rubygems/commands/mirror_command.rb +0 -2
- data/lib/rubygems/commands/open_command.rb +0 -4
- data/lib/rubygems/commands/outdated_command.rb +0 -2
- data/lib/rubygems/commands/owner_command.rb +9 -3
- data/lib/rubygems/commands/pristine_command.rb +11 -5
- data/lib/rubygems/commands/push_command.rb +10 -46
- data/lib/rubygems/commands/query_command.rb +14 -344
- data/lib/rubygems/commands/rdoc_command.rb +0 -2
- data/lib/rubygems/commands/search_command.rb +7 -7
- data/lib/rubygems/commands/server_command.rb +3 -1
- data/lib/rubygems/commands/setup_command.rb +131 -58
- data/lib/rubygems/commands/signin_command.rb +0 -2
- data/lib/rubygems/commands/signout_command.rb +0 -2
- data/lib/rubygems/commands/sources_command.rb +9 -7
- data/lib/rubygems/commands/specification_command.rb +8 -4
- data/lib/rubygems/commands/stale_command.rb +1 -3
- data/lib/rubygems/commands/uninstall_command.rb +1 -3
- data/lib/rubygems/commands/unpack_command.rb +1 -3
- data/lib/rubygems/commands/update_command.rb +59 -14
- data/lib/rubygems/commands/which_command.rb +0 -2
- data/lib/rubygems/commands/yank_command.rb +4 -6
- data/lib/rubygems/config_file.rb +11 -4
- data/lib/rubygems/core_ext/kernel_require.rb +29 -36
- data/lib/rubygems/core_ext/kernel_warn.rb +12 -13
- data/lib/rubygems/defaults.rb +101 -7
- data/lib/rubygems/dependency.rb +3 -8
- data/lib/rubygems/dependency_installer.rb +5 -78
- data/lib/rubygems/dependency_list.rb +7 -9
- data/lib/rubygems/deprecate.rb +46 -1
- data/lib/rubygems/doctor.rb +4 -4
- data/lib/rubygems/errors.rb +3 -14
- data/lib/rubygems/exceptions.rb +2 -33
- data/lib/rubygems/ext.rb +6 -6
- data/lib/rubygems/ext/build_error.rb +2 -0
- data/lib/rubygems/ext/builder.rb +14 -35
- data/lib/rubygems/ext/cmake_builder.rb +5 -7
- data/lib/rubygems/ext/configure_builder.rb +4 -6
- data/lib/rubygems/ext/ext_conf_builder.rb +21 -19
- data/lib/rubygems/ext/rake_builder.rb +3 -5
- data/lib/rubygems/gem_runner.rb +3 -10
- data/lib/rubygems/gemcutter_utilities.rb +91 -15
- data/lib/rubygems/indexer.rb +1 -22
- data/lib/rubygems/install_update_options.rb +7 -7
- data/lib/rubygems/installer.rb +59 -57
- data/lib/rubygems/installer_test_case.rb +25 -11
- data/lib/rubygems/installer_uninstaller_utils.rb +24 -0
- data/lib/rubygems/local_remote_options.rb +1 -1
- data/lib/rubygems/mock_gem_ui.rb +0 -6
- data/lib/rubygems/name_tuple.rb +3 -7
- data/lib/rubygems/openssl.rb +7 -0
- data/lib/rubygems/package.rb +14 -25
- data/lib/rubygems/package/digest_io.rb +0 -2
- data/lib/rubygems/package/file_source.rb +0 -2
- data/lib/rubygems/package/io_source.rb +0 -2
- data/lib/rubygems/package/old.rb +1 -3
- data/lib/rubygems/package/tar_header.rb +4 -6
- data/lib/rubygems/package/tar_reader.rb +0 -3
- data/lib/rubygems/package/tar_reader/entry.rb +0 -3
- data/lib/rubygems/package/tar_test_case.rb +2 -4
- data/lib/rubygems/package/tar_writer.rb +2 -12
- data/lib/rubygems/package_task.rb +1 -7
- data/lib/rubygems/path_support.rb +1 -3
- data/lib/rubygems/platform.rb +21 -12
- data/lib/rubygems/psych_tree.rb +0 -2
- data/lib/rubygems/query_utils.rb +353 -0
- data/lib/rubygems/rdoc.rb +0 -12
- data/lib/rubygems/remote_fetcher.rb +10 -27
- data/lib/rubygems/request.rb +4 -11
- data/lib/rubygems/request/connection_pools.rb +1 -5
- data/lib/rubygems/request/http_pool.rb +0 -2
- data/lib/rubygems/request/https_pool.rb +0 -2
- data/lib/rubygems/request_set.rb +5 -7
- data/lib/rubygems/request_set/gem_dependency_api.rb +5 -7
- data/lib/rubygems/request_set/lockfile.rb +8 -12
- data/lib/rubygems/request_set/lockfile/parser.rb +0 -2
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +1 -3
- data/lib/rubygems/requirement.rb +20 -21
- data/lib/rubygems/resolver.rb +8 -11
- data/lib/rubygems/resolver/activation_request.rb +9 -3
- data/lib/rubygems/resolver/api_set.rb +4 -6
- data/lib/rubygems/resolver/api_specification.rb +21 -8
- data/lib/rubygems/resolver/best_set.rb +0 -2
- data/lib/rubygems/resolver/composed_set.rb +3 -5
- data/lib/rubygems/resolver/conflict.rb +2 -4
- data/lib/rubygems/resolver/current_set.rb +0 -2
- data/lib/rubygems/resolver/dependency_request.rb +1 -3
- data/lib/rubygems/resolver/git_set.rb +0 -2
- data/lib/rubygems/resolver/git_specification.rb +0 -2
- data/lib/rubygems/resolver/index_set.rb +1 -3
- data/lib/rubygems/resolver/index_specification.rb +11 -2
- data/lib/rubygems/resolver/installed_specification.rb +0 -2
- data/lib/rubygems/resolver/installer_set.rb +4 -7
- data/lib/rubygems/resolver/local_specification.rb +0 -2
- data/lib/rubygems/resolver/lock_set.rb +2 -4
- data/lib/rubygems/resolver/lock_specification.rb +0 -2
- data/lib/rubygems/resolver/molinillo/lib/molinillo.rb +6 -5
- data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb +7 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +39 -5
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb +7 -6
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb +4 -3
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb +43 -10
- data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +75 -7
- data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb +3 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb +506 -165
- data/lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb +3 -2
- data/lib/rubygems/resolver/molinillo/lib/molinillo/state.rb +8 -4
- data/lib/rubygems/resolver/requirement_list.rb +0 -2
- data/lib/rubygems/resolver/set.rb +0 -2
- data/lib/rubygems/resolver/source_set.rb +0 -2
- data/lib/rubygems/resolver/spec_specification.rb +0 -2
- data/lib/rubygems/resolver/specification.rb +1 -3
- data/lib/rubygems/resolver/stats.rb +0 -2
- data/lib/rubygems/resolver/vendor_set.rb +0 -2
- data/lib/rubygems/resolver/vendor_specification.rb +0 -2
- data/lib/rubygems/s3_uri_signer.rb +2 -8
- data/lib/rubygems/safe_yaml.rb +4 -4
- data/lib/rubygems/security.rb +27 -34
- data/lib/rubygems/security/policy.rb +4 -8
- data/lib/rubygems/security/signer.rb +5 -7
- data/lib/rubygems/security/trust_dir.rb +1 -3
- data/lib/rubygems/server.rb +10 -12
- data/lib/rubygems/source.rb +13 -7
- data/lib/rubygems/source/git.rb +7 -8
- data/lib/rubygems/source/installed.rb +0 -2
- data/lib/rubygems/source/local.rb +2 -4
- data/lib/rubygems/source/lock.rb +0 -2
- data/lib/rubygems/source/specific_file.rb +0 -2
- data/lib/rubygems/source/vendor.rb +0 -2
- data/lib/rubygems/source_list.rb +4 -7
- data/lib/rubygems/spec_fetcher.rb +19 -18
- data/lib/rubygems/specification.rb +113 -126
- data/lib/rubygems/specification_policy.rb +88 -30
- data/lib/rubygems/ssl_certs/{index.rubygems.org → rubygems.org}/GlobalSignRootCA.pem +0 -0
- data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem +21 -0
- data/lib/rubygems/stub_specification.rb +1 -5
- data/lib/rubygems/syck_hack.rb +0 -2
- data/lib/rubygems/test_case.rb +105 -132
- data/lib/rubygems/test_utilities.rb +6 -14
- data/lib/rubygems/uninstaller.rb +35 -16
- data/lib/rubygems/uri_formatter.rb +2 -3
- data/lib/rubygems/uri_parser.rb +0 -2
- data/lib/rubygems/user_interaction.rb +1 -26
- data/lib/rubygems/util.rb +8 -2
- data/lib/rubygems/util/licenses.rb +4 -6
- data/lib/rubygems/util/list.rb +0 -2
- data/lib/rubygems/validator.rb +1 -3
- data/lib/rubygems/version.rb +4 -6
- data/lib/rubygems/version_option.rb +6 -0
- data/rubygems-update.gemspec +2 -2
- data/setup.rb +2 -7
- data/test/rubygems/plugin/load/rubygems_plugin.rb +0 -2
- data/test/rubygems/rubygems/commands/crash_command.rb +0 -2
- data/test/rubygems/rubygems_plugin.rb +0 -2
- data/test/rubygems/specifications/bar-0.0.2.gemspec +0 -2
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +12 -0
- data/test/rubygems/test_bundled_ca.rb +42 -45
- data/test/rubygems/test_config.rb +0 -2
- data/test/rubygems/test_deprecate.rb +40 -7
- data/test/rubygems/test_gem.rb +91 -100
- data/test/rubygems/test_gem_available_set.rb +3 -5
- data/test/rubygems/test_gem_bundler_version_finder.rb +19 -3
- data/test/rubygems/test_gem_command.rb +24 -7
- data/test/rubygems/test_gem_command_manager.rb +36 -5
- data/test/rubygems/test_gem_commands_build_command.rb +250 -15
- data/test/rubygems/test_gem_commands_cert_command.rb +4 -6
- data/test/rubygems/test_gem_commands_check_command.rb +0 -2
- data/test/rubygems/test_gem_commands_cleanup_command.rb +14 -5
- data/test/rubygems/test_gem_commands_contents_command.rb +50 -19
- data/test/rubygems/test_gem_commands_dependency_command.rb +0 -2
- data/test/rubygems/test_gem_commands_environment_command.rb +21 -23
- data/test/rubygems/test_gem_commands_fetch_command.rb +0 -2
- data/test/rubygems/test_gem_commands_generate_index_command.rb +1 -7
- data/test/rubygems/test_gem_commands_help_command.rb +15 -4
- data/test/rubygems/test_gem_commands_info_command.rb +6 -8
- data/test/rubygems/test_gem_commands_install_command.rb +32 -34
- data/test/rubygems/test_gem_commands_list_command.rb +0 -2
- data/test/rubygems/test_gem_commands_lock_command.rb +0 -2
- data/test/rubygems/test_gem_commands_mirror.rb +1 -3
- data/test/rubygems/test_gem_commands_open_command.rb +4 -6
- data/test/rubygems/test_gem_commands_outdated_command.rb +0 -2
- data/test/rubygems/test_gem_commands_owner_command.rb +59 -5
- data/test/rubygems/test_gem_commands_pristine_command.rb +43 -12
- data/test/rubygems/test_gem_commands_push_command.rb +38 -9
- data/test/rubygems/test_gem_commands_query_command.rb +12 -12
- data/test/rubygems/test_gem_commands_search_command.rb +0 -2
- data/test/rubygems/test_gem_commands_server_command.rb +0 -2
- data/test/rubygems/test_gem_commands_setup_command.rb +165 -124
- data/test/rubygems/test_gem_commands_signin_command.rb +33 -9
- data/test/rubygems/test_gem_commands_signout_command.rb +0 -7
- data/test/rubygems/test_gem_commands_sources_command.rb +99 -3
- data/test/rubygems/test_gem_commands_specification_command.rb +46 -20
- data/test/rubygems/test_gem_commands_stale_command.rb +0 -2
- data/test/rubygems/test_gem_commands_uninstall_command.rb +1 -3
- data/test/rubygems/test_gem_commands_unpack_command.rb +0 -2
- data/test/rubygems/test_gem_commands_update_command.rb +116 -7
- data/test/rubygems/test_gem_commands_which_command.rb +3 -5
- data/test/rubygems/test_gem_commands_yank_command.rb +44 -8
- data/test/rubygems/test_gem_config_file.rb +7 -12
- data/test/rubygems/test_gem_dependency.rb +0 -2
- data/test/rubygems/test_gem_dependency_installer.rb +90 -193
- data/test/rubygems/test_gem_dependency_list.rb +10 -12
- data/test/rubygems/test_gem_dependency_resolution_error.rb +1 -3
- data/test/rubygems/test_gem_doctor.rb +28 -2
- data/test/rubygems/test_gem_ext_builder.rb +26 -47
- data/test/rubygems/test_gem_ext_cmake_builder.rb +16 -23
- data/test/rubygems/test_gem_ext_configure_builder.rb +4 -20
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +9 -29
- data/test/rubygems/test_gem_ext_rake_builder.rb +14 -24
- data/test/rubygems/test_gem_gem_runner.rb +44 -1
- data/test/rubygems/test_gem_gemcutter_utilities.rb +8 -5
- data/test/rubygems/test_gem_impossible_dependencies_error.rb +0 -2
- data/test/rubygems/test_gem_indexer.rb +9 -15
- data/test/rubygems/test_gem_install_update_options.rb +14 -4
- data/test/rubygems/test_gem_installer.rb +256 -59
- data/test/rubygems/test_gem_local_remote_options.rb +0 -2
- data/test/rubygems/test_gem_name_tuple.rb +0 -2
- data/test/rubygems/test_gem_package.rb +38 -31
- data/test/rubygems/test_gem_package_old.rb +4 -6
- data/test/rubygems/test_gem_package_tar_header.rb +18 -1
- data/test/rubygems/test_gem_package_tar_reader.rb +0 -2
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +0 -2
- data/test/rubygems/test_gem_package_tar_writer.rb +4 -6
- data/test/rubygems/test_gem_package_task.rb +46 -13
- data/test/rubygems/test_gem_path_support.rb +0 -2
- data/test/rubygems/test_gem_platform.rb +63 -6
- data/test/rubygems/test_gem_rdoc.rb +0 -2
- data/test/rubygems/test_gem_remote_fetcher.rb +168 -211
- data/test/rubygems/test_gem_request.rb +13 -17
- data/test/rubygems/test_gem_request_connection_pools.rb +0 -4
- data/test/rubygems/test_gem_request_set.rb +20 -22
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +3 -5
- data/test/rubygems/test_gem_request_set_lockfile.rb +4 -6
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +9 -11
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +118 -120
- data/test/rubygems/test_gem_requirement.rb +10 -4
- data/test/rubygems/test_gem_resolver.rb +6 -8
- data/test/rubygems/test_gem_resolver_activation_request.rb +0 -2
- data/test/rubygems/test_gem_resolver_api_set.rb +11 -13
- data/test/rubygems/test_gem_resolver_api_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_best_set.rb +2 -4
- data/test/rubygems/test_gem_resolver_composed_set.rb +0 -2
- data/test/rubygems/test_gem_resolver_conflict.rb +1 -3
- data/test/rubygems/test_gem_resolver_dependency_request.rb +0 -2
- data/test/rubygems/test_gem_resolver_git_set.rb +0 -2
- data/test/rubygems/test_gem_resolver_git_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_index_set.rb +2 -4
- data/test/rubygems/test_gem_resolver_index_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_installed_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_installer_set.rb +7 -9
- data/test/rubygems/test_gem_resolver_local_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_lock_set.rb +3 -5
- data/test/rubygems/test_gem_resolver_lock_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_requirement_list.rb +0 -2
- data/test/rubygems/test_gem_resolver_specification.rb +0 -4
- data/test/rubygems/test_gem_resolver_vendor_set.rb +1 -3
- data/test/rubygems/test_gem_resolver_vendor_specification.rb +0 -2
- data/test/rubygems/test_gem_security.rb +22 -24
- data/test/rubygems/test_gem_security_policy.rb +7 -12
- data/test/rubygems/test_gem_security_signer.rb +10 -12
- data/test/rubygems/test_gem_security_trust_dir.rb +4 -6
- data/test/rubygems/test_gem_server.rb +10 -14
- data/test/rubygems/test_gem_silent_ui.rb +0 -2
- data/test/rubygems/test_gem_source.rb +17 -16
- data/test/rubygems/test_gem_source_fetch_problem.rb +0 -2
- data/test/rubygems/test_gem_source_git.rb +12 -13
- data/test/rubygems/test_gem_source_installed.rb +7 -9
- data/test/rubygems/test_gem_source_list.rb +1 -2
- data/test/rubygems/test_gem_source_local.rb +8 -10
- data/test/rubygems/test_gem_source_lock.rb +10 -12
- data/test/rubygems/test_gem_source_specific_file.rb +7 -9
- data/test/rubygems/test_gem_source_subpath_problem.rb +49 -0
- data/test/rubygems/test_gem_source_vendor.rb +7 -9
- data/test/rubygems/test_gem_spec_fetcher.rb +11 -4
- data/test/rubygems/test_gem_specification.rb +176 -130
- data/test/rubygems/test_gem_stream_ui.rb +3 -3
- data/test/rubygems/test_gem_stub_specification.rb +4 -7
- data/test/rubygems/test_gem_text.rb +1 -3
- data/test/rubygems/test_gem_uninstaller.rb +134 -12
- data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +0 -2
- data/test/rubygems/test_gem_uri_formatter.rb +0 -2
- data/test/rubygems/test_gem_util.rb +7 -7
- data/test/rubygems/test_gem_validator.rb +1 -3
- data/test/rubygems/test_gem_version.rb +1 -3
- data/test/rubygems/test_gem_version_option.rb +1 -3
- data/test/rubygems/test_kernel.rb +25 -10
- data/test/rubygems/test_project_sanity.rb +7 -2
- data/test/rubygems/test_remote_fetch_error.rb +0 -2
- data/test/rubygems/test_require.rb +291 -56
- metadata +66 -100
- data/.bundle/config +0 -2
- data/.rubocop.yml +0 -91
- data/Gemfile +0 -8
- data/Gemfile.lock +0 -43
- data/bundler/CODE_OF_CONDUCT.md +0 -136
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +0 -26
- data/bundler/man/bundle-add.1.txt +0 -58
- data/bundler/man/bundle-binstubs.1.txt +0 -48
- data/bundler/man/bundle-cache.1.txt +0 -78
- data/bundler/man/bundle-check.1.txt +0 -33
- data/bundler/man/bundle-clean.1.txt +0 -26
- data/bundler/man/bundle-config.1.txt +0 -528
- data/bundler/man/bundle-doctor.1.txt +0 -44
- data/bundler/man/bundle-exec.1.txt +0 -178
- data/bundler/man/bundle-gem.1.txt +0 -91
- data/bundler/man/bundle-info.1.txt +0 -21
- data/bundler/man/bundle-init.1.txt +0 -34
- data/bundler/man/bundle-inject.1.txt +0 -32
- data/bundler/man/bundle-install.1.txt +0 -401
- data/bundler/man/bundle-list.1.txt +0 -43
- data/bundler/man/bundle-lock.1.txt +0 -93
- data/bundler/man/bundle-open.1.txt +0 -29
- data/bundler/man/bundle-outdated.1.txt +0 -131
- data/bundler/man/bundle-platform.1.txt +0 -57
- data/bundler/man/bundle-pristine.1.txt +0 -44
- data/bundler/man/bundle-remove.1.txt +0 -34
- data/bundler/man/bundle-show.1.txt +0 -27
- data/bundler/man/bundle-update.1.txt +0 -390
- data/bundler/man/bundle-viz.1.txt +0 -39
- data/bundler/man/bundle.1.txt +0 -116
- data/bundler/man/gemfile.5.txt +0 -649
- data/lib/rubygems/source_local.rb +0 -7
- data/lib/rubygems/source_specific_file.rb +0 -6
- data/lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -23
- data/lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -25
- data/lib/ubygems.rb +0 -14
- data/tmp/.keep +0 -0
- data/util/CL2notes +0 -55
- data/util/bisect +0 -10
- data/util/ci.sh +0 -62
- data/util/cops/deprecations.rb +0 -52
- data/util/create_certs.rb +0 -171
- data/util/create_certs.sh +0 -27
- data/util/create_encrypted_key.rb +0 -16
- data/util/generate_spdx_license_list.rb +0 -63
- data/util/patch_with_prs.rb +0 -77
- data/util/rubocop +0 -8
- data/util/update_bundled_ca_certificates.rb +0 -139
- data/util/update_changelog.rb +0 -67
@@ -3,7 +3,6 @@ require 'rubygems/test_case'
|
|
3
3
|
require 'rubygems/dependency_list'
|
4
4
|
|
5
5
|
class TestGemDependencyList < Gem::TestCase
|
6
|
-
|
7
6
|
def setup
|
8
7
|
super
|
9
8
|
|
@@ -53,7 +52,7 @@ class TestGemDependencyList < Gem::TestCase
|
|
53
52
|
|
54
53
|
order = @deplist.dependency_order
|
55
54
|
|
56
|
-
assert_equal %w[d-1 c-1 b-1 a-1], order.map {
|
55
|
+
assert_equal %w[d-1 c-1 b-1 a-1], order.map {|s| s.full_name }
|
57
56
|
end
|
58
57
|
|
59
58
|
def test_dependency_order_circle
|
@@ -62,7 +61,7 @@ class TestGemDependencyList < Gem::TestCase
|
|
62
61
|
|
63
62
|
order = @deplist.dependency_order
|
64
63
|
|
65
|
-
assert_equal %w[b-1 c-1 a-1], order.map {
|
64
|
+
assert_equal %w[b-1 c-1 a-1], order.map {|s| s.full_name }
|
66
65
|
end
|
67
66
|
|
68
67
|
def test_dependency_order_development
|
@@ -80,7 +79,7 @@ class TestGemDependencyList < Gem::TestCase
|
|
80
79
|
|
81
80
|
order = deplist.dependency_order
|
82
81
|
|
83
|
-
assert_equal %w[g-1 a-1 f-1 e-1], order.map {
|
82
|
+
assert_equal %w[g-1 a-1 f-1 e-1], order.map {|s| s.full_name },
|
84
83
|
'development on'
|
85
84
|
|
86
85
|
deplist2 = Gem::DependencyList.new
|
@@ -88,7 +87,7 @@ class TestGemDependencyList < Gem::TestCase
|
|
88
87
|
|
89
88
|
order = deplist2.dependency_order
|
90
89
|
|
91
|
-
assert_equal %w[a-1 g-1 f-1 e-1], order.map {
|
90
|
+
assert_equal %w[a-1 g-1 f-1 e-1], order.map {|s| s.full_name },
|
92
91
|
'development off'
|
93
92
|
end
|
94
93
|
|
@@ -100,7 +99,7 @@ class TestGemDependencyList < Gem::TestCase
|
|
100
99
|
|
101
100
|
order = @deplist.dependency_order
|
102
101
|
|
103
|
-
assert_equal %w[d-1 c-2 b-1 a-2 e-1], order.map {
|
102
|
+
assert_equal %w[d-1 c-2 b-1 a-2 e-1], order.map {|s| s.full_name },
|
104
103
|
'deps of trimmed specs not included'
|
105
104
|
end
|
106
105
|
|
@@ -109,7 +108,7 @@ class TestGemDependencyList < Gem::TestCase
|
|
109
108
|
|
110
109
|
order = @deplist.dependency_order
|
111
110
|
|
112
|
-
assert_equal %w[c-2 a-1], order.map {
|
111
|
+
assert_equal %w[c-2 a-1], order.map {|s| s.full_name }
|
113
112
|
end
|
114
113
|
|
115
114
|
def test_find_name
|
@@ -134,14 +133,14 @@ class TestGemDependencyList < Gem::TestCase
|
|
134
133
|
end
|
135
134
|
|
136
135
|
def test_why_not_ok_eh
|
137
|
-
assert_equal({},
|
136
|
+
assert_equal({}, @deplist.why_not_ok?)
|
138
137
|
|
139
138
|
@deplist.add @b2
|
140
139
|
|
141
140
|
exp = {
|
142
141
|
"b" => [
|
143
|
-
Gem::Dependency.new("a", ">= 1")
|
144
|
-
]
|
142
|
+
Gem::Dependency.new("a", ">= 1"),
|
143
|
+
],
|
145
144
|
}
|
146
145
|
|
147
146
|
assert_equal exp, @deplist.why_not_ok?
|
@@ -162,7 +161,7 @@ class TestGemDependencyList < Gem::TestCase
|
|
162
161
|
|
163
162
|
@deplist.add a, b0, b1
|
164
163
|
|
165
|
-
assert_equal({},
|
164
|
+
assert_equal({}, @deplist.why_not_ok?)
|
166
165
|
end
|
167
166
|
|
168
167
|
def test_ok_eh_mismatch
|
@@ -262,5 +261,4 @@ class TestGemDependencyList < Gem::TestCase
|
|
262
261
|
|
263
262
|
@deplist.add @a1, @a2, @b1, @c2, @d1
|
264
263
|
end
|
265
|
-
|
266
264
|
end
|
@@ -2,7 +2,6 @@
|
|
2
2
|
require 'rubygems/test_case'
|
3
3
|
|
4
4
|
class TestGemDependencyResolutionError < Gem::TestCase
|
5
|
-
|
6
5
|
def setup
|
7
6
|
super
|
8
7
|
|
@@ -21,8 +20,7 @@ class TestGemDependencyResolutionError < Gem::TestCase
|
|
21
20
|
end
|
22
21
|
|
23
22
|
def test_message
|
24
|
-
assert_match %r
|
23
|
+
assert_match %r{^conflicting dependencies a \(= 1\) and a \(= 2\)$},
|
25
24
|
@error.message
|
26
25
|
end
|
27
|
-
|
28
26
|
end
|
@@ -3,7 +3,6 @@ require 'rubygems/test_case'
|
|
3
3
|
require 'rubygems/doctor'
|
4
4
|
|
5
5
|
class TestGemDoctor < Gem::TestCase
|
6
|
-
|
7
6
|
def gem(name)
|
8
7
|
spec = quick_gem name do |gem|
|
9
8
|
gem.files = %W[lib/#{name}.rb Rakefile]
|
@@ -153,6 +152,34 @@ This directory does not appear to be a RubyGems repository, skipping
|
|
153
152
|
assert true # count
|
154
153
|
end
|
155
154
|
|
155
|
+
def test_doctor_badly_named_plugins
|
156
|
+
gem 'a'
|
157
|
+
|
158
|
+
Gem.use_paths @gemhome.to_s
|
159
|
+
|
160
|
+
FileUtils.mkdir_p Gem.plugindir
|
161
|
+
bad_plugin = File.join(Gem.plugindir, "a_badly_named_file.rb")
|
162
|
+
write_file bad_plugin
|
163
|
+
|
164
|
+
doctor = Gem::Doctor.new @gemhome
|
165
|
+
|
166
|
+
capture_io do
|
167
|
+
use_ui @ui do
|
168
|
+
doctor.doctor
|
169
|
+
end
|
170
|
+
end
|
171
|
+
|
172
|
+
# refute_path_exists bad_plugin
|
173
|
+
|
174
|
+
expected = <<-OUTPUT
|
175
|
+
Checking #{@gemhome}
|
176
|
+
Removed file plugins/a_badly_named_file.rb
|
177
|
+
|
178
|
+
OUTPUT
|
179
|
+
|
180
|
+
assert_equal expected, @ui.output
|
181
|
+
end
|
182
|
+
|
156
183
|
def test_gem_repository_eh
|
157
184
|
doctor = Gem::Doctor.new @gemhome
|
158
185
|
|
@@ -164,5 +191,4 @@ This directory does not appear to be a RubyGems repository, skipping
|
|
164
191
|
|
165
192
|
assert doctor.gem_repository?, 'gems installed'
|
166
193
|
end
|
167
|
-
|
168
194
|
end
|
@@ -4,7 +4,6 @@ require 'rubygems/ext'
|
|
4
4
|
require 'rubygems/installer'
|
5
5
|
|
6
6
|
class TestGemExtBuilder < Gem::TestCase
|
7
|
-
|
8
7
|
def setup
|
9
8
|
super
|
10
9
|
|
@@ -31,9 +30,8 @@ class TestGemExtBuilder < Gem::TestCase
|
|
31
30
|
ENV['DESTDIR'] = 'destination'
|
32
31
|
results = []
|
33
32
|
|
34
|
-
|
35
|
-
|
36
|
-
io.puts <<-MAKEFILE
|
33
|
+
File.open File.join(@ext, 'Makefile'), 'w' do |io|
|
34
|
+
io.puts <<-MAKEFILE
|
37
35
|
all:
|
38
36
|
\t@#{Gem.ruby} -e "puts %Q{all: \#{ENV['DESTDIR']}}"
|
39
37
|
|
@@ -42,22 +40,21 @@ clean:
|
|
42
40
|
|
43
41
|
install:
|
44
42
|
\t@#{Gem.ruby} -e "puts %Q{install: \#{ENV['DESTDIR']}}"
|
45
|
-
|
46
|
-
end
|
47
|
-
|
48
|
-
Gem::Ext::Builder.make @dest_path, results
|
43
|
+
MAKEFILE
|
49
44
|
end
|
50
45
|
|
51
|
-
|
46
|
+
Gem::Ext::Builder.make @dest_path, results, @ext
|
47
|
+
|
48
|
+
results = results.join("\n").b
|
52
49
|
|
53
|
-
assert_match %r
|
54
|
-
assert_match %r
|
55
|
-
assert_match %r
|
50
|
+
assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" clean$}, results
|
51
|
+
assert_match %r{"DESTDIR=#{ENV['DESTDIR']}"$}, results
|
52
|
+
assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" install$}, results
|
56
53
|
|
57
54
|
if /nmake/ !~ results
|
58
|
-
assert_match %r
|
59
|
-
assert_match %r
|
60
|
-
assert_match %r
|
55
|
+
assert_match %r{^clean: destination$}, results
|
56
|
+
assert_match %r{^all: destination$}, results
|
57
|
+
assert_match %r{^install: destination$}, results
|
61
58
|
end
|
62
59
|
end
|
63
60
|
|
@@ -65,25 +62,23 @@ install:
|
|
65
62
|
ENV['DESTDIR'] = 'destination'
|
66
63
|
results = []
|
67
64
|
|
68
|
-
|
69
|
-
|
70
|
-
io.puts <<-MAKEFILE
|
65
|
+
File.open File.join(@ext, 'Makefile'), 'w' do |io|
|
66
|
+
io.puts <<-MAKEFILE
|
71
67
|
all:
|
72
68
|
\t@#{Gem.ruby} -e "puts %Q{all: \#{ENV['DESTDIR']}}"
|
73
69
|
|
74
70
|
install:
|
75
71
|
\t@#{Gem.ruby} -e "puts %Q{install: \#{ENV['DESTDIR']}}"
|
76
|
-
|
77
|
-
end
|
78
|
-
|
79
|
-
Gem::Ext::Builder.make @dest_path, results
|
72
|
+
MAKEFILE
|
80
73
|
end
|
81
74
|
|
82
|
-
|
75
|
+
Gem::Ext::Builder.make @dest_path, results, @ext
|
83
76
|
|
84
|
-
|
85
|
-
|
86
|
-
assert_match %r
|
77
|
+
results = results.join("\n").b
|
78
|
+
|
79
|
+
assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" clean$}, results
|
80
|
+
assert_match %r{"DESTDIR=#{ENV['DESTDIR']}"$}, results
|
81
|
+
assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" install$}, results
|
87
82
|
end
|
88
83
|
|
89
84
|
def test_build_extensions
|
@@ -134,7 +129,6 @@ install:
|
|
134
129
|
|
135
130
|
def test_build_extensions_install_ext_only
|
136
131
|
class << Gem
|
137
|
-
|
138
132
|
alias orig_install_extension_in_lib install_extension_in_lib
|
139
133
|
|
140
134
|
remove_method :install_extension_in_lib
|
@@ -142,7 +136,6 @@ install:
|
|
142
136
|
def Gem.install_extension_in_lib
|
143
137
|
false
|
144
138
|
end
|
145
|
-
|
146
139
|
end
|
147
140
|
|
148
141
|
@spec.extensions << 'ext/extconf.rb'
|
@@ -179,11 +172,9 @@ install:
|
|
179
172
|
refute_path_exists File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
|
180
173
|
ensure
|
181
174
|
class << Gem
|
182
|
-
|
183
175
|
remove_method :install_extension_in_lib
|
184
176
|
|
185
177
|
alias install_extension_in_lib orig_install_extension_in_lib
|
186
|
-
|
187
178
|
end
|
188
179
|
end
|
189
180
|
|
@@ -227,26 +218,17 @@ install:
|
|
227
218
|
end
|
228
219
|
|
229
220
|
assert_match(/\AERROR: Failed to build gem native extension.$/, e.message)
|
230
|
-
|
231
|
-
assert_equal "Building native extensions. This could take a while...\n",
|
232
|
-
@ui.output
|
221
|
+
assert_equal "Building native extensions. This could take a while...\n", @ui.output
|
233
222
|
assert_equal '', @ui.error
|
234
223
|
|
235
224
|
gem_make_out = File.join @spec.extension_dir, 'gem_make.out'
|
225
|
+
cmd_make_out = File.read(gem_make_out)
|
236
226
|
|
237
|
-
assert_match %r
|
238
|
-
|
239
|
-
assert_match %r%: No such file%,
|
240
|
-
File.read(gem_make_out)
|
227
|
+
assert_match %r{#{Regexp.escape Gem.ruby} .* extconf\.rb}, cmd_make_out
|
228
|
+
assert_match %r{: No such file}, cmd_make_out
|
241
229
|
|
242
230
|
refute_path_exists @spec.gem_build_complete_path
|
243
231
|
|
244
|
-
skip "Gem.ruby is not the name of the binary being run in the end" \
|
245
|
-
unless File.read(gem_make_out).include? "#{Gem.ruby}:"
|
246
|
-
|
247
|
-
assert_match %r%#{Regexp.escape Gem.ruby}: No such file%,
|
248
|
-
File.read(gem_make_out)
|
249
|
-
|
250
232
|
assert_equal cwd, Dir.pwd
|
251
233
|
end
|
252
234
|
|
@@ -262,9 +244,7 @@ install:
|
|
262
244
|
end
|
263
245
|
|
264
246
|
assert_match(/^\s*No builder for extension ''$/, e.message)
|
265
|
-
|
266
|
-
assert_equal "Building native extensions. This could take a while...\n",
|
267
|
-
@ui.output
|
247
|
+
assert_equal "Building native extensions. This could take a while...\n", @ui.output
|
268
248
|
assert_equal '', @ui.error
|
269
249
|
|
270
250
|
assert_equal "No builder for extension ''\n", File.read(gem_make_out)
|
@@ -328,5 +308,4 @@ install:
|
|
328
308
|
|
329
309
|
assert_equal %w[--with-foo-dir=/nonexistent], builder.build_args
|
330
310
|
end
|
331
|
-
|
332
311
|
end unless Gem.java_platform?
|
@@ -3,18 +3,18 @@ require 'rubygems/test_case'
|
|
3
3
|
require 'rubygems/ext'
|
4
4
|
|
5
5
|
class TestGemExtCmakeBuilder < Gem::TestCase
|
6
|
-
|
7
6
|
def setup
|
8
7
|
super
|
9
8
|
|
10
9
|
# Details: https://github.com/rubygems/rubygems/issues/1270#issuecomment-177368340
|
11
10
|
skip "CmakeBuilder doesn't work on Windows." if Gem.win_platform?
|
12
11
|
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
12
|
+
begin
|
13
|
+
_, status = Open3.capture2e('cmake')
|
14
|
+
skip 'cmake not present' unless status.success?
|
15
|
+
rescue Errno::ENOENT
|
16
|
+
skip 'cmake not present'
|
17
|
+
end
|
18
18
|
|
19
19
|
@ext = File.join @tempdir, 'ext'
|
20
20
|
@dest_path = File.join @tempdir, 'prefix'
|
@@ -25,38 +25,34 @@ class TestGemExtCmakeBuilder < Gem::TestCase
|
|
25
25
|
|
26
26
|
def test_self_build
|
27
27
|
File.open File.join(@ext, 'CMakeLists.txt'), 'w' do |cmakelists|
|
28
|
-
cmakelists.write <<-
|
28
|
+
cmakelists.write <<-EO_CMAKE
|
29
29
|
cmake_minimum_required(VERSION 2.6)
|
30
30
|
project(self_build NONE)
|
31
31
|
install (FILES test.txt DESTINATION bin)
|
32
|
-
|
32
|
+
EO_CMAKE
|
33
33
|
end
|
34
34
|
|
35
35
|
FileUtils.touch File.join(@ext, 'test.txt')
|
36
36
|
|
37
37
|
output = []
|
38
38
|
|
39
|
-
|
40
|
-
Gem::Ext::CmakeBuilder.build nil, @dest_path, output
|
41
|
-
end
|
39
|
+
Gem::Ext::CmakeBuilder.build nil, @dest_path, output, [], nil, @ext
|
42
40
|
|
43
41
|
output = output.join "\n"
|
44
42
|
|
45
43
|
assert_match \
|
46
|
-
%r
|
47
|
-
assert_match %r
|
44
|
+
%r{^cmake \. -DCMAKE_INSTALL_PREFIX=#{Regexp.escape @dest_path}}, output
|
45
|
+
assert_match %r{#{Regexp.escape @ext}}, output
|
48
46
|
assert_contains_make_command '', output
|
49
47
|
assert_contains_make_command 'install', output
|
50
|
-
assert_match %r
|
48
|
+
assert_match %r{test\.txt}, output
|
51
49
|
end
|
52
50
|
|
53
51
|
def test_self_build_fail
|
54
52
|
output = []
|
55
53
|
|
56
54
|
error = assert_raises Gem::InstallError do
|
57
|
-
|
58
|
-
Gem::Ext::CmakeBuilder.build nil, @dest_path, output
|
59
|
-
end
|
55
|
+
Gem::Ext::CmakeBuilder.build nil, @dest_path, output, [], nil, @ext
|
60
56
|
end
|
61
57
|
|
62
58
|
output = output.join "\n"
|
@@ -66,8 +62,8 @@ install (FILES test.txt DESTINATION bin)
|
|
66
62
|
|
67
63
|
assert_match 'cmake failed', error.message
|
68
64
|
|
69
|
-
assert_match %r
|
70
|
-
assert_match %r
|
65
|
+
assert_match %r{^#{sh_prefix_cmake}#{Regexp.escape @dest_path}}, output
|
66
|
+
assert_match %r{#{shell_error_msg}}, output
|
71
67
|
end
|
72
68
|
|
73
69
|
def test_self_build_has_makefile
|
@@ -77,14 +73,11 @@ install (FILES test.txt DESTINATION bin)
|
|
77
73
|
|
78
74
|
output = []
|
79
75
|
|
80
|
-
|
81
|
-
Gem::Ext::CmakeBuilder.build nil, @dest_path, output
|
82
|
-
end
|
76
|
+
Gem::Ext::CmakeBuilder.build nil, @dest_path, output, [], nil, @ext
|
83
77
|
|
84
78
|
output = output.join "\n"
|
85
79
|
|
86
80
|
assert_contains_make_command '', output
|
87
81
|
assert_contains_make_command 'install', output
|
88
82
|
end
|
89
|
-
|
90
83
|
end
|
@@ -3,7 +3,6 @@ require 'rubygems/test_case'
|
|
3
3
|
require 'rubygems/ext'
|
4
4
|
|
5
5
|
class TestGemExtConfigureBuilder < Gem::TestCase
|
6
|
-
|
7
6
|
def setup
|
8
7
|
super
|
9
8
|
|
@@ -18,10 +17,6 @@ class TestGemExtConfigureBuilder < Gem::TestCase
|
|
18
17
|
end
|
19
18
|
|
20
19
|
def test_self_build
|
21
|
-
if java_platform? && ENV["CI"]
|
22
|
-
skip("failing on jruby")
|
23
|
-
end
|
24
|
-
|
25
20
|
skip("test_self_build skipped on MS Windows (VC++)") if vc_windows?
|
26
21
|
|
27
22
|
File.open File.join(@ext, './configure'), 'w' do |configure|
|
@@ -30,9 +25,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
|
|
30
25
|
|
31
26
|
output = []
|
32
27
|
|
33
|
-
|
34
|
-
Gem::Ext::ConfigureBuilder.build nil, @dest_path, output
|
35
|
-
end
|
28
|
+
Gem::Ext::ConfigureBuilder.build nil, @dest_path, output, [], nil, @ext
|
36
29
|
|
37
30
|
assert_match(/^current directory:/, output.shift)
|
38
31
|
assert_equal "sh ./configure --prefix=#{@dest_path}", output.shift
|
@@ -49,17 +42,11 @@ class TestGemExtConfigureBuilder < Gem::TestCase
|
|
49
42
|
end
|
50
43
|
|
51
44
|
def test_self_build_fail
|
52
|
-
if java_platform? && ENV["CI"]
|
53
|
-
skip("failing on jruby")
|
54
|
-
end
|
55
|
-
|
56
45
|
skip("test_self_build_fail skipped on MS Windows (VC++)") if vc_windows?
|
57
46
|
output = []
|
58
47
|
|
59
48
|
error = assert_raises Gem::InstallError do
|
60
|
-
|
61
|
-
Gem::Ext::ConfigureBuilder.build nil, @dest_path, output
|
62
|
-
end
|
49
|
+
Gem::Ext::ConfigureBuilder.build nil, @dest_path, output, [], nil, @ext
|
63
50
|
end
|
64
51
|
|
65
52
|
shell_error_msg = %r{(\./configure: .*)|((?:[Cc]an't|cannot) open '?\./configure'?(?:: No such file or directory)?)}
|
@@ -69,7 +56,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
|
|
69
56
|
|
70
57
|
assert_match(/^current directory:/, output.shift)
|
71
58
|
assert_equal "#{sh_prefix_configure}#{@dest_path}", output.shift
|
72
|
-
assert_match %r
|
59
|
+
assert_match %r{#{shell_error_msg}}, output.shift
|
73
60
|
assert_equal true, output.empty?
|
74
61
|
end
|
75
62
|
|
@@ -83,13 +70,10 @@ class TestGemExtConfigureBuilder < Gem::TestCase
|
|
83
70
|
end
|
84
71
|
|
85
72
|
output = []
|
86
|
-
|
87
|
-
Gem::Ext::ConfigureBuilder.build nil, @dest_path, output
|
88
|
-
end
|
73
|
+
Gem::Ext::ConfigureBuilder.build nil, @dest_path, output, [], nil, @ext
|
89
74
|
|
90
75
|
assert_contains_make_command 'clean', output[1]
|
91
76
|
assert_contains_make_command '', output[4]
|
92
77
|
assert_contains_make_command 'install', output[7]
|
93
78
|
end
|
94
|
-
|
95
79
|
end
|