RubyGems - rubygems-update - Versions diffs - 3.3.18 → 3.3.22 - Mend

rubygems-update 3.3.18 → 3.3.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (388) hide show

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

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e4ec6bc7526731f88132fc2b50228513c227ccb3ba0e4d92ad009de6131ee99
-  data.tar.gz: 848ab25d5d8e63a8a13a15cbf2814fd90e13e026c7e3d3594315944fd6bb966a
+  metadata.gz: 7155d16d3c9857d2ae7b4dd04e939a77f72fa12f939413f328d77c73b152cc37
+  data.tar.gz: 5f696b3a1885a97d4f0a518761e8a452a256fe360d428cff409ada562b64fa36
 SHA512:
-  metadata.gz: 8b6dbc2d36b694c6de2b1adea1be5319b20a81db44d633933d3254852000c4909f1354ccebd6c334fcef95f6c9ab20723e144f28784ccaeb823e026433d879f4
-  data.tar.gz: f20de7a450239710b77454b12f1ff78ef2c88951862b3edb2458bde54b5aa4353c697de9ea0b291c37430fff6de6e388254e6c10fdaf67686a4784d67c61f35c
+  metadata.gz: 64a732dbbe8b89756cebcc79c9806bf9f0ddd6646d2e527e029fdbcba7ae19bc8b33ae82ccbf4e04dacca81d550af36e6cd31eea0a9950e8210098a827241d89
+  data.tar.gz: d3bf1303f659b05996386c5cc2f36d4f6bee88a6c187a4cb4f93cd4044b6848c700a653ad3d402af5c48e23d6eaffb8ebd0ff87300377d4cbbb834083f26d836

data/CHANGELOG.md CHANGED Viewed

@@ -1,3 +1,68 @@
+# 3.3.22 / 2022-09-07
+## Enhancements:
+* Support non gnu libc arm-linux-eabi platforms. Pull request #5889 by
+  ntkme
+* Installs bundler 2.3.22 as a default gem.
+## Bug fixes:
+* Fix `gem info` with explicit `--version`. Pull request #5884 by
+  tonyaraujop
+# 3.3.21 / 2022-08-24
+## Enhancements:
+* Support non gnu libc linux platforms. Pull request #5852 by
+  deivid-rodriguez
+* Installs bundler 2.3.21 as a default gem.
+# 3.3.20 / 2022-08-10
+## Enhancements:
+* Include backtrace with crashes by default. Pull request #5811 by
+  deivid-rodriguez
+* Don't create broken symlinks when a gem includes them, but print a
+  warning instead. Pull request #5801 by deivid-rodriguez
+* Warn (rather than crash) when setting `nil` specification versions. Pull
+  request #5794 by deivid-rodriguez
+* Installs bundler 2.3.20 as a default gem.
+## Bug fixes:
+* Always consider installed specs for resolution, even if prereleases.
+  Pull request #5821 by deivid-rodriguez
+* Fix `gem install` with `--platform` flag not matching simulated platform
+  correctly. Pull request #5820 by deivid-rodriguez
+* Fix platform matching for index specs. Pull request #5795 by Ilushkanama
+# 3.3.19 / 2022-07-27
+## Enhancements:
+* Display mfa warnings on `gem signin`. Pull request #5590 by aellispierce
+* Require fileutils more lazily when installing gems. Pull request #5738
+  by deivid-rodriguez
+* Fix upgrading RubyGems with a customized `Gem.default_dir`. Pull request
+  #5728 by deivid-rodriguez
+* Stop using `/dev/null` for silent ui for WASI platform. Pull request
+  #5703 by kateinoigakukun
+* Unify loading `Gem::Requirement`. Pull request #5596 by deivid-rodriguez
+* Installs bundler 2.3.19 as a default gem.
+## Bug fixes:
+* Fix `ruby setup.rb` with `--destdir` writing outside of `--destdir`.
+  Pull request #5737 by deivid-rodriguez
+## Documentation:
+* Fix wrong information about default RubyGems source. Pull request #5723
+  by tnir
 # 3.3.18 / 2022-07-14
 ## Enhancements:

