rubygems-update 3.2.0.rc.1 → 3.2.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CONTRIBUTING.md +23 -8
- data/History.txt +307 -239
- data/Manifest.txt +36 -54
- data/POLICIES.md +4 -3
- data/Rakefile +29 -51
- data/bundler/CHANGELOG.md +786 -690
- data/bundler/UPGRADING.md +3 -3
- data/bundler/lib/bundler.rb +17 -3
- data/bundler/lib/bundler/build_metadata.rb +4 -12
- data/bundler/lib/bundler/cli.rb +31 -15
- 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/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 +1 -1
- data/bundler/lib/bundler/cli/info.rb +2 -1
- data/bundler/lib/bundler/cli/init.rb +1 -1
- data/bundler/lib/bundler/cli/inject.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +18 -7
- data/bundler/lib/bundler/cli/list.rb +1 -1
- data/bundler/lib/bundler/cli/outdated.rb +1 -3
- data/bundler/lib/bundler/cli/pristine.rb +1 -1
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/update.rb +3 -1
- data/bundler/lib/bundler/compact_index_client.rb +1 -1
- data/bundler/lib/bundler/compact_index_client/cache.rb +6 -14
- data/bundler/lib/bundler/compact_index_client/gem_parser.rb +28 -0
- data/bundler/lib/bundler/compact_index_client/updater.rb +5 -5
- data/bundler/lib/bundler/definition.rb +49 -60
- data/bundler/lib/bundler/dep_proxy.rb +1 -1
- data/bundler/lib/bundler/dependency.rb +3 -1
- data/bundler/lib/bundler/dsl.rb +4 -4
- data/bundler/lib/bundler/endpoint_specification.rb +1 -1
- data/bundler/lib/bundler/env.rb +1 -1
- data/bundler/lib/bundler/feature_flag.rb +0 -1
- data/bundler/lib/bundler/fetcher.rb +3 -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 +18 -3
- data/bundler/lib/bundler/gem_helper.rb +17 -9
- data/bundler/lib/bundler/gem_helpers.rb +36 -25
- data/bundler/lib/bundler/gem_version_promoter.rb +1 -1
- data/bundler/lib/bundler/graph.rb +1 -1
- data/bundler/lib/bundler/index.rb +6 -2
- data/bundler/lib/bundler/injector.rb +10 -3
- data/bundler/lib/bundler/installer.rb +8 -6
- data/bundler/lib/bundler/installer/gem_installer.rb +1 -1
- data/bundler/lib/bundler/installer/parallel_installer.rb +1 -1
- data/bundler/lib/bundler/installer/standalone.rb +2 -2
- data/bundler/lib/bundler/lazy_specification.rb +22 -11
- 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} +14 -21
- 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} +0 -0
- 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} +0 -0
- 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 +5 -6
- 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 +1 -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/remote_specification.rb +1 -1
- data/bundler/lib/bundler/resolver.rb +26 -30
- data/bundler/lib/bundler/resolver/spec_group.rb +21 -27
- data/bundler/lib/bundler/retry.rb +1 -1
- data/bundler/lib/bundler/ruby_version.rb +1 -1
- data/bundler/lib/bundler/rubygems_ext.rb +46 -1
- data/bundler/lib/bundler/rubygems_gem_installer.rb +2 -2
- data/bundler/lib/bundler/rubygems_integration.rb +22 -12
- data/bundler/lib/bundler/runtime.rb +2 -2
- data/bundler/lib/bundler/settings.rb +49 -43
- data/bundler/lib/bundler/shared_helpers.rb +1 -1
- data/bundler/lib/bundler/similarity_detector.rb +1 -1
- data/bundler/lib/bundler/source.rb +1 -1
- data/bundler/lib/bundler/source/git.rb +1 -1
- data/bundler/lib/bundler/source/git/git_proxy.rb +5 -3
- data/bundler/lib/bundler/source/path.rb +2 -2
- data/bundler/lib/bundler/source/path/installer.rb +1 -1
- data/bundler/lib/bundler/source/rubygems.rb +2 -2
- 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 +7 -9
- data/bundler/lib/bundler/stub_specification.rb +1 -3
- data/bundler/lib/bundler/templates/newgem/README.md.tt +1 -2
- data/bundler/lib/bundler/templates/newgem/bin/console.tt +1 -2
- data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +2 -2
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +8 -2
- data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +0 -1
- 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 +8 -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 +14 -17
- data/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/man/bundle-exec.1 +1 -1
- data/bundler/man/bundle-gem.1 +1 -1
- 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 +1 -1
- 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 +8 -7
- data/lib/rubygems/available_set.rb +1 -3
- data/lib/rubygems/basic_specification.rb +0 -4
- data/lib/rubygems/command.rb +0 -2
- data/lib/rubygems/command_manager.rb +2 -4
- data/lib/rubygems/commands/build_command.rb +40 -20
- data/lib/rubygems/commands/cert_command.rb +1 -9
- data/lib/rubygems/commands/check_command.rb +0 -2
- data/lib/rubygems/commands/cleanup_command.rb +8 -4
- data/lib/rubygems/commands/contents_command.rb +0 -2
- data/lib/rubygems/commands/dependency_command.rb +0 -2
- data/lib/rubygems/commands/environment_command.rb +1 -3
- data/lib/rubygems/commands/fetch_command.rb +0 -2
- data/lib/rubygems/commands/generate_index_command.rb +0 -2
- data/lib/rubygems/commands/help_command.rb +2 -2
- data/lib/rubygems/commands/info_command.rb +0 -2
- data/lib/rubygems/commands/install_command.rb +0 -2
- data/lib/rubygems/commands/list_command.rb +0 -2
- data/lib/rubygems/commands/lock_command.rb +0 -2
- data/lib/rubygems/commands/mirror_command.rb +0 -2
- data/lib/rubygems/commands/open_command.rb +0 -2
- data/lib/rubygems/commands/outdated_command.rb +0 -2
- data/lib/rubygems/commands/owner_command.rb +9 -4
- data/lib/rubygems/commands/pristine_command.rb +1 -3
- data/lib/rubygems/commands/push_command.rb +6 -5
- data/lib/rubygems/commands/query_command.rb +16 -1
- data/lib/rubygems/commands/rdoc_command.rb +0 -2
- data/lib/rubygems/commands/search_command.rb +0 -2
- data/lib/rubygems/commands/server_command.rb +3 -1
- data/lib/rubygems/commands/setup_command.rb +21 -44
- 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 +6 -2
- data/lib/rubygems/commands/stale_command.rb +0 -2
- data/lib/rubygems/commands/uninstall_command.rb +0 -2
- data/lib/rubygems/commands/unpack_command.rb +0 -2
- data/lib/rubygems/commands/update_command.rb +20 -5
- data/lib/rubygems/commands/which_command.rb +0 -2
- data/lib/rubygems/commands/yank_command.rb +4 -7
- data/lib/rubygems/config_file.rb +0 -2
- data/lib/rubygems/core_ext/kernel_require.rb +3 -0
- data/lib/rubygems/core_ext/kernel_warn.rb +12 -13
- data/lib/rubygems/defaults.rb +2 -2
- data/lib/rubygems/dependency.rb +1 -3
- data/lib/rubygems/dependency_installer.rb +5 -5
- data/lib/rubygems/dependency_list.rb +0 -2
- data/lib/rubygems/doctor.rb +0 -2
- data/lib/rubygems/errors.rb +0 -12
- data/lib/rubygems/exceptions.rb +0 -20
- data/lib/rubygems/ext/builder.rb +13 -34
- data/lib/rubygems/ext/cmake_builder.rb +4 -6
- data/lib/rubygems/ext/configure_builder.rb +4 -6
- data/lib/rubygems/ext/ext_conf_builder.rb +19 -16
- data/lib/rubygems/ext/rake_builder.rb +4 -6
- data/lib/rubygems/gem_runner.rb +0 -2
- data/lib/rubygems/gemcutter_utilities.rb +101 -20
- data/lib/rubygems/indexer.rb +0 -3
- data/lib/rubygems/install_update_options.rb +2 -2
- data/lib/rubygems/installer.rb +16 -40
- data/lib/rubygems/installer_test_case.rb +7 -10
- data/lib/rubygems/mock_gem_ui.rb +0 -6
- data/lib/rubygems/name_tuple.rb +1 -3
- data/lib/rubygems/openssl.rb +7 -0
- data/lib/rubygems/package.rb +6 -12
- 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 +0 -2
- data/lib/rubygems/package/tar_header.rb +1 -3
- data/lib/rubygems/package/tar_reader.rb +0 -2
- data/lib/rubygems/package/tar_reader/entry.rb +0 -2
- data/lib/rubygems/package/tar_test_case.rb +1 -3
- data/lib/rubygems/package/tar_writer.rb +0 -6
- data/lib/rubygems/package_task.rb +0 -2
- data/lib/rubygems/path_support.rb +0 -2
- data/lib/rubygems/platform.rb +18 -9
- data/lib/rubygems/psych_tree.rb +0 -2
- data/lib/rubygems/query_utils.rb +0 -9
- data/lib/rubygems/remote_fetcher.rb +6 -9
- data/lib/rubygems/request.rb +4 -11
- data/lib/rubygems/request/connection_pools.rb +0 -4
- data/lib/rubygems/request/http_pool.rb +0 -2
- data/lib/rubygems/request/https_pool.rb +0 -2
- data/lib/rubygems/request_set.rb +2 -15
- data/lib/rubygems/request_set/gem_dependency_api.rb +4 -6
- data/lib/rubygems/request_set/lockfile.rb +0 -4
- data/lib/rubygems/request_set/lockfile/parser.rb +0 -2
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +0 -2
- data/lib/rubygems/requirement.rb +8 -8
- data/lib/rubygems/resolver.rb +7 -4
- data/lib/rubygems/resolver/activation_request.rb +9 -3
- data/lib/rubygems/resolver/api_set.rb +27 -20
- data/lib/rubygems/resolver/api_set/gem_parser.rb +20 -0
- data/lib/rubygems/resolver/api_specification.rb +23 -9
- data/lib/rubygems/resolver/best_set.rb +1 -3
- data/lib/rubygems/resolver/composed_set.rb +0 -2
- data/lib/rubygems/resolver/conflict.rb +1 -3
- 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 +0 -2
- data/lib/rubygems/resolver/index_specification.rb +26 -2
- data/lib/rubygems/resolver/installed_specification.rb +0 -2
- data/lib/rubygems/resolver/installer_set.rb +57 -10
- data/lib/rubygems/resolver/local_specification.rb +0 -2
- data/lib/rubygems/resolver/lock_set.rb +1 -3
- 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 +14 -2
- data/lib/rubygems/resolver/specification.rb +13 -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/security.rb +2 -9
- data/lib/rubygems/security/policy.rb +1 -5
- data/lib/rubygems/security/signer.rb +1 -3
- data/lib/rubygems/security/trust_dir.rb +0 -2
- data/lib/rubygems/server.rb +7 -4
- data/lib/rubygems/source.rb +23 -12
- data/lib/rubygems/source/git.rb +0 -2
- data/lib/rubygems/source/installed.rb +0 -2
- data/lib/rubygems/source/local.rb +0 -2
- 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 +0 -2
- data/lib/rubygems/spec_fetcher.rb +1 -3
- data/lib/rubygems/specification.rb +27 -19
- data/lib/rubygems/specification_policy.rb +0 -2
- 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 +18 -42
- data/lib/rubygems/test_utilities.rb +6 -13
- data/lib/rubygems/uninstaller.rb +0 -2
- data/lib/rubygems/uri_formatter.rb +2 -3
- data/lib/rubygems/uri_parser.rb +0 -2
- data/lib/rubygems/user_interaction.rb +0 -16
- data/lib/rubygems/util.rb +0 -2
- data/lib/rubygems/util/licenses.rb +0 -2
- data/lib/rubygems/util/list.rb +0 -2
- data/lib/rubygems/validator.rb +0 -2
- data/lib/rubygems/version.rb +0 -2
- data/lib/rubygems/version_option.rb +6 -0
- data/rubygems-update.gemspec +1 -1
- 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/test_bundled_ca.rb +42 -41
- data/test/rubygems/test_config.rb +0 -2
- data/test/rubygems/test_deprecate.rb +0 -6
- data/test/rubygems/test_gem.rb +3 -5
- data/test/rubygems/test_gem_available_set.rb +0 -2
- data/test/rubygems/test_gem_bundler_version_finder.rb +0 -2
- data/test/rubygems/test_gem_command.rb +0 -4
- data/test/rubygems/test_gem_command_manager.rb +0 -2
- data/test/rubygems/test_gem_commands_build_command.rb +226 -13
- data/test/rubygems/test_gem_commands_cert_command.rb +2 -4
- data/test/rubygems/test_gem_commands_check_command.rb +0 -2
- data/test/rubygems/test_gem_commands_cleanup_command.rb +13 -4
- data/test/rubygems/test_gem_commands_contents_command.rb +2 -4
- data/test/rubygems/test_gem_commands_dependency_command.rb +0 -2
- data/test/rubygems/test_gem_commands_environment_command.rb +0 -2
- data/test/rubygems/test_gem_commands_fetch_command.rb +0 -2
- data/test/rubygems/test_gem_commands_generate_index_command.rb +0 -2
- data/test/rubygems/test_gem_commands_help_command.rb +15 -4
- data/test/rubygems/test_gem_commands_info_command.rb +0 -2
- data/test/rubygems/test_gem_commands_install_command.rb +132 -3
- 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 +0 -2
- data/test/rubygems/test_gem_commands_open_command.rb +0 -2
- data/test/rubygems/test_gem_commands_outdated_command.rb +0 -2
- data/test/rubygems/test_gem_commands_owner_command.rb +48 -2
- data/test/rubygems/test_gem_commands_pristine_command.rb +2 -4
- data/test/rubygems/test_gem_commands_push_command.rb +70 -7
- data/test/rubygems/test_gem_commands_query_command.rb +3 -7
- 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 +19 -30
- data/test/rubygems/test_gem_commands_signin_command.rb +27 -5
- data/test/rubygems/test_gem_commands_signout_command.rb +0 -2
- data/test/rubygems/test_gem_commands_sources_command.rb +60 -2
- data/test/rubygems/test_gem_commands_specification_command.rb +28 -2
- data/test/rubygems/test_gem_commands_stale_command.rb +0 -2
- data/test/rubygems/test_gem_commands_uninstall_command.rb +0 -2
- data/test/rubygems/test_gem_commands_unpack_command.rb +0 -2
- data/test/rubygems/test_gem_commands_update_command.rb +50 -4
- data/test/rubygems/test_gem_commands_which_command.rb +0 -2
- data/test/rubygems/test_gem_commands_yank_command.rb +30 -2
- data/test/rubygems/test_gem_config_file.rb +0 -2
- data/test/rubygems/test_gem_dependency.rb +0 -2
- data/test/rubygems/test_gem_dependency_installer.rb +38 -4
- data/test/rubygems/test_gem_dependency_list.rb +2 -4
- data/test/rubygems/test_gem_dependency_resolution_error.rb +0 -2
- data/test/rubygems/test_gem_doctor.rb +0 -2
- data/test/rubygems/test_gem_ext_builder.rb +12 -22
- data/test/rubygems/test_gem_ext_cmake_builder.rb +3 -11
- data/test/rubygems/test_gem_ext_configure_builder.rb +3 -11
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +9 -28
- data/test/rubygems/test_gem_ext_rake_builder.rb +30 -15
- data/test/rubygems/test_gem_gem_runner.rb +7 -6
- data/test/rubygems/test_gem_gemcutter_utilities.rb +3 -5
- data/test/rubygems/test_gem_impossible_dependencies_error.rb +0 -2
- data/test/rubygems/test_gem_indexer.rb +0 -2
- data/test/rubygems/test_gem_install_update_options.rb +14 -4
- data/test/rubygems/test_gem_installer.rb +113 -74
- 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 +25 -19
- data/test/rubygems/test_gem_package_old.rb +4 -6
- data/test/rubygems/test_gem_package_tar_header.rb +0 -2
- 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 +1 -3
- data/test/rubygems/test_gem_package_task.rb +0 -2
- 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 +18 -23
- data/test/rubygems/test_gem_request.rb +2 -6
- data/test/rubygems/test_gem_request_connection_pools.rb +0 -4
- data/test/rubygems/test_gem_request_set.rb +0 -2
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +0 -2
- data/test/rubygems/test_gem_request_set_lockfile.rb +4 -6
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +0 -2
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +0 -2
- data/test/rubygems/test_gem_requirement.rb +8 -2
- data/test/rubygems/test_gem_resolver.rb +0 -2
- data/test/rubygems/test_gem_resolver_activation_request.rb +0 -2
- data/test/rubygems/test_gem_resolver_api_set.rb +58 -57
- data/test/rubygems/test_gem_resolver_api_specification.rb +3 -5
- data/test/rubygems/test_gem_resolver_best_set.rb +3 -5
- 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 +0 -2
- 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 +0 -2
- data/test/rubygems/test_gem_resolver_local_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_lock_set.rb +0 -2
- 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 +2 -4
- data/test/rubygems/test_gem_security_policy.rb +2 -4
- data/test/rubygems/test_gem_security_signer.rb +2 -4
- data/test/rubygems/test_gem_security_trust_dir.rb +2 -4
- data/test/rubygems/test_gem_server.rb +0 -4
- data/test/rubygems/test_gem_silent_ui.rb +0 -2
- data/test/rubygems/test_gem_source.rb +7 -4
- data/test/rubygems/test_gem_source_fetch_problem.rb +0 -2
- data/test/rubygems/test_gem_source_git.rb +0 -2
- data/test/rubygems/test_gem_source_installed.rb +0 -2
- data/test/rubygems/test_gem_source_list.rb +1 -2
- data/test/rubygems/test_gem_source_local.rb +0 -2
- data/test/rubygems/test_gem_source_lock.rb +0 -2
- data/test/rubygems/test_gem_source_specific_file.rb +0 -2
- data/test/rubygems/test_gem_source_subpath_problem.rb +49 -0
- data/test/rubygems/test_gem_source_vendor.rb +0 -2
- data/test/rubygems/test_gem_spec_fetcher.rb +0 -2
- data/test/rubygems/test_gem_specification.rb +15 -14
- data/test/rubygems/test_gem_stream_ui.rb +0 -2
- data/test/rubygems/test_gem_stub_specification.rb +4 -6
- data/test/rubygems/test_gem_text.rb +0 -2
- data/test/rubygems/test_gem_uninstaller.rb +7 -9
- 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 +0 -2
- data/test/rubygems/test_gem_validator.rb +1 -3
- data/test/rubygems/test_gem_version.rb +0 -2
- data/test/rubygems/test_gem_version_option.rb +1 -3
- data/test/rubygems/test_kernel.rb +0 -2
- data/test/rubygems/test_project_sanity.rb +0 -2
- data/test/rubygems/test_remote_fetch_error.rb +0 -2
- data/test/rubygems/test_require.rb +50 -17
- data/test/test_changelog_generator.rb +17 -0
- metadata +59 -77
- 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 -527
- data/bundler/man/bundle-doctor.1.txt +0 -44
- data/bundler/man/bundle-exec.1.txt +0 -181
- data/bundler/man/bundle-gem.1.txt +0 -117
- 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 -44
- 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 -391
- data/bundler/man/bundle-viz.1.txt +0 -39
- data/bundler/man/bundle.1.txt +0 -116
- data/bundler/man/gemfile.5.txt +0 -651
- 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
@@ -1,5 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
|
2
|
+
|
3
|
+
require_relative 'dependency_graph'
|
3
4
|
|
4
5
|
module Gem::Resolver::Molinillo
|
5
6
|
# This class encapsulates a dependency resolver.
|
@@ -8,7 +9,7 @@ module Gem::Resolver::Molinillo
|
|
8
9
|
#
|
9
10
|
#
|
10
11
|
class Resolver
|
11
|
-
|
12
|
+
require_relative 'resolution'
|
12
13
|
|
13
14
|
# @return [SpecificationProvider] the specification provider used
|
14
15
|
# in the resolution process
|
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
module Gem::Resolver::Molinillo
|
3
4
|
# A state that a {Resolution} can be in
|
4
5
|
# @attr [String] name the name of the current requirement
|
@@ -7,7 +8,8 @@ module Gem::Resolver::Molinillo
|
|
7
8
|
# @attr [Object] requirement the current requirement
|
8
9
|
# @attr [Object] possibilities the possibilities to satisfy the current requirement
|
9
10
|
# @attr [Integer] depth the depth of the resolution
|
10
|
-
# @attr [
|
11
|
+
# @attr [Hash] conflicts unresolved conflicts, indexed by dependency name
|
12
|
+
# @attr [Array<UnwindDetails>] unused_unwind_options unwinds for previous conflicts that weren't explored
|
11
13
|
ResolutionState = Struct.new(
|
12
14
|
:name,
|
13
15
|
:requirements,
|
@@ -15,14 +17,15 @@ module Gem::Resolver::Molinillo
|
|
15
17
|
:requirement,
|
16
18
|
:possibilities,
|
17
19
|
:depth,
|
18
|
-
:conflicts
|
20
|
+
:conflicts,
|
21
|
+
:unused_unwind_options
|
19
22
|
)
|
20
23
|
|
21
24
|
class ResolutionState
|
22
25
|
# Returns an empty resolution state
|
23
26
|
# @return [ResolutionState] an empty state
|
24
27
|
def self.empty
|
25
|
-
new(nil, [], DependencyGraph.new, nil, nil, 0,
|
28
|
+
new(nil, [], DependencyGraph.new, nil, nil, 0, {}, [])
|
26
29
|
end
|
27
30
|
end
|
28
31
|
|
@@ -40,7 +43,8 @@ module Gem::Resolver::Molinillo
|
|
40
43
|
requirement,
|
41
44
|
[possibilities.pop],
|
42
45
|
depth + 1,
|
43
|
-
conflicts.dup
|
46
|
+
conflicts.dup,
|
47
|
+
unused_unwind_options.dup
|
44
48
|
).tap do |state|
|
45
49
|
state.activated.tag(state)
|
46
50
|
end
|
@@ -4,7 +4,6 @@
|
|
4
4
|
# Kind off like BestSet but filters the sources for gems
|
5
5
|
|
6
6
|
class Gem::Resolver::SourceSet < Gem::Resolver::Set
|
7
|
-
|
8
7
|
##
|
9
8
|
# Creates a SourceSet for the given +sources+ or Gem::sources if none are
|
10
9
|
# specified. +sources+ must be a Gem::SourceList.
|
@@ -43,5 +42,4 @@ class Gem::Resolver::SourceSet < Gem::Resolver::Set
|
|
43
42
|
link = @links[name]
|
44
43
|
@sets[link] ||= Gem::Source.new(link).dependency_resolver_set if link
|
45
44
|
end
|
46
|
-
|
47
45
|
end
|
@@ -4,7 +4,6 @@
|
|
4
4
|
# Resolver specifications that are backed by a Gem::Specification.
|
5
5
|
|
6
6
|
class Gem::Resolver::SpecSpecification < Gem::Resolver::Specification
|
7
|
-
|
8
7
|
##
|
9
8
|
# A SpecSpecification is created for a +set+ for a Gem::Specification in
|
10
9
|
# +spec+. The +source+ is either where the +spec+ came from, or should be
|
@@ -23,6 +22,20 @@ class Gem::Resolver::SpecSpecification < Gem::Resolver::Specification
|
|
23
22
|
spec.dependencies
|
24
23
|
end
|
25
24
|
|
25
|
+
##
|
26
|
+
# The required_ruby_version constraint for this specification
|
27
|
+
|
28
|
+
def required_ruby_version
|
29
|
+
spec.required_ruby_version
|
30
|
+
end
|
31
|
+
|
32
|
+
##
|
33
|
+
# The required_rubygems_version constraint for this specification
|
34
|
+
|
35
|
+
def required_rubygems_version
|
36
|
+
spec.required_rubygems_version
|
37
|
+
end
|
38
|
+
|
26
39
|
##
|
27
40
|
# The name and version of the specification.
|
28
41
|
#
|
@@ -52,5 +65,4 @@ class Gem::Resolver::SpecSpecification < Gem::Resolver::Specification
|
|
52
65
|
def version
|
53
66
|
spec.version
|
54
67
|
end
|
55
|
-
|
56
68
|
end
|
@@ -5,7 +5,6 @@
|
|
5
5
|
# dependency resolution in the resolver is included.
|
6
6
|
|
7
7
|
class Gem::Resolver::Specification
|
8
|
-
|
9
8
|
##
|
10
9
|
# The dependencies of the gem for this specification
|
11
10
|
|
@@ -44,6 +43,16 @@ class Gem::Resolver::Specification
|
|
44
43
|
|
45
44
|
attr_reader :version
|
46
45
|
|
46
|
+
##
|
47
|
+
# The required_ruby_version constraint for this specification.
|
48
|
+
|
49
|
+
attr_reader :required_ruby_version
|
50
|
+
|
51
|
+
##
|
52
|
+
# The required_ruby_version constraint for this specification.
|
53
|
+
|
54
|
+
attr_reader :required_rubygems_version
|
55
|
+
|
47
56
|
##
|
48
57
|
# Sets default instance variables for the specification.
|
49
58
|
|
@@ -54,6 +63,8 @@ class Gem::Resolver::Specification
|
|
54
63
|
@set = nil
|
55
64
|
@source = nil
|
56
65
|
@version = nil
|
66
|
+
@required_ruby_version = Gem::Requirement.default
|
67
|
+
@required_rubygems_version = Gem::Requirement.default
|
57
68
|
end
|
58
69
|
|
59
70
|
##
|
@@ -105,11 +116,10 @@ class Gem::Resolver::Specification
|
|
105
116
|
# Returns true if this specification is installable on this platform.
|
106
117
|
|
107
118
|
def installable_platform?
|
108
|
-
Gem::Platform.
|
119
|
+
Gem::Platform.match_spec? spec
|
109
120
|
end
|
110
121
|
|
111
122
|
def local? # :nodoc:
|
112
123
|
false
|
113
124
|
end
|
114
|
-
|
115
125
|
end
|
@@ -1,6 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
class Gem::Resolver::Stats
|
3
|
-
|
4
3
|
def initialize
|
5
4
|
@max_depth = 0
|
6
5
|
@max_requirements = 0
|
@@ -43,5 +42,4 @@ class Gem::Resolver::Stats
|
|
43
42
|
$stdout.printf PATTERN, "Backtracking #", @backtracking
|
44
43
|
$stdout.printf PATTERN, "Iteration #", @iterations
|
45
44
|
end
|
46
|
-
|
47
45
|
end
|
@@ -15,7 +15,6 @@
|
|
15
15
|
# rake.gemspec (watching the given name).
|
16
16
|
|
17
17
|
class Gem::Resolver::VendorSet < Gem::Resolver::Set
|
18
|
-
|
19
18
|
##
|
20
19
|
# The specifications for this set.
|
21
20
|
|
@@ -83,5 +82,4 @@ class Gem::Resolver::VendorSet < Gem::Resolver::Set
|
|
83
82
|
end
|
84
83
|
end
|
85
84
|
end
|
86
|
-
|
87
85
|
end
|
@@ -5,7 +5,6 @@
|
|
5
5
|
# option.
|
6
6
|
|
7
7
|
class Gem::Resolver::VendorSpecification < Gem::Resolver::SpecSpecification
|
8
|
-
|
9
8
|
def ==(other) # :nodoc:
|
10
9
|
self.class === other and
|
11
10
|
@set == other.set and
|
@@ -20,5 +19,4 @@ class Gem::Resolver::VendorSpecification < Gem::Resolver::SpecSpecification
|
|
20
19
|
def install(options = {})
|
21
20
|
yield nil
|
22
21
|
end
|
23
|
-
|
24
22
|
end
|
@@ -1,14 +1,12 @@
|
|
1
1
|
require 'base64'
|
2
2
|
require 'digest'
|
3
|
-
require 'openssl'
|
3
|
+
require 'rubygems/openssl'
|
4
4
|
|
5
5
|
##
|
6
6
|
# S3URISigner implements AWS SigV4 for S3 Source to avoid a dependency on the aws-sdk-* gems
|
7
7
|
# More on AWS SigV4: https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html
|
8
8
|
class Gem::S3URISigner
|
9
|
-
|
10
9
|
class ConfigurationError < Gem::Exception
|
11
|
-
|
12
10
|
def initialize(message)
|
13
11
|
super message
|
14
12
|
end
|
@@ -16,11 +14,9 @@ class Gem::S3URISigner
|
|
16
14
|
def to_s # :nodoc:
|
17
15
|
"#{super}"
|
18
16
|
end
|
19
|
-
|
20
17
|
end
|
21
18
|
|
22
19
|
class InstanceProfileError < Gem::Exception
|
23
|
-
|
24
20
|
def initialize(message)
|
25
21
|
super message
|
26
22
|
end
|
@@ -28,7 +24,6 @@ class Gem::S3URISigner
|
|
28
24
|
def to_s # :nodoc:
|
29
25
|
"#{super}"
|
30
26
|
end
|
31
|
-
|
32
27
|
end
|
33
28
|
|
34
29
|
attr_accessor :uri
|
@@ -93,7 +88,7 @@ class Gem::S3URISigner
|
|
93
88
|
"AWS4-HMAC-SHA256",
|
94
89
|
date_time,
|
95
90
|
credential_info,
|
96
|
-
Digest::SHA256.hexdigest(canonical_request)
|
91
|
+
Digest::SHA256.hexdigest(canonical_request),
|
97
92
|
].join("\n")
|
98
93
|
end
|
99
94
|
|
@@ -179,5 +174,4 @@ class Gem::S3URISigner
|
|
179
174
|
BASE64_URI_TRANSLATE = { "+" => "%2B", "/" => "%2F", "=" => "%3D", "\n" => "" }.freeze
|
180
175
|
EC2_IAM_INFO = "http://169.254.169.254/latest/meta-data/iam/info".freeze
|
181
176
|
EC2_IAM_SECURITY_CREDENTIALS = "http://169.254.169.254/latest/meta-data/iam/security-credentials/".freeze
|
182
|
-
|
183
177
|
end
|
data/lib/rubygems/security.rb
CHANGED
@@ -6,14 +6,7 @@
|
|
6
6
|
#++
|
7
7
|
|
8
8
|
require 'rubygems/exceptions'
|
9
|
-
|
10
|
-
|
11
|
-
begin
|
12
|
-
require 'openssl'
|
13
|
-
rescue LoadError => e
|
14
|
-
raise unless (e.respond_to?(:path) && e.path == 'openssl') ||
|
15
|
-
e.message =~ / -- openssl$/
|
16
|
-
end
|
9
|
+
require_relative 'openssl'
|
17
10
|
|
18
11
|
##
|
19
12
|
# = Signing gems
|
@@ -598,7 +591,7 @@ module Gem::Security
|
|
598
591
|
|
599
592
|
end
|
600
593
|
|
601
|
-
if
|
594
|
+
if Gem::HAVE_OPENSSL
|
602
595
|
require 'rubygems/security/policy'
|
603
596
|
require 'rubygems/security/policies'
|
604
597
|
require 'rubygems/security/trust_dir'
|
@@ -8,7 +8,6 @@ require 'rubygems/user_interaction'
|
|
8
8
|
# Gem::Security::Policies.
|
9
9
|
|
10
10
|
class Gem::Security::Policy
|
11
|
-
|
12
11
|
include Gem::UserInteraction
|
13
12
|
|
14
13
|
attr_reader :name
|
@@ -25,8 +24,6 @@ class Gem::Security::Policy
|
|
25
24
|
# options.
|
26
25
|
|
27
26
|
def initialize(name, policy = {}, opt = {})
|
28
|
-
require 'openssl'
|
29
|
-
|
30
27
|
@name = name
|
31
28
|
|
32
29
|
@opt = opt
|
@@ -197,7 +194,7 @@ class Gem::Security::Policy
|
|
197
194
|
("[Policy: %s - data: %p signer: %p chain: %p root: %p " +
|
198
195
|
"signed-only: %p trusted-only: %p]") % [
|
199
196
|
@name, @verify_chain, @verify_data, @verify_root, @verify_signer,
|
200
|
-
@only_signed, @only_trusted
|
197
|
+
@only_signed, @only_trusted
|
201
198
|
]
|
202
199
|
end
|
203
200
|
|
@@ -291,5 +288,4 @@ class Gem::Security::Policy
|
|
291
288
|
end
|
292
289
|
|
293
290
|
alias to_s name # :nodoc:
|
294
|
-
|
295
291
|
end
|
@@ -5,7 +5,6 @@
|
|
5
5
|
require "rubygems/user_interaction"
|
6
6
|
|
7
7
|
class Gem::Security::Signer
|
8
|
-
|
9
8
|
include Gem::UserInteraction
|
10
9
|
|
11
10
|
##
|
@@ -35,7 +34,7 @@ class Gem::Security::Signer
|
|
35
34
|
attr_reader :options
|
36
35
|
|
37
36
|
DEFAULT_OPTIONS = {
|
38
|
-
expiration_length_days: 365
|
37
|
+
expiration_length_days: 365,
|
39
38
|
}.freeze
|
40
39
|
|
41
40
|
##
|
@@ -202,5 +201,4 @@ class Gem::Security::Signer
|
|
202
201
|
end
|
203
202
|
end
|
204
203
|
end
|
205
|
-
|
206
204
|
end
|
@@ -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
|
|
@@ -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
@@ -1,5 +1,4 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require 'webrick'
|
3
2
|
require 'zlib'
|
4
3
|
require 'erb'
|
5
4
|
require 'uri'
|
@@ -29,7 +28,6 @@ require 'rubygems/rdoc'
|
|
29
28
|
# TODO Refactor into a real WEBrick servlet to remove code duplication.
|
30
29
|
|
31
30
|
class Gem::Server
|
32
|
-
|
33
31
|
attr_reader :spec_dirs
|
34
32
|
|
35
33
|
include ERB::Util
|
@@ -430,6 +428,12 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
|
|
430
428
|
end
|
431
429
|
|
432
430
|
def initialize(gem_dirs, port, daemon, launch = nil, addresses = nil)
|
431
|
+
begin
|
432
|
+
require 'webrick'
|
433
|
+
rescue LoadError
|
434
|
+
abort "webrick is not found. You may need to `gem install webrick` to install webrick."
|
435
|
+
end
|
436
|
+
|
433
437
|
Gem::RDoc.load_rdoc
|
434
438
|
Socket.do_not_reverse_lookup = true
|
435
439
|
|
@@ -772,7 +776,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
|
|
772
776
|
doc_items << {
|
773
777
|
:name => base_name,
|
774
778
|
:url => doc_root(new_path),
|
775
|
-
:summary => ''
|
779
|
+
:summary => '',
|
776
780
|
}
|
777
781
|
end
|
778
782
|
|
@@ -875,5 +879,4 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
|
|
875
879
|
|
876
880
|
system("#{@launch} http://#{host}:#{@port}")
|
877
881
|
end
|
878
|
-
|
879
882
|
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,15 @@ 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
|
-
|
82
|
+
fetch_uri = if uri.host == "rubygems.org"
|
83
|
+
index_uri = uri.dup
|
84
|
+
index_uri.host = "index.rubygems.org"
|
85
|
+
index_uri
|
86
|
+
else
|
87
|
+
uri
|
88
|
+
end
|
89
|
+
|
90
|
+
bundler_api_uri = enforce_trailing_slash(fetch_uri)
|
85
91
|
|
86
92
|
begin
|
87
93
|
fetcher = Gem::RemoteFetcher.fetcher
|
@@ -89,11 +95,7 @@ class Gem::Source
|
|
89
95
|
rescue Gem::RemoteFetcher::FetchError
|
90
96
|
Gem::Resolver::IndexSet.new self
|
91
97
|
else
|
92
|
-
|
93
|
-
Gem::Resolver::APISet.new response.uri
|
94
|
-
else
|
95
|
-
Gem::Resolver::APISet.new bundler_api_uri
|
96
|
-
end
|
98
|
+
Gem::Resolver::APISet.new response.uri + "./info/"
|
97
99
|
end
|
98
100
|
end
|
99
101
|
|
@@ -132,7 +134,7 @@ class Gem::Source
|
|
132
134
|
|
133
135
|
spec_file_name = name_tuple.spec_name
|
134
136
|
|
135
|
-
source_uri = uri + "#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}"
|
137
|
+
source_uri = enforce_trailing_slash(uri) + "#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}"
|
136
138
|
|
137
139
|
cache_dir = cache_dir source_uri
|
138
140
|
|
@@ -150,6 +152,7 @@ class Gem::Source
|
|
150
152
|
spec = Gem::Util.inflate spec
|
151
153
|
|
152
154
|
if update_cache?
|
155
|
+
require "fileutils"
|
153
156
|
FileUtils.mkdir_p cache_dir
|
154
157
|
|
155
158
|
File.open local_spec, 'wb' do |io|
|
@@ -176,12 +179,15 @@ class Gem::Source
|
|
176
179
|
file = FILES[type]
|
177
180
|
fetcher = Gem::RemoteFetcher.fetcher
|
178
181
|
file_name = "#{file}.#{Gem.marshal_version}"
|
179
|
-
spec_path = uri + "#{file_name}.gz"
|
182
|
+
spec_path = enforce_trailing_slash(uri) + "#{file_name}.gz"
|
180
183
|
cache_dir = cache_dir spec_path
|
181
184
|
local_file = File.join(cache_dir, file_name)
|
182
185
|
retried = false
|
183
186
|
|
184
|
-
|
187
|
+
if update_cache?
|
188
|
+
require "fileutils"
|
189
|
+
FileUtils.mkdir_p cache_dir
|
190
|
+
end
|
185
191
|
|
186
192
|
spec_dump = fetcher.cache_update_path spec_path, local_file, update_cache?
|
187
193
|
|
@@ -222,9 +228,14 @@ class Gem::Source
|
|
222
228
|
|
223
229
|
def typo_squatting?(host, distance_threshold=4)
|
224
230
|
return if @uri.host.nil?
|
225
|
-
levenshtein_distance(@uri.host, host)
|
231
|
+
levenshtein_distance(@uri.host, host).between? 1, distance_threshold
|
226
232
|
end
|
227
233
|
|
234
|
+
private
|
235
|
+
|
236
|
+
def enforce_trailing_slash(uri)
|
237
|
+
uri.merge(uri.path.gsub(/\/+$/, '') + '/')
|
238
|
+
end
|
228
239
|
end
|
229
240
|
|
230
241
|
require 'rubygems/source/git'
|