rubygems-update 3.3.18 → 3.3.22
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +65 -0
- data/Manifest.txt +11 -0
- data/bin/gem +2 -2
- data/bin/update_rubygems +4 -4
- data/bundler/CHANGELOG.md +100 -0
- data/bundler/UPGRADING.md +11 -4
- data/bundler/bundler.gemspec +6 -8
- data/bundler/lib/bundler/build_metadata.rb +2 -2
- data/bundler/lib/bundler/cli/common.rb +1 -0
- data/bundler/lib/bundler/cli/install.rb +5 -2
- data/bundler/lib/bundler/cli/outdated.rb +12 -3
- data/bundler/lib/bundler/cli/platform.rb +1 -1
- data/bundler/lib/bundler/cli.rb +7 -4
- data/bundler/lib/bundler/current_ruby.rb +14 -5
- data/bundler/lib/bundler/definition.rb +102 -31
- data/bundler/lib/bundler/dependency.rb +18 -85
- data/bundler/lib/bundler/dsl.rb +2 -2
- data/bundler/lib/bundler/endpoint_specification.rb +2 -13
- data/bundler/lib/bundler/feature_flag.rb +0 -1
- data/bundler/lib/bundler/fetcher.rb +6 -6
- data/bundler/lib/bundler/gem_helpers.rb +7 -1
- data/bundler/lib/bundler/gem_version_promoter.rb +8 -18
- data/bundler/lib/bundler/index.rb +10 -12
- data/bundler/lib/bundler/injector.rb +2 -1
- data/bundler/lib/bundler/inline.rb +1 -1
- data/bundler/lib/bundler/installer/standalone.rb +1 -1
- data/bundler/lib/bundler/installer.rb +14 -12
- data/bundler/lib/bundler/lazy_specification.rb +30 -23
- data/bundler/lib/bundler/lockfile_generator.rb +1 -1
- data/bundler/lib/bundler/man/bundle-add.1 +6 -2
- data/bundler/lib/bundler/man/bundle-add.1.ronn +4 -1
- data/bundler/lib/bundler/man/bundle-binstubs.1 +1 -1
- data/bundler/lib/bundler/man/bundle-cache.1 +7 -1
- data/bundler/lib/bundler/man/bundle-cache.1.ronn +7 -0
- data/bundler/lib/bundler/man/bundle-check.1 +1 -1
- data/bundler/lib/bundler/man/bundle-clean.1 +1 -1
- data/bundler/lib/bundler/man/bundle-config.1 +25 -6
- data/bundler/lib/bundler/man/bundle-config.1.ronn +16 -6
- data/bundler/lib/bundler/man/bundle-console.1 +53 -0
- data/bundler/lib/bundler/man/bundle-console.1.ronn +44 -0
- data/bundler/lib/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/lib/bundler/man/bundle-exec.1 +2 -2
- data/bundler/lib/bundler/man/bundle-exec.1.ronn +1 -1
- data/bundler/lib/bundler/man/bundle-gem.1 +1 -1
- data/bundler/lib/bundler/man/bundle-help.1 +13 -0
- data/bundler/lib/bundler/man/bundle-help.1.ronn +12 -0
- data/bundler/lib/bundler/man/bundle-info.1 +1 -1
- data/bundler/lib/bundler/man/bundle-init.1 +1 -1
- data/bundler/lib/bundler/man/bundle-inject.1 +5 -2
- data/bundler/lib/bundler/man/bundle-inject.1.ronn +3 -1
- data/bundler/lib/bundler/man/bundle-install.1 +5 -1
- data/bundler/lib/bundler/man/bundle-install.1.ronn +6 -0
- data/bundler/lib/bundler/man/bundle-list.1 +1 -1
- data/bundler/lib/bundler/man/bundle-lock.1 +1 -1
- data/bundler/lib/bundler/man/bundle-open.1 +1 -1
- data/bundler/lib/bundler/man/bundle-outdated.1 +1 -1
- data/bundler/lib/bundler/man/bundle-platform.1 +16 -6
- data/bundler/lib/bundler/man/bundle-platform.1.ronn +14 -7
- data/bundler/lib/bundler/man/bundle-plugin.1 +81 -0
- data/bundler/lib/bundler/man/bundle-plugin.1.ronn +59 -0
- data/bundler/lib/bundler/man/bundle-pristine.1 +1 -1
- data/bundler/lib/bundler/man/bundle-remove.1 +1 -1
- data/bundler/lib/bundler/man/bundle-show.1 +1 -1
- data/bundler/lib/bundler/man/bundle-update.1 +1 -1
- data/bundler/lib/bundler/man/bundle-version.1 +35 -0
- data/bundler/lib/bundler/man/bundle-version.1.ronn +24 -0
- data/bundler/lib/bundler/man/bundle-viz.1 +4 -1
- data/bundler/lib/bundler/man/bundle-viz.1.ronn +2 -0
- data/bundler/lib/bundler/man/bundle.1 +15 -10
- data/bundler/lib/bundler/man/bundle.1.ronn +12 -7
- data/bundler/lib/bundler/man/gemfile.5 +23 -47
- data/bundler/lib/bundler/man/gemfile.5.ronn +32 -43
- data/bundler/lib/bundler/man/index.txt +4 -0
- data/bundler/lib/bundler/match_metadata.rb +13 -0
- data/bundler/lib/bundler/match_remote_metadata.rb +29 -0
- data/bundler/lib/bundler/plugin.rb +2 -0
- data/bundler/lib/bundler/remote_specification.rb +6 -11
- data/bundler/lib/bundler/resolver/base.rb +50 -0
- data/bundler/lib/bundler/resolver/spec_group.rb +11 -8
- data/bundler/lib/bundler/resolver.rb +95 -90
- data/bundler/lib/bundler/ruby_dsl.rb +1 -1
- data/bundler/lib/bundler/ruby_version.rb +5 -5
- data/bundler/lib/bundler/rubygems_ext.rb +52 -1
- data/bundler/lib/bundler/rubygems_gem_installer.rb +19 -12
- data/bundler/lib/bundler/settings.rb +1 -1
- data/bundler/lib/bundler/source/metadata.rb +1 -1
- data/bundler/lib/bundler/source_list.rb +4 -0
- data/bundler/lib/bundler/spec_set.rb +48 -33
- data/bundler/lib/bundler/version.rb +1 -1
- data/bundler/lib/bundler.rb +3 -3
- data/lib/rubygems/available_set.rb +3 -3
- data/lib/rubygems/basic_specification.rb +4 -4
- data/lib/rubygems/command.rb +25 -25
- data/lib/rubygems/command_manager.rb +9 -9
- data/lib/rubygems/commands/build_command.rb +8 -8
- data/lib/rubygems/commands/cert_command.rb +33 -33
- data/lib/rubygems/commands/check_command.rb +20 -20
- data/lib/rubygems/commands/cleanup_command.rb +17 -17
- data/lib/rubygems/commands/contents_command.rb +13 -13
- data/lib/rubygems/commands/dependency_command.rb +16 -16
- data/lib/rubygems/commands/environment_command.rb +5 -5
- data/lib/rubygems/commands/fetch_command.rb +8 -8
- data/lib/rubygems/commands/generate_index_command.rb +17 -17
- data/lib/rubygems/commands/help_command.rb +3 -3
- data/lib/rubygems/commands/info_command.rb +3 -3
- data/lib/rubygems/commands/install_command.rb +20 -20
- data/lib/rubygems/commands/list_command.rb +3 -3
- data/lib/rubygems/commands/lock_command.rb +4 -4
- data/lib/rubygems/commands/mirror_command.rb +3 -3
- data/lib/rubygems/commands/open_command.rb +9 -9
- data/lib/rubygems/commands/outdated_command.rb +5 -5
- data/lib/rubygems/commands/owner_command.rb +11 -11
- data/lib/rubygems/commands/pristine_command.rb +36 -36
- data/lib/rubygems/commands/push_command.rb +8 -8
- data/lib/rubygems/commands/query_command.rb +8 -8
- data/lib/rubygems/commands/rdoc_command.rb +17 -17
- data/lib/rubygems/commands/search_command.rb +3 -3
- data/lib/rubygems/commands/server_command.rb +3 -3
- data/lib/rubygems/commands/setup_command.rb +96 -106
- data/lib/rubygems/commands/signin_command.rb +9 -9
- data/lib/rubygems/commands/signout_command.rb +7 -7
- data/lib/rubygems/commands/sources_command.rb +21 -21
- data/lib/rubygems/commands/specification_command.rb +13 -13
- data/lib/rubygems/commands/stale_command.rb +2 -2
- data/lib/rubygems/commands/uninstall_command.rb +40 -40
- data/lib/rubygems/commands/unpack_command.rb +12 -12
- data/lib/rubygems/commands/update_command.rb +40 -56
- data/lib/rubygems/commands/which_command.rb +7 -7
- data/lib/rubygems/commands/yank_command.rb +11 -11
- data/lib/rubygems/config_file.rb +21 -21
- data/lib/rubygems/core_ext/kernel_gem.rb +1 -1
- data/lib/rubygems/core_ext/kernel_require.rb +1 -1
- data/lib/rubygems/core_ext/kernel_warn.rb +1 -1
- data/lib/rubygems/core_ext/tcpsocket_init.rb +1 -1
- data/lib/rubygems/defaults.rb +16 -16
- data/lib/rubygems/dependency.rb +9 -9
- data/lib/rubygems/dependency_installer.rb +13 -13
- data/lib/rubygems/dependency_list.rb +6 -6
- data/lib/rubygems/doctor.rb +18 -18
- data/lib/rubygems/errors.rb +2 -2
- data/lib/rubygems/exceptions.rb +5 -5
- data/lib/rubygems/ext/build_error.rb +1 -1
- data/lib/rubygems/ext/builder.rb +16 -16
- data/lib/rubygems/ext/cargo_builder.rb +7 -7
- data/lib/rubygems/ext/cmake_builder.rb +2 -2
- data/lib/rubygems/ext/configure_builder.rb +1 -1
- data/lib/rubygems/ext/ext_conf_builder.rb +8 -8
- data/lib/rubygems/ext/rake_builder.rb +3 -3
- data/lib/rubygems/ext.rb +7 -7
- data/lib/rubygems/gem_runner.rb +5 -5
- data/lib/rubygems/gemcutter_utilities.rb +31 -28
- data/lib/rubygems/indexer.rb +27 -27
- data/lib/rubygems/install_default_message.rb +2 -2
- data/lib/rubygems/install_message.rb +2 -2
- data/lib/rubygems/install_update_options.rb +55 -55
- data/lib/rubygems/installer.rb +32 -40
- data/lib/rubygems/installer_uninstaller_utils.rb +2 -2
- data/lib/rubygems/local_remote_options.rb +18 -20
- data/lib/rubygems/mock_gem_ui.rb +2 -2
- data/lib/rubygems/name_tuple.rb +4 -4
- data/lib/rubygems/optparse.rb +1 -1
- data/lib/rubygems/package/file_source.rb +2 -2
- data/lib/rubygems/package/old.rb +8 -8
- data/lib/rubygems/package/tar_header.rb +50 -50
- data/lib/rubygems/package/tar_reader/entry.rb +2 -2
- data/lib/rubygems/package/tar_reader.rb +1 -1
- data/lib/rubygems/package/tar_writer.rb +7 -7
- data/lib/rubygems/package.rb +54 -43
- data/lib/rubygems/package_task.rb +4 -4
- data/lib/rubygems/platform.rb +66 -55
- data/lib/rubygems/psych_tree.rb +1 -1
- data/lib/rubygems/query_utils.rb +35 -35
- data/lib/rubygems/rdoc.rb +2 -2
- data/lib/rubygems/remote_fetcher.rb +22 -22
- data/lib/rubygems/request/connection_pools.rb +4 -4
- data/lib/rubygems/request/http_pool.rb +1 -1
- data/lib/rubygems/request.rb +22 -22
- data/lib/rubygems/request_set/gem_dependency_api.rb +18 -18
- data/lib/rubygems/request_set/lockfile/parser.rb +26 -26
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +4 -4
- data/lib/rubygems/request_set/lockfile.rb +5 -5
- data/lib/rubygems/request_set.rb +17 -17
- data/lib/rubygems/requirement.rb +6 -6
- data/lib/rubygems/resolver/activation_request.rb +3 -3
- data/lib/rubygems/resolver/api_set.rb +4 -4
- data/lib/rubygems/resolver/api_specification.rb +6 -6
- data/lib/rubygems/resolver/best_set.rb +5 -5
- data/lib/rubygems/resolver/conflict.rb +10 -10
- data/lib/rubygems/resolver/dependency_request.rb +2 -2
- data/lib/rubygems/resolver/git_set.rb +2 -2
- data/lib/rubygems/resolver/git_specification.rb +6 -6
- data/lib/rubygems/resolver/index_set.rb +3 -3
- data/lib/rubygems/resolver/index_specification.rb +6 -5
- data/lib/rubygems/resolver/installed_specification.rb +4 -4
- data/lib/rubygems/resolver/installer_set.rb +11 -16
- data/lib/rubygems/resolver/local_specification.rb +2 -2
- data/lib/rubygems/resolver/lock_set.rb +4 -4
- data/lib/rubygems/resolver/lock_specification.rb +4 -4
- data/lib/rubygems/resolver/molinillo.rb +1 -1
- data/lib/rubygems/resolver/specification.rb +1 -1
- data/lib/rubygems/resolver/vendor_set.rb +1 -1
- data/lib/rubygems/resolver/vendor_specification.rb +3 -3
- data/lib/rubygems/resolver.rb +39 -39
- data/lib/rubygems/s3_uri_signer.rb +6 -6
- data/lib/rubygems/safe_yaml.rb +2 -2
- data/lib/rubygems/security/policies.rb +11 -11
- data/lib/rubygems/security/policy.rb +18 -18
- data/lib/rubygems/security/signer.rb +5 -5
- data/lib/rubygems/security/trust_dir.rb +3 -3
- data/lib/rubygems/security.rb +28 -28
- data/lib/rubygems/security_option.rb +5 -5
- data/lib/rubygems/source/git.rb +21 -21
- data/lib/rubygems/source/installed.rb +1 -1
- data/lib/rubygems/source/local.rb +2 -2
- data/lib/rubygems/source/specific_file.rb +1 -1
- data/lib/rubygems/source.rb +16 -16
- data/lib/rubygems/spec_fetcher.rb +9 -9
- data/lib/rubygems/specification.rb +63 -62
- data/lib/rubygems/specification_policy.rb +15 -15
- data/lib/rubygems/stub_specification.rb +5 -5
- data/lib/rubygems/tsort.rb +1 -1
- data/lib/rubygems/uninstaller.rb +18 -18
- data/lib/rubygems/uri.rb +4 -4
- data/lib/rubygems/uri_formatter.rb +1 -1
- data/lib/rubygems/user_interaction.rb +33 -19
- data/lib/rubygems/util/licenses.rb +3 -3
- data/lib/rubygems/util.rb +10 -10
- data/lib/rubygems/validator.rb +5 -5
- data/lib/rubygems/version.rb +15 -9
- data/lib/rubygems/version_option.rb +3 -3
- data/lib/rubygems.rb +62 -61
- data/rubygems-update.gemspec +2 -2
- data/setup.rb +9 -9
- data/test/rubygems/helper.rb +132 -134
- data/test/rubygems/installer_test_case.rb +13 -13
- data/test/rubygems/package/tar_test_case.rb +2 -2
- data/test/rubygems/plugin/exception/rubygems_plugin.rb +1 -1
- data/test/rubygems/plugin/standarderror/rubygems_plugin.rb +1 -1
- data/test/rubygems/rubygems_plugin.rb +2 -2
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +4 -4
- data/test/rubygems/test_bundled_ca.rb +10 -10
- data/test/rubygems/test_config.rb +3 -3
- data/test/rubygems/test_deprecate.rb +3 -3
- data/test/rubygems/test_exit.rb +2 -2
- data/test/rubygems/test_gem.rb +342 -342
- data/test/rubygems/test_gem_available_set.rb +21 -21
- data/test/rubygems/test_gem_bundler_version_finder.rb +1 -1
- data/test/rubygems/test_gem_command.rb +44 -44
- data/test/rubygems/test_gem_command_manager.rb +29 -29
- data/test/rubygems/test_gem_commands_build_command.rb +63 -63
- data/test/rubygems/test_gem_commands_cert_command.rb +97 -99
- data/test/rubygems/test_gem_commands_check_command.rb +4 -4
- data/test/rubygems/test_gem_commands_cleanup_command.rb +40 -40
- data/test/rubygems/test_gem_commands_contents_command.rb +27 -27
- data/test/rubygems/test_gem_commands_dependency_command.rb +36 -36
- data/test/rubygems/test_gem_commands_environment_command.rb +16 -16
- data/test/rubygems/test_gem_commands_fetch_command.rb +37 -37
- data/test/rubygems/test_gem_commands_generate_index_command.rb +7 -7
- data/test/rubygems/test_gem_commands_help_command.rb +13 -13
- data/test/rubygems/test_gem_commands_info_command.rb +28 -2
- data/test/rubygems/test_gem_commands_install_command.rb +131 -131
- data/test/rubygems/test_gem_commands_list_command.rb +4 -4
- data/test/rubygems/test_gem_commands_lock_command.rb +10 -10
- data/test/rubygems/test_gem_commands_mirror.rb +2 -2
- data/test/rubygems/test_gem_commands_open_command.rb +4 -4
- data/test/rubygems/test_gem_commands_outdated_command.rb +9 -9
- data/test/rubygems/test_gem_commands_owner_command.rb +41 -41
- data/test/rubygems/test_gem_commands_pristine_command.rb +92 -92
- data/test/rubygems/test_gem_commands_push_command.rb +54 -54
- data/test/rubygems/test_gem_commands_query_command.rb +73 -73
- data/test/rubygems/test_gem_commands_search_command.rb +2 -2
- data/test/rubygems/test_gem_commands_server_command.rb +2 -2
- data/test/rubygems/test_gem_commands_setup_command.rb +119 -85
- data/test/rubygems/test_gem_commands_signin_command.rb +45 -31
- data/test/rubygems/test_gem_commands_signout_command.rb +3 -3
- data/test/rubygems/test_gem_commands_sources_command.rb +28 -29
- data/test/rubygems/test_gem_commands_specification_command.rb +32 -32
- data/test/rubygems/test_gem_commands_stale_command.rb +4 -4
- data/test/rubygems/test_gem_commands_uninstall_command.rb +75 -75
- data/test/rubygems/test_gem_commands_unpack_command.rb +31 -31
- data/test/rubygems/test_gem_commands_update_command.rb +89 -89
- data/test/rubygems/test_gem_commands_which_command.rb +6 -6
- data/test/rubygems/test_gem_commands_yank_command.rb +40 -40
- data/test/rubygems/test_gem_config_file.rb +93 -81
- data/test/rubygems/test_gem_dependency.rb +73 -73
- data/test/rubygems/test_gem_dependency_installer.rb +165 -165
- data/test/rubygems/test_gem_dependency_list.rb +47 -47
- data/test/rubygems/test_gem_dependency_resolution_error.rb +4 -4
- data/test/rubygems/test_gem_doctor.rb +26 -26
- data/test/rubygems/test_gem_ext_builder.rb +59 -59
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock +6 -6
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/build.rb +8 -8
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +6 -6
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/build.rb +8 -8
- data/test/rubygems/test_gem_ext_cargo_builder.rb +26 -26
- data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb +3 -3
- data/test/rubygems/test_gem_ext_cargo_builder_unit.rb +23 -23
- data/test/rubygems/test_gem_ext_cmake_builder.rb +15 -15
- data/test/rubygems/test_gem_ext_configure_builder.rb +13 -13
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +51 -52
- data/test/rubygems/test_gem_ext_rake_builder.rb +15 -15
- data/test/rubygems/test_gem_gem_runner.rb +7 -7
- data/test/rubygems/test_gem_gemcutter_utilities.rb +66 -66
- data/test/rubygems/test_gem_impossible_dependencies_error.rb +4 -4
- data/test/rubygems/test_gem_indexer.rb +48 -48
- data/test/rubygems/test_gem_install_update_options.rb +16 -16
- data/test/rubygems/test_gem_installer.rb +303 -300
- data/test/rubygems/test_gem_local_remote_options.rb +10 -10
- data/test/rubygems/test_gem_name_tuple.rb +4 -4
- data/test/rubygems/test_gem_package.rb +228 -206
- data/test/rubygems/test_gem_package_old.rb +13 -13
- data/test/rubygems/test_gem_package_tar_header.rb +42 -42
- data/test/rubygems/test_gem_package_tar_reader.rb +8 -8
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +10 -10
- data/test/rubygems/test_gem_package_tar_writer.rb +76 -76
- data/test/rubygems/test_gem_package_task.rb +18 -18
- data/test/rubygems/test_gem_path_support.rb +14 -14
- data/test/rubygems/test_gem_platform.rb +298 -227
- data/test/rubygems/test_gem_rdoc.rb +14 -14
- data/test/rubygems/test_gem_remote_fetcher.rb +149 -149
- data/test/rubygems/test_gem_request.rb +55 -55
- data/test/rubygems/test_gem_request_connection_pools.rb +29 -29
- data/test/rubygems/test_gem_request_set.rb +99 -99
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +204 -206
- data/test/rubygems/test_gem_request_set_lockfile.rb +86 -86
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +56 -56
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +62 -62
- data/test/rubygems/test_gem_requirement.rb +47 -41
- data/test/rubygems/test_gem_resolver.rb +133 -99
- data/test/rubygems/test_gem_resolver_activation_request.rb +6 -6
- data/test/rubygems/test_gem_resolver_api_set.rb +33 -33
- data/test/rubygems/test_gem_resolver_api_specification.rb +47 -47
- data/test/rubygems/test_gem_resolver_best_set.rb +22 -22
- data/test/rubygems/test_gem_resolver_composed_set.rb +1 -1
- data/test/rubygems/test_gem_resolver_conflict.rb +12 -12
- data/test/rubygems/test_gem_resolver_dependency_request.rb +15 -15
- data/test/rubygems/test_gem_resolver_git_set.rb +21 -21
- data/test/rubygems/test_gem_resolver_git_specification.rb +21 -21
- data/test/rubygems/test_gem_resolver_index_set.rb +12 -12
- data/test/rubygems/test_gem_resolver_index_specification.rb +16 -16
- data/test/rubygems/test_gem_resolver_installed_specification.rb +5 -5
- data/test/rubygems/test_gem_resolver_installer_set.rb +78 -34
- data/test/rubygems/test_gem_resolver_local_specification.rb +7 -7
- data/test/rubygems/test_gem_resolver_lock_set.rb +12 -12
- data/test/rubygems/test_gem_resolver_lock_specification.rb +17 -17
- data/test/rubygems/test_gem_resolver_requirement_list.rb +1 -1
- data/test/rubygems/test_gem_resolver_specification.rb +8 -8
- data/test/rubygems/test_gem_resolver_vendor_set.rb +6 -6
- data/test/rubygems/test_gem_resolver_vendor_specification.rb +10 -10
- data/test/rubygems/test_gem_security.rb +67 -67
- data/test/rubygems/test_gem_security_policy.rb +62 -62
- data/test/rubygems/test_gem_security_signer.rb +28 -28
- data/test/rubygems/test_gem_security_trust_dir.rb +4 -4
- data/test/rubygems/test_gem_silent_ui.rb +38 -32
- data/test/rubygems/test_gem_source.rb +44 -44
- data/test/rubygems/test_gem_source_fetch_problem.rb +9 -9
- data/test/rubygems/test_gem_source_git.rb +59 -59
- data/test/rubygems/test_gem_source_installed.rb +16 -16
- data/test/rubygems/test_gem_source_list.rb +5 -5
- data/test/rubygems/test_gem_source_local.rb +14 -14
- data/test/rubygems/test_gem_source_lock.rb +31 -31
- data/test/rubygems/test_gem_source_specific_file.rb +17 -17
- data/test/rubygems/test_gem_source_subpath_problem.rb +7 -7
- data/test/rubygems/test_gem_source_vendor.rb +13 -13
- data/test/rubygems/test_gem_spec_fetcher.rb +72 -72
- data/test/rubygems/test_gem_specification.rb +444 -436
- data/test/rubygems/test_gem_stream_ui.rb +19 -19
- data/test/rubygems/test_gem_stub_specification.rb +32 -32
- data/test/rubygems/test_gem_text.rb +1 -1
- data/test/rubygems/test_gem_uninstaller.rb +112 -112
- data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +3 -3
- data/test/rubygems/test_gem_uri.rb +4 -4
- data/test/rubygems/test_gem_uri_formatter.rb +14 -14
- data/test/rubygems/test_gem_util.rb +23 -23
- data/test/rubygems/test_gem_validator.rb +8 -8
- data/test/rubygems/test_gem_version.rb +22 -15
- data/test/rubygems/test_gem_version_option.rb +15 -15
- data/test/rubygems/test_kernel.rb +31 -31
- data/test/rubygems/test_project_sanity.rb +1 -1
- data/test/rubygems/test_remote_fetch_error.rb +6 -6
- data/test/rubygems/test_require.rb +43 -43
- data/test/rubygems/test_rubygems.rb +8 -8
- data/test/rubygems/utilities.rb +19 -19
- metadata +14 -3
@@ -1,14 +1,14 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require_relative
|
3
|
-
require
|
4
|
-
require
|
5
|
-
require
|
6
|
-
require
|
2
|
+
require_relative "helper"
|
3
|
+
require "rubygems/request_set"
|
4
|
+
require "rubygems/request_set/lockfile"
|
5
|
+
require "rubygems/request_set/lockfile/tokenizer"
|
6
|
+
require "rubygems/request_set/lockfile/parser"
|
7
7
|
|
8
8
|
class TestGemRequestSetLockfileParser < Gem::TestCase
|
9
9
|
def setup
|
10
10
|
super
|
11
|
-
@gem_deps_file =
|
11
|
+
@gem_deps_file = "gem.deps.rb"
|
12
12
|
@lock_file = File.expand_path "#{@gem_deps_file}.lock"
|
13
13
|
@set = Gem::RequestSet.new
|
14
14
|
end
|
@@ -53,7 +53,7 @@ class TestGemRequestSetLockfileParser < Gem::TestCase
|
|
53
53
|
parser = tokenizer.make_parser nil, nil
|
54
54
|
|
55
55
|
e = assert_raise Gem::RequestSet::Lockfile::ParseError do
|
56
|
-
parser.get :text,
|
56
|
+
parser.get :text, "y"
|
57
57
|
end
|
58
58
|
|
59
59
|
expected =
|
@@ -83,7 +83,7 @@ DEPENDENCIES
|
|
83
83
|
platforms = []
|
84
84
|
parse_lockfile @set, platforms
|
85
85
|
|
86
|
-
assert_equal [dep(
|
86
|
+
assert_equal [dep("a")], @set.dependencies
|
87
87
|
|
88
88
|
assert_equal [Gem::Platform::RUBY], platforms
|
89
89
|
|
@@ -91,7 +91,7 @@ DEPENDENCIES
|
|
91
91
|
Gem::Resolver::LockSet === set
|
92
92
|
end
|
93
93
|
|
94
|
-
assert lockfile_set,
|
94
|
+
assert lockfile_set, "could not find a LockSet"
|
95
95
|
|
96
96
|
assert_equal %w[a-2], lockfile_set.specs.map {|tuple| tuple.full_name }
|
97
97
|
end
|
@@ -113,7 +113,7 @@ DEPENDENCIES
|
|
113
113
|
platforms = []
|
114
114
|
parse_lockfile @set, platforms
|
115
115
|
|
116
|
-
assert_equal [dep(
|
116
|
+
assert_equal [dep("a", ">= 1", "<= 2")], @set.dependencies
|
117
117
|
|
118
118
|
assert_equal [Gem::Platform::RUBY], platforms
|
119
119
|
|
@@ -121,7 +121,7 @@ DEPENDENCIES
|
|
121
121
|
Gem::Resolver::LockSet === set
|
122
122
|
end
|
123
123
|
|
124
|
-
assert lockfile_set,
|
124
|
+
assert lockfile_set, "could not find a LockSet"
|
125
125
|
|
126
126
|
assert_equal %w[a-2], lockfile_set.specs.map {|tuple| tuple.full_name }
|
127
127
|
end
|
@@ -159,8 +159,8 @@ DEPENDENCIES
|
|
159
159
|
parse_lockfile @set, []
|
160
160
|
|
161
161
|
expected = [
|
162
|
-
dep(
|
163
|
-
dep(
|
162
|
+
dep("i18n-active_record", "= 0.0.2"),
|
163
|
+
dep("rails-footnotes", "= 3.7.9"),
|
164
164
|
]
|
165
165
|
|
166
166
|
assert_equal expected, @set.dependencies
|
@@ -188,7 +188,7 @@ DEPENDENCIES
|
|
188
188
|
parse_lockfile @set, []
|
189
189
|
|
190
190
|
expected = [
|
191
|
-
dep(
|
191
|
+
dep("jwt", "= 1.1"),
|
192
192
|
]
|
193
193
|
|
194
194
|
assert_equal expected, @set.dependencies
|
@@ -209,13 +209,13 @@ DEPENDENCIES
|
|
209
209
|
|
210
210
|
parse_lockfile @set, []
|
211
211
|
|
212
|
-
assert_equal [dep(
|
212
|
+
assert_equal [dep("a", ">= 0")], @set.dependencies
|
213
213
|
|
214
214
|
lockfile_set = @set.sets.find do |set|
|
215
215
|
Gem::Resolver::LockSet === set
|
216
216
|
end
|
217
217
|
|
218
|
-
assert lockfile_set,
|
218
|
+
assert lockfile_set, "found a LockSet"
|
219
219
|
|
220
220
|
assert_equal %w[a-2], lockfile_set.specs.map {|s| s.full_name }
|
221
221
|
end
|
@@ -237,13 +237,13 @@ DEPENDENCIES
|
|
237
237
|
|
238
238
|
parse_lockfile @set, []
|
239
239
|
|
240
|
-
assert_equal [dep(
|
240
|
+
assert_equal [dep("a", ">= 0")], @set.dependencies
|
241
241
|
|
242
242
|
lockfile_set = @set.sets.find do |set|
|
243
243
|
Gem::Resolver::LockSet === set
|
244
244
|
end
|
245
245
|
|
246
|
-
assert lockfile_set,
|
246
|
+
assert lockfile_set, "found a LockSet"
|
247
247
|
|
248
248
|
assert_equal %w[a-2], lockfile_set.specs.map {|s| s.full_name }
|
249
249
|
|
@@ -252,7 +252,7 @@ DEPENDENCIES
|
|
252
252
|
end
|
253
253
|
|
254
254
|
def test_parse_GIT
|
255
|
-
@set.instance_variable_set :@install_dir,
|
255
|
+
@set.instance_variable_set :@install_dir, "install_dir"
|
256
256
|
|
257
257
|
write_lockfile <<-LOCKFILE
|
258
258
|
GIT
|
@@ -269,31 +269,31 @@ DEPENDENCIES
|
|
269
269
|
|
270
270
|
parse_lockfile @set, []
|
271
271
|
|
272
|
-
assert_equal [dep(
|
272
|
+
assert_equal [dep("a", "= 2")], @set.dependencies
|
273
273
|
|
274
274
|
lockfile_set = @set.sets.find do |set|
|
275
275
|
Gem::Resolver::LockSet === set
|
276
276
|
end
|
277
277
|
|
278
|
-
refute lockfile_set,
|
278
|
+
refute lockfile_set, "fount a LockSet"
|
279
279
|
|
280
280
|
git_set = @set.sets.find do |set|
|
281
281
|
Gem::Resolver::GitSet === set
|
282
282
|
end
|
283
283
|
|
284
|
-
assert git_set,
|
284
|
+
assert git_set, "could not find a GitSet"
|
285
285
|
|
286
286
|
assert_equal %w[a-2], git_set.specs.values.map {|s| s.full_name }
|
287
287
|
|
288
|
-
assert_equal [dep(
|
288
|
+
assert_equal [dep("b", ">= 3"), dep("c")],
|
289
289
|
git_set.specs.values.first.dependencies
|
290
290
|
|
291
291
|
expected = {
|
292
|
-
|
292
|
+
"a" => %w[git://example/a.git master],
|
293
293
|
}
|
294
294
|
|
295
295
|
assert_equal expected, git_set.repositories
|
296
|
-
assert_equal
|
296
|
+
assert_equal "install_dir", git_set.root_dir
|
297
297
|
end
|
298
298
|
|
299
299
|
def test_parse_GIT_branch
|
@@ -312,22 +312,22 @@ DEPENDENCIES
|
|
312
312
|
|
313
313
|
parse_lockfile @set, []
|
314
314
|
|
315
|
-
assert_equal [dep(
|
315
|
+
assert_equal [dep("a", "= 2")], @set.dependencies
|
316
316
|
|
317
317
|
lockfile_set = @set.sets.find do |set|
|
318
318
|
Gem::Resolver::LockSet === set
|
319
319
|
end
|
320
320
|
|
321
|
-
refute lockfile_set,
|
321
|
+
refute lockfile_set, "fount a LockSet"
|
322
322
|
|
323
323
|
git_set = @set.sets.find do |set|
|
324
324
|
Gem::Resolver::GitSet === set
|
325
325
|
end
|
326
326
|
|
327
|
-
assert git_set,
|
327
|
+
assert git_set, "could not find a GitSet"
|
328
328
|
|
329
329
|
expected = {
|
330
|
-
|
330
|
+
"a" => %w[git://example/a.git 1234abc],
|
331
331
|
}
|
332
332
|
|
333
333
|
assert_equal expected, git_set.repositories
|
@@ -349,22 +349,22 @@ DEPENDENCIES
|
|
349
349
|
|
350
350
|
parse_lockfile @set, []
|
351
351
|
|
352
|
-
assert_equal [dep(
|
352
|
+
assert_equal [dep("a", "= 2")], @set.dependencies
|
353
353
|
|
354
354
|
lockfile_set = @set.sets.find do |set|
|
355
355
|
Gem::Resolver::LockSet === set
|
356
356
|
end
|
357
357
|
|
358
|
-
refute lockfile_set,
|
358
|
+
refute lockfile_set, "fount a LockSet"
|
359
359
|
|
360
360
|
git_set = @set.sets.find do |set|
|
361
361
|
Gem::Resolver::GitSet === set
|
362
362
|
end
|
363
363
|
|
364
|
-
assert git_set,
|
364
|
+
assert git_set, "could not find a GitSet"
|
365
365
|
|
366
366
|
expected = {
|
367
|
-
|
367
|
+
"a" => %w[git://example/a.git 1234abc],
|
368
368
|
}
|
369
369
|
|
370
370
|
assert_equal expected, git_set.repositories
|
@@ -386,22 +386,22 @@ DEPENDENCIES
|
|
386
386
|
|
387
387
|
parse_lockfile @set, []
|
388
388
|
|
389
|
-
assert_equal [dep(
|
389
|
+
assert_equal [dep("a", "= 2")], @set.dependencies
|
390
390
|
|
391
391
|
lockfile_set = @set.sets.find do |set|
|
392
392
|
Gem::Resolver::LockSet === set
|
393
393
|
end
|
394
394
|
|
395
|
-
refute lockfile_set,
|
395
|
+
refute lockfile_set, "fount a LockSet"
|
396
396
|
|
397
397
|
git_set = @set.sets.find do |set|
|
398
398
|
Gem::Resolver::GitSet === set
|
399
399
|
end
|
400
400
|
|
401
|
-
assert git_set,
|
401
|
+
assert git_set, "could not find a GitSet"
|
402
402
|
|
403
403
|
expected = {
|
404
|
-
|
404
|
+
"a" => %w[git://example/a.git 1234abc],
|
405
405
|
}
|
406
406
|
|
407
407
|
assert_equal expected, git_set.repositories
|
@@ -423,45 +423,45 @@ DEPENDENCIES
|
|
423
423
|
|
424
424
|
parse_lockfile @set, []
|
425
425
|
|
426
|
-
assert_equal [dep(
|
426
|
+
assert_equal [dep("a", "= 1")], @set.dependencies
|
427
427
|
|
428
428
|
lockfile_set = @set.sets.find do |set|
|
429
429
|
Gem::Resolver::LockSet === set
|
430
430
|
end
|
431
431
|
|
432
|
-
refute lockfile_set,
|
432
|
+
refute lockfile_set, "found a LockSet"
|
433
433
|
|
434
434
|
vendor_set = @set.sets.find do |set|
|
435
435
|
Gem::Resolver::VendorSet === set
|
436
436
|
end
|
437
437
|
|
438
|
-
assert vendor_set,
|
438
|
+
assert vendor_set, "could not find a VendorSet"
|
439
439
|
|
440
440
|
assert_equal %w[a-1], vendor_set.specs.values.map {|s| s.full_name }
|
441
441
|
|
442
|
-
spec = vendor_set.load_spec
|
442
|
+
spec = vendor_set.load_spec "a", nil, nil, nil
|
443
443
|
|
444
|
-
assert_equal [dep(
|
444
|
+
assert_equal [dep("b", "= 2")], spec.dependencies
|
445
445
|
end
|
446
446
|
|
447
447
|
def test_parse_dependency
|
448
|
-
write_lockfile
|
448
|
+
write_lockfile " 1)"
|
449
449
|
|
450
450
|
tokenizer = Gem::RequestSet::Lockfile::Tokenizer.from_file @lock_file
|
451
451
|
parser = tokenizer.make_parser nil, nil
|
452
452
|
|
453
|
-
parsed = parser.parse_dependency
|
453
|
+
parsed = parser.parse_dependency "a", "="
|
454
454
|
|
455
|
-
assert_equal dep(
|
455
|
+
assert_equal dep("a", "= 1"), parsed
|
456
456
|
|
457
|
-
write_lockfile
|
457
|
+
write_lockfile ")"
|
458
458
|
|
459
459
|
tokenizer = Gem::RequestSet::Lockfile::Tokenizer.from_file @lock_file
|
460
460
|
parser = tokenizer.make_parser nil, nil
|
461
461
|
|
462
|
-
parsed = parser.parse_dependency
|
462
|
+
parsed = parser.parse_dependency "a", "2"
|
463
463
|
|
464
|
-
assert_equal dep(
|
464
|
+
assert_equal dep("a", "= 2"), parsed
|
465
465
|
end
|
466
466
|
|
467
467
|
def test_parse_gem_specs_dependency
|
@@ -486,7 +486,7 @@ DEPENDENCIES
|
|
486
486
|
platforms = []
|
487
487
|
parse_lockfile @set, platforms
|
488
488
|
|
489
|
-
assert_equal [dep(
|
489
|
+
assert_equal [dep("a")], @set.dependencies
|
490
490
|
|
491
491
|
assert_equal [Gem::Platform::RUBY], platforms
|
492
492
|
|
@@ -494,13 +494,13 @@ DEPENDENCIES
|
|
494
494
|
Gem::Resolver::LockSet === set
|
495
495
|
end
|
496
496
|
|
497
|
-
assert lockfile_set,
|
497
|
+
assert lockfile_set, "could not find a LockSet"
|
498
498
|
|
499
499
|
assert_equal %w[a-2 b-3], lockfile_set.specs.map {|tuple| tuple.full_name }
|
500
500
|
|
501
501
|
expected = [
|
502
502
|
Gem::Platform::RUBY,
|
503
|
-
Gem::Platform.new(
|
503
|
+
Gem::Platform.new("x86_64-linux"),
|
504
504
|
]
|
505
505
|
|
506
506
|
assert_equal expected, lockfile_set.specs.map {|tuple| tuple.platform }
|
@@ -508,10 +508,10 @@ DEPENDENCIES
|
|
508
508
|
spec = lockfile_set.specs.first
|
509
509
|
|
510
510
|
expected = [
|
511
|
-
dep(
|
512
|
-
dep(
|
513
|
-
dep(
|
514
|
-
dep(
|
511
|
+
dep("b", "= 3"),
|
512
|
+
dep("c", "~> 4"),
|
513
|
+
dep("d"),
|
514
|
+
dep("e", "~> 5.0", ">= 5.0.1"),
|
515
515
|
]
|
516
516
|
|
517
517
|
assert_equal expected, spec.dependencies
|
@@ -530,7 +530,7 @@ DEPENDENCIES
|
|
530
530
|
end
|
531
531
|
|
532
532
|
def write_lockfile(lockfile)
|
533
|
-
File.open @lock_file,
|
533
|
+
File.open @lock_file, "w" do |io|
|
534
534
|
io.write lockfile
|
535
535
|
end
|
536
536
|
end
|
@@ -1,15 +1,15 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require_relative
|
3
|
-
require
|
4
|
-
require
|
5
|
-
require
|
6
|
-
require
|
2
|
+
require_relative "helper"
|
3
|
+
require "rubygems/request_set"
|
4
|
+
require "rubygems/request_set/lockfile"
|
5
|
+
require "rubygems/request_set/lockfile/tokenizer"
|
6
|
+
require "rubygems/request_set/lockfile/parser"
|
7
7
|
|
8
8
|
class TestGemRequestSetLockfileTokenizer < Gem::TestCase
|
9
9
|
def setup
|
10
10
|
super
|
11
11
|
|
12
|
-
@gem_deps_file =
|
12
|
+
@gem_deps_file = "gem.deps.rb"
|
13
13
|
@lock_file = File.expand_path "#{@gem_deps_file}.lock"
|
14
14
|
end
|
15
15
|
|
@@ -34,10 +34,10 @@ class TestGemRequestSetLockfileTokenizer < Gem::TestCase
|
|
34
34
|
end
|
35
35
|
|
36
36
|
def test_token_pos
|
37
|
-
tokenizer = Gem::RequestSet::Lockfile::Tokenizer.new
|
37
|
+
tokenizer = Gem::RequestSet::Lockfile::Tokenizer.new ""
|
38
38
|
assert_equal [5, 0], tokenizer.token_pos(5)
|
39
39
|
|
40
|
-
tokenizer = Gem::RequestSet::Lockfile::Tokenizer.new
|
40
|
+
tokenizer = Gem::RequestSet::Lockfile::Tokenizer.new "", nil, 1, 2
|
41
41
|
assert_equal [3, 1], tokenizer.token_pos(5)
|
42
42
|
end
|
43
43
|
|
@@ -63,74 +63,74 @@ DEPENDENCIES
|
|
63
63
|
LOCKFILE
|
64
64
|
|
65
65
|
expected = [
|
66
|
-
[:section,
|
66
|
+
[:section, "GEM", 0, 0],
|
67
67
|
[:newline, nil, 3, 0],
|
68
68
|
|
69
|
-
[:entry,
|
69
|
+
[:entry, "remote", 2, 1],
|
70
70
|
[:text, @gem_repo, 10, 1],
|
71
71
|
[:newline, nil, 34, 1],
|
72
72
|
|
73
|
-
[:entry,
|
73
|
+
[:entry, "specs", 2, 2],
|
74
74
|
[:newline, nil, 8, 2],
|
75
75
|
|
76
|
-
[:text,
|
76
|
+
[:text, "a", 4, 3],
|
77
77
|
[:l_paren, nil, 6, 3],
|
78
|
-
[:text,
|
78
|
+
[:text, "2", 7, 3],
|
79
79
|
[:r_paren, nil, 8, 3],
|
80
80
|
[:newline, nil, 9, 3],
|
81
81
|
|
82
|
-
[:text,
|
82
|
+
[:text, "b", 6, 4],
|
83
83
|
[:l_paren, nil, 8, 4],
|
84
|
-
[:requirement,
|
85
|
-
[:text,
|
84
|
+
[:requirement, "=", 9, 4],
|
85
|
+
[:text, "2", 11, 4],
|
86
86
|
[:r_paren, nil, 12, 4],
|
87
87
|
[:newline, nil, 13, 4],
|
88
88
|
|
89
|
-
[:text,
|
89
|
+
[:text, "c", 6, 5],
|
90
90
|
[:l_paren, nil, 8, 5],
|
91
|
-
[:requirement,
|
92
|
-
[:text,
|
91
|
+
[:requirement, "!=", 9, 5],
|
92
|
+
[:text, "3", 12, 5],
|
93
93
|
[:r_paren, nil, 13, 5],
|
94
94
|
[:newline, nil, 14, 5],
|
95
95
|
|
96
|
-
[:text,
|
96
|
+
[:text, "d", 6, 6],
|
97
97
|
[:l_paren, nil, 8, 6],
|
98
|
-
[:requirement,
|
99
|
-
[:text,
|
98
|
+
[:requirement, ">", 9, 6],
|
99
|
+
[:text, "4", 11, 6],
|
100
100
|
[:r_paren, nil, 12, 6],
|
101
101
|
[:newline, nil, 13, 6],
|
102
102
|
|
103
|
-
[:text,
|
103
|
+
[:text, "e", 6, 7],
|
104
104
|
[:l_paren, nil, 8, 7],
|
105
|
-
[:requirement,
|
106
|
-
[:text,
|
105
|
+
[:requirement, "<", 9, 7],
|
106
|
+
[:text, "5", 11, 7],
|
107
107
|
[:r_paren, nil, 12, 7],
|
108
108
|
[:newline, nil, 13, 7],
|
109
109
|
|
110
|
-
[:text,
|
110
|
+
[:text, "f", 6, 8],
|
111
111
|
[:l_paren, nil, 8, 8],
|
112
|
-
[:requirement,
|
113
|
-
[:text,
|
112
|
+
[:requirement, ">=", 9, 8],
|
113
|
+
[:text, "6", 12, 8],
|
114
114
|
[:r_paren, nil, 13, 8],
|
115
115
|
[:newline, nil, 14, 8],
|
116
116
|
|
117
|
-
[:text,
|
117
|
+
[:text, "g", 6, 9],
|
118
118
|
[:l_paren, nil, 8, 9],
|
119
|
-
[:requirement,
|
120
|
-
[:text,
|
119
|
+
[:requirement, "<=", 9, 9],
|
120
|
+
[:text, "7", 12, 9],
|
121
121
|
[:r_paren, nil, 13, 9],
|
122
122
|
[:newline, nil, 14, 9],
|
123
123
|
|
124
|
-
[:text,
|
124
|
+
[:text, "h", 6, 10],
|
125
125
|
[:l_paren, nil, 8, 10],
|
126
|
-
[:requirement,
|
127
|
-
[:text,
|
126
|
+
[:requirement, "~>", 9, 10],
|
127
|
+
[:text, "8", 12, 10],
|
128
128
|
[:r_paren, nil, 13, 10],
|
129
129
|
[:newline, nil, 14, 10],
|
130
130
|
|
131
131
|
[:newline, nil, 0, 11],
|
132
132
|
|
133
|
-
[:section,
|
133
|
+
[:section, "PLATFORMS", 0, 12],
|
134
134
|
[:newline, nil, 9, 12],
|
135
135
|
|
136
136
|
[:text, Gem::Platform::RUBY, 2, 13],
|
@@ -138,10 +138,10 @@ DEPENDENCIES
|
|
138
138
|
|
139
139
|
[:newline, nil, 0, 14],
|
140
140
|
|
141
|
-
[:section,
|
141
|
+
[:section, "DEPENDENCIES", 0, 15],
|
142
142
|
[:newline, nil, 12, 15],
|
143
143
|
|
144
|
-
[:text,
|
144
|
+
[:text, "a", 2, 16],
|
145
145
|
[:newline, nil, 3, 16],
|
146
146
|
]
|
147
147
|
|
@@ -163,27 +163,27 @@ DEPENDENCIES
|
|
163
163
|
LOCKFILE
|
164
164
|
|
165
165
|
expected = [
|
166
|
-
[:section,
|
166
|
+
[:section, "GEM", 0, 0],
|
167
167
|
[:newline, nil, 3, 0],
|
168
|
-
[:entry,
|
168
|
+
[:entry, "remote", 2, 1],
|
169
169
|
[:text, @gem_repo, 10, 1],
|
170
170
|
[:newline, nil, 34, 1],
|
171
|
-
[:entry,
|
171
|
+
[:entry, "specs", 2, 2],
|
172
172
|
[:newline, nil, 8, 2],
|
173
|
-
[:text,
|
173
|
+
[:text, "Ab", 4, 3],
|
174
174
|
[:l_paren, nil, 7, 3],
|
175
|
-
[:text,
|
175
|
+
[:text, "2", 8, 3],
|
176
176
|
[:r_paren, nil, 9, 3],
|
177
177
|
[:newline, nil, 10, 3],
|
178
178
|
[:newline, nil, 0, 4],
|
179
|
-
[:section,
|
179
|
+
[:section, "PLATFORMS", 0, 5],
|
180
180
|
[:newline, nil, 9, 5],
|
181
181
|
[:text, Gem::Platform::RUBY, 2, 6],
|
182
182
|
[:newline, nil, 6, 6],
|
183
183
|
[:newline, nil, 0, 7],
|
184
|
-
[:section,
|
184
|
+
[:section, "DEPENDENCIES", 0, 8],
|
185
185
|
[:newline, nil, 12, 8],
|
186
|
-
[:text,
|
186
|
+
[:text, "Ab", 2, 9],
|
187
187
|
[:newline, nil, 4, 9],
|
188
188
|
]
|
189
189
|
|
@@ -191,7 +191,7 @@ DEPENDENCIES
|
|
191
191
|
end
|
192
192
|
|
193
193
|
def test_tokenize_conflict_markers
|
194
|
-
write_lockfile
|
194
|
+
write_lockfile "<<<<<<<"
|
195
195
|
|
196
196
|
e = assert_raise Gem::RequestSet::Lockfile::ParseError do
|
197
197
|
tokenize_lockfile
|
@@ -200,7 +200,7 @@ DEPENDENCIES
|
|
200
200
|
assert_equal "your #{@lock_file} contains merge conflict markers (at line 0 column 0)",
|
201
201
|
e.message
|
202
202
|
|
203
|
-
write_lockfile
|
203
|
+
write_lockfile "|||||||"
|
204
204
|
|
205
205
|
e = assert_raise Gem::RequestSet::Lockfile::ParseError do
|
206
206
|
tokenize_lockfile
|
@@ -209,7 +209,7 @@ DEPENDENCIES
|
|
209
209
|
assert_equal "your #{@lock_file} contains merge conflict markers (at line 0 column 0)",
|
210
210
|
e.message
|
211
211
|
|
212
|
-
write_lockfile
|
212
|
+
write_lockfile "======="
|
213
213
|
|
214
214
|
e = assert_raise Gem::RequestSet::Lockfile::ParseError do
|
215
215
|
tokenize_lockfile
|
@@ -218,7 +218,7 @@ DEPENDENCIES
|
|
218
218
|
assert_equal "your #{@lock_file} contains merge conflict markers (at line 0 column 0)",
|
219
219
|
e.message
|
220
220
|
|
221
|
-
write_lockfile
|
221
|
+
write_lockfile ">>>>>>>"
|
222
222
|
|
223
223
|
e = assert_raise Gem::RequestSet::Lockfile::ParseError do
|
224
224
|
tokenize_lockfile
|
@@ -235,10 +235,10 @@ DEPENDENCIES
|
|
235
235
|
LOCKFILE
|
236
236
|
|
237
237
|
expected = [
|
238
|
-
[:section,
|
238
|
+
[:section, "DEPENDENCIES", 0, 0],
|
239
239
|
[:newline, nil, 12, 0],
|
240
240
|
|
241
|
-
[:text,
|
241
|
+
[:text, "a", 2, 1],
|
242
242
|
[:bang, nil, 3, 1],
|
243
243
|
[:newline, nil, 4, 1],
|
244
244
|
]
|
@@ -256,29 +256,29 @@ GEM
|
|
256
256
|
LOCKFILE
|
257
257
|
|
258
258
|
expected = [
|
259
|
-
[:section,
|
259
|
+
[:section, "GEM", 0, 0],
|
260
260
|
[:newline, nil, 3, 0],
|
261
261
|
|
262
|
-
[:entry,
|
262
|
+
[:entry, "remote", 2, 1],
|
263
263
|
[:text, @gem_repo, 10, 1],
|
264
264
|
[:newline, nil, 34, 1],
|
265
265
|
|
266
|
-
[:entry,
|
266
|
+
[:entry, "specs", 2, 2],
|
267
267
|
[:newline, nil, 8, 2],
|
268
268
|
|
269
|
-
[:text,
|
269
|
+
[:text, "a", 4, 3],
|
270
270
|
[:l_paren, nil, 6, 3],
|
271
|
-
[:text,
|
271
|
+
[:text, "2", 7, 3],
|
272
272
|
[:r_paren, nil, 8, 3],
|
273
273
|
[:newline, nil, 9, 3],
|
274
274
|
|
275
|
-
[:text,
|
275
|
+
[:text, "b", 6, 4],
|
276
276
|
[:l_paren, nil, 8, 4],
|
277
|
-
[:requirement,
|
278
|
-
[:text,
|
277
|
+
[:requirement, "~>", 9, 4],
|
278
|
+
[:text, "3.0", 12, 4],
|
279
279
|
[:comma, nil, 15, 4],
|
280
|
-
[:requirement,
|
281
|
-
[:text,
|
280
|
+
[:requirement, ">=", 17, 4],
|
281
|
+
[:text, "3.0.1", 20, 4],
|
282
282
|
[:r_paren, nil, 25, 4],
|
283
283
|
[:newline, nil, 26, 4],
|
284
284
|
]
|
@@ -295,7 +295,7 @@ GEM
|
|
295
295
|
end
|
296
296
|
|
297
297
|
def write_lockfile(lockfile)
|
298
|
-
File.open @lock_file,
|
298
|
+
File.open @lock_file, "w" do |io|
|
299
299
|
io.write lockfile
|
300
300
|
end
|
301
301
|
end
|