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
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
@@ -5,7 +5,6 @@
|
|
5
5
|
# wrap the data returned from the indexes.
|
6
6
|
|
7
7
|
class Gem::NameTuple
|
8
|
-
|
9
8
|
def initialize(name, version, platform="ruby")
|
10
9
|
@name = name
|
11
10
|
@version = version
|
@@ -60,7 +59,7 @@ class Gem::NameTuple
|
|
60
59
|
# Indicate if this NameTuple matches the current platform.
|
61
60
|
|
62
61
|
def match_platform?
|
63
|
-
Gem::Platform.
|
62
|
+
Gem::Platform.match_gem? @platform, @name
|
64
63
|
end
|
65
64
|
|
66
65
|
##
|
@@ -119,5 +118,4 @@ class Gem::NameTuple
|
|
119
118
|
def hash
|
120
119
|
to_a.hash
|
121
120
|
end
|
122
|
-
|
123
121
|
end
|
data/lib/rubygems/package.rb
CHANGED
@@ -44,16 +44,13 @@
|
|
44
44
|
require "rubygems"
|
45
45
|
require 'rubygems/security'
|
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,6 +185,8 @@ 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
|
@@ -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
|
|
@@ -674,10 +670,9 @@ EOM
|
|
674
670
|
when 'data.tar.gz' then
|
675
671
|
verify_gz entry
|
676
672
|
end
|
677
|
-
rescue
|
678
|
-
|
679
|
-
|
680
|
-
raise Gem::Package::FormatError.new message, @gem
|
673
|
+
rescue
|
674
|
+
warn "Exception while verifying #{@gem.path}"
|
675
|
+
raise
|
681
676
|
end
|
682
677
|
|
683
678
|
##
|
@@ -712,7 +707,6 @@ EOM
|
|
712
707
|
rescue Zlib::GzipFile::Error => e
|
713
708
|
raise Gem::Package::FormatError.new(e.message, entry.full_name)
|
714
709
|
end
|
715
|
-
|
716
710
|
end
|
717
711
|
|
718
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
@@ -28,7 +28,6 @@
|
|
28
28
|
# A header for a tar file
|
29
29
|
|
30
30
|
class Gem::Package::TarHeader
|
31
|
-
|
32
31
|
##
|
33
32
|
# Fields in the tar header
|
34
33
|
|
@@ -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
|
@@ -8,7 +8,6 @@
|
|
8
8
|
# TarReader reads tar files and allows iteration over their items
|
9
9
|
|
10
10
|
class Gem::Package::TarReader
|
11
|
-
|
12
11
|
include Enumerable
|
13
12
|
|
14
13
|
##
|
@@ -120,7 +119,6 @@ class Gem::Package::TarReader
|
|
120
119
|
ensure
|
121
120
|
rewind
|
122
121
|
end
|
123
|
-
|
124
122
|
end
|
125
123
|
|
126
124
|
require 'rubygems/package/tar_reader/entry'
|
@@ -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
|
@@ -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
|
@@ -8,14 +8,12 @@
|
|
8
8
|
# Allows writing of tar files
|
9
9
|
|
10
10
|
class Gem::Package::TarWriter
|
11
|
-
|
12
11
|
class FileOverflow < StandardError; end
|
13
12
|
|
14
13
|
##
|
15
14
|
# IO wrapper that allows writing a limited amount of data
|
16
15
|
|
17
16
|
class BoundedStream
|
18
|
-
|
19
17
|
##
|
20
18
|
# Maximum number of bytes that can be written
|
21
19
|
|
@@ -47,14 +45,12 @@ class Gem::Package::TarWriter
|
|
47
45
|
@written += data.bytesize
|
48
46
|
data.bytesize
|
49
47
|
end
|
50
|
-
|
51
48
|
end
|
52
49
|
|
53
50
|
##
|
54
51
|
# IO wrapper that provides only #write
|
55
52
|
|
56
53
|
class RestrictedStream
|
57
|
-
|
58
54
|
##
|
59
55
|
# Creates a new RestrictedStream wrapping +io+
|
60
56
|
|
@@ -68,7 +64,6 @@ class Gem::Package::TarWriter
|
|
68
64
|
def write(data)
|
69
65
|
@io.write data
|
70
66
|
end
|
71
|
-
|
72
67
|
end
|
73
68
|
|
74
69
|
##
|
@@ -330,5 +325,4 @@ class Gem::Package::TarWriter
|
|
330
325
|
|
331
326
|
return name, prefix
|
332
327
|
end
|
333
|
-
|
334
328
|
end
|
@@ -57,7 +57,6 @@ require 'rake/packagetask'
|
|
57
57
|
# end
|
58
58
|
|
59
59
|
class Gem::PackageTask < Rake::PackageTask
|
60
|
-
|
61
60
|
##
|
62
61
|
# Ruby Gem::Specification containing the metadata for this package. The
|
63
62
|
# name, version and package_files are automatically determined from the
|
@@ -120,5 +119,4 @@ class Gem::PackageTask < Rake::PackageTask
|
|
120
119
|
end
|
121
120
|
end
|
122
121
|
end
|
123
|
-
|
124
122
|
end
|
data/lib/rubygems/platform.rb
CHANGED
@@ -7,14 +7,9 @@ require "rubygems/deprecate"
|
|
7
7
|
# See `gem help platform` for information on platform matching.
|
8
8
|
|
9
9
|
class Gem::Platform
|
10
|
-
|
11
10
|
@local = nil
|
12
11
|
|
13
|
-
attr_accessor :cpu
|
14
|
-
|
15
|
-
attr_accessor :os
|
16
|
-
|
17
|
-
attr_accessor :version
|
12
|
+
attr_accessor :cpu, :os, :version
|
18
13
|
|
19
14
|
def self.local
|
20
15
|
arch = RbConfig::CONFIG['arch']
|
@@ -23,18 +18,33 @@ class Gem::Platform
|
|
23
18
|
end
|
24
19
|
|
25
20
|
def self.match(platform)
|
26
|
-
Gem.platforms
|
21
|
+
match_platforms?(platform, Gem.platforms)
|
22
|
+
end
|
23
|
+
|
24
|
+
def self.match_platforms?(platform, platforms)
|
25
|
+
platforms.any? do |local_platform|
|
27
26
|
platform.nil? or
|
28
27
|
local_platform == platform or
|
29
28
|
(local_platform != Gem::Platform::RUBY and local_platform =~ platform)
|
30
29
|
end
|
31
30
|
end
|
31
|
+
private_class_method :match_platforms?
|
32
|
+
|
33
|
+
def self.match_spec?(spec)
|
34
|
+
match_gem?(spec.platform, spec.name)
|
35
|
+
end
|
36
|
+
|
37
|
+
def self.match_gem?(platform, gem_name)
|
38
|
+
# Note: this method might be redefined by Ruby implementations to
|
39
|
+
# customize behavior per RUBY_ENGINE, gem_name or other criteria.
|
40
|
+
match_platforms?(platform, Gem.platforms)
|
41
|
+
end
|
32
42
|
|
33
43
|
def self.installable?(spec)
|
34
44
|
if spec.respond_to? :installable_platform?
|
35
45
|
spec.installable_platform?
|
36
46
|
else
|
37
|
-
|
47
|
+
match_spec? spec
|
38
48
|
end
|
39
49
|
end
|
40
50
|
|
@@ -202,5 +212,4 @@ class Gem::Platform
|
|
202
212
|
# This will be replaced with Gem::Platform::local.
|
203
213
|
|
204
214
|
CURRENT = 'current'.freeze
|
205
|
-
|
206
215
|
end
|
data/lib/rubygems/psych_tree.rb
CHANGED
data/lib/rubygems/query_utils.rb
CHANGED
@@ -57,15 +57,6 @@ module Gem::QueryUtils
|
|
57
57
|
"--local --name-matches // --no-details --versions --no-installed"
|
58
58
|
end
|
59
59
|
|
60
|
-
def description # :nodoc:
|
61
|
-
<<-EOF
|
62
|
-
The query command is the basis for the list and search commands.
|
63
|
-
|
64
|
-
You should really use the list and search commands instead. This command
|
65
|
-
is too hard to use.
|
66
|
-
EOF
|
67
|
-
end
|
68
|
-
|
69
60
|
def execute
|
70
61
|
gem_names = Array(options[:name])
|
71
62
|
|
@@ -13,7 +13,6 @@ require 'resolv'
|
|
13
13
|
# a remote source.
|
14
14
|
|
15
15
|
class Gem::RemoteFetcher
|
16
|
-
|
17
16
|
include Gem::UserInteraction
|
18
17
|
include Gem::UriParsing
|
19
18
|
|
@@ -22,7 +21,6 @@ class Gem::RemoteFetcher
|
|
22
21
|
# that could happen while downloading from the internet.
|
23
22
|
|
24
23
|
class FetchError < Gem::Exception
|
25
|
-
|
26
24
|
include Gem::UriParsing
|
27
25
|
|
28
26
|
##
|
@@ -43,7 +41,6 @@ class Gem::RemoteFetcher
|
|
43
41
|
def to_s # :nodoc:
|
44
42
|
"#{super} (#{uri})"
|
45
43
|
end
|
46
|
-
|
47
44
|
end
|
48
45
|
|
49
46
|
##
|
@@ -81,7 +78,6 @@ class Gem::RemoteFetcher
|
|
81
78
|
def initialize(proxy=nil, dns=nil, headers={})
|
82
79
|
require 'net/http'
|
83
80
|
require 'stringio'
|
84
|
-
require 'time'
|
85
81
|
require 'uri'
|
86
82
|
|
87
83
|
Socket.do_not_reverse_lookup = true
|
@@ -117,11 +113,12 @@ class Gem::RemoteFetcher
|
|
117
113
|
# always replaced.
|
118
114
|
|
119
115
|
def download(spec, source_uri, install_dir = Gem.dir)
|
116
|
+
install_cache_dir = File.join install_dir, "cache"
|
120
117
|
cache_dir =
|
121
118
|
if Dir.pwd == install_dir # see fetch_command
|
122
119
|
install_dir
|
123
|
-
elsif File.writable? install_dir
|
124
|
-
|
120
|
+
elsif File.writable?(install_cache_dir) || (File.writable?(install_dir) && (not File.exist?(install_cache_dir)))
|
121
|
+
install_cache_dir
|
125
122
|
else
|
126
123
|
File.join Gem.user_dir, "cache"
|
127
124
|
end
|
@@ -129,6 +126,7 @@ class Gem::RemoteFetcher
|
|
129
126
|
gem_file_name = File.basename spec.cache_file
|
130
127
|
local_gem_path = File.join cache_dir, gem_file_name
|
131
128
|
|
129
|
+
require "fileutils"
|
132
130
|
FileUtils.mkdir_p cache_dir rescue nil unless File.exist? cache_dir
|
133
131
|
|
134
132
|
source_uri = parse_uri(source_uri)
|
@@ -217,7 +215,7 @@ class Gem::RemoteFetcher
|
|
217
215
|
|
218
216
|
case response
|
219
217
|
when Net::HTTPOK, Net::HTTPNotModified then
|
220
|
-
response.uri = uri
|
218
|
+
response.uri = uri
|
221
219
|
head ? response : response.body
|
222
220
|
when Net::HTTPMovedPermanently, Net::HTTPFound, Net::HTTPSeeOther,
|
223
221
|
Net::HTTPTemporaryRedirect then
|
@@ -264,7 +262,7 @@ class Gem::RemoteFetcher
|
|
264
262
|
rescue Timeout::Error
|
265
263
|
raise UnknownHostError.new('timed out', uri)
|
266
264
|
rescue IOError, SocketError, SystemCallError,
|
267
|
-
*(OpenSSL::SSL::SSLError if
|
265
|
+
*(OpenSSL::SSL::SSLError if Gem::HAVE_OPENSSL) => e
|
268
266
|
if e.message =~ /getaddrinfo/
|
269
267
|
raise UnknownHostError.new('no such name', uri)
|
270
268
|
else
|
@@ -341,5 +339,4 @@ class Gem::RemoteFetcher
|
|
341
339
|
@pools[proxy] ||= Gem::Request::ConnectionPools.new proxy, @cert_files
|
342
340
|
end
|
343
341
|
end
|
344
|
-
|
345
342
|
end
|