data/Manifest.txt CHANGED Viewed

@@ -103,12 +103,16 @@ bundler/lib/bundler/man/bundle-clean.1
 bundler/lib/bundler/man/bundle-clean.1.ronn
 bundler/lib/bundler/man/bundle-config.1
 bundler/lib/bundler/man/bundle-config.1.ronn
+bundler/lib/bundler/man/bundle-console.1
+bundler/lib/bundler/man/bundle-console.1.ronn
 bundler/lib/bundler/man/bundle-doctor.1
 bundler/lib/bundler/man/bundle-doctor.1.ronn
 bundler/lib/bundler/man/bundle-exec.1
 bundler/lib/bundler/man/bundle-exec.1.ronn
 bundler/lib/bundler/man/bundle-gem.1
 bundler/lib/bundler/man/bundle-gem.1.ronn
+bundler/lib/bundler/man/bundle-help.1
+bundler/lib/bundler/man/bundle-help.1.ronn
 bundler/lib/bundler/man/bundle-info.1
 bundler/lib/bundler/man/bundle-info.1.ronn
 bundler/lib/bundler/man/bundle-init.1
@@ -127,6 +131,8 @@ bundler/lib/bundler/man/bundle-outdated.1
 bundler/lib/bundler/man/bundle-outdated.1.ronn
 bundler/lib/bundler/man/bundle-platform.1
 bundler/lib/bundler/man/bundle-platform.1.ronn
+bundler/lib/bundler/man/bundle-plugin.1
+bundler/lib/bundler/man/bundle-plugin.1.ronn
 bundler/lib/bundler/man/bundle-pristine.1
 bundler/lib/bundler/man/bundle-pristine.1.ronn
 bundler/lib/bundler/man/bundle-remove.1
@@ -135,6 +141,8 @@ bundler/lib/bundler/man/bundle-show.1
 bundler/lib/bundler/man/bundle-show.1.ronn
 bundler/lib/bundler/man/bundle-update.1
 bundler/lib/bundler/man/bundle-update.1.ronn
+bundler/lib/bundler/man/bundle-version.1
+bundler/lib/bundler/man/bundle-version.1.ronn
 bundler/lib/bundler/man/bundle-viz.1
 bundler/lib/bundler/man/bundle-viz.1.ronn
 bundler/lib/bundler/man/bundle.1
@@ -142,7 +150,9 @@ bundler/lib/bundler/man/bundle.1.ronn
 bundler/lib/bundler/man/gemfile.5
 bundler/lib/bundler/man/gemfile.5.ronn
 bundler/lib/bundler/man/index.txt
+bundler/lib/bundler/match_metadata.rb
 bundler/lib/bundler/match_platform.rb
+bundler/lib/bundler/match_remote_metadata.rb
 bundler/lib/bundler/mirror.rb
 bundler/lib/bundler/plugin.rb
 bundler/lib/bundler/plugin/api.rb
@@ -157,6 +167,7 @@ bundler/lib/bundler/plugin/source_list.rb
 bundler/lib/bundler/process_lock.rb
 bundler/lib/bundler/remote_specification.rb
 bundler/lib/bundler/resolver.rb
+bundler/lib/bundler/resolver/base.rb
 bundler/lib/bundler/resolver/spec_group.rb
 bundler/lib/bundler/retry.rb
 bundler/lib/bundler/ruby_dsl.rb

data/bin/gem CHANGED Viewed

@@ -5,8 +5,8 @@
 # See LICENSE.txt for permissions.
 #++
-require 'rubygems'
-require 'rubygems/gem_runner'
+require "rubygems"
+require "rubygems/gem_runner"
 args = ARGV.clone

data/bin/update_rubygems CHANGED Viewed

@@ -5,9 +5,9 @@
 # See LICENSE.txt for permissions.
 #++
-require 'rubygems'
+require "rubygems"
-if ARGV.include? '-h' or ARGV.include? '--help'
+if ARGV.include?("-h") || ARGV.include?("--help")
   $stderr.puts "rubygems_update [options]"
   $stderr.puts
   $stderr.puts "This will install the latest version of RubyGems."
@@ -17,7 +17,7 @@ if ARGV.include? '-h' or ARGV.include? '--help'
 end
 unless ARGV.grep(/--version=([\d\.]*)/).empty?
-  exec Gem.ruby, '-S', $PROGRAM_NAME, "_#{$1}_"
+  exec Gem.ruby, "-S", $PROGRAM_NAME, "_#{$1}_"
 end
 update_dir = $LOAD_PATH.find {|dir| dir =~ /rubygems-update/ }
@@ -32,5 +32,5 @@ else
   update_dir = File.dirname(update_dir)
   Dir.chdir update_dir
   ENV["GEM_PREV_VER"] = Gem::VERSION
-  abort unless system(Gem.ruby, 'setup.rb', *ARGV)
+  abort unless system(Gem.ruby, "setup.rb", *ARGV)
 end

data/bundler/CHANGELOG.md CHANGED Viewed

@@ -1,3 +1,103 @@
+# 2.3.22 (September 7, 2022)
+## Enhancements:
+  - Use a more accurate source code uri in gemspec [#5896](https://github.com/rubygems/rubygems/pull/5896)
+  - Support `--path` option in `bundle add` [#5897](https://github.com/rubygems/rubygems/pull/5897)
+  - Improve lockfile dependency unlocking [#5881](https://github.com/rubygems/rubygems/pull/5881)
+  - Add platform alias `:windows` to Gemfile DSL [#5650](https://github.com/rubygems/rubygems/pull/5650)
+  - Make `#to_lock` consistent between `Gem::Dependency` and `Bundler::Dependency` [#5872](https://github.com/rubygems/rubygems/pull/5872)
+  - Support marshaled index specifications with `nil` required ruby version [#5824](https://github.com/rubygems/rubygems/pull/5824)
+## Bug fixes:
+  - Fix resolution hanging on musl platforms [#5875](https://github.com/rubygems/rubygems/pull/5875)
+  - Fix another regression affecting the sorbet family of gems [#5874](https://github.com/rubygems/rubygems/pull/5874)
+## Documentation:
+  - Introduce bundle-console(1) man [#5901](https://github.com/rubygems/rubygems/pull/5901)
+  - Introduce bundle-version(1) man [#5895](https://github.com/rubygems/rubygems/pull/5895)
+  - Introduce bundle-help(1) man [#5886](https://github.com/rubygems/rubygems/pull/5886)
+# 2.3.21 (August 24, 2022)
+## Enhancements:
+  - Backport non gnu libc linux support from RubyGems [#4488](https://github.com/rubygems/rubygems/pull/4488)
+  - Improve `Bundler.rm_rf` error message [#5861](https://github.com/rubygems/rubygems/pull/5861)
+  - Disallow both `--branch` and `--ref` at the same time in bundle-plugin [#5855](https://github.com/rubygems/rubygems/pull/5855)
+  - Restore previous performance of private RubyGems servers [#5826](https://github.com/rubygems/rubygems/pull/5826)
+## Bug fixes:
+  - Fix conservative update downgrading top level gems [#5847](https://github.com/rubygems/rubygems/pull/5847)
+  - Fix edge case where `bundler/inline` unintentionally skips install [#5848](https://github.com/rubygems/rubygems/pull/5848)
+  - Fix `bundle platform` crash when there's a lockfile with no Ruby locked [#5850](https://github.com/rubygems/rubygems/pull/5850)
+  - Fix crash when incomplete locked specifications are found in transitive dependencies [#5840](https://github.com/rubygems/rubygems/pull/5840)
+  - Fix Ruby platform incorrectly removed on `bundle update` [#5832](https://github.com/rubygems/rubygems/pull/5832)
+## Documentation:
+  - Explain cancelled CLI deprecations clearly [#5864](https://github.com/rubygems/rubygems/pull/5864)
+  - Improve `bundle config` command synopsis [#5854](https://github.com/rubygems/rubygems/pull/5854)
+  - Introduce bundle-plugin(1) man [#5853](https://github.com/rubygems/rubygems/pull/5853)
+# 2.3.20 (August 10, 2022)
+## Enhancements:
+  - Consistently ignore patchlevel when reporting `bundle platform --ruby` [#5793](https://github.com/rubygems/rubygems/pull/5793)
+  - Make `--standalone` play nice with `--local` [#5762](https://github.com/rubygems/rubygems/pull/5762)
+  - Implement `bundle install --prefer-local` [#5761](https://github.com/rubygems/rubygems/pull/5761)
+## Bug fixes:
+  - Fix regression where yanked gems are now unintentionally updated when other gems are unlocked [#5812](https://github.com/rubygems/rubygems/pull/5812)
+  - Automatically remove "ruby" from lockfile if incomplete [#5807](https://github.com/rubygems/rubygems/pull/5807)
+  - Fix `bundle outdated --strict` showing too many outdated gems [#5798](https://github.com/rubygems/rubygems/pull/5798)
+  - Don't discard candidates matching Ruby metadata [#5784](https://github.com/rubygems/rubygems/pull/5784)
+  - Fix `bundle outdated` crash in debug mode [#5796](https://github.com/rubygems/rubygems/pull/5796)
+  - Fix `ruby` DSL requirement matching for head and prerelease rubies [#5766](https://github.com/rubygems/rubygems/pull/5766)
+## Documentation:
+  - Update Bundler support policies to match what we do these days [#5813](https://github.com/rubygems/rubygems/pull/5813)
+  - Fix arguments for bundle-config(1) docs [#5804](https://github.com/rubygems/rubygems/pull/5804)
+  - Improve `bundle platform` man page [#5788](https://github.com/rubygems/rubygems/pull/5788)
+  - Remove `bundle cache` from deprecated commands list, and consistently link to `bundle cache` in man pages [#5783](https://github.com/rubygems/rubygems/pull/5783)
+  - Add package/pack aliases to man pages for cache [#5785](https://github.com/rubygems/rubygems/pull/5785)
+  - Add deprecation notice of bundle console [#5775](https://github.com/rubygems/rubygems/pull/5775)
+# 2.3.19 (July 27, 2022)
+## Enhancements:
+  - Add `Bundler.settings[:only]` to install gems of the specified groups [#5759](https://github.com/rubygems/rubygems/pull/5759)
+  - Add `ignore_funding_requests` config flag [#5767](https://github.com/rubygems/rubygems/pull/5767)
+  - Prevent random crash when autoloading `Pathname` [#5769](https://github.com/rubygems/rubygems/pull/5769)
+  - Don't corrupt lockfile when user moves a gem that's already in the lockfile to an incorrect source by mistake [#5070](https://github.com/rubygems/rubygems/pull/5070)
+  - Reconcile error/warning message for multiple global sources with documentation [#5741](https://github.com/rubygems/rubygems/pull/5741)
+  - Improve error message when gems cannot be found to include the source for each gem [#5729](https://github.com/rubygems/rubygems/pull/5729)
+## Bug fixes:
+  - Fix yet another TruffleRuby platform selection regression [#5746](https://github.com/rubygems/rubygems/pull/5746)
+  - Show a proper error if extension dir is not writable [#5726](https://github.com/rubygems/rubygems/pull/5726)
+## Performance:
+  - Lazily check incomplete lockfile to improve performance [#5546](https://github.com/rubygems/rubygems/pull/5546)
+## Documentation:
+  - Add deprecation notice of bundle inject [#5776](https://github.com/rubygems/rubygems/pull/5776)
+  - Add deprecation notice of `bundle viz` to man pages [#5765](https://github.com/rubygems/rubygems/pull/5765)
+  - Update command example in `bundle exec` man page [#5754](https://github.com/rubygems/rubygems/pull/5754)
+  - Remove bundle show from obsolete commands [#5753](https://github.com/rubygems/rubygems/pull/5753)
+  - Improve global source(s) documentation [#5732](https://github.com/rubygems/rubygems/pull/5732)
+  - Use https protocol for URLs for config mirror in bundler man [#5722](https://github.com/rubygems/rubygems/pull/5722)
 # 2.3.18 (July 14, 2022)
 ## Enhancements:

data/bundler/UPGRADING.md CHANGED Viewed

@@ -25,7 +25,7 @@ I'll be dividing the deprecations into four groups: CLI deprecations, Helper
 deprecations, DSL deprecations, and misc deprecations. Let's dive into each of
 them.
-#### CLI deprecations
+### CLI deprecations
 The CLI defines a set of commands and options that can be used by our users to
 create command lines that bundler can understand. There's a number of changes
@@ -82,7 +82,6 @@ in the upcoming 3 version.
   in favor of a `bin/console` script created by `bundle gem` on gem generation
   that users can tweak to their needs.
-* ~The `bundle update` command will no longer update all gems, you'll need to pass `--all` to it.~ (postponed)
 * The `bundle install` command will no longer accept a `--binstubs` flag.
@@ -94,7 +93,6 @@ in the upcoming 3 version.
   likely unused files into source control. Because of this, binstubs now must
   be created and checked into version control individually.
-* ~The `bundle config` command has a new subcommand-based interface.~ (postponed)
 * The `bundle inject` command is deprecated and replaced with `bundle add`.
@@ -103,7 +101,16 @@ in the upcoming 3 version.
   exactly the same in `bundle add`, so it should be easy to migrate to the new
   command.
-#### Helper deprecations
+#### Cancelled CLI deprecations
+These deprecations have been initally announced before, but the deprecations
+were cancelled before the release of Bundler 2.1.0 in [rubygems/bundler#7475](https://github.com/rubygems/bundler/pull/7475).
+* ~The `bundle update` command will no longer update all gems, you'll need to pass `--all` to it.~ (postponed)
+* ~The `bundle config` command will no longer accept old subcommand-based interface before Bundler 2.1.~ (postponed)
+### Helper deprecations
 * `Bundler.clean_env`, `Bundler.with_clean_env`, `Bundler.clean_system`, and `Bundler.clean_exec` are deprecated.

data/bundler/bundler.gemspec CHANGED Viewed

@@ -22,14 +22,12 @@ Gem::Specification.new do |s|
   s.summary     = "The best way to manage your application's dependencies"
   s.description = "Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably"
-  if s.respond_to?(:metadata=)
-    s.metadata = {
-      "bug_tracker_uri" => "https://github.com/rubygems/rubygems/issues?q=is%3Aopen+is%3Aissue+label%3ABundler",
-      "changelog_uri" => "https://github.com/rubygems/rubygems/blob/master/bundler/CHANGELOG.md",
-      "homepage_uri" => "https://bundler.io/",
-      "source_code_uri" => "https://github.com/rubygems/rubygems/",
-    }
-  end
+  s.metadata = {
+    "bug_tracker_uri" => "https://github.com/rubygems/rubygems/issues?q=is%3Aopen+is%3Aissue+label%3ABundler",
+    "changelog_uri" => "https://github.com/rubygems/rubygems/blob/master/bundler/CHANGELOG.md",
+    "homepage_uri" => "https://bundler.io/",
+    "source_code_uri" => "https://github.com/rubygems/rubygems/tree/master/bundler",
+  }
   s.required_ruby_version     = ">= 2.3.0"
   s.required_rubygems_version = ">= 2.5.2"

data/bundler/lib/bundler/build_metadata.rb CHANGED Viewed

@@ -4,8 +4,8 @@ module Bundler
   # Represents metadata from when the Bundler gem was built.
   module BuildMetadata
     # begin ivars
-    @built_at = "2022-07-14".freeze
-    @git_commit_sha = "fc31b7f7d9".freeze
+    @built_at = "2022-09-07".freeze
+    @git_commit_sha = "44fb4c9ef5".freeze
     @release = true
     # end ivars

data/bundler/lib/bundler/cli/common.rb CHANGED Viewed

@@ -15,6 +15,7 @@ module Bundler
     end
     def self.output_fund_metadata_summary
+      return if Bundler.settings["ignore_funding_requests"]
       definition = Bundler.definition
       current_dependencies = definition.requested_dependencies
       current_specs = definition.specs

data/bundler/lib/bundler/cli/install.rb CHANGED Viewed

@@ -147,8 +147,11 @@ module Bundler
     def normalize_settings
       Bundler.settings.set_command_option :path, nil if options[:system]
       Bundler.settings.set_command_option_if_given :path, options[:path]
-      Bundler.settings.temporary(:path_relative_to_cwd => false) do
-        Bundler.settings.set_command_option :path, "bundle" if options["standalone"] && Bundler.settings[:path].nil?
+      if options["standalone"] && Bundler.settings[:path].nil? && !options["local"]
+        Bundler.settings.temporary(:path_relative_to_cwd => false) do
+          Bundler.settings.set_command_option :path, "bundle"
+        end
       end
       bin_option = options["binstubs"]

data/bundler/lib/bundler/cli/outdated.rb CHANGED Viewed

@@ -46,7 +46,7 @@ module Bundler
       Bundler::CLI::Common.configure_gem_version_promoter(
         Bundler.definition,
-        options
+        options.merge(:strict => @strict)
       )
       definition_resolution = proc do
@@ -129,6 +129,12 @@ module Bundler
     private
+    def loaded_from_for(spec)
+      return unless spec.respond_to?(:loaded_from)
+      spec.loaded_from
+    end
     def groups_text(group_text, groups)
       "#{group_text}#{groups.split(",").size > 1 ? "s" : ""} \"#{groups}\""
     end
@@ -184,7 +190,10 @@ module Bundler
     def print_gem(current_spec, active_spec, dependency, groups)
       spec_version = "#{active_spec.version}#{active_spec.git_version}"
-      spec_version += " (from #{active_spec.loaded_from})" if Bundler.ui.debug? && active_spec.loaded_from
+      if Bundler.ui.debug?
+        loaded_from = loaded_from_for(active_spec)
+        spec_version += " (from #{loaded_from})" if loaded_from
+      end
       current_version = "#{current_spec.version}#{current_spec.git_version}"
       if dependency && dependency.specific?
@@ -211,7 +220,7 @@ module Bundler
       dependency = dependency.requirement if dependency
       ret_val = [active_spec.name, current_version, spec_version, dependency.to_s, groups.to_s]
-      ret_val << active_spec.loaded_from.to_s if Bundler.ui.debug?
+      ret_val << loaded_from_for(active_spec).to_s if Bundler.ui.debug?
       ret_val
     end

data/bundler/lib/bundler/cli/platform.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Bundler
     def run
       platforms, ruby_version = Bundler.ui.silence do
-        locked_ruby_version = Bundler.locked_gems && Bundler.locked_gems.ruby_version
+        locked_ruby_version = Bundler.locked_gems && Bundler.locked_gems.ruby_version&.gsub(/p\d+\Z/, "")
         gemfile_ruby_version = Bundler.definition.ruby_version && Bundler.definition.ruby_version.single_version_string
         [Bundler.definition.platforms.map {|p| "* #{p}" },
          locked_ruby_version || gemfile_ruby_version]

data/bundler/lib/bundler/cli.rb CHANGED Viewed

@@ -218,6 +218,8 @@ module Bundler
       "Specify the number of jobs to run in parallel"
     method_option "local", :type => :boolean, :banner =>
       "Do not attempt to fetch gems remotely and use the gem cache instead"
+    method_option "prefer-local", :type => :boolean, :banner =>
+      "Only attempt to fetch gems remotely if not present locally, even if newer versions are available remotely"
     method_option "no-cache", :type => :boolean, :banner =>
       "Don't update the existing gem cache."
     method_option "redownload", :type => :boolean, :aliases => "--force", :banner =>
@@ -236,7 +238,7 @@ module Bundler
       "Install to the system location ($BUNDLE_PATH or $GEM_HOME) even if the bundle was previously installed somewhere else for this application"
     method_option "trust-policy", :alias => "P", :type => :string, :banner =>
       "Gem trust policy (like gem install -P). Must be one of " +
-        Bundler.rubygems.security_policy_keys.join("|")
+      Bundler.rubygems.security_policy_keys.join("|")
     method_option "without", :type => :array, :banner =>
       "Exclude gems that are part of the specified named group."
     method_option "with", :type => :array, :banner =>
@@ -370,6 +372,7 @@ module Bundler
     method_option "group", :aliases => "-g", :type => :string
     method_option "source", :aliases => "-s", :type => :string
     method_option "require", :aliases => "-r", :type => :string, :banner => "Adds require path to gem. Provide false, or a path as a string."
+    method_option "path", :type => :string
     method_option "git", :type => :string
     method_option "github", :type => :string
     method_option "branch", :type => :string
@@ -399,9 +402,9 @@ module Bundler
       "Do not attempt to fetch gems remotely and use the gem cache instead"
     method_option "pre", :type => :boolean, :banner => "Check for newer pre-release gems"
     method_option "source", :type => :array, :banner => "Check against a specific source"
-    method_option "filter-strict", :type => :boolean, :banner =>
+    method_option "filter-strict", :type => :boolean, :aliases => "--strict", :banner =>
       "Only list newer versions allowed by your Gemfile requirements"
-    method_option "strict", :type => :boolean, :aliases => "--update-strict", :banner =>
+    method_option "update-strict", :type => :boolean, :banner =>
       "Strict conservative resolution, do not allow any gem to be updated past latest --patch | --minor | --major"
     method_option "minor", :type => :boolean, :banner => "Prefer updating only to next minor version"
     method_option "major", :type => :boolean, :banner => "Prefer updating to next major version (default)"
@@ -514,7 +517,7 @@ module Bundler
       end
     end
-    desc "version", "Prints the bundler's version information"
+    desc "version", "Prints Bundler version information"
     def version
       cli_help = current_command.name == "cli_help"
       if cli_help || ARGV.include?("version")

data/bundler/lib/bundler/current_ruby.rb CHANGED Viewed

@@ -36,17 +36,18 @@ module Bundler
       rbx
       ruby
       truffleruby
+      windows
       x64_mingw
     ].freeze
     def ruby?
       return true if Bundler::GemHelpers.generic_local_platform == Gem::Platform::RUBY
-      !mswin? && (RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev" || RUBY_ENGINE == "truffleruby")
+      !windows? && (RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev" || RUBY_ENGINE == "truffleruby")
     end
     def mri?
-      !mswin? && RUBY_ENGINE == "ruby"
+      !windows? && RUBY_ENGINE == "ruby"
     end
     def rbx?
@@ -65,16 +66,24 @@ module Bundler
       RUBY_ENGINE == "truffleruby"
     end
-    def mswin?
+    def windows?
       Gem.win_platform?
     end
+    def mswin?
+      # For backwards compatibility
+      windows?
+      # TODO: This should correctly be:
+      # windows? && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mswin32" && Bundler.local_platform.cpu == "x86"
+    end
     def mswin64?
-      Gem.win_platform? && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mswin64" && Bundler.local_platform.cpu == "x64"
+      windows? && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mswin64" && Bundler.local_platform.cpu == "x64"
     end
     def mingw?
-      Gem.win_platform? && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mingw32" && Bundler.local_platform.cpu != "x64"
+      windows? && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mingw32" && Bundler.local_platform.cpu != "x64"
     end
     def x64_mingw?