rubygems-update 3.1.6 → 3.2.0.rc.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CODE_OF_CONDUCT.md +55 -19
- data/CONTRIBUTING.md +1 -2
- data/History.txt +122 -14
- data/Manifest.txt +13 -25
- data/POLICIES.md +2 -9
- data/README.md +1 -1
- data/Rakefile +31 -33
- data/bin/update_rubygems +1 -1
- data/bundler/CHANGELOG.md +806 -741
- data/bundler/README.md +6 -8
- data/bundler/UPGRADING.md +16 -30
- data/bundler/bundler.gemspec +3 -3
- data/bundler/exe/bundle +3 -0
- data/bundler/lib/bundler.rb +15 -4
- data/bundler/lib/bundler/build_metadata.rb +2 -2
- data/bundler/lib/bundler/cli.rb +32 -11
- data/bundler/lib/bundler/cli/console.rb +1 -1
- data/bundler/lib/bundler/cli/gem.rb +83 -10
- data/bundler/lib/bundler/cli/info.rb +13 -3
- data/bundler/lib/bundler/cli/init.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +5 -14
- data/bundler/lib/bundler/cli/issue.rb +2 -2
- data/bundler/lib/bundler/cli/list.rb +11 -9
- data/bundler/lib/bundler/cli/outdated.rb +88 -65
- data/bundler/lib/bundler/cli/plugin.rb +10 -0
- data/bundler/lib/bundler/cli/pristine.rb +5 -0
- data/bundler/lib/bundler/definition.rb +32 -32
- data/bundler/lib/bundler/dependency.rb +0 -9
- data/bundler/lib/bundler/dsl.rb +1 -5
- 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 -2
- data/bundler/lib/bundler/fetcher.rb +1 -0
- data/bundler/lib/bundler/friendly_errors.rb +4 -10
- data/bundler/lib/bundler/gem_helper.rb +17 -10
- data/bundler/lib/bundler/gem_version_promoter.rb +1 -1
- data/bundler/lib/bundler/injector.rb +14 -3
- data/bundler/lib/bundler/inline.rb +1 -1
- data/bundler/lib/bundler/installer.rb +29 -28
- data/bundler/lib/bundler/installer/gem_installer.rb +2 -2
- data/bundler/lib/bundler/installer/parallel_installer.rb +9 -9
- data/bundler/lib/bundler/lazy_specification.rb +16 -3
- data/bundler/lib/bundler/plugin.rb +26 -0
- data/bundler/lib/bundler/plugin/index.rb +9 -0
- data/bundler/lib/bundler/psyched_yaml.rb +0 -15
- data/bundler/lib/bundler/remote_specification.rb +4 -1
- data/bundler/lib/bundler/resolver.rb +31 -8
- data/bundler/lib/bundler/resolver/spec_group.rb +26 -5
- data/bundler/lib/bundler/rubygems_ext.rb +7 -8
- data/bundler/lib/bundler/rubygems_gem_installer.rb +1 -7
- data/bundler/lib/bundler/rubygems_integration.rb +3 -48
- data/bundler/lib/bundler/runtime.rb +2 -12
- data/bundler/lib/bundler/settings.rb +0 -3
- data/bundler/lib/bundler/shared_helpers.rb +1 -1
- data/bundler/lib/bundler/source/git.rb +4 -4
- data/bundler/lib/bundler/source/git/git_proxy.rb +53 -58
- data/bundler/lib/bundler/source/path.rb +5 -1
- data/bundler/lib/bundler/source/path/installer.rb +7 -9
- data/bundler/lib/bundler/source/rubygems.rb +11 -14
- data/bundler/lib/bundler/stub_specification.rb +16 -4
- 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/Rakefile.tt +19 -5
- data/bundler/lib/bundler/templates/newgem/bin/console.tt +2 -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 +2 -0
- data/bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +6 -4
- data/bundler/lib/bundler/templates/newgem/rubocop.yml.tt +10 -0
- data/bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +2 -0
- 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/vendor/net-http-persistent/lib/net/http/persistent.rb +75 -189
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +0 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +2 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +9 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/version.rb +1 -1
- data/bundler/man/bundle-add.1 +1 -1
- data/bundler/man/bundle-add.1.txt +15 -15
- data/bundler/man/bundle-binstubs.1 +1 -1
- data/bundler/man/bundle-binstubs.1.txt +10 -10
- data/bundler/man/bundle-cache.1 +1 -1
- data/bundler/man/bundle-cache.1.txt +15 -15
- data/bundler/man/bundle-check.1 +1 -1
- data/bundler/man/bundle-check.1.txt +8 -8
- data/bundler/man/bundle-clean.1 +1 -1
- data/bundler/man/bundle-clean.1.txt +6 -6
- data/bundler/man/bundle-config.1 +3 -9
- data/bundler/man/bundle-config.1.txt +271 -272
- data/bundler/man/bundle-config.ronn +5 -9
- data/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/man/bundle-doctor.1.txt +9 -9
- data/bundler/man/bundle-exec.1 +1 -1
- data/bundler/man/bundle-exec.1.txt +84 -81
- data/bundler/man/bundle-gem.1 +25 -3
- data/bundler/man/bundle-gem.1.txt +65 -39
- data/bundler/man/bundle-gem.ronn +30 -7
- data/bundler/man/bundle-info.1 +1 -1
- data/bundler/man/bundle-info.1.txt +2 -2
- data/bundler/man/bundle-init.1 +1 -1
- data/bundler/man/bundle-init.1.txt +9 -9
- data/bundler/man/bundle-inject.1 +1 -1
- data/bundler/man/bundle-inject.1.txt +4 -4
- data/bundler/man/bundle-install.1 +1 -1
- data/bundler/man/bundle-install.1.txt +169 -169
- data/bundler/man/bundle-list.1 +7 -7
- data/bundler/man/bundle-list.1.txt +12 -11
- data/bundler/man/bundle-list.ronn +6 -6
- data/bundler/man/bundle-lock.1 +1 -1
- data/bundler/man/bundle-lock.1.txt +28 -28
- data/bundler/man/bundle-open.1 +1 -1
- data/bundler/man/bundle-open.1.txt +3 -3
- data/bundler/man/bundle-outdated.1 +1 -1
- data/bundler/man/bundle-outdated.1.txt +34 -34
- data/bundler/man/bundle-platform.1 +1 -1
- data/bundler/man/bundle-platform.1.txt +16 -16
- data/bundler/man/bundle-pristine.1 +1 -1
- data/bundler/man/bundle-pristine.1.txt +8 -8
- data/bundler/man/bundle-remove.1 +1 -1
- data/bundler/man/bundle-remove.1.txt +9 -9
- data/bundler/man/bundle-show.1 +1 -1
- data/bundler/man/bundle-show.1.txt +8 -8
- data/bundler/man/bundle-update.1 +1 -1
- data/bundler/man/bundle-update.1.txt +149 -148
- data/bundler/man/bundle-viz.1 +1 -1
- data/bundler/man/bundle-viz.1.txt +11 -11
- data/bundler/man/bundle.1 +1 -1
- data/bundler/man/bundle.1.txt +31 -31
- data/bundler/man/gemfile.5 +1 -1
- data/bundler/man/gemfile.5.txt +218 -216
- data/lib/rubygems.rb +68 -148
- data/lib/rubygems/available_set.rb +4 -4
- data/lib/rubygems/basic_specification.rb +11 -5
- data/lib/rubygems/bundler_version_finder.rb +14 -9
- data/lib/rubygems/command.rb +16 -14
- data/lib/rubygems/command_manager.rb +4 -3
- data/lib/rubygems/commands/cert_command.rb +1 -1
- data/lib/rubygems/commands/cleanup_command.rb +3 -3
- data/lib/rubygems/commands/contents_command.rb +4 -4
- data/lib/rubygems/commands/dependency_command.rb +6 -6
- data/lib/rubygems/commands/fetch_command.rb +2 -2
- data/lib/rubygems/commands/help_command.rb +1 -1
- data/lib/rubygems/commands/info_command.rb +9 -4
- data/lib/rubygems/commands/install_command.rb +3 -3
- data/lib/rubygems/commands/list_command.rb +9 -6
- data/lib/rubygems/commands/lock_command.rb +1 -1
- data/lib/rubygems/commands/open_command.rb +0 -2
- data/lib/rubygems/commands/pristine_command.rb +10 -2
- data/lib/rubygems/commands/push_command.rb +4 -42
- data/lib/rubygems/commands/query_command.rb +7 -352
- data/lib/rubygems/commands/search_command.rb +8 -6
- data/lib/rubygems/commands/setup_command.rb +128 -32
- data/lib/rubygems/commands/specification_command.rb +2 -2
- data/lib/rubygems/commands/stale_command.rb +1 -1
- data/lib/rubygems/commands/uninstall_command.rb +1 -1
- data/lib/rubygems/commands/unpack_command.rb +1 -1
- data/lib/rubygems/commands/update_command.rb +40 -10
- data/lib/rubygems/config_file.rb +11 -2
- data/lib/rubygems/core_ext/kernel_require.rb +2 -2
- data/lib/rubygems/defaults.rb +99 -5
- data/lib/rubygems/dependency.rb +2 -5
- data/lib/rubygems/dependency_installer.rb +1 -73
- data/lib/rubygems/dependency_list.rb +7 -7
- data/lib/rubygems/deprecate.rb +46 -1
- data/lib/rubygems/doctor.rb +4 -2
- data/lib/rubygems/errors.rb +3 -2
- data/lib/rubygems/exceptions.rb +2 -13
- data/lib/rubygems/ext.rb +6 -6
- data/lib/rubygems/ext/build_error.rb +2 -0
- data/lib/rubygems/ext/builder.rb +1 -1
- data/lib/rubygems/ext/cmake_builder.rb +1 -1
- data/lib/rubygems/ext/ext_conf_builder.rb +6 -7
- data/lib/rubygems/gem_runner.rb +3 -8
- data/lib/rubygems/gemcutter_utilities.rb +1 -1
- data/lib/rubygems/indexer.rb +1 -19
- data/lib/rubygems/install_update_options.rb +5 -5
- data/lib/rubygems/installer.rb +45 -42
- data/lib/rubygems/installer_test_case.rb +19 -2
- data/lib/rubygems/installer_uninstaller_utils.rb +24 -0
- data/lib/rubygems/local_remote_options.rb +1 -1
- data/lib/rubygems/name_tuple.rb +2 -4
- data/lib/rubygems/package.rb +8 -13
- data/lib/rubygems/package/old.rb +1 -1
- data/lib/rubygems/package/tar_header.rb +3 -3
- data/lib/rubygems/package/tar_reader.rb +0 -1
- data/lib/rubygems/package/tar_reader/entry.rb +0 -1
- data/lib/rubygems/package/tar_test_case.rb +1 -1
- data/lib/rubygems/package/tar_writer.rb +2 -6
- data/lib/rubygems/package_task.rb +1 -5
- data/lib/rubygems/path_support.rb +1 -1
- data/lib/rubygems/platform.rb +3 -3
- data/lib/rubygems/query_utils.rb +362 -0
- data/lib/rubygems/rdoc.rb +0 -12
- data/lib/rubygems/remote_fetcher.rb +5 -19
- data/lib/rubygems/request/connection_pools.rb +1 -1
- data/lib/rubygems/request_set.rb +5 -5
- data/lib/rubygems/request_set/gem_dependency_api.rb +1 -1
- data/lib/rubygems/request_set/lockfile.rb +8 -8
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +1 -1
- data/lib/rubygems/requirement.rb +14 -15
- data/lib/rubygems/resolver.rb +7 -8
- data/lib/rubygems/resolver/api_set.rb +3 -3
- data/lib/rubygems/resolver/composed_set.rb +3 -3
- data/lib/rubygems/resolver/conflict.rb +1 -1
- data/lib/rubygems/resolver/index_set.rb +1 -1
- data/lib/rubygems/resolver/installer_set.rb +3 -3
- data/lib/rubygems/resolver/lock_set.rb +1 -1
- data/lib/rubygems/safe_yaml.rb +4 -4
- data/lib/rubygems/security.rb +25 -25
- data/lib/rubygems/security/policy.rb +3 -3
- data/lib/rubygems/security/signer.rb +4 -4
- data/lib/rubygems/security/trust_dir.rb +1 -1
- data/lib/rubygems/server.rb +8 -8
- data/lib/rubygems/source/git.rb +7 -6
- data/lib/rubygems/source/local.rb +2 -2
- data/lib/rubygems/source_list.rb +4 -5
- data/lib/rubygems/spec_fetcher.rb +18 -15
- data/lib/rubygems/specification.rb +79 -104
- data/lib/rubygems/specification_policy.rb +79 -27
- data/lib/rubygems/ssl_certs/{rubygems.org → index.rubygems.org}/GlobalSignRootCA.pem +0 -0
- data/lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +23 -0
- data/lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +25 -0
- data/lib/rubygems/test_case.rb +63 -83
- data/lib/rubygems/test_utilities.rb +6 -6
- data/lib/rubygems/uninstaller.rb +35 -14
- data/lib/rubygems/user_interaction.rb +1 -10
- data/lib/rubygems/util.rb +10 -2
- data/lib/rubygems/util/licenses.rb +4 -4
- data/lib/rubygems/validator.rb +1 -1
- data/lib/rubygems/version.rb +4 -4
- data/rubygems-update.gemspec +2 -2
- data/setup.rb +2 -7
- data/test/rubygems/specifications/bar-0.0.2.gemspec +0 -2
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +0 -2
- data/test/rubygems/test_bundled_ca.rb +4 -12
- data/test/rubygems/test_deprecate.rb +43 -4
- data/test/rubygems/test_gem.rb +79 -74
- data/test/rubygems/test_gem_available_set.rb +3 -3
- data/test/rubygems/test_gem_bundler_version_finder.rb +19 -1
- data/test/rubygems/test_gem_command.rb +24 -3
- data/test/rubygems/test_gem_command_manager.rb +37 -4
- data/test/rubygems/test_gem_commands_build_command.rb +7 -2
- data/test/rubygems/test_gem_commands_cert_command.rb +2 -2
- data/test/rubygems/test_gem_commands_cleanup_command.rb +1 -1
- data/test/rubygems/test_gem_commands_contents_command.rb +48 -15
- data/test/rubygems/test_gem_commands_environment_command.rb +21 -21
- data/test/rubygems/test_gem_commands_generate_index_command.rb +1 -5
- data/test/rubygems/test_gem_commands_info_command.rb +6 -6
- data/test/rubygems/test_gem_commands_install_command.rb +31 -31
- data/test/rubygems/test_gem_commands_mirror.rb +1 -1
- data/test/rubygems/test_gem_commands_open_command.rb +4 -4
- data/test/rubygems/test_gem_commands_owner_command.rb +11 -3
- data/test/rubygems/test_gem_commands_pristine_command.rb +41 -8
- data/test/rubygems/test_gem_commands_push_command.rb +7 -2
- data/test/rubygems/test_gem_commands_query_command.rb +9 -5
- data/test/rubygems/test_gem_commands_setup_command.rb +160 -108
- data/test/rubygems/test_gem_commands_signin_command.rb +6 -4
- data/test/rubygems/test_gem_commands_signout_command.rb +0 -5
- data/test/rubygems/test_gem_commands_specification_command.rb +18 -18
- data/test/rubygems/test_gem_commands_uninstall_command.rb +1 -1
- data/test/rubygems/test_gem_commands_update_command.rb +68 -5
- data/test/rubygems/test_gem_commands_which_command.rb +3 -3
- data/test/rubygems/test_gem_commands_yank_command.rb +14 -6
- data/test/rubygems/test_gem_config_file.rb +7 -10
- data/test/rubygems/test_gem_dependency_installer.rb +52 -189
- data/test/rubygems/test_gem_dependency_list.rb +8 -8
- data/test/rubygems/test_gem_dependency_resolution_error.rb +1 -1
- data/test/rubygems/test_gem_doctor.rb +28 -0
- data/test/rubygems/test_gem_ext_builder.rb +14 -25
- data/test/rubygems/test_gem_ext_cmake_builder.rb +13 -12
- data/test/rubygems/test_gem_ext_configure_builder.rb +1 -9
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +0 -1
- data/test/rubygems/test_gem_ext_rake_builder.rb +9 -9
- data/test/rubygems/test_gem_gem_runner.rb +42 -0
- data/test/rubygems/test_gem_gemcutter_utilities.rb +5 -0
- data/test/rubygems/test_gem_indexer.rb +9 -13
- data/test/rubygems/test_gem_installer.rb +149 -45
- data/test/rubygems/test_gem_package.rb +13 -12
- data/test/rubygems/test_gem_package_tar_header.rb +19 -0
- data/test/rubygems/test_gem_package_tar_writer.rb +3 -3
- data/test/rubygems/test_gem_package_task.rb +46 -11
- data/test/rubygems/test_gem_remote_fetcher.rb +152 -190
- data/test/rubygems/test_gem_request.rb +11 -11
- data/test/rubygems/test_gem_request_set.rb +20 -20
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +3 -3
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +9 -9
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +118 -118
- data/test/rubygems/test_gem_requirement.rb +2 -2
- data/test/rubygems/test_gem_resolver.rb +6 -6
- data/test/rubygems/test_gem_resolver_api_set.rb +3 -3
- data/test/rubygems/test_gem_resolver_best_set.rb +2 -2
- data/test/rubygems/test_gem_resolver_index_set.rb +2 -2
- data/test/rubygems/test_gem_resolver_installer_set.rb +7 -7
- data/test/rubygems/test_gem_resolver_lock_set.rb +3 -3
- data/test/rubygems/test_gem_security.rb +20 -20
- data/test/rubygems/test_gem_security_policy.rb +5 -8
- data/test/rubygems/test_gem_security_signer.rb +8 -8
- data/test/rubygems/test_gem_security_trust_dir.rb +2 -2
- data/test/rubygems/test_gem_server.rb +10 -10
- data/test/rubygems/test_gem_source.rb +12 -14
- data/test/rubygems/test_gem_source_git.rb +12 -11
- data/test/rubygems/test_gem_source_installed.rb +7 -7
- data/test/rubygems/test_gem_source_local.rb +8 -8
- data/test/rubygems/test_gem_source_lock.rb +10 -10
- data/test/rubygems/test_gem_source_specific_file.rb +7 -7
- data/test/rubygems/test_gem_source_vendor.rb +7 -7
- data/test/rubygems/test_gem_spec_fetcher.rb +11 -2
- data/test/rubygems/test_gem_specification.rb +143 -113
- data/test/rubygems/test_gem_stream_ui.rb +3 -1
- data/test/rubygems/test_gem_text.rb +1 -1
- data/test/rubygems/test_gem_uninstaller.rb +134 -10
- data/test/rubygems/test_gem_util.rb +7 -5
- data/test/rubygems/test_gem_version.rb +1 -1
- data/test/rubygems/test_kernel.rb +10 -12
- data/test/rubygems/test_project_sanity.rb +8 -1
- data/test/rubygems/test_require.rb +141 -43
- metadata +32 -45
- 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/lib/rubygems/source_local.rb +0 -7
- data/lib/rubygems/source_specific_file.rb +0 -6
- data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem +0 -21
- 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 -137
- data/util/update_changelog.rb +0 -64
@@ -390,8 +390,8 @@ class TestGemRequirement < Gem::TestCase
|
|
390
390
|
r2 = req('2.0', '1.0')
|
391
391
|
assert_equal r1.hash, r2.hash
|
392
392
|
|
393
|
-
r1 = req('1.0', '2.0').tap {
|
394
|
-
r2 = req('3.0', '1.0').tap {
|
393
|
+
r1 = req('1.0', '2.0').tap {|r| r.concat(['3.0']) }
|
394
|
+
r2 = req('3.0', '1.0').tap {|r| r.concat(['2.0']) }
|
395
395
|
assert_equal r1.hash, r2.hash
|
396
396
|
end
|
397
397
|
|
@@ -26,10 +26,10 @@ class TestGemResolver < Gem::TestCase
|
|
26
26
|
def assert_resolves_to(expected, resolver)
|
27
27
|
actual = resolver.resolve
|
28
28
|
|
29
|
-
exp = expected.sort_by {
|
30
|
-
act = actual.map {
|
29
|
+
exp = expected.sort_by {|s| s.full_name }
|
30
|
+
act = actual.map {|a| a.spec.spec }.sort_by {|s| s.full_name }
|
31
31
|
|
32
|
-
msg = "Set of gems was not the same: #{exp.map {
|
32
|
+
msg = "Set of gems was not the same: #{exp.map {|x| x.full_name }.inspect} != #{act.map {|x| x.full_name }.inspect}"
|
33
33
|
|
34
34
|
assert_equal exp, act, msg
|
35
35
|
rescue Gem::DependencyResolutionError => e
|
@@ -105,7 +105,7 @@ class TestGemResolver < Gem::TestCase
|
|
105
105
|
|
106
106
|
res.requests a1, act, reqs
|
107
107
|
|
108
|
-
assert_equal ['b (= 2)'], reqs.map {
|
108
|
+
assert_equal ['b (= 2)'], reqs.map {|req| req.to_s }
|
109
109
|
end
|
110
110
|
|
111
111
|
def test_requests_development
|
@@ -127,7 +127,7 @@ class TestGemResolver < Gem::TestCase
|
|
127
127
|
|
128
128
|
res.requests spec, act, reqs
|
129
129
|
|
130
|
-
assert_equal ['b (= 2)'], reqs.map {
|
130
|
+
assert_equal ['b (= 2)'], reqs.map {|req| req.to_s }
|
131
131
|
|
132
132
|
assert spec.instance_variable_defined? :@called
|
133
133
|
end
|
@@ -546,7 +546,7 @@ class TestGemResolver < Gem::TestCase
|
|
546
546
|
|
547
547
|
dependency = e.conflict.dependency
|
548
548
|
|
549
|
-
assert_includes %w
|
549
|
+
assert_includes %w[a b], dependency.name
|
550
550
|
assert_equal req('>= 0'), dependency.requirement
|
551
551
|
|
552
552
|
activated = e.conflict.activated
|
@@ -23,14 +23,14 @@ class TestGemResolverAPISet < Gem::TestCase
|
|
23
23
|
|
24
24
|
assert_equal URI('https://rubygemsserver.com/mygems/api/v1/dependencies'), set.dep_uri
|
25
25
|
assert_equal URI('https://rubygemsserver.com/mygems/'), set.uri
|
26
|
-
assert_equal Gem::Source.new(URI('https://rubygemsserver.com/mygems/')),
|
26
|
+
assert_equal Gem::Source.new(URI('https://rubygemsserver.com/mygems/')), set.source
|
27
27
|
end
|
28
28
|
|
29
29
|
def test_initialize_uri
|
30
30
|
set = @DR::APISet.new @dep_uri
|
31
31
|
|
32
32
|
assert_equal URI("#{@gem_repo}api/v1/dependencies"), set.dep_uri
|
33
|
-
assert_equal URI("#{@gem_repo}"),
|
33
|
+
assert_equal URI("#{@gem_repo}"), set.uri
|
34
34
|
end
|
35
35
|
|
36
36
|
def test_find_all
|
@@ -128,7 +128,7 @@ class TestGemResolverAPISet < Gem::TestCase
|
|
128
128
|
|
129
129
|
set.prefetch [a_dep, b_dep]
|
130
130
|
|
131
|
-
assert_equal %w[a-1], set.find_all(a_dep).map {
|
131
|
+
assert_equal %w[a-1], set.find_all(a_dep).map {|s| s.full_name }
|
132
132
|
assert_empty set.find_all(b_dep)
|
133
133
|
end
|
134
134
|
|
@@ -30,7 +30,7 @@ class TestGemResolverBestSet < Gem::TestCase
|
|
30
30
|
|
31
31
|
found = set.find_all req
|
32
32
|
|
33
|
-
assert_equal %w[a-1], found.map {
|
33
|
+
assert_equal %w[a-1], found.map {|s| s.full_name }
|
34
34
|
end
|
35
35
|
|
36
36
|
def test_find_all_fallback
|
@@ -50,7 +50,7 @@ class TestGemResolverBestSet < Gem::TestCase
|
|
50
50
|
|
51
51
|
found = set.find_all req
|
52
52
|
|
53
|
-
assert_equal %w[a-1], found.map {
|
53
|
+
assert_equal %w[a-1], found.map {|s| s.full_name }
|
54
54
|
end
|
55
55
|
|
56
56
|
def test_find_all_local
|
@@ -42,7 +42,7 @@ class TestGemResolverIndexSet < Gem::TestCase
|
|
42
42
|
|
43
43
|
found = set.find_all req
|
44
44
|
|
45
|
-
assert_equal %w[a-1], found.map {
|
45
|
+
assert_equal %w[a-1], found.map {|s| s.full_name }
|
46
46
|
end
|
47
47
|
|
48
48
|
def test_find_all_local
|
@@ -83,7 +83,7 @@ class TestGemResolverIndexSet < Gem::TestCase
|
|
83
83
|
|
84
84
|
found = set.find_all req
|
85
85
|
|
86
|
-
assert_equal %w[a-1.a], found.map {
|
86
|
+
assert_equal %w[a-1.a], found.map {|s| s.full_name }
|
87
87
|
end
|
88
88
|
|
89
89
|
end
|
@@ -15,7 +15,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
|
|
15
15
|
|
16
16
|
set.add_always_install dep('a')
|
17
17
|
|
18
|
-
assert_equal %w[a-2], set.always_install.map {
|
18
|
+
assert_equal %w[a-2], set.always_install.map {|s| s.full_name }
|
19
19
|
|
20
20
|
e = assert_raises Gem::UnsatisfiableDependencyError do
|
21
21
|
set.add_always_install dep('b')
|
@@ -49,7 +49,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
|
|
49
49
|
|
50
50
|
set.add_always_install dep('a')
|
51
51
|
|
52
|
-
assert_equal %w[a-1], set.always_install.map {
|
52
|
+
assert_equal %w[a-1], set.always_install.map {|s| s.full_name }
|
53
53
|
end
|
54
54
|
|
55
55
|
def test_add_always_install_prerelease
|
@@ -62,7 +62,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
|
|
62
62
|
|
63
63
|
set.add_always_install dep('a')
|
64
64
|
|
65
|
-
assert_equal %w[a-1], set.always_install.map {
|
65
|
+
assert_equal %w[a-1], set.always_install.map {|s| s.full_name }
|
66
66
|
end
|
67
67
|
|
68
68
|
def test_add_always_install_prerelease_only
|
@@ -93,7 +93,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
|
|
93
93
|
|
94
94
|
req = Gem::Resolver::DependencyRequest.new dep('a'), nil
|
95
95
|
|
96
|
-
assert_equal %w[a-1], set.find_all(req).map {
|
96
|
+
assert_equal %w[a-1], set.find_all(req).map {|spec| spec.full_name }
|
97
97
|
end
|
98
98
|
|
99
99
|
def test_consider_local_eh
|
@@ -149,7 +149,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
|
|
149
149
|
|
150
150
|
req = Gem::Resolver::DependencyRequest.new dep('a'), nil
|
151
151
|
|
152
|
-
assert_equal %w[a-2], set.find_all(req).map {
|
152
|
+
assert_equal %w[a-2], set.find_all(req).map {|spec| spec.full_name }
|
153
153
|
end
|
154
154
|
|
155
155
|
def test_find_all_prerelease
|
@@ -162,12 +162,12 @@ class TestGemResolverInstallerSet < Gem::TestCase
|
|
162
162
|
|
163
163
|
req = Gem::Resolver::DependencyRequest.new dep('a'), nil
|
164
164
|
|
165
|
-
assert_equal %w[a-1], set.find_all(req).map {
|
165
|
+
assert_equal %w[a-1], set.find_all(req).map {|spec| spec.full_name }
|
166
166
|
|
167
167
|
req = Gem::Resolver::DependencyRequest.new dep('a', '>= 0.a'), nil
|
168
168
|
|
169
169
|
assert_equal %w[a-1 a-1.a],
|
170
|
-
set.find_all(req).map {
|
170
|
+
set.find_all(req).map {|spec| spec.full_name }.sort
|
171
171
|
end
|
172
172
|
|
173
173
|
def test_load_spec
|
@@ -16,7 +16,7 @@ class TestGemResolverLockSet < Gem::TestCase
|
|
16
16
|
specs = @set.add 'a', '2', Gem::Platform::RUBY
|
17
17
|
spec = specs.first
|
18
18
|
|
19
|
-
assert_equal %w[a-2], @set.specs.map {
|
19
|
+
assert_equal %w[a-2], @set.specs.map {|t| t.full_name }
|
20
20
|
|
21
21
|
assert_kind_of Gem::Resolver::LockSpecification, spec
|
22
22
|
|
@@ -34,11 +34,11 @@ class TestGemResolverLockSet < Gem::TestCase
|
|
34
34
|
|
35
35
|
found = @set.find_all dep 'a'
|
36
36
|
|
37
|
-
assert_equal %w[a-2], found.map {
|
37
|
+
assert_equal %w[a-2], found.map {|s| s.full_name }
|
38
38
|
|
39
39
|
found = @set.find_all dep 'a', '>= 0.a'
|
40
40
|
|
41
|
-
assert_equal %w[a-1.a a-2], found.map {
|
41
|
+
assert_equal %w[a-1.a a-2], found.map {|s| s.full_name }
|
42
42
|
end
|
43
43
|
|
44
44
|
def test_load_spec
|
@@ -40,16 +40,16 @@ class TestGemSecurity < Gem::TestCase
|
|
40
40
|
assert_equal name.to_s, cert.subject.to_s
|
41
41
|
|
42
42
|
assert_equal 3, cert.extensions.length,
|
43
|
-
cert.extensions.map {
|
43
|
+
cert.extensions.map {|e| e.to_a.first }
|
44
44
|
|
45
|
-
constraints = cert.extensions.find {
|
45
|
+
constraints = cert.extensions.find {|ext| ext.oid == 'basicConstraints' }
|
46
46
|
assert_equal 'CA:FALSE', constraints.value
|
47
47
|
|
48
|
-
key_usage = cert.extensions.find {
|
48
|
+
key_usage = cert.extensions.find {|ext| ext.oid == 'keyUsage' }
|
49
49
|
assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
|
50
50
|
key_usage.value
|
51
51
|
|
52
|
-
key_ident = cert.extensions.find {
|
52
|
+
key_ident = cert.extensions.find {|ext| ext.oid == 'subjectKeyIdentifier' }
|
53
53
|
assert_equal 59, key_ident.value.length
|
54
54
|
assert_equal '5F:43:6E:F6:9A:8E:45:25:E9:22:E3:7D:37:5E:A4:D5:36:02:85:1B',
|
55
55
|
key_ident.value
|
@@ -85,19 +85,19 @@ class TestGemSecurity < Gem::TestCase
|
|
85
85
|
assert_equal name.to_s, cert.issuer.to_s
|
86
86
|
|
87
87
|
assert_equal 5, cert.extensions.length,
|
88
|
-
cert.extensions.map {
|
88
|
+
cert.extensions.map {|e| e.to_a.first }
|
89
89
|
|
90
|
-
constraints = cert.extensions.find {
|
90
|
+
constraints = cert.extensions.find {|ext| ext.oid == 'subjectAltName' }
|
91
91
|
assert_equal 'email:nobody@example', constraints.value
|
92
92
|
|
93
|
-
constraints = cert.extensions.find {
|
93
|
+
constraints = cert.extensions.find {|ext| ext.oid == 'basicConstraints' }
|
94
94
|
assert_equal 'CA:FALSE', constraints.value
|
95
95
|
|
96
|
-
key_usage = cert.extensions.find {
|
96
|
+
key_usage = cert.extensions.find {|ext| ext.oid == 'keyUsage' }
|
97
97
|
assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
|
98
98
|
key_usage.value
|
99
99
|
|
100
|
-
key_ident = cert.extensions.find {
|
100
|
+
key_ident = cert.extensions.find {|ext| ext.oid == 'subjectKeyIdentifier' }
|
101
101
|
assert_equal 59, key_ident.value.length
|
102
102
|
assert_equal '5F:43:6E:F6:9A:8E:45:25:E9:22:E3:7D:37:5E:A4:D5:36:02:85:1B',
|
103
103
|
key_ident.value
|
@@ -188,20 +188,20 @@ class TestGemSecurity < Gem::TestCase
|
|
188
188
|
assert_in_delta Time.now + 60, signed.not_after, 10
|
189
189
|
|
190
190
|
assert_equal 4, signed.extensions.length,
|
191
|
-
signed.extensions.map {
|
191
|
+
signed.extensions.map {|e| e.to_a.first }
|
192
192
|
|
193
|
-
constraints = signed.extensions.find {
|
193
|
+
constraints = signed.extensions.find {|ext| ext.oid == 'issuerAltName' }
|
194
194
|
assert_equal 'email:nobody@example', constraints.value, 'issuerAltName'
|
195
195
|
|
196
|
-
constraints = signed.extensions.find {
|
196
|
+
constraints = signed.extensions.find {|ext| ext.oid == 'basicConstraints' }
|
197
197
|
assert_equal 'CA:FALSE', constraints.value
|
198
198
|
|
199
|
-
key_usage = signed.extensions.find {
|
199
|
+
key_usage = signed.extensions.find {|ext| ext.oid == 'keyUsage' }
|
200
200
|
assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
|
201
201
|
key_usage.value
|
202
202
|
|
203
203
|
key_ident =
|
204
|
-
signed.extensions.find {
|
204
|
+
signed.extensions.find {|ext| ext.oid == 'subjectKeyIdentifier' }
|
205
205
|
assert_equal 59, key_ident.value.length
|
206
206
|
assert_equal '5F:43:6E:F6:9A:8E:45:25:E9:22:E3:7D:37:5E:A4:D5:36:02:85:1B',
|
207
207
|
key_ident.value
|
@@ -227,23 +227,23 @@ class TestGemSecurity < Gem::TestCase
|
|
227
227
|
assert_equal "sha256WithRSAEncryption", signed.signature_algorithm
|
228
228
|
|
229
229
|
assert_equal 5, signed.extensions.length,
|
230
|
-
signed.extensions.map {
|
230
|
+
signed.extensions.map {|e| e.to_a.first }
|
231
231
|
|
232
|
-
constraints = signed.extensions.find {
|
232
|
+
constraints = signed.extensions.find {|ext| ext.oid == 'issuerAltName' }
|
233
233
|
assert_equal 'email:nobody@example', constraints.value, 'issuerAltName'
|
234
234
|
|
235
|
-
constraints = signed.extensions.find {
|
235
|
+
constraints = signed.extensions.find {|ext| ext.oid == 'subjectAltName' }
|
236
236
|
assert_equal 'email:signee@example', constraints.value, 'subjectAltName'
|
237
237
|
|
238
|
-
constraints = signed.extensions.find {
|
238
|
+
constraints = signed.extensions.find {|ext| ext.oid == 'basicConstraints' }
|
239
239
|
assert_equal 'CA:FALSE', constraints.value
|
240
240
|
|
241
|
-
key_usage = signed.extensions.find {
|
241
|
+
key_usage = signed.extensions.find {|ext| ext.oid == 'keyUsage' }
|
242
242
|
assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
|
243
243
|
key_usage.value
|
244
244
|
|
245
245
|
key_ident =
|
246
|
-
signed.extensions.find {
|
246
|
+
signed.extensions.find {|ext| ext.oid == 'subjectKeyIdentifier' }
|
247
247
|
assert_equal 59, key_ident.value.length
|
248
248
|
assert_equal '5F:43:6E:F6:9A:8E:45:25:E9:22:E3:7D:37:5E:A4:D5:36:02:85:1B',
|
249
249
|
key_ident.value
|
@@ -1,4 +1,3 @@
|
|
1
|
-
# coding: utf-8
|
2
1
|
# frozen_string_literal: true
|
3
2
|
|
4
3
|
require 'rubygems/test_case'
|
@@ -34,7 +33,7 @@ class TestGemSecurityPolicy < Gem::TestCase
|
|
34
33
|
s.files = %w[lib/code.rb]
|
35
34
|
end
|
36
35
|
|
37
|
-
@digest = Gem::Security::
|
36
|
+
@digest = OpenSSL::Digest.new Gem::Security::DIGEST_NAME
|
38
37
|
@trust_dir = Gem::Security.trust_dir.dir # HACK use the object
|
39
38
|
|
40
39
|
@no = Gem::Security::NoSecurity
|
@@ -397,13 +396,11 @@ class TestGemSecurityPolicy < Gem::TestCase
|
|
397
396
|
def test_verify_wrong_digest_type
|
398
397
|
Gem::Security.trust_dir.trust_cert PUBLIC_CERT
|
399
398
|
|
400
|
-
|
401
|
-
|
402
|
-
data = sha512.new
|
399
|
+
data = OpenSSL::Digest.new('SHA512')
|
403
400
|
data << 'hello'
|
404
401
|
|
405
402
|
digests = { 'SHA512' => { 0 => data } }
|
406
|
-
signature = PRIVATE_KEY.sign sha512
|
403
|
+
signature = PRIVATE_KEY.sign 'sha512', data.digest
|
407
404
|
signatures = { 0 => signature }
|
408
405
|
|
409
406
|
e = assert_raises Gem::Security::Exception do
|
@@ -482,7 +479,7 @@ class TestGemSecurityPolicy < Gem::TestCase
|
|
482
479
|
def s.full_name() 'metadata.gz' end
|
483
480
|
|
484
481
|
digests = package.digest s
|
485
|
-
digests[Gem::Security::DIGEST_NAME]['data.tar.gz'] = @digest.
|
482
|
+
digests[Gem::Security::DIGEST_NAME]['data.tar.gz'] = @digest.hexdigest 'hello'
|
486
483
|
|
487
484
|
metadata_gz_digest = digests[Gem::Security::DIGEST_NAME]['metadata.gz']
|
488
485
|
|
@@ -511,7 +508,7 @@ class TestGemSecurityPolicy < Gem::TestCase
|
|
511
508
|
def s.full_name() 'metadata.gz' end
|
512
509
|
|
513
510
|
digests = package.digest s
|
514
|
-
digests[Gem::Security::DIGEST_NAME]['data.tar.gz'] = @digest.
|
511
|
+
digests[Gem::Security::DIGEST_NAME]['data.tar.gz'] = @digest.hexdigest 'hello'
|
515
512
|
|
516
513
|
assert_raises Gem::Security::Exception do
|
517
514
|
@high.verify_signatures @spec, digests, {}
|
@@ -37,8 +37,8 @@ class TestGemSecuritySigner < Gem::TestCase
|
|
37
37
|
def test_initialize_cert_chain_mixed
|
38
38
|
signer = Gem::Security::Signer.new nil, [@cert_file, CHILD_CERT]
|
39
39
|
|
40
|
-
assert_equal [PUBLIC_CERT, CHILD_CERT].map {
|
41
|
-
signer.cert_chain.map {
|
40
|
+
assert_equal [PUBLIC_CERT, CHILD_CERT].map {|c| c.to_pem },
|
41
|
+
signer.cert_chain.map {|c| c.to_pem }
|
42
42
|
end
|
43
43
|
|
44
44
|
def test_initialize_cert_chain_invalid
|
@@ -50,8 +50,8 @@ class TestGemSecuritySigner < Gem::TestCase
|
|
50
50
|
def test_initialize_cert_chain_path
|
51
51
|
signer = Gem::Security::Signer.new nil, [@cert_file]
|
52
52
|
|
53
|
-
assert_equal [PUBLIC_CERT].map {
|
54
|
-
signer.cert_chain.map {
|
53
|
+
assert_equal [PUBLIC_CERT].map {|c| c.to_pem },
|
54
|
+
signer.cert_chain.map {|c| c.to_pem }
|
55
55
|
end
|
56
56
|
|
57
57
|
def test_initialize_default
|
@@ -66,7 +66,7 @@ class TestGemSecuritySigner < Gem::TestCase
|
|
66
66
|
signer = Gem::Security::Signer.new nil, nil
|
67
67
|
|
68
68
|
assert_equal PRIVATE_KEY.to_pem, signer.key.to_pem
|
69
|
-
assert_equal [PUBLIC_CERT.to_pem], signer.cert_chain.map {
|
69
|
+
assert_equal [PUBLIC_CERT.to_pem], signer.cert_chain.map {|c| c.to_pem }
|
70
70
|
end
|
71
71
|
|
72
72
|
def test_initialize_key_path
|
@@ -100,7 +100,7 @@ class TestGemSecuritySigner < Gem::TestCase
|
|
100
100
|
signer.load_cert_chain
|
101
101
|
|
102
102
|
assert_equal [PUBLIC_CERT.to_pem, CHILD_CERT.to_pem],
|
103
|
-
signer.cert_chain.map {
|
103
|
+
signer.cert_chain.map {|c| c.to_pem }
|
104
104
|
end
|
105
105
|
|
106
106
|
def test_load_cert_chain_broken
|
@@ -112,7 +112,7 @@ class TestGemSecuritySigner < Gem::TestCase
|
|
112
112
|
signer.load_cert_chain
|
113
113
|
|
114
114
|
assert_equal [CHILD_CERT.to_pem, GRANDCHILD_CERT.to_pem],
|
115
|
-
signer.cert_chain.map {
|
115
|
+
signer.cert_chain.map {|c| c.to_pem }
|
116
116
|
end
|
117
117
|
|
118
118
|
def test_sign
|
@@ -191,7 +191,7 @@ toqvglr0kdbknSRRjBVLK6tsgr07aLT9gNP7mTW2PA==
|
|
191
191
|
signer.sign 'hello'
|
192
192
|
end
|
193
193
|
|
194
|
-
assert_match %r
|
194
|
+
assert_match %r{certificate /CN=nobody/DC=example not valid}, e.message
|
195
195
|
end
|
196
196
|
|
197
197
|
def test_sign_no_key
|
@@ -18,7 +18,7 @@ class TestGemSecurityTrustDir < Gem::TestCase
|
|
18
18
|
end
|
19
19
|
|
20
20
|
def test_cert_path
|
21
|
-
digest = Gem::Security::
|
21
|
+
digest = OpenSSL::Digest.hexdigest Gem::Security::DIGEST_NAME, PUBLIC_CERT.subject.to_s
|
22
22
|
|
23
23
|
expected = File.join @dest_dir, "cert-#{digest}.pem"
|
24
24
|
|
@@ -42,7 +42,7 @@ class TestGemSecurityTrustDir < Gem::TestCase
|
|
42
42
|
end
|
43
43
|
|
44
44
|
def test_name_path
|
45
|
-
digest = Gem::Security::
|
45
|
+
digest = OpenSSL::Digest.hexdigest Gem::Security::DIGEST_NAME, PUBLIC_CERT.subject.to_s
|
46
46
|
|
47
47
|
expected = File.join @dest_dir, "cert-#{digest}.pem"
|
48
48
|
|
@@ -88,7 +88,7 @@ class TestGemServer < Gem::TestCase
|
|
88
88
|
end
|
89
89
|
|
90
90
|
assert_equal 200, @res.status, @res.body
|
91
|
-
assert_match %r
|
91
|
+
assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
|
92
92
|
assert_equal 'application/octet-stream', @res['content-type']
|
93
93
|
assert_equal [['a', Gem::Version.new(2), Gem::Platform::RUBY]],
|
94
94
|
Marshal.load(@res.body)
|
@@ -127,7 +127,7 @@ class TestGemServer < Gem::TestCase
|
|
127
127
|
end
|
128
128
|
|
129
129
|
assert_equal 200, @res.status, @res.body
|
130
|
-
assert_match %r
|
130
|
+
assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
|
131
131
|
assert_equal 'application/x-gzip', @res['content-type']
|
132
132
|
assert_equal [['a', Gem::Version.new(2), Gem::Platform::RUBY]],
|
133
133
|
Marshal.load(Gem::Util.gunzip(@res.body))
|
@@ -162,7 +162,7 @@ class TestGemServer < Gem::TestCase
|
|
162
162
|
end
|
163
163
|
|
164
164
|
assert_equal 200, @res.status, @res.body
|
165
|
-
assert_match %r
|
165
|
+
assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
|
166
166
|
assert_equal 'application/octet-stream', @res['content-type']
|
167
167
|
assert_equal [['a', v('3.a'), Gem::Platform::RUBY]],
|
168
168
|
Marshal.load(@res.body)
|
@@ -177,7 +177,7 @@ class TestGemServer < Gem::TestCase
|
|
177
177
|
end
|
178
178
|
|
179
179
|
assert_equal 200, @res.status, @res.body
|
180
|
-
assert_match %r
|
180
|
+
assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
|
181
181
|
assert_equal 'application/x-gzip', @res['content-type']
|
182
182
|
assert_equal [['a', v('3.a'), Gem::Platform::RUBY]],
|
183
183
|
Marshal.load(Gem::Util.gunzip(@res.body))
|
@@ -223,7 +223,7 @@ class TestGemServer < Gem::TestCase
|
|
223
223
|
@server.quick @req, @res
|
224
224
|
|
225
225
|
assert_equal 404, @res.status, @res.body
|
226
|
-
assert_match %r
|
226
|
+
assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
|
227
227
|
assert_equal 'text/plain', @res['content-type']
|
228
228
|
assert_equal 'No gems found matching "z-9"', @res.body
|
229
229
|
assert_equal 404, @res.status
|
@@ -320,7 +320,7 @@ class TestGemServer < Gem::TestCase
|
|
320
320
|
@server.rdoc @req, @res
|
321
321
|
|
322
322
|
assert_equal 200, @res.status, @res.body
|
323
|
-
assert_match %r
|
323
|
+
assert_match %r{No documentation found}, @res.body
|
324
324
|
assert_equal 'text/html', @res['content-type']
|
325
325
|
end
|
326
326
|
|
@@ -331,7 +331,7 @@ class TestGemServer < Gem::TestCase
|
|
331
331
|
@server.root @req, @res
|
332
332
|
|
333
333
|
assert_equal 200, @res.status, @res.body
|
334
|
-
assert_match %r
|
334
|
+
assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
|
335
335
|
assert_equal 'text/html', @res['content-type']
|
336
336
|
end
|
337
337
|
|
@@ -529,7 +529,7 @@ class TestGemServer < Gem::TestCase
|
|
529
529
|
@server.specs @req, @res
|
530
530
|
|
531
531
|
assert_equal 200, @res.status, @res.body
|
532
|
-
assert_match %r
|
532
|
+
assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
|
533
533
|
assert_equal 'application/octet-stream', @res['content-type']
|
534
534
|
|
535
535
|
assert_equal [['a', Gem::Version.new(1), Gem::Platform::RUBY],
|
@@ -569,7 +569,7 @@ class TestGemServer < Gem::TestCase
|
|
569
569
|
@server.specs @req, @res
|
570
570
|
|
571
571
|
assert_equal 200, @res.status, @res.body
|
572
|
-
assert_match %r
|
572
|
+
assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
|
573
573
|
assert_equal 'application/x-gzip', @res['content-type']
|
574
574
|
|
575
575
|
assert_equal [['a', Gem::Version.new(1), Gem::Platform::RUBY],
|
@@ -591,7 +591,7 @@ class TestGemServer < Gem::TestCase
|
|
591
591
|
|
592
592
|
@server.root @req, @res
|
593
593
|
|
594
|
-
refute_match %r
|
594
|
+
refute_match %r{%3A%2F%2F}, @res.body
|
595
595
|
end
|
596
596
|
|
597
597
|
def util_listen
|