rubygems-update 3.1.2 → 3.2.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/{History.txt → CHANGELOG.md} +756 -489
- data/CODE_OF_CONDUCT.md +55 -19
- data/CONTRIBUTING.md +25 -11
- data/Manifest.txt +75 -104
- data/POLICIES.md +6 -12
- data/README.md +5 -5
- data/Rakefile +64 -92
- data/bin/update_rubygems +1 -1
- data/bundler/CHANGELOG.md +1636 -1422
- data/bundler/README.md +6 -8
- data/bundler/UPGRADING.md +18 -32
- data/bundler/bundler.gemspec +4 -4
- data/bundler/exe/bundle +3 -0
- data/bundler/lib/bundler.rb +32 -8
- data/bundler/lib/bundler/build_metadata.rb +4 -12
- data/bundler/lib/bundler/cli.rb +55 -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 +86 -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 +16 -13
- 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 +87 -66
- 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 +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 -13
- data/bundler/lib/bundler/definition.rb +66 -82
- data/bundler/lib/bundler/dep_proxy.rb +16 -9
- data/bundler/lib/bundler/dependency.rb +3 -10
- 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 +33 -19
- data/bundler/lib/bundler/gem_helpers.rb +36 -25
- data/bundler/lib/bundler/gem_version_promoter.rb +4 -4
- 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 +2 -2
- 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 +35 -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 → lib/bundler/man}/bundle-add.1 +1 -1
- data/bundler/{man/bundle-add.ronn → lib/bundler/man/bundle-add.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-binstubs.1 +5 -3
- data/bundler/{man/bundle-binstubs.ronn → lib/bundler/man/bundle-binstubs.1.ronn} +2 -4
- data/bundler/{man → lib/bundler/man}/bundle-cache.1 +1 -1
- data/bundler/{man/bundle-cache.ronn → lib/bundler/man/bundle-cache.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-check.1 +1 -1
- data/bundler/{man/bundle-check.ronn → lib/bundler/man/bundle-check.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-clean.1 +1 -1
- data/bundler/{man/bundle-clean.ronn → lib/bundler/man/bundle-clean.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-config.1 +16 -25
- data/bundler/{man/bundle-config.ronn → lib/bundler/man/bundle-config.1.ronn} +19 -30
- data/bundler/{man → lib/bundler/man}/bundle-doctor.1 +1 -1
- data/bundler/{man/bundle-doctor.ronn → lib/bundler/man/bundle-doctor.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-exec.1 +1 -1
- data/bundler/{man/bundle-exec.ronn → lib/bundler/man/bundle-exec.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-gem.1 +25 -3
- data/bundler/{man/bundle-gem.ronn → lib/bundler/man/bundle-gem.1.ronn} +30 -7
- data/bundler/{man → lib/bundler/man}/bundle-info.1 +1 -1
- data/bundler/{man/bundle-info.ronn → lib/bundler/man/bundle-info.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-init.1 +1 -1
- data/bundler/{man/bundle-init.ronn → lib/bundler/man/bundle-init.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-inject.1 +1 -1
- data/bundler/{man/bundle-inject.ronn → lib/bundler/man/bundle-inject.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-install.1 +30 -3
- data/bundler/{man/bundle-install.ronn → lib/bundler/man/bundle-install.1.ronn} +25 -3
- data/bundler/{man → lib/bundler/man}/bundle-list.1 +7 -7
- data/bundler/{man/bundle-list.ronn → lib/bundler/man/bundle-list.1.ronn} +6 -6
- data/bundler/{man → lib/bundler/man}/bundle-lock.1 +1 -1
- data/bundler/{man/bundle-lock.ronn → lib/bundler/man/bundle-lock.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-open.1 +1 -1
- data/bundler/{man/bundle-open.ronn → lib/bundler/man/bundle-open.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-outdated.1 +1 -1
- data/bundler/{man/bundle-outdated.ronn → lib/bundler/man/bundle-outdated.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-platform.1 +1 -1
- data/bundler/{man/bundle-platform.ronn → lib/bundler/man/bundle-platform.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-pristine.1 +1 -1
- data/bundler/{man/bundle-pristine.ronn → lib/bundler/man/bundle-pristine.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-remove.1 +1 -1
- data/bundler/{man/bundle-remove.ronn → lib/bundler/man/bundle-remove.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-show.1 +1 -1
- data/bundler/{man/bundle-show.ronn → lib/bundler/man/bundle-show.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-update.1 +1 -1
- data/bundler/{man/bundle-update.ronn → lib/bundler/man/bundle-update.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle-viz.1 +1 -1
- data/bundler/{man/bundle-viz.ronn → lib/bundler/man/bundle-viz.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/bundle.1 +1 -1
- data/bundler/{man/bundle.ronn → lib/bundler/man/bundle.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/gemfile.5 +4 -4
- data/bundler/{man → lib/bundler/man}/gemfile.5.ronn +4 -4
- data/bundler/{man → lib/bundler/man}/index.txt +0 -0
- 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 +43 -19
- data/bundler/lib/bundler/resolver/spec_group.rb +39 -24
- data/bundler/lib/bundler/retry.rb +1 -1
- data/bundler/lib/bundler/ruby_version.rb +1 -1
- data/bundler/lib/bundler/rubygems_ext.rb +69 -9
- data/bundler/lib/bundler/rubygems_gem_installer.rb +3 -9
- data/bundler/lib/bundler/rubygems_integration.rb +26 -61
- 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 +23 -21
- data/bundler/lib/bundler/source/git/git_proxy.rb +82 -80
- data/bundler/lib/bundler/source/path.rb +7 -3
- data/bundler/lib/bundler/source/path/installer.rb +10 -10
- data/bundler/lib/bundler/source/rubygems.rb +23 -17
- 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 +8 -10
- data/bundler/lib/bundler/stub_specification.rb +17 -7
- 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 +15 -7
- data/bundler/lib/bundler/templates/newgem/rubocop.yml.tt +13 -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 +48 -46
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +79 -208
- 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/lib/rubygems.rb +138 -187
- data/lib/rubygems/available_set.rb +4 -6
- data/lib/rubygems/basic_specification.rb +12 -10
- data/lib/rubygems/bundler_version_finder.rb +14 -9
- data/lib/rubygems/command.rb +17 -17
- data/lib/rubygems/command_manager.rb +5 -6
- data/lib/rubygems/commands/build_command.rb +40 -20
- data/lib/rubygems/commands/cert_command.rb +2 -10
- data/lib/rubygems/commands/check_command.rb +0 -2
- data/lib/rubygems/commands/cleanup_command.rb +11 -7
- data/lib/rubygems/commands/contents_command.rb +4 -6
- data/lib/rubygems/commands/dependency_command.rb +6 -8
- data/lib/rubygems/commands/environment_command.rb +1 -3
- data/lib/rubygems/commands/fetch_command.rb +2 -4
- data/lib/rubygems/commands/generate_index_command.rb +0 -2
- data/lib/rubygems/commands/help_command.rb +4 -4
- data/lib/rubygems/commands/info_command.rb +8 -5
- data/lib/rubygems/commands/install_command.rb +3 -5
- data/lib/rubygems/commands/list_command.rb +8 -7
- data/lib/rubygems/commands/lock_command.rb +1 -3
- data/lib/rubygems/commands/mirror_command.rb +0 -2
- data/lib/rubygems/commands/open_command.rb +0 -4
- data/lib/rubygems/commands/outdated_command.rb +0 -2
- data/lib/rubygems/commands/owner_command.rb +9 -4
- data/lib/rubygems/commands/pristine_command.rb +11 -5
- data/lib/rubygems/commands/push_command.rb +10 -47
- 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 +101 -74
- data/lib/rubygems/commands/signin_command.rb +0 -2
- data/lib/rubygems/commands/signout_command.rb +0 -2
- data/lib/rubygems/commands/sources_command.rb +9 -7
- data/lib/rubygems/commands/specification_command.rb +8 -4
- data/lib/rubygems/commands/stale_command.rb +1 -3
- data/lib/rubygems/commands/uninstall_command.rb +2 -4
- 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 -7
- 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 +6 -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 +21 -39
- data/lib/rubygems/ext/cmake_builder.rb +6 -9
- data/lib/rubygems/ext/configure_builder.rb +5 -8
- data/lib/rubygems/ext/ext_conf_builder.rb +21 -19
- data/lib/rubygems/ext/rake_builder.rb +4 -6
- data/lib/rubygems/gem_runner.rb +3 -10
- data/lib/rubygems/gemcutter_utilities.rb +102 -21
- data/lib/rubygems/indexer.rb +1 -22
- data/lib/rubygems/install_update_options.rb +7 -7
- data/lib/rubygems/installer.rb +59 -80
- 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 -16
- 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 +14 -29
- 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 +7 -20
- data/lib/rubygems/request_set/gem_dependency_api.rb +6 -8
- 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 +21 -22
- data/lib/rubygems/resolver.rb +14 -12
- data/lib/rubygems/resolver/activation_request.rb +9 -3
- data/lib/rubygems/resolver/api_set.rb +31 -24
- data/lib/rubygems/resolver/api_set/gem_parser.rb +20 -0
- data/lib/rubygems/resolver/api_specification.rb +24 -10
- data/lib/rubygems/resolver/best_set.rb +2 -4
- 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 +29 -2
- data/lib/rubygems/resolver/installed_specification.rb +0 -2
- data/lib/rubygems/resolver/installer_set.rb +60 -13
- 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 +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/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 +16 -13
- data/lib/rubygems/source.rb +23 -12
- 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 +122 -131
- data/lib/rubygems/specification_policy.rb +88 -30
- data/lib/rubygems/ssl_certs/{index.rubygems.org → rubygems.org}/GlobalSignRootCA.pem +0 -0
- data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem +21 -0
- data/lib/rubygems/stub_specification.rb +1 -5
- data/lib/rubygems/syck_hack.rb +0 -2
- data/lib/rubygems/test_case.rb +120 -134
- data/lib/rubygems/test_utilities.rb +12 -19
- 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 +15 -3
- 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 +5 -7
- data/lib/rubygems/version_option.rb +6 -0
- data/rubygems-update.gemspec +3 -3
- data/setup.rb +2 -7
- data/test/rubygems/data/null-required-rubygems-version.gemspec.rz +0 -0
- data/test/rubygems/plugin/load/rubygems_plugin.rb +0 -2
- data/test/rubygems/rubygems/commands/crash_command.rb +0 -2
- data/test/rubygems/rubygems_plugin.rb +0 -2
- data/test/rubygems/specifications/bar-0.0.2.gemspec +0 -2
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +12 -0
- data/test/rubygems/test_bundled_ca.rb +42 -45
- data/test/rubygems/test_config.rb +0 -2
- data/test/rubygems/test_deprecate.rb +40 -7
- data/test/rubygems/test_gem.rb +156 -99
- data/test/rubygems/test_gem_available_set.rb +3 -5
- data/test/rubygems/test_gem_bundler_version_finder.rb +19 -3
- data/test/rubygems/test_gem_command.rb +24 -7
- data/test/rubygems/test_gem_command_manager.rb +36 -5
- data/test/rubygems/test_gem_commands_build_command.rb +250 -15
- data/test/rubygems/test_gem_commands_cert_command.rb +4 -6
- data/test/rubygems/test_gem_commands_check_command.rb +0 -2
- data/test/rubygems/test_gem_commands_cleanup_command.rb +14 -5
- data/test/rubygems/test_gem_commands_contents_command.rb +50 -19
- data/test/rubygems/test_gem_commands_dependency_command.rb +0 -2
- data/test/rubygems/test_gem_commands_environment_command.rb +21 -23
- data/test/rubygems/test_gem_commands_fetch_command.rb +0 -2
- data/test/rubygems/test_gem_commands_generate_index_command.rb +1 -7
- data/test/rubygems/test_gem_commands_help_command.rb +15 -4
- data/test/rubygems/test_gem_commands_info_command.rb +6 -8
- data/test/rubygems/test_gem_commands_install_command.rb +163 -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 +77 -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 +160 -135
- data/test/rubygems/test_gem_commands_signin_command.rb +33 -9
- data/test/rubygems/test_gem_commands_signout_command.rb +0 -7
- data/test/rubygems/test_gem_commands_sources_command.rb +99 -3
- data/test/rubygems/test_gem_commands_specification_command.rb +46 -20
- data/test/rubygems/test_gem_commands_stale_command.rb +0 -2
- data/test/rubygems/test_gem_commands_uninstall_command.rb +2 -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 +116 -239
- 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 +50 -47
- data/test/rubygems/test_gem_ext_cmake_builder.rb +16 -25
- data/test/rubygems/test_gem_ext_configure_builder.rb +6 -22
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +9 -29
- data/test/rubygems/test_gem_ext_rake_builder.rb +39 -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 +258 -115
- 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 +41 -39
- 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 +9 -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 +71 -6
- data/test/rubygems/test_gem_rdoc.rb +0 -2
- data/test/rubygems/test_gem_remote_fetcher.rb +169 -212
- 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 +72 -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 +43 -3
- 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 +60 -59
- data/test/rubygems/test_gem_resolver_api_specification.rb +3 -5
- data/test/rubygems/test_gem_resolver_best_set.rb +27 -6
- 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 +19 -18
- 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 +188 -131
- data/test/rubygems/test_gem_stream_ui.rb +3 -3
- data/test/rubygems/test_gem_stub_specification.rb +4 -7
- data/test/rubygems/test_gem_text.rb +1 -3
- data/test/rubygems/test_gem_uninstaller.rb +134 -12
- data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +0 -2
- data/test/rubygems/test_gem_uri_formatter.rb +0 -2
- data/test/rubygems/test_gem_util.rb +7 -7
- data/test/rubygems/test_gem_validator.rb +1 -3
- data/test/rubygems/test_gem_version.rb +1 -3
- data/test/rubygems/test_gem_version_option.rb +1 -3
- data/test/rubygems/test_kernel.rb +25 -10
- data/test/rubygems/test_project_sanity.rb +7 -2
- data/test/rubygems/test_remote_fetch_error.rb +0 -2
- data/test/rubygems/test_require.rb +291 -56
- data/test/test_changelog_generator.rb +17 -0
- metadata +79 -133
- data/.bundle/config +0 -2
- data/.rubocop.yml +0 -91
- data/Gemfile +0 -8
- data/Gemfile.lock +0 -43
- data/bundler/CODE_OF_CONDUCT.md +0 -136
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +0 -26
- data/bundler/man/bundle-add.1.txt +0 -58
- data/bundler/man/bundle-binstubs.1.txt +0 -48
- data/bundler/man/bundle-cache.1.txt +0 -78
- data/bundler/man/bundle-check.1.txt +0 -33
- data/bundler/man/bundle-clean.1.txt +0 -26
- data/bundler/man/bundle-config.1.txt +0 -528
- data/bundler/man/bundle-doctor.1.txt +0 -44
- data/bundler/man/bundle-exec.1.txt +0 -178
- data/bundler/man/bundle-gem.1.txt +0 -91
- data/bundler/man/bundle-info.1.txt +0 -21
- data/bundler/man/bundle-init.1.txt +0 -34
- data/bundler/man/bundle-inject.1.txt +0 -32
- data/bundler/man/bundle-install.1.txt +0 -401
- data/bundler/man/bundle-list.1.txt +0 -43
- data/bundler/man/bundle-lock.1.txt +0 -93
- data/bundler/man/bundle-open.1.txt +0 -29
- data/bundler/man/bundle-outdated.1.txt +0 -131
- data/bundler/man/bundle-platform.1.txt +0 -57
- data/bundler/man/bundle-pristine.1.txt +0 -44
- data/bundler/man/bundle-remove.1.txt +0 -34
- data/bundler/man/bundle-show.1.txt +0 -27
- data/bundler/man/bundle-update.1.txt +0 -390
- data/bundler/man/bundle-viz.1.txt +0 -39
- data/bundler/man/bundle.1.txt +0 -116
- data/bundler/man/gemfile.5.txt +0 -649
- data/lib/rubygems/source_local.rb +0 -7
- data/lib/rubygems/source_specific_file.rb +0 -6
- data/lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -23
- data/lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -25
- data/lib/ubygems.rb +0 -14
- data/tmp/.keep +0 -0
- data/util/CL2notes +0 -55
- data/util/bisect +0 -10
- data/util/ci.sh +0 -62
- data/util/cops/deprecations.rb +0 -52
- data/util/create_certs.rb +0 -171
- data/util/create_certs.sh +0 -27
- data/util/create_encrypted_key.rb +0 -16
- data/util/generate_spdx_license_list.rb +0 -63
- data/util/patch_with_prs.rb +0 -77
- data/util/rubocop +0 -8
- data/util/update_bundled_ca_certificates.rb +0 -139
- data/util/update_changelog.rb +0 -67
@@ -0,0 +1,24 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
##
|
4
|
+
# Helper methods for both Gem::Installer and Gem::Uninstaller
|
5
|
+
|
6
|
+
module Gem::InstallerUninstallerUtils
|
7
|
+
|
8
|
+
def regenerate_plugins_for(spec, plugins_dir)
|
9
|
+
spec.plugins.each do |plugin|
|
10
|
+
plugin_script_path = File.join plugins_dir, "#{spec.name}_plugin#{File.extname(plugin)}"
|
11
|
+
|
12
|
+
File.open plugin_script_path, 'wb' do |file|
|
13
|
+
file.puts "require '#{plugin}'"
|
14
|
+
end
|
15
|
+
|
16
|
+
verbose plugin_script_path
|
17
|
+
end
|
18
|
+
end
|
19
|
+
|
20
|
+
def remove_plugins_for(spec, plugins_dir)
|
21
|
+
FileUtils.rm_f Gem::Util.glob_files_in_dir("#{spec.name}#{Gem.plugin_suffix_pattern}", plugins_dir)
|
22
|
+
end
|
23
|
+
|
24
|
+
end
|
@@ -26,7 +26,7 @@ module Gem::LocalRemoteOptions
|
|
26
26
|
|
27
27
|
valid_uri_schemes = ["http", "https", "file", "s3"]
|
28
28
|
unless valid_uri_schemes.include?(uri.scheme)
|
29
|
-
msg = "Invalid uri scheme for #{value}\nPreface URLs with one of #{valid_uri_schemes.map{|s| "#{s}://"}}"
|
29
|
+
msg = "Invalid uri scheme for #{value}\nPreface URLs with one of #{valid_uri_schemes.map{|s| "#{s}://" }}"
|
30
30
|
raise ArgumentError, msg
|
31
31
|
end
|
32
32
|
|
data/lib/rubygems/mock_gem_ui.rb
CHANGED
@@ -6,27 +6,22 @@ require 'rubygems/user_interaction'
|
|
6
6
|
# retrieval during tests.
|
7
7
|
|
8
8
|
class Gem::MockGemUi < Gem::StreamUI
|
9
|
-
|
10
9
|
##
|
11
10
|
# Raised when you haven't provided enough input to your MockGemUi
|
12
11
|
|
13
12
|
class InputEOFError < RuntimeError
|
14
|
-
|
15
13
|
def initialize(question)
|
16
14
|
super "Out of input for MockGemUi on #{question.inspect}"
|
17
15
|
end
|
18
|
-
|
19
16
|
end
|
20
17
|
|
21
18
|
class TermError < RuntimeError
|
22
|
-
|
23
19
|
attr_reader :exit_code
|
24
20
|
|
25
21
|
def initialize(exit_code)
|
26
22
|
super
|
27
23
|
@exit_code = exit_code
|
28
24
|
end
|
29
|
-
|
30
25
|
end
|
31
26
|
class SystemExitException < RuntimeError; end
|
32
27
|
|
@@ -87,5 +82,4 @@ class Gem::MockGemUi < Gem::StreamUI
|
|
87
82
|
raise TermError, status if status != 0
|
88
83
|
raise SystemExitException
|
89
84
|
end
|
90
|
-
|
91
85
|
end
|
data/lib/rubygems/name_tuple.rb
CHANGED
@@ -4,10 +4,7 @@
|
|
4
4
|
# Represents a gem of name +name+ at +version+ of +platform+. These
|
5
5
|
# wrap the data returned from the indexes.
|
6
6
|
|
7
|
-
require 'rubygems/platform'
|
8
|
-
|
9
7
|
class Gem::NameTuple
|
10
|
-
|
11
8
|
def initialize(name, version, platform="ruby")
|
12
9
|
@name = name
|
13
10
|
@version = version
|
@@ -26,7 +23,7 @@ class Gem::NameTuple
|
|
26
23
|
# NameTuple objects.
|
27
24
|
|
28
25
|
def self.from_list(list)
|
29
|
-
list.map {
|
26
|
+
list.map {|t| new(*t) }
|
30
27
|
end
|
31
28
|
|
32
29
|
##
|
@@ -34,7 +31,7 @@ class Gem::NameTuple
|
|
34
31
|
# [name, version, platform] tuples.
|
35
32
|
|
36
33
|
def self.to_basic(list)
|
37
|
-
list.map {
|
34
|
+
list.map {|t| t.to_a }
|
38
35
|
end
|
39
36
|
|
40
37
|
##
|
@@ -62,7 +59,7 @@ class Gem::NameTuple
|
|
62
59
|
# Indicate if this NameTuple matches the current platform.
|
63
60
|
|
64
61
|
def match_platform?
|
65
|
-
Gem::Platform.
|
62
|
+
Gem::Platform.match_gem? @platform, @name
|
66
63
|
end
|
67
64
|
|
68
65
|
##
|
@@ -121,5 +118,4 @@ class Gem::NameTuple
|
|
121
118
|
def hash
|
122
119
|
to_a.hash
|
123
120
|
end
|
124
|
-
|
125
121
|
end
|
data/lib/rubygems/package.rb
CHANGED
@@ -1,4 +1,3 @@
|
|
1
|
-
# -*- coding: utf-8 -*-
|
2
1
|
# frozen_string_literal: true
|
3
2
|
#--
|
4
3
|
# Copyright (C) 2004 Mauricio Julio Fernández Pradier
|
@@ -8,7 +7,8 @@
|
|
8
7
|
# Example using a Gem::Package
|
9
8
|
#
|
10
9
|
# Builds a .gem file given a Gem::Specification. A .gem file is a tarball
|
11
|
-
# which contains a data.tar.gz
|
10
|
+
# which contains a data.tar.gz, metadata.gz, checksums.yaml.gz and possibly
|
11
|
+
# signatures.
|
12
12
|
#
|
13
13
|
# require 'rubygems'
|
14
14
|
# require 'rubygems/package'
|
@@ -41,19 +41,16 @@
|
|
41
41
|
# #files are the files in the .gem tar file, not the Ruby files in the gem
|
42
42
|
# #extract_files and #contents automatically call #verify
|
43
43
|
|
44
|
+
require "rubygems"
|
44
45
|
require 'rubygems/security'
|
45
|
-
require 'rubygems/specification'
|
46
46
|
require 'rubygems/user_interaction'
|
47
|
-
require 'zlib'
|
48
47
|
|
49
48
|
class Gem::Package
|
50
|
-
|
51
49
|
include Gem::UserInteraction
|
52
50
|
|
53
51
|
class Error < Gem::Exception; end
|
54
52
|
|
55
53
|
class FormatError < Error
|
56
|
-
|
57
54
|
attr_reader :path
|
58
55
|
|
59
56
|
def initialize(message, source = nil)
|
@@ -65,16 +62,13 @@ class Gem::Package
|
|
65
62
|
|
66
63
|
super message
|
67
64
|
end
|
68
|
-
|
69
65
|
end
|
70
66
|
|
71
67
|
class PathError < Error
|
72
|
-
|
73
68
|
def initialize(destination, destination_dir)
|
74
69
|
super "installing into parent path %s of %s is not allowed" %
|
75
70
|
[destination, destination_dir]
|
76
71
|
end
|
77
|
-
|
78
72
|
end
|
79
73
|
|
80
74
|
class NonSeekableIO < Error; end
|
@@ -191,12 +185,14 @@ class Gem::Package
|
|
191
185
|
# Creates a new package that will read or write to the file +gem+.
|
192
186
|
|
193
187
|
def initialize(gem, security_policy) # :notnew:
|
188
|
+
require 'zlib'
|
189
|
+
|
194
190
|
@gem = gem
|
195
191
|
|
196
192
|
@build_time = Gem.source_date_epoch
|
197
193
|
@checksums = {}
|
198
194
|
@contents = nil
|
199
|
-
@digests = Hash.new {
|
195
|
+
@digests = Hash.new {|h, algorithm| h[algorithm] = {} }
|
200
196
|
@files = nil
|
201
197
|
@security_policy = security_policy
|
202
198
|
@signatures = {}
|
@@ -217,7 +213,7 @@ class Gem::Package
|
|
217
213
|
def add_checksums(tar)
|
218
214
|
Gem.load_yaml
|
219
215
|
|
220
|
-
checksums_by_algorithm = Hash.new {
|
216
|
+
checksums_by_algorithm = Hash.new {|h, algorithm| h[algorithm] = {} }
|
221
217
|
|
222
218
|
@checksums.each do |name, digests|
|
223
219
|
digests.each do |algorithm, digest|
|
@@ -302,7 +298,7 @@ class Gem::Package
|
|
302
298
|
|
303
299
|
setup_signer(
|
304
300
|
signer_options: {
|
305
|
-
expiration_length_days: Gem.configuration.cert_expiration_length_days
|
301
|
+
expiration_length_days: Gem.configuration.cert_expiration_length_days,
|
306
302
|
}
|
307
303
|
)
|
308
304
|
|
@@ -363,12 +359,7 @@ EOM
|
|
363
359
|
end
|
364
360
|
|
365
361
|
algorithms.each do |algorithm|
|
366
|
-
digester =
|
367
|
-
if defined?(OpenSSL::Digest)
|
368
|
-
OpenSSL::Digest.new algorithm
|
369
|
-
else
|
370
|
-
Digest.const_get(algorithm).new
|
371
|
-
end
|
362
|
+
digester = Gem::Security.create_digest(algorithm)
|
372
363
|
|
373
364
|
digester << entry.read(16384) until entry.eof?
|
374
365
|
|
@@ -580,10 +571,10 @@ EOM
|
|
580
571
|
)
|
581
572
|
|
582
573
|
@spec.signing_key = nil
|
583
|
-
@spec.cert_chain = @signer.cert_chain.map {
|
574
|
+
@spec.cert_chain = @signer.cert_chain.map {|cert| cert.to_s }
|
584
575
|
else
|
585
576
|
@signer = Gem::Security::Signer.new nil, nil, passphrase
|
586
|
-
@spec.cert_chain = @signer.cert_chain.map {
|
577
|
+
@spec.cert_chain = @signer.cert_chain.map {|cert| cert.to_pem } if
|
587
578
|
@signer.cert_chain
|
588
579
|
end
|
589
580
|
end
|
@@ -679,10 +670,9 @@ EOM
|
|
679
670
|
when 'data.tar.gz' then
|
680
671
|
verify_gz entry
|
681
672
|
end
|
682
|
-
rescue
|
683
|
-
|
684
|
-
|
685
|
-
raise Gem::Package::FormatError.new message, @gem
|
673
|
+
rescue
|
674
|
+
warn "Exception while verifying #{@gem.path}"
|
675
|
+
raise
|
686
676
|
end
|
687
677
|
|
688
678
|
##
|
@@ -717,7 +707,6 @@ EOM
|
|
717
707
|
rescue Zlib::GzipFile::Error => e
|
718
708
|
raise Gem::Package::FormatError.new(e.message, entry.full_name)
|
719
709
|
end
|
720
|
-
|
721
710
|
end
|
722
711
|
|
723
712
|
require 'rubygems/package/digest_io'
|
@@ -7,7 +7,6 @@
|
|
7
7
|
# object to `Gem::Package.new`.
|
8
8
|
|
9
9
|
class Gem::Package::FileSource < Gem::Package::Source # :nodoc: all
|
10
|
-
|
11
10
|
attr_reader :path
|
12
11
|
|
13
12
|
def initialize(path)
|
@@ -29,5 +28,4 @@ class Gem::Package::FileSource < Gem::Package::Source # :nodoc: all
|
|
29
28
|
def with_read_io(&block)
|
30
29
|
File.open path, 'rb', &block
|
31
30
|
end
|
32
|
-
|
33
31
|
end
|
@@ -8,7 +8,6 @@
|
|
8
8
|
# object to `Gem::Package.new`.
|
9
9
|
|
10
10
|
class Gem::Package::IOSource < Gem::Package::Source # :nodoc: all
|
11
|
-
|
12
11
|
attr_reader :io
|
13
12
|
|
14
13
|
def initialize(io)
|
@@ -41,5 +40,4 @@ class Gem::Package::IOSource < Gem::Package::Source # :nodoc: all
|
|
41
40
|
|
42
41
|
def path
|
43
42
|
end
|
44
|
-
|
45
43
|
end
|
data/lib/rubygems/package/old.rb
CHANGED
@@ -12,7 +12,6 @@
|
|
12
12
|
# Please pretend this doesn't exist.
|
13
13
|
|
14
14
|
class Gem::Package::Old < Gem::Package
|
15
|
-
|
16
15
|
undef_method :spec=
|
17
16
|
|
18
17
|
##
|
@@ -42,7 +41,7 @@ class Gem::Package::Old < Gem::Package
|
|
42
41
|
read_until_dashes io # spec
|
43
42
|
header = file_list io
|
44
43
|
|
45
|
-
@contents = header.map {
|
44
|
+
@contents = header.map {|file| file['path'] }
|
46
45
|
end
|
47
46
|
end
|
48
47
|
|
@@ -166,5 +165,4 @@ class Gem::Package::Old < Gem::Package
|
|
166
165
|
|
167
166
|
true
|
168
167
|
end
|
169
|
-
|
170
168
|
end
|
@@ -1,4 +1,3 @@
|
|
1
|
-
# -*- coding: utf-8 -*-
|
2
1
|
# frozen_string_literal: true
|
3
2
|
#--
|
4
3
|
# Copyright (C) 2004 Mauricio Julio Fernández Pradier
|
@@ -29,7 +28,6 @@
|
|
29
28
|
# A header for a tar file
|
30
29
|
|
31
30
|
class Gem::Package::TarHeader
|
32
|
-
|
33
31
|
##
|
34
32
|
# Fields in the tar header
|
35
33
|
|
@@ -126,7 +124,8 @@ class Gem::Package::TarHeader
|
|
126
124
|
end
|
127
125
|
|
128
126
|
def self.strict_oct(str)
|
129
|
-
return str.oct if str =~ /\A[0-7]*\z/
|
127
|
+
return str.strip.oct if str.strip =~ /\A[0-7]*\z/
|
128
|
+
|
130
129
|
raise ArgumentError, "#{str.inspect} is not an octal string"
|
131
130
|
end
|
132
131
|
|
@@ -209,7 +208,7 @@ class Gem::Package::TarHeader
|
|
209
208
|
private
|
210
209
|
|
211
210
|
def calculate_checksum(header)
|
212
|
-
header.unpack("C*").inject {
|
211
|
+
header.unpack("C*").inject {|a, b| a + b }
|
213
212
|
end
|
214
213
|
|
215
214
|
def header(checksum = @checksum)
|
@@ -230,7 +229,7 @@ class Gem::Package::TarHeader
|
|
230
229
|
gname,
|
231
230
|
oct(devmajor, 7),
|
232
231
|
oct(devminor, 7),
|
233
|
-
prefix
|
232
|
+
prefix,
|
234
233
|
]
|
235
234
|
|
236
235
|
header = header.pack PACK_FORMAT
|
@@ -241,5 +240,4 @@ class Gem::Package::TarHeader
|
|
241
240
|
def oct(num, len)
|
242
241
|
"%0#{len}o" % num
|
243
242
|
end
|
244
|
-
|
245
243
|
end
|
@@ -1,4 +1,3 @@
|
|
1
|
-
# -*- coding: utf-8 -*-
|
2
1
|
# frozen_string_literal: true
|
3
2
|
#--
|
4
3
|
# Copyright (C) 2004 Mauricio Julio Fernández Pradier
|
@@ -9,7 +8,6 @@
|
|
9
8
|
# TarReader reads tar files and allows iteration over their items
|
10
9
|
|
11
10
|
class Gem::Package::TarReader
|
12
|
-
|
13
11
|
include Enumerable
|
14
12
|
|
15
13
|
##
|
@@ -121,7 +119,6 @@ class Gem::Package::TarReader
|
|
121
119
|
ensure
|
122
120
|
rewind
|
123
121
|
end
|
124
|
-
|
125
122
|
end
|
126
123
|
|
127
124
|
require 'rubygems/package/tar_reader/entry'
|
@@ -1,4 +1,3 @@
|
|
1
|
-
# -*- coding: utf-8 -*-
|
2
1
|
# frozen_string_literal: true
|
3
2
|
#++
|
4
3
|
# Copyright (C) 2004 Mauricio Julio Fernández Pradier
|
@@ -9,7 +8,6 @@
|
|
9
8
|
# Class for reading entries out of a tar file
|
10
9
|
|
11
10
|
class Gem::Package::TarReader::Entry
|
12
|
-
|
13
11
|
##
|
14
12
|
# Header for this tar entry
|
15
13
|
|
@@ -166,5 +164,4 @@ class Gem::Package::TarReader::Entry
|
|
166
164
|
@io.pos = @orig_pos
|
167
165
|
@read = 0
|
168
166
|
end
|
169
|
-
|
170
167
|
end
|
@@ -6,7 +6,6 @@ require 'rubygems/package'
|
|
6
6
|
# A test case for Gem::Package::Tar* classes
|
7
7
|
|
8
8
|
class Gem::Package::TarTestCase < Gem::TestCase
|
9
|
-
|
10
9
|
def ASCIIZ(str, length)
|
11
10
|
str + "\0" * (length - str.length)
|
12
11
|
end
|
@@ -68,7 +67,7 @@ class Gem::Package::TarTestCase < Gem::TestCase
|
|
68
67
|
end
|
69
68
|
|
70
69
|
def calc_checksum(header)
|
71
|
-
sum = header.unpack("C*").inject{|s,a| s + a}
|
70
|
+
sum = header.unpack("C*").inject{|s,a| s + a }
|
72
71
|
SP(Z(to_oct(sum, 6)))
|
73
72
|
end
|
74
73
|
|
@@ -91,7 +90,7 @@ class Gem::Package::TarTestCase < Gem::TestCase
|
|
91
90
|
ASCIIZ("wheel", 32), # char gname[32]; ASCIIZ
|
92
91
|
Z(to_oct(0, 7)), # char devmajor[8]; 0 padded, octal, null
|
93
92
|
Z(to_oct(0, 7)), # char devminor[8]; 0 padded, octal, null
|
94
|
-
ASCIIZ(dname, 155)
|
93
|
+
ASCIIZ(dname, 155), # char prefix[155]; ASCII + (Z unless filled)
|
95
94
|
]
|
96
95
|
|
97
96
|
h = arr.join
|
@@ -137,5 +136,4 @@ class Gem::Package::TarTestCase < Gem::TestCase
|
|
137
136
|
def util_symlink_entry
|
138
137
|
util_entry tar_symlink_header("foo", "bar", 0, Time.now, "link")
|
139
138
|
end
|
140
|
-
|
141
139
|
end
|
@@ -1,24 +1,19 @@
|
|
1
|
-
# -*- coding: utf-8 -*-
|
2
1
|
# frozen_string_literal: true
|
3
2
|
#--
|
4
3
|
# Copyright (C) 2004 Mauricio Julio Fernández Pradier
|
5
4
|
# See LICENSE.txt for additional licensing information.
|
6
5
|
#++
|
7
6
|
|
8
|
-
require 'digest'
|
9
|
-
|
10
7
|
##
|
11
8
|
# Allows writing of tar files
|
12
9
|
|
13
10
|
class Gem::Package::TarWriter
|
14
|
-
|
15
11
|
class FileOverflow < StandardError; end
|
16
12
|
|
17
13
|
##
|
18
14
|
# IO wrapper that allows writing a limited amount of data
|
19
15
|
|
20
16
|
class BoundedStream
|
21
|
-
|
22
17
|
##
|
23
18
|
# Maximum number of bytes that can be written
|
24
19
|
|
@@ -50,14 +45,12 @@ class Gem::Package::TarWriter
|
|
50
45
|
@written += data.bytesize
|
51
46
|
data.bytesize
|
52
47
|
end
|
53
|
-
|
54
48
|
end
|
55
49
|
|
56
50
|
##
|
57
51
|
# IO wrapper that provides only #write
|
58
52
|
|
59
53
|
class RestrictedStream
|
60
|
-
|
61
54
|
##
|
62
55
|
# Creates a new RestrictedStream wrapping +io+
|
63
56
|
|
@@ -71,7 +64,6 @@ class Gem::Package::TarWriter
|
|
71
64
|
def write(data)
|
72
65
|
@io.write data
|
73
66
|
end
|
74
|
-
|
75
67
|
end
|
76
68
|
|
77
69
|
##
|
@@ -146,8 +138,7 @@ class Gem::Package::TarWriter
|
|
146
138
|
if digest.respond_to? :name
|
147
139
|
digest.name
|
148
140
|
else
|
149
|
-
/::([^:]+)
|
150
|
-
$1
|
141
|
+
digest_algorithm.class.name[/::([^:]+)\z/, 1]
|
151
142
|
end
|
152
143
|
|
153
144
|
[digest_name, digest]
|
@@ -175,7 +166,7 @@ class Gem::Package::TarWriter
|
|
175
166
|
def add_file_signed(name, mode, signer)
|
176
167
|
digest_algorithms = [
|
177
168
|
signer.digest_algorithm,
|
178
|
-
|
169
|
+
Gem::Security.create_digest('SHA512'),
|
179
170
|
].compact.uniq
|
180
171
|
|
181
172
|
digests = add_file_digest name, mode, digest_algorithms do |io|
|
@@ -334,5 +325,4 @@ class Gem::Package::TarWriter
|
|
334
325
|
|
335
326
|
return name, prefix
|
336
327
|
end
|
337
|
-
|
338
328
|
end
|