rubygems-update 3.1.4 → 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 +24 -10
- data/History.txt +370 -177
- data/Manifest.txt +43 -77
- data/POLICIES.md +2 -9
- data/README.md +1 -1
- data/Rakefile +42 -80
- 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 +83 -159
- 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 +16 -16
- 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 +3 -3
- 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 +6 -4
- 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 +3 -5
- data/lib/rubygems/resolver/api_specification.rb +20 -7
- 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 +9 -11
- 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 +101 -118
- data/lib/rubygems/specification_policy.rb +79 -29
- 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 +79 -122
- 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 +0 -2
- 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 +82 -79
- 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 +233 -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 +60 -2
- 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 +156 -125
- data/test/rubygems/test_gem_stream_ui.rb +3 -3
- data/test/rubygems/test_gem_stub_specification.rb +4 -6
- 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 +62 -97
- 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 -64
@@ -4,7 +4,6 @@
|
|
4
4
|
# verification.
|
5
5
|
|
6
6
|
class Gem::Security::TrustDir
|
7
|
-
|
8
7
|
##
|
9
8
|
# Default permissions for the trust directory and its contents
|
10
9
|
|
@@ -26,7 +25,7 @@ class Gem::Security::TrustDir
|
|
26
25
|
@dir = dir
|
27
26
|
@permissions = permissions
|
28
27
|
|
29
|
-
@digester = Gem::Security
|
28
|
+
@digester = Gem::Security.create_digest
|
30
29
|
end
|
31
30
|
|
32
31
|
##
|
@@ -115,5 +114,4 @@ class Gem::Security::TrustDir
|
|
115
114
|
FileUtils.mkdir_p @dir, :mode => @permissions[:trust_dir]
|
116
115
|
end
|
117
116
|
end
|
118
|
-
|
119
117
|
end
|
data/lib/rubygems/server.rb
CHANGED
@@ -29,7 +29,6 @@ require 'rubygems/rdoc'
|
|
29
29
|
# TODO Refactor into a real WEBrick servlet to remove code duplication.
|
30
30
|
|
31
31
|
class Gem::Server
|
32
|
-
|
33
32
|
attr_reader :spec_dirs
|
34
33
|
|
35
34
|
include ERB::Util
|
@@ -442,8 +441,8 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
|
|
442
441
|
logger = WEBrick::Log.new nil, WEBrick::BasicLog::FATAL
|
443
442
|
@server = WEBrick::HTTPServer.new :DoNotListen => true, :Logger => logger
|
444
443
|
|
445
|
-
@spec_dirs = @gem_dirs.map {
|
446
|
-
@spec_dirs.reject! {
|
444
|
+
@spec_dirs = @gem_dirs.map {|gem_dir| File.join gem_dir, 'specifications' }
|
445
|
+
@spec_dirs.reject! {|spec_dir| !File.directory? spec_dir }
|
447
446
|
|
448
447
|
reset_gems
|
449
448
|
|
@@ -458,7 +457,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
|
|
458
457
|
|
459
458
|
def uri_encode(str)
|
460
459
|
str.gsub(URI::UNSAFE) do |match|
|
461
|
-
match.each_byte.map {
|
460
|
+
match.each_byte.map {|c| sprintf('%%%02X', c.ord) }.join
|
462
461
|
end
|
463
462
|
end
|
464
463
|
|
@@ -573,7 +572,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
|
|
573
572
|
add_date res
|
574
573
|
|
575
574
|
case req.request_uri.path
|
576
|
-
when %r
|
575
|
+
when %r{^/quick/(Marshal.#{Regexp.escape Gem.marshal_version}/)?(.*?)\.gemspec\.rz$} then
|
577
576
|
marshal_format, full_name = $1, $2
|
578
577
|
specs = Gem::Specification.find_all_by_full_name(full_name)
|
579
578
|
|
@@ -615,11 +614,11 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
|
|
615
614
|
}
|
616
615
|
end
|
617
616
|
|
618
|
-
deps = deps.sort_by {
|
617
|
+
deps = deps.sort_by {|dep| [dep["name"].downcase, dep["version"]] }
|
619
618
|
deps.last["is_last"] = true unless deps.empty?
|
620
619
|
|
621
620
|
# executables
|
622
|
-
executables = spec.executables.sort.collect {
|
621
|
+
executables = spec.executables.sort.collect {|exec| {"executable" => exec} }
|
623
622
|
executables = nil if executables.empty?
|
624
623
|
executables.last["is_last"] = true if executables
|
625
624
|
|
@@ -668,7 +667,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
|
|
668
667
|
"version" => Gem::VERSION,
|
669
668
|
}
|
670
669
|
|
671
|
-
specs = specs.sort_by {
|
670
|
+
specs = specs.sort_by {|spec| [spec["name"].downcase, spec["version"]] }
|
672
671
|
specs.last["is_last"] = true
|
673
672
|
|
674
673
|
# tag all specs with first_name_entry
|
@@ -772,7 +771,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
|
|
772
771
|
doc_items << {
|
773
772
|
:name => base_name,
|
774
773
|
:url => doc_root(new_path),
|
775
|
-
:summary => ''
|
774
|
+
:summary => '',
|
776
775
|
}
|
777
776
|
end
|
778
777
|
|
@@ -869,11 +868,10 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
|
|
869
868
|
listeners = @server.listeners.map{|l| l.addr[2] }
|
870
869
|
|
871
870
|
# TODO: 0.0.0.0 == any, not localhost.
|
872
|
-
host = listeners.any?{|l| l == '0.0.0.0'} ? 'localhost' : listeners.first
|
871
|
+
host = listeners.any?{|l| l == '0.0.0.0' } ? 'localhost' : listeners.first
|
873
872
|
|
874
873
|
say "Launching browser to http://#{host}:#{@port}"
|
875
874
|
|
876
875
|
system("#{@launch} http://#{host}:#{@port}")
|
877
876
|
end
|
878
|
-
|
879
877
|
end
|
data/lib/rubygems/source.rb
CHANGED
@@ -1,5 +1,4 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
autoload :FileUtils, 'fileutils'
|
3
2
|
|
4
3
|
require "rubygems/text"
|
5
4
|
##
|
@@ -9,7 +8,6 @@ require "rubygems/text"
|
|
9
8
|
# bundler dependency API and so-forth.
|
10
9
|
|
11
10
|
class Gem::Source
|
12
|
-
|
13
11
|
include Comparable
|
14
12
|
include Gem::Text
|
15
13
|
|
@@ -81,7 +79,7 @@ class Gem::Source
|
|
81
79
|
def dependency_resolver_set # :nodoc:
|
82
80
|
return Gem::Resolver::IndexSet.new self if 'file' == uri.scheme
|
83
81
|
|
84
|
-
bundler_api_uri = uri + './api/v1/dependencies'
|
82
|
+
bundler_api_uri = enforce_trailing_slash(uri) + './api/v1/dependencies'
|
85
83
|
|
86
84
|
begin
|
87
85
|
fetcher = Gem::RemoteFetcher.fetcher
|
@@ -132,7 +130,7 @@ class Gem::Source
|
|
132
130
|
|
133
131
|
spec_file_name = name_tuple.spec_name
|
134
132
|
|
135
|
-
source_uri = uri + "#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}"
|
133
|
+
source_uri = enforce_trailing_slash(uri) + "#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}"
|
136
134
|
|
137
135
|
cache_dir = cache_dir source_uri
|
138
136
|
|
@@ -176,12 +174,15 @@ class Gem::Source
|
|
176
174
|
file = FILES[type]
|
177
175
|
fetcher = Gem::RemoteFetcher.fetcher
|
178
176
|
file_name = "#{file}.#{Gem.marshal_version}"
|
179
|
-
spec_path = uri + "#{file_name}.gz"
|
177
|
+
spec_path = enforce_trailing_slash(uri) + "#{file_name}.gz"
|
180
178
|
cache_dir = cache_dir spec_path
|
181
179
|
local_file = File.join(cache_dir, file_name)
|
182
180
|
retried = false
|
183
181
|
|
184
|
-
|
182
|
+
if update_cache?
|
183
|
+
require "fileutils"
|
184
|
+
FileUtils.mkdir_p cache_dir
|
185
|
+
end
|
185
186
|
|
186
187
|
spec_dump = fetcher.cache_update_path spec_path, local_file, update_cache?
|
187
188
|
|
@@ -222,9 +223,14 @@ class Gem::Source
|
|
222
223
|
|
223
224
|
def typo_squatting?(host, distance_threshold=4)
|
224
225
|
return if @uri.host.nil?
|
225
|
-
levenshtein_distance(@uri.host, host)
|
226
|
+
levenshtein_distance(@uri.host, host).between? 1, distance_threshold
|
226
227
|
end
|
227
228
|
|
229
|
+
private
|
230
|
+
|
231
|
+
def enforce_trailing_slash(uri)
|
232
|
+
uri.merge(uri.path.gsub(/\/+$/, '') + '/')
|
233
|
+
end
|
228
234
|
end
|
229
235
|
|
230
236
|
require 'rubygems/source/git'
|
data/lib/rubygems/source/git.rb
CHANGED
@@ -1,5 +1,4 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require 'rubygems/util'
|
3
2
|
|
4
3
|
##
|
5
4
|
# A git gem for use in a gem dependencies file.
|
@@ -12,7 +11,6 @@ require 'rubygems/util'
|
|
12
11
|
# source.specs
|
13
12
|
|
14
13
|
class Gem::Source::Git < Gem::Source
|
15
|
-
|
16
14
|
##
|
17
15
|
# The name of the gem created by this git gem.
|
18
16
|
|
@@ -103,9 +101,11 @@ class Gem::Source::Git < Gem::Source
|
|
103
101
|
|
104
102
|
success = system @git, 'reset', '--quiet', '--hard', rev_parse
|
105
103
|
|
106
|
-
|
107
|
-
|
108
|
-
|
104
|
+
if @need_submodules
|
105
|
+
_, status = Open3.capture2e(@git, 'submodule', 'update', '--quiet', '--init', '--recursive')
|
106
|
+
|
107
|
+
success &&= status.success?
|
108
|
+
end
|
109
109
|
|
110
110
|
success
|
111
111
|
end
|
@@ -228,8 +228,8 @@ class Gem::Source::Git < Gem::Source
|
|
228
228
|
require 'digest' # required here to avoid deadlocking in Gem.activate_bin_path (because digest is a gem on 2.5+)
|
229
229
|
|
230
230
|
normalized =
|
231
|
-
if @repository =~ %r
|
232
|
-
uri = URI(@repository).normalize.to_s.sub %r
|
231
|
+
if @repository =~ %r{^\w+://(\w+@)?}
|
232
|
+
uri = URI(@repository).normalize.to_s.sub %r{/$},''
|
233
233
|
uri.sub(/\A(\w+)/) { $1.downcase }
|
234
234
|
else
|
235
235
|
@repository
|
@@ -237,5 +237,4 @@ class Gem::Source::Git < Gem::Source
|
|
237
237
|
|
238
238
|
Digest::SHA1.hexdigest normalized
|
239
239
|
end
|
240
|
-
|
241
240
|
end
|
@@ -3,7 +3,6 @@
|
|
3
3
|
# Represents an installed gem. This is used for dependency resolution.
|
4
4
|
|
5
5
|
class Gem::Source::Installed < Gem::Source
|
6
|
-
|
7
6
|
def initialize # :nodoc:
|
8
7
|
@uri = nil
|
9
8
|
end
|
@@ -36,5 +35,4 @@ class Gem::Source::Installed < Gem::Source
|
|
36
35
|
def pretty_print(q) # :nodoc:
|
37
36
|
q.text '[Installed]'
|
38
37
|
end
|
39
|
-
|
40
38
|
end
|
@@ -4,7 +4,6 @@
|
|
4
4
|
# dependencies.
|
5
5
|
|
6
6
|
class Gem::Source::Local < Gem::Source
|
7
|
-
|
8
7
|
def initialize # :nodoc:
|
9
8
|
@specs = nil
|
10
9
|
@api_uri = nil
|
@@ -61,7 +60,7 @@ class Gem::Source::Local < Gem::Source
|
|
61
60
|
when :latest
|
62
61
|
tup = pkg.spec.name_tuple
|
63
62
|
|
64
|
-
cur = names.find {
|
63
|
+
cur = names.find {|x| x.name == tup.name }
|
65
64
|
if !cur
|
66
65
|
names << tup
|
67
66
|
elsif cur.version < tup.version
|
@@ -98,7 +97,7 @@ class Gem::Source::Local < Gem::Source
|
|
98
97
|
end
|
99
98
|
end
|
100
99
|
|
101
|
-
found.max_by {
|
100
|
+
found.max_by {|s| s.version }
|
102
101
|
end
|
103
102
|
|
104
103
|
def fetch_spec(name) # :nodoc:
|
@@ -129,5 +128,4 @@ class Gem::Source::Local < Gem::Source
|
|
129
128
|
end
|
130
129
|
end
|
131
130
|
end
|
132
|
-
|
133
131
|
end
|
data/lib/rubygems/source/lock.rb
CHANGED
@@ -3,7 +3,6 @@
|
|
3
3
|
# This represents a vendored source that is similar to an installed gem.
|
4
4
|
|
5
5
|
class Gem::Source::Vendor < Gem::Source::Installed
|
6
|
-
|
7
6
|
##
|
8
7
|
# Creates a new Vendor source for a gem that was unpacked at +path+.
|
9
8
|
|
@@ -23,5 +22,4 @@ class Gem::Source::Vendor < Gem::Source::Installed
|
|
23
22
|
nil
|
24
23
|
end
|
25
24
|
end
|
26
|
-
|
27
25
|
end
|
data/lib/rubygems/source_list.rb
CHANGED
@@ -1,5 +1,4 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require 'rubygems/source'
|
3
2
|
|
4
3
|
##
|
5
4
|
# The SourceList represents the sources rubygems has been configured to use.
|
@@ -15,7 +14,6 @@ require 'rubygems/source'
|
|
15
14
|
# The most common way to get a SourceList is Gem.sources.
|
16
15
|
|
17
16
|
class Gem::SourceList
|
18
|
-
|
19
17
|
include Enumerable
|
20
18
|
|
21
19
|
##
|
@@ -90,7 +88,7 @@ class Gem::SourceList
|
|
90
88
|
# Yields each source URI in the list.
|
91
89
|
|
92
90
|
def each
|
93
|
-
@sources.each {
|
91
|
+
@sources.each {|s| yield s.uri.to_s }
|
94
92
|
end
|
95
93
|
|
96
94
|
##
|
@@ -115,7 +113,7 @@ class Gem::SourceList
|
|
115
113
|
# Returns an Array of source URI Strings.
|
116
114
|
|
117
115
|
def to_a
|
118
|
-
@sources.map {
|
116
|
+
@sources.map {|x| x.uri.to_s }
|
119
117
|
end
|
120
118
|
|
121
119
|
alias_method :to_ary, :to_a
|
@@ -135,7 +133,7 @@ class Gem::SourceList
|
|
135
133
|
if other.kind_of? Gem::Source
|
136
134
|
@sources.include? other
|
137
135
|
else
|
138
|
-
@sources.find {
|
136
|
+
@sources.find {|x| x.uri.to_s == other.to_s }
|
139
137
|
end
|
140
138
|
end
|
141
139
|
|
@@ -146,8 +144,7 @@ class Gem::SourceList
|
|
146
144
|
if source.kind_of? Gem::Source
|
147
145
|
@sources.delete source
|
148
146
|
else
|
149
|
-
@sources.delete_if {
|
147
|
+
@sources.delete_if {|x| x.uri.to_s == source.to_s }
|
150
148
|
end
|
151
149
|
end
|
152
|
-
|
153
150
|
end
|
@@ -9,7 +9,6 @@ require 'rubygems/name_tuple'
|
|
9
9
|
# SpecFetcher handles metadata updates from remote gem repositories.
|
10
10
|
|
11
11
|
class Gem::SpecFetcher
|
12
|
-
|
13
12
|
include Gem::UserInteraction
|
14
13
|
include Gem::Text
|
15
14
|
|
@@ -92,14 +91,14 @@ class Gem::SpecFetcher
|
|
92
91
|
|
93
92
|
list.each do |source, specs|
|
94
93
|
if dependency.name.is_a?(String) && specs.respond_to?(:bsearch)
|
95
|
-
start_index = (0 ... specs.length).bsearch{
|
96
|
-
end_index = (0 ... specs.length).bsearch{
|
94
|
+
start_index = (0 ... specs.length).bsearch{|i| specs[i].name >= dependency.name }
|
95
|
+
end_index = (0 ... specs.length).bsearch{|i| specs[i].name > dependency.name }
|
97
96
|
specs = specs[start_index ... end_index] if start_index && end_index
|
98
97
|
end
|
99
98
|
|
100
99
|
found[source] = specs.select do |tup|
|
101
100
|
if dependency.match?(tup)
|
102
|
-
if matching_platform and !Gem::Platform.
|
101
|
+
if matching_platform and !Gem::Platform.match_gem?(tup.platform, tup.name)
|
103
102
|
pm = (
|
104
103
|
rejected_specs[dependency] ||= \
|
105
104
|
Gem::PlatformMismatch.new(tup.name, tup.version))
|
@@ -122,7 +121,7 @@ class Gem::SpecFetcher
|
|
122
121
|
end
|
123
122
|
end
|
124
123
|
|
125
|
-
tuples = tuples.sort_by {
|
124
|
+
tuples = tuples.sort_by {|x| x[0] }
|
126
125
|
|
127
126
|
return [tuples, errors]
|
128
127
|
end
|
@@ -171,30 +170,33 @@ class Gem::SpecFetcher
|
|
171
170
|
# Suggests gems based on the supplied +gem_name+. Returns an array of
|
172
171
|
# alternative gem names.
|
173
172
|
|
174
|
-
def suggest_gems_from_name(gem_name, type = :latest)
|
173
|
+
def suggest_gems_from_name(gem_name, type = :latest, num_results = 5)
|
175
174
|
gem_name = gem_name.downcase.tr('_-', '')
|
176
175
|
max = gem_name.size / 2
|
177
176
|
names = available_specs(type).first.values.flatten(1)
|
178
177
|
|
179
178
|
matches = names.map do |n|
|
180
179
|
next unless n.match_platform?
|
181
|
-
|
182
|
-
distance = levenshtein_distance gem_name, n.name.downcase.tr('_-', '')
|
183
|
-
|
184
|
-
next if distance >= max
|
185
|
-
|
186
|
-
return [n.name] if distance == 0
|
187
|
-
|
188
|
-
[n.name, distance]
|
180
|
+
[n.name, 0] if n.name.downcase.tr('_-', '').include?(gem_name)
|
189
181
|
end.compact
|
190
182
|
|
183
|
+
if matches.length < num_results
|
184
|
+
matches += names.map do |n|
|
185
|
+
next unless n.match_platform?
|
186
|
+
distance = levenshtein_distance gem_name, n.name.downcase.tr('_-', '')
|
187
|
+
next if distance >= max
|
188
|
+
return [n.name] if distance == 0
|
189
|
+
[n.name, distance]
|
190
|
+
end.compact
|
191
|
+
end
|
192
|
+
|
191
193
|
matches = if matches.empty? && type != :prerelease
|
192
194
|
suggest_gems_from_name gem_name, :prerelease
|
193
195
|
else
|
194
|
-
matches.uniq.sort_by {
|
196
|
+
matches.uniq.sort_by {|name, dist| dist }
|
195
197
|
end
|
196
198
|
|
197
|
-
matches.
|
199
|
+
matches.map {|name, dist| name }.uniq.first(num_results)
|
198
200
|
end
|
199
201
|
|
200
202
|
##
|
@@ -251,10 +253,9 @@ class Gem::SpecFetcher
|
|
251
253
|
|
252
254
|
def tuples_for(source, type, gracefully_ignore=false) # :nodoc:
|
253
255
|
@caches[type][source.uri] ||=
|
254
|
-
source.load_specs(type).sort_by {
|
256
|
+
source.load_specs(type).sort_by {|tup| tup.name }
|
255
257
|
rescue Gem::RemoteFetcher::FetchError
|
256
258
|
raise unless gracefully_ignore
|
257
259
|
[]
|
258
260
|
end
|
259
|
-
|
260
261
|
end
|
@@ -6,9 +6,6 @@
|
|
6
6
|
# See LICENSE.txt for permissions.
|
7
7
|
#++
|
8
8
|
|
9
|
-
require 'rubygems/version'
|
10
|
-
require 'rubygems/requirement'
|
11
|
-
require 'rubygems/platform'
|
12
9
|
require 'rubygems/deprecate'
|
13
10
|
require 'rubygems/basic_specification'
|
14
11
|
require 'rubygems/stub_specification'
|
@@ -37,7 +34,6 @@ require 'rubygems/util/list'
|
|
37
34
|
# items you may add to a specification.
|
38
35
|
|
39
36
|
class Gem::Specification < Gem::BasicSpecification
|
40
|
-
|
41
37
|
extend Gem::Deprecate
|
42
38
|
|
43
39
|
# REFACTOR: Consider breaking out this version stuff into a separate
|
@@ -81,18 +77,18 @@ class Gem::Specification < Gem::BasicSpecification
|
|
81
77
|
-1 => ['(RubyGems versions up to and including 0.7 did not have versioned specifications)'],
|
82
78
|
1 => [
|
83
79
|
'Deprecated "test_suite_file" in favor of the new, but equivalent, "test_files"',
|
84
|
-
'"test_file=x" is a shortcut for "test_files=[x]"'
|
80
|
+
'"test_file=x" is a shortcut for "test_files=[x]"',
|
85
81
|
],
|
86
82
|
2 => [
|
87
83
|
'Added "required_rubygems_version"',
|
88
84
|
'Now forward-compatible with future versions',
|
89
85
|
],
|
90
86
|
3 => [
|
91
|
-
'Added Fixnum validation to the specification_version'
|
87
|
+
'Added Fixnum validation to the specification_version',
|
92
88
|
],
|
93
89
|
4 => [
|
94
|
-
'Added sandboxed freeform metadata to the specification version.'
|
95
|
-
]
|
90
|
+
'Added sandboxed freeform metadata to the specification version.',
|
91
|
+
],
|
96
92
|
}.freeze
|
97
93
|
|
98
94
|
MARSHAL_FIELDS = { # :nodoc:
|
@@ -180,8 +176,8 @@ class Gem::Specification < Gem::BasicSpecification
|
|
180
176
|
end
|
181
177
|
end
|
182
178
|
|
183
|
-
@@attributes = @@default_value.keys.sort_by {
|
184
|
-
@@array_attributes = @@default_value.reject {
|
179
|
+
@@attributes = @@default_value.keys.sort_by {|s| s.to_s }
|
180
|
+
@@array_attributes = @@default_value.reject {|k,v| v != [] }.keys
|
185
181
|
@@nil_attributes, @@non_nil_attributes = @@default_value.keys.partition do |k|
|
186
182
|
@@default_value[k].nil?
|
187
183
|
end
|
@@ -249,12 +245,11 @@ class Gem::Specification < Gem::BasicSpecification
|
|
249
245
|
# require 'rake'
|
250
246
|
# spec.files = FileList['lib/**/*.rb',
|
251
247
|
# 'bin/*',
|
252
|
-
# '[A-Z]*'
|
253
|
-
# 'test/**/*'].to_a
|
248
|
+
# '[A-Z]*'].to_a
|
254
249
|
#
|
255
250
|
# # or without Rake...
|
256
251
|
# spec.files = Dir['lib/**/*.rb'] + Dir['bin/*']
|
257
|
-
# spec.files += Dir['[A-Z]*']
|
252
|
+
# spec.files += Dir['[A-Z]*']
|
258
253
|
# spec.files.reject! { |fn| fn.include? "CVS" }
|
259
254
|
|
260
255
|
def files
|
@@ -390,6 +385,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
390
385
|
# "mailing_list_uri" => "https://groups.example.com/bestgemever",
|
391
386
|
# "source_code_uri" => "https://example.com/user/bestgemever",
|
392
387
|
# "wiki_uri" => "https://example.com/user/bestgemever/wiki"
|
388
|
+
# "funding_uri" => "https://example.com/donate"
|
393
389
|
# }
|
394
390
|
#
|
395
391
|
# These links will be used on your gem's page on rubygems.org and must pass
|
@@ -560,6 +556,10 @@ class Gem::Specification < Gem::BasicSpecification
|
|
560
556
|
# spec.add_runtime_dependency 'example', '~> 1.1', '>= 1.1.4'
|
561
557
|
|
562
558
|
def add_runtime_dependency(gem, *requirements)
|
559
|
+
if requirements.uniq.size != requirements.size
|
560
|
+
warn "WARNING: duplicated #{gem} dependency #{requirements}"
|
561
|
+
end
|
562
|
+
|
563
563
|
add_dependency_with_type(gem, :runtime, requirements)
|
564
564
|
end
|
565
565
|
|
@@ -725,7 +725,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
725
725
|
# Deprecated: You must now specify the executable name to Gem.bin_path.
|
726
726
|
|
727
727
|
attr_writer :default_executable
|
728
|
-
|
728
|
+
rubygems_deprecate :default_executable=
|
729
729
|
|
730
730
|
##
|
731
731
|
# Allows deinstallation of gems with legacy platforms.
|
@@ -746,8 +746,8 @@ class Gem::Specification < Gem::BasicSpecification
|
|
746
746
|
# After a reset, make sure already loaded specs
|
747
747
|
# are still marked as activated.
|
748
748
|
specs = {}
|
749
|
-
Gem.loaded_specs.each_value{|s| specs[s] = true}
|
750
|
-
@@all.each{|s| s.activated = true if specs[s]}
|
749
|
+
Gem.loaded_specs.each_value{|s| specs[s] = true }
|
750
|
+
@@all.each{|s| s.activated = true if specs[s] }
|
751
751
|
end
|
752
752
|
@@all
|
753
753
|
end
|
@@ -767,7 +767,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
767
767
|
end
|
768
768
|
|
769
769
|
def self.gemspec_stubs_in(dir, pattern)
|
770
|
-
Gem::Util.glob_files_in_dir(pattern, dir).map {
|
770
|
+
Gem::Util.glob_files_in_dir(pattern, dir).map {|path| yield path }.select(&:valid?)
|
771
771
|
end
|
772
772
|
private_class_method :gemspec_stubs_in
|
773
773
|
|
@@ -782,21 +782,11 @@ class Gem::Specification < Gem::BasicSpecification
|
|
782
782
|
dirs.flat_map do |dir|
|
783
783
|
base_dir = File.dirname dir
|
784
784
|
gems_dir = File.join base_dir, "gems"
|
785
|
-
gemspec_stubs_in(dir, pattern) {
|
785
|
+
gemspec_stubs_in(dir, pattern) {|path| yield path, base_dir, gems_dir }
|
786
786
|
end
|
787
787
|
end
|
788
788
|
private_class_method :map_stubs
|
789
789
|
|
790
|
-
def self.uniq_by(list, &block) # :nodoc:
|
791
|
-
list.uniq(&block)
|
792
|
-
end
|
793
|
-
private_class_method :uniq_by
|
794
|
-
|
795
|
-
def self.sort_by!(list, &block)
|
796
|
-
list.sort_by!(&block)
|
797
|
-
end
|
798
|
-
private_class_method :sort_by!
|
799
|
-
|
800
790
|
def self.each_spec(dirs) # :nodoc:
|
801
791
|
each_gemspec(dirs) do |path|
|
802
792
|
spec = self.load path
|
@@ -810,11 +800,11 @@ class Gem::Specification < Gem::BasicSpecification
|
|
810
800
|
def self.stubs
|
811
801
|
@@stubs ||= begin
|
812
802
|
pattern = "*.gemspec"
|
813
|
-
stubs =
|
814
|
-
stubs =
|
803
|
+
stubs = installed_stubs(dirs, pattern) + default_stubs(pattern)
|
804
|
+
stubs = stubs.uniq {|stub| stub.full_name }
|
815
805
|
|
816
806
|
_resort!(stubs)
|
817
|
-
@@stubs_by_name = stubs.select {
|
807
|
+
@@stubs_by_name = stubs.select {|s| Gem::Platform.match_spec? s }.group_by(&:name)
|
818
808
|
stubs
|
819
809
|
end
|
820
810
|
end
|
@@ -837,15 +827,13 @@ class Gem::Specification < Gem::BasicSpecification
|
|
837
827
|
# only returns stubs that match Gem.platforms
|
838
828
|
|
839
829
|
def self.stubs_for(name)
|
840
|
-
if @@
|
841
|
-
@@stubs_by_name[name]
|
830
|
+
if @@stubs_by_name[name]
|
831
|
+
@@stubs_by_name[name]
|
842
832
|
else
|
843
833
|
pattern = "#{name}-*.gemspec"
|
844
|
-
stubs = Gem.
|
845
|
-
|
846
|
-
|
847
|
-
stubs = uniq_by(stubs) { |stub| stub.full_name }.group_by(&:name)
|
848
|
-
stubs.each_value { |v| _resort!(v) }
|
834
|
+
stubs = installed_stubs(dirs, pattern).select {|s| Gem::Platform.match_spec? s } + default_stubs(pattern)
|
835
|
+
stubs = stubs.uniq {|stub| stub.full_name }.group_by(&:name)
|
836
|
+
stubs.each_value {|v| _resort!(v) }
|
849
837
|
|
850
838
|
@@stubs_by_name.merge! stubs
|
851
839
|
@@stubs_by_name[name] ||= EMPTY
|
@@ -939,7 +927,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
939
927
|
def self.dirs=(dirs)
|
940
928
|
self.reset
|
941
929
|
|
942
|
-
@@dirs = Array(dirs).map {
|
930
|
+
@@dirs = Array(dirs).map {|dir| File.join dir, "specifications" }
|
943
931
|
end
|
944
932
|
|
945
933
|
extend Enumerable
|
@@ -1022,10 +1010,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1022
1010
|
# Return currently unresolved specs that contain the file matching +path+.
|
1023
1011
|
|
1024
1012
|
def self.find_in_unresolved(path)
|
1025
|
-
|
1026
|
-
specs = unresolved_deps.values.map { |dep| dep.to_specs }.flatten
|
1027
|
-
|
1028
|
-
specs.find_all { |spec| spec.contains_requirable_file? path }
|
1013
|
+
unresolved_specs.find_all {|spec| spec.contains_requirable_file? path }
|
1029
1014
|
end
|
1030
1015
|
|
1031
1016
|
##
|
@@ -1033,9 +1018,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1033
1018
|
# specs that contain the file matching +path+.
|
1034
1019
|
|
1035
1020
|
def self.find_in_unresolved_tree(path)
|
1036
|
-
|
1037
|
-
|
1038
|
-
specs.each do |spec|
|
1021
|
+
unresolved_specs.each do |spec|
|
1039
1022
|
spec.traverse do |from_spec, dep, to_spec, trail|
|
1040
1023
|
if to_spec.has_conflicts? || to_spec.conficts_when_loaded_with?(trail)
|
1041
1024
|
:next
|
@@ -1048,6 +1031,11 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1048
1031
|
[]
|
1049
1032
|
end
|
1050
1033
|
|
1034
|
+
def self.unresolved_specs
|
1035
|
+
unresolved_deps.values.map {|dep| dep.to_specs }.flatten
|
1036
|
+
end
|
1037
|
+
private_class_method :unresolved_specs
|
1038
|
+
|
1051
1039
|
##
|
1052
1040
|
# Special loader for YAML files. When a Specification object is loaded
|
1053
1041
|
# from a YAML file, it bypasses the normal Ruby object initialization
|
@@ -1084,8 +1072,15 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1084
1072
|
_latest_specs Gem::Specification._all, prerelease
|
1085
1073
|
end
|
1086
1074
|
|
1075
|
+
##
|
1076
|
+
# Return the latest installed spec for gem +name+.
|
1077
|
+
|
1078
|
+
def self.latest_spec_for(name)
|
1079
|
+
latest_specs(true).find {|installed_spec| installed_spec.name == name }
|
1080
|
+
end
|
1081
|
+
|
1087
1082
|
def self._latest_specs(specs, prerelease = false) # :nodoc:
|
1088
|
-
result = Hash.new {
|
1083
|
+
result = Hash.new {|h,k| h[k] = {} }
|
1089
1084
|
native = {}
|
1090
1085
|
|
1091
1086
|
specs.reverse_each do |spec|
|
@@ -1098,7 +1093,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1098
1093
|
result.map(&:last).map(&:values).flatten.reject do |spec|
|
1099
1094
|
minimum = native[spec.name]
|
1100
1095
|
minimum && spec.version < minimum
|
1101
|
-
end.sort_by{
|
1096
|
+
end.sort_by{|tup| tup.name }
|
1102
1097
|
end
|
1103
1098
|
|
1104
1099
|
##
|
@@ -1155,7 +1150,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1155
1150
|
|
1156
1151
|
def self.normalize_yaml_input(input)
|
1157
1152
|
result = input.respond_to?(:read) ? input.read : input
|
1158
|
-
result = "--- " + result unless result
|
1153
|
+
result = "--- " + result unless result.start_with?("--- ")
|
1159
1154
|
result = result.dup
|
1160
1155
|
result.gsub!(/ !!null \n/, " \n")
|
1161
1156
|
# date: 2011-04-26 00:00:00.000000000Z
|
@@ -1172,7 +1167,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1172
1167
|
# version as well.
|
1173
1168
|
|
1174
1169
|
def self.outdated
|
1175
|
-
outdated_and_latest_version.map {
|
1170
|
+
outdated_and_latest_version.map {|local, _| local.name }
|
1176
1171
|
end
|
1177
1172
|
|
1178
1173
|
##
|
@@ -1193,7 +1188,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1193
1188
|
Gem::Dependency.new local_spec.name, ">= #{local_spec.version}"
|
1194
1189
|
|
1195
1190
|
remotes, = fetcher.search_for_dependency dependency
|
1196
|
-
remotes = remotes.map {
|
1191
|
+
remotes = remotes.map {|n, _| n.version }
|
1197
1192
|
|
1198
1193
|
latest_remote = remotes.sort.last
|
1199
1194
|
|
@@ -1224,7 +1219,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1224
1219
|
|
1225
1220
|
def self.reset
|
1226
1221
|
@@dirs = nil
|
1227
|
-
Gem.pre_reset_hooks.each {
|
1222
|
+
Gem.pre_reset_hooks.each {|hook| hook.call }
|
1228
1223
|
@@all = nil
|
1229
1224
|
@@stubs = nil
|
1230
1225
|
@@stubs_by_name = {}
|
@@ -1241,19 +1236,19 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1241
1236
|
versions = find_all_by_name(dep.name)
|
1242
1237
|
unless versions.empty?
|
1243
1238
|
warn " Available/installed versions of this gem:"
|
1244
|
-
versions.each {
|
1239
|
+
versions.each {|s| warn " - #{s.version}" }
|
1245
1240
|
end
|
1246
1241
|
end
|
1247
1242
|
warn "#{w}: Clearing out unresolved specs. Try 'gem cleanup <gem>'"
|
1248
1243
|
warn "Please report a bug if this causes problems."
|
1249
1244
|
unresolved.clear
|
1250
1245
|
end
|
1251
|
-
Gem.post_reset_hooks.each {
|
1246
|
+
Gem.post_reset_hooks.each {|hook| hook.call }
|
1252
1247
|
end
|
1253
1248
|
|
1254
1249
|
# DOC: This method needs documented or nodoc'd
|
1255
1250
|
def self.unresolved_deps
|
1256
|
-
@unresolved_deps ||= Hash.new {
|
1251
|
+
@unresolved_deps ||= Hash.new {|h, n| h[n] = Gem::Dependency.new n }
|
1257
1252
|
end
|
1258
1253
|
|
1259
1254
|
##
|
@@ -1284,7 +1279,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1284
1279
|
# Cleanup any YAML::PrivateType. They only show up for an old bug
|
1285
1280
|
# where nil => null, so just convert them to nil based on the type.
|
1286
1281
|
|
1287
|
-
array.map! {
|
1282
|
+
array.map! {|e| e.kind_of?(YAML::PrivateType) ? nil : e }
|
1288
1283
|
|
1289
1284
|
spec.instance_variable_set :@rubygems_version, array[0]
|
1290
1285
|
# spec version
|
@@ -1349,7 +1344,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1349
1344
|
true, # has_rdoc
|
1350
1345
|
@new_platform,
|
1351
1346
|
@licenses,
|
1352
|
-
@metadata
|
1347
|
+
@metadata,
|
1353
1348
|
]
|
1354
1349
|
end
|
1355
1350
|
|
@@ -1397,7 +1392,11 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1397
1392
|
raise e
|
1398
1393
|
end
|
1399
1394
|
|
1400
|
-
|
1395
|
+
begin
|
1396
|
+
specs = spec_dep.to_specs
|
1397
|
+
rescue Gem::MissingSpecError => e
|
1398
|
+
raise Gem::MissingSpecError.new(e.name, e.requirement, "at: #{self.spec_file}")
|
1399
|
+
end
|
1401
1400
|
|
1402
1401
|
if specs.size == 1
|
1403
1402
|
specs.first.activate
|
@@ -1433,7 +1432,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1433
1432
|
self.summary = sanitize_string(summary)
|
1434
1433
|
self.description = sanitize_string(description)
|
1435
1434
|
self.post_install_message = sanitize_string(post_install_message)
|
1436
|
-
self.authors = authors.collect {
|
1435
|
+
self.authors = authors.collect {|a| sanitize_string(a) }
|
1437
1436
|
end
|
1438
1437
|
|
1439
1438
|
##
|
@@ -1445,13 +1444,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1445
1444
|
# HACK the #to_s is in here because RSpec has an Array of Arrays of
|
1446
1445
|
# Strings for authors. Need a way to disallow bad values on gemspec
|
1447
1446
|
# generation. (Probably won't happen.)
|
1448
|
-
string
|
1449
|
-
|
1450
|
-
begin
|
1451
|
-
Builder::XChar.encode string
|
1452
|
-
rescue NameError, NoMethodError
|
1453
|
-
string.to_xs
|
1454
|
-
end
|
1447
|
+
string.to_s
|
1455
1448
|
end
|
1456
1449
|
|
1457
1450
|
##
|
@@ -1462,7 +1455,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1462
1455
|
return nil if executables.nil?
|
1463
1456
|
|
1464
1457
|
if @bindir
|
1465
|
-
Array(executables).map {
|
1458
|
+
Array(executables).map {|e| File.join(@bindir, e) }
|
1466
1459
|
else
|
1467
1460
|
executables
|
1468
1461
|
end
|
@@ -1544,7 +1537,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1544
1537
|
def build_args
|
1545
1538
|
if File.exist? build_info_file
|
1546
1539
|
build_info = File.readlines build_info_file
|
1547
|
-
build_info = build_info.map {
|
1540
|
+
build_info = build_info.map {|x| x.strip }
|
1548
1541
|
build_info.delete ""
|
1549
1542
|
build_info
|
1550
1543
|
else
|
@@ -1636,7 +1629,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1636
1629
|
|
1637
1630
|
def conficts_when_loaded_with?(list_of_specs) # :nodoc:
|
1638
1631
|
result = list_of_specs.any? do |spec|
|
1639
|
-
spec.dependencies.any? {
|
1632
|
+
spec.dependencies.any? {|dep| dep.runtime? && (dep.name == name) && !satisfies_requirement?(dep) }
|
1640
1633
|
end
|
1641
1634
|
result
|
1642
1635
|
end
|
@@ -1725,7 +1718,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1725
1718
|
end
|
1726
1719
|
result
|
1727
1720
|
end
|
1728
|
-
|
1721
|
+
rubygems_deprecate :default_executable
|
1729
1722
|
|
1730
1723
|
##
|
1731
1724
|
# The default value for specification attribute +name+
|
@@ -1750,10 +1743,11 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1750
1743
|
#
|
1751
1744
|
# [depending_gem, dependency, [list_of_gems_that_satisfy_dependency]]
|
1752
1745
|
|
1753
|
-
def dependent_gems
|
1746
|
+
def dependent_gems(check_dev=true)
|
1754
1747
|
out = []
|
1755
1748
|
Gem::Specification.each do |spec|
|
1756
|
-
spec.dependencies
|
1749
|
+
deps = check_dev ? spec.dependencies : spec.runtime_dependencies
|
1750
|
+
deps.each do |dep|
|
1757
1751
|
if self.satisfies_requirement?(dep)
|
1758
1752
|
sats = []
|
1759
1753
|
find_all_satisfiers(dep) do |sat|
|
@@ -1770,7 +1764,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1770
1764
|
# Returns all specs that matches this spec's runtime dependencies.
|
1771
1765
|
|
1772
1766
|
def dependent_specs
|
1773
|
-
runtime_dependencies.map {
|
1767
|
+
runtime_dependencies.map {|dep| dep.to_specs }.flatten
|
1774
1768
|
end
|
1775
1769
|
|
1776
1770
|
##
|
@@ -1784,7 +1778,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1784
1778
|
# List of dependencies that are used for development
|
1785
1779
|
|
1786
1780
|
def development_dependencies
|
1787
|
-
dependencies.select {
|
1781
|
+
dependencies.select {|d| d.type == :development }
|
1788
1782
|
end
|
1789
1783
|
|
1790
1784
|
##
|
@@ -1845,29 +1839,23 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1845
1839
|
end
|
1846
1840
|
|
1847
1841
|
##
|
1848
|
-
# Sets executables to +value+, ensuring it is an array.
|
1849
|
-
# use this, push onto the array instead.
|
1842
|
+
# Sets executables to +value+, ensuring it is an array.
|
1850
1843
|
|
1851
1844
|
def executables=(value)
|
1852
|
-
# TODO: warn about setting instead of pushing
|
1853
1845
|
@executables = Array(value)
|
1854
1846
|
end
|
1855
1847
|
|
1856
1848
|
##
|
1857
|
-
# Sets extensions to +extensions+, ensuring it is an array.
|
1858
|
-
# use this, push onto the array instead.
|
1849
|
+
# Sets extensions to +extensions+, ensuring it is an array.
|
1859
1850
|
|
1860
1851
|
def extensions=(extensions)
|
1861
|
-
# TODO: warn about setting instead of pushing
|
1862
1852
|
@extensions = Array extensions
|
1863
1853
|
end
|
1864
1854
|
|
1865
1855
|
##
|
1866
|
-
# Sets extra_rdoc_files to +files+, ensuring it is an array.
|
1867
|
-
# use this, push onto the array instead.
|
1856
|
+
# Sets extra_rdoc_files to +files+, ensuring it is an array.
|
1868
1857
|
|
1869
1858
|
def extra_rdoc_files=(files)
|
1870
|
-
# TODO: warn about setting instead of pushing
|
1871
1859
|
@extra_rdoc_files = Array files
|
1872
1860
|
end
|
1873
1861
|
|
@@ -1933,7 +1921,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1933
1921
|
def has_rdoc # :nodoc:
|
1934
1922
|
true
|
1935
1923
|
end
|
1936
|
-
|
1924
|
+
rubygems_deprecate :has_rdoc
|
1937
1925
|
|
1938
1926
|
##
|
1939
1927
|
# Deprecated and ignored.
|
@@ -1943,10 +1931,10 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1943
1931
|
def has_rdoc=(ignored) # :nodoc:
|
1944
1932
|
@has_rdoc = true
|
1945
1933
|
end
|
1946
|
-
|
1934
|
+
rubygems_deprecate :has_rdoc=
|
1947
1935
|
|
1948
1936
|
alias :has_rdoc? :has_rdoc # :nodoc:
|
1949
|
-
|
1937
|
+
rubygems_deprecate :has_rdoc?
|
1950
1938
|
|
1951
1939
|
##
|
1952
1940
|
# True if this gem has files in test_files
|
@@ -1968,7 +1956,9 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1968
1956
|
yaml_initialize coder.tag, coder.map
|
1969
1957
|
end
|
1970
1958
|
|
1971
|
-
eval <<-
|
1959
|
+
eval <<-RUBY, binding, __FILE__, __LINE__ + 1
|
1960
|
+
# frozen_string_literal: true
|
1961
|
+
|
1972
1962
|
def set_nil_attributes_to_nil
|
1973
1963
|
#{@@nil_attributes.map {|key| "@#{key} = nil" }.join "; "}
|
1974
1964
|
end
|
@@ -1978,7 +1968,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1978
1968
|
#{@@non_nil_attributes.map {|key| "@#{key} = #{INITIALIZE_CODE_FOR_DEFAULTS[key]}" }.join ";"}
|
1979
1969
|
end
|
1980
1970
|
private :set_not_nil_attributes_to_default_values
|
1981
|
-
|
1971
|
+
RUBY
|
1982
1972
|
|
1983
1973
|
##
|
1984
1974
|
# Specification constructor. Assigns the default values to the attributes
|
@@ -2003,6 +1993,10 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2003
1993
|
self.name = name if name
|
2004
1994
|
self.version = version if version
|
2005
1995
|
|
1996
|
+
if platform = Gem.platforms.last and platform != Gem::Platform::RUBY and platform != Gem::Platform.local
|
1997
|
+
self.platform = platform
|
1998
|
+
end
|
1999
|
+
|
2006
2000
|
yield self if block_given?
|
2007
2001
|
end
|
2008
2002
|
|
@@ -2115,7 +2109,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2115
2109
|
end
|
2116
2110
|
|
2117
2111
|
if @specification_version > CURRENT_SPECIFICATION_VERSION and
|
2118
|
-
sym.to_s
|
2112
|
+
sym.to_s.end_with?("=")
|
2119
2113
|
warn "ignoring #{sym} loading #{full_name}" if $DEBUG
|
2120
2114
|
else
|
2121
2115
|
super
|
@@ -2199,7 +2193,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2199
2193
|
|
2200
2194
|
attributes.each do |attr_name|
|
2201
2195
|
current_value = self.send attr_name
|
2202
|
-
current_value = current_value.sort if %i
|
2196
|
+
current_value = current_value.sort if %i[files test_files].include? attr_name
|
2203
2197
|
if current_value != default_value(attr_name) or
|
2204
2198
|
self.class.required_attribute? attr_name
|
2205
2199
|
|
@@ -2249,11 +2243,9 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2249
2243
|
end
|
2250
2244
|
|
2251
2245
|
##
|
2252
|
-
# Sets rdoc_options to +value+, ensuring it is an array.
|
2253
|
-
# use this, push onto the array instead.
|
2246
|
+
# Sets rdoc_options to +value+, ensuring it is an array.
|
2254
2247
|
|
2255
2248
|
def rdoc_options=(options)
|
2256
|
-
# TODO: warn about setting instead of pushing
|
2257
2249
|
@rdoc_options = Array options
|
2258
2250
|
end
|
2259
2251
|
|
@@ -2272,11 +2264,9 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2272
2264
|
end
|
2273
2265
|
|
2274
2266
|
##
|
2275
|
-
# Set requirements to +req+, ensuring it is an array.
|
2276
|
-
# use this, push onto the array instead.
|
2267
|
+
# Set requirements to +req+, ensuring it is an array.
|
2277
2268
|
|
2278
2269
|
def requirements=(req)
|
2279
|
-
# TODO: warn about setting instead of pushing
|
2280
2270
|
@requirements = Array req
|
2281
2271
|
end
|
2282
2272
|
|
@@ -2298,9 +2288,9 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2298
2288
|
def ruby_code(obj)
|
2299
2289
|
case obj
|
2300
2290
|
when String then obj.dump + ".freeze"
|
2301
|
-
when Array then '[' + obj.map {
|
2291
|
+
when Array then '[' + obj.map {|x| ruby_code x }.join(", ") + ']'
|
2302
2292
|
when Hash then
|
2303
|
-
seg = obj.keys.sort.map {
|
2293
|
+
seg = obj.keys.sort.map {|k| "#{k.to_s.dump} => #{obj[k].to_s.dump}" }
|
2304
2294
|
"{ #{seg.join(', ')} }"
|
2305
2295
|
when Gem::Version then obj.to_s.dump
|
2306
2296
|
when DateLike then obj.strftime('%Y-%m-%d').dump
|
@@ -2328,7 +2318,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2328
2318
|
# True if this gem has the same attributes as +other+.
|
2329
2319
|
|
2330
2320
|
def same_attributes?(spec)
|
2331
|
-
@@attributes.all? {
|
2321
|
+
@@attributes.all? {|name, default| self.send(name) == spec.send(name) }
|
2332
2322
|
end
|
2333
2323
|
|
2334
2324
|
private :same_attributes?
|
@@ -2427,7 +2417,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2427
2417
|
# still have their default values are omitted.
|
2428
2418
|
|
2429
2419
|
def to_ruby
|
2430
|
-
|
2420
|
+
require_relative 'openssl'
|
2431
2421
|
mark_version
|
2432
2422
|
result = []
|
2433
2423
|
result << "# -*- encoding: utf-8 -*-"
|
@@ -2460,14 +2450,14 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2460
2450
|
:version,
|
2461
2451
|
:has_rdoc,
|
2462
2452
|
:default_executable,
|
2463
|
-
:metadata
|
2453
|
+
:metadata,
|
2464
2454
|
]
|
2465
2455
|
|
2466
2456
|
@@attributes.each do |attr_name|
|
2467
2457
|
next if handled.include? attr_name
|
2468
2458
|
current_value = self.send(attr_name)
|
2469
2459
|
if current_value != default_value(attr_name) || self.class.required_attribute?(attr_name)
|
2470
|
-
result << " s.#{attr_name} = #{ruby_code current_value}" unless current_value.is_a?(OpenSSL::PKey::RSA)
|
2460
|
+
result << " s.#{attr_name} = #{ruby_code current_value}" unless defined?(OpenSSL::PKey::RSA) && current_value.is_a?(OpenSSL::PKey::RSA)
|
2471
2461
|
end
|
2472
2462
|
end
|
2473
2463
|
|
@@ -2570,7 +2560,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2570
2560
|
unless result == :next
|
2571
2561
|
spec_name = dep_spec.name
|
2572
2562
|
dep_spec.traverse(trail, visited, &block) unless
|
2573
|
-
trail.any? {
|
2563
|
+
trail.any? {|s| s.name == spec_name }
|
2574
2564
|
end
|
2575
2565
|
end
|
2576
2566
|
end
|
@@ -2595,30 +2585,27 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2595
2585
|
end
|
2596
2586
|
|
2597
2587
|
def keep_only_files_and_directories
|
2598
|
-
@executables.delete_if {
|
2599
|
-
@extensions.delete_if {
|
2600
|
-
@extra_rdoc_files.delete_if {
|
2601
|
-
@files.delete_if {
|
2602
|
-
@test_files.delete_if {
|
2588
|
+
@executables.delete_if {|x| File.directory?(File.join(@bindir, x)) }
|
2589
|
+
@extensions.delete_if {|x| File.directory?(x) && !File.symlink?(x) }
|
2590
|
+
@extra_rdoc_files.delete_if {|x| File.directory?(x) && !File.symlink?(x) }
|
2591
|
+
@files.delete_if {|x| File.directory?(x) && !File.symlink?(x) }
|
2592
|
+
@test_files.delete_if {|x| File.directory?(x) && !File.symlink?(x) }
|
2603
2593
|
end
|
2604
2594
|
|
2605
2595
|
def validate_metadata
|
2606
2596
|
Gem::SpecificationPolicy.new(self).validate_metadata
|
2607
2597
|
end
|
2598
|
+
rubygems_deprecate :validate_metadata
|
2608
2599
|
|
2609
|
-
##
|
2610
|
-
# Checks that dependencies use requirements as we recommend. Warnings are
|
2611
|
-
# issued when dependencies are open-ended or overly strict for semantic
|
2612
|
-
# versioning.
|
2613
2600
|
def validate_dependencies
|
2614
2601
|
Gem::SpecificationPolicy.new(self).validate_dependencies
|
2615
2602
|
end
|
2603
|
+
rubygems_deprecate :validate_dependencies
|
2616
2604
|
|
2617
|
-
##
|
2618
|
-
# Checks to see if the files to be packaged are world-readable.
|
2619
2605
|
def validate_permissions
|
2620
2606
|
Gem::SpecificationPolicy.new(self).validate_permissions
|
2621
2607
|
end
|
2608
|
+
rubygems_deprecate :validate_permissions
|
2622
2609
|
|
2623
2610
|
##
|
2624
2611
|
# Set the version to +version+, potentially also setting
|
@@ -2681,8 +2668,4 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2681
2668
|
def raw_require_paths # :nodoc:
|
2682
2669
|
@require_paths
|
2683
2670
|
end
|
2684
|
-
|
2685
2671
|
end
|
2686
|
-
|
2687
|
-
# DOC: What is this and why is it here, randomly, at the end of this file?
|
2688
|
-
Gem.clear_paths
|