rubygems-update 3.3.7 → 3.4.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1419 -1036
- data/CONTRIBUTING.md +30 -7
- data/Manifest.txt +63 -31
- data/POLICIES.md +53 -18
- data/README.md +3 -6
- data/bin/gem +2 -5
- data/bin/update_rubygems +5 -5
- data/bundler/CHANGELOG.md +457 -1
- data/bundler/README.md +3 -6
- data/bundler/UPGRADING.md +11 -4
- data/bundler/bundler.gemspec +8 -10
- data/bundler/exe/bundle +2 -5
- data/bundler/exe/bundler +1 -1
- data/bundler/lib/bundler/build_metadata.rb +3 -3
- data/bundler/lib/bundler/cli/add.rb +1 -1
- data/bundler/lib/bundler/cli/binstubs.rb +5 -1
- data/bundler/lib/bundler/cli/check.rb +1 -1
- data/bundler/lib/bundler/cli/common.rb +4 -2
- data/bundler/lib/bundler/cli/console.rb +2 -2
- data/bundler/lib/bundler/cli/doctor.rb +4 -6
- data/bundler/lib/bundler/cli/gem.rb +62 -40
- data/bundler/lib/bundler/cli/info.rb +1 -1
- data/bundler/lib/bundler/cli/init.rb +6 -2
- data/bundler/lib/bundler/cli/install.rb +7 -5
- data/bundler/lib/bundler/cli/lock.rb +8 -5
- data/bundler/lib/bundler/cli/open.rb +6 -4
- data/bundler/lib/bundler/cli/outdated.rb +13 -6
- data/bundler/lib/bundler/cli/platform.rb +1 -1
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/viz.rb +1 -1
- data/bundler/lib/bundler/cli.rb +55 -10
- data/bundler/lib/bundler/compact_index_client/cache.rb +1 -1
- data/bundler/lib/bundler/compact_index_client/updater.rb +53 -39
- data/bundler/lib/bundler/constants.rb +1 -1
- data/bundler/lib/bundler/current_ruby.rb +18 -6
- data/bundler/lib/bundler/definition.rb +206 -129
- data/bundler/lib/bundler/dependency.rb +21 -66
- data/bundler/lib/bundler/digest.rb +1 -1
- data/bundler/lib/bundler/dsl.rb +13 -18
- data/bundler/lib/bundler/endpoint_specification.rb +6 -10
- data/bundler/lib/bundler/env.rb +1 -1
- data/bundler/lib/bundler/environment_preserver.rb +3 -2
- data/bundler/lib/bundler/errors.rb +15 -15
- data/bundler/lib/bundler/feature_flag.rb +0 -1
- data/bundler/lib/bundler/fetcher/base.rb +6 -8
- data/bundler/lib/bundler/fetcher/compact_index.rb +9 -11
- data/bundler/lib/bundler/fetcher/dependency.rb +1 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +2 -5
- data/bundler/lib/bundler/fetcher.rb +15 -14
- data/bundler/lib/bundler/force_platform.rb +18 -0
- data/bundler/lib/bundler/friendly_errors.rb +21 -7
- data/bundler/lib/bundler/gem_helpers.rb +9 -2
- data/bundler/lib/bundler/gem_version_promoter.rb +53 -98
- data/bundler/lib/bundler/graph.rb +3 -3
- data/bundler/lib/bundler/index.rb +13 -51
- data/bundler/lib/bundler/injector.rb +9 -4
- data/bundler/lib/bundler/inline.rb +9 -21
- data/bundler/lib/bundler/installer/gem_installer.rb +14 -1
- data/bundler/lib/bundler/installer/parallel_installer.rb +3 -33
- data/bundler/lib/bundler/installer/standalone.rb +42 -11
- data/bundler/lib/bundler/installer.rb +20 -41
- data/bundler/lib/bundler/lazy_specification.rb +53 -48
- data/bundler/lib/bundler/lockfile_generator.rb +2 -2
- data/bundler/lib/bundler/lockfile_parser.rb +18 -14
- data/bundler/lib/bundler/man/bundle-add.1 +13 -5
- data/bundler/lib/bundler/man/bundle-add.1.ronn +10 -4
- 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 +2 -2
- data/bundler/lib/bundler/man/bundle-clean.1.ronn +1 -1
- data/bundler/lib/bundler/man/bundle-config.1 +30 -11
- data/bundler/lib/bundler/man/bundle-config.1.ronn +26 -14
- 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 +6 -6
- data/bundler/lib/bundler/man/bundle-exec.1.ronn +6 -6
- data/bundler/lib/bundler/man/bundle-gem.1 +27 -37
- data/bundler/lib/bundler/man/bundle-gem.1.ronn +5 -5
- 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 +5 -1
- data/bundler/lib/bundler/man/bundle-init.1.ronn +2 -0
- 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 -30
- data/bundler/lib/bundler/man/bundle-install.1.ronn +6 -29
- 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 +22 -2
- data/bundler/lib/bundler/man/bundle-open.1.ronn +9 -1
- data/bundler/lib/bundler/man/bundle-outdated.1 +3 -10
- data/bundler/lib/bundler/man/bundle-outdated.1.ronn +1 -10
- 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 +92 -81
- data/bundler/lib/bundler/man/gemfile.5.ronn +98 -85
- data/bundler/lib/bundler/man/index.txt +4 -0
- data/bundler/lib/bundler/match_metadata.rb +13 -0
- data/bundler/lib/bundler/match_platform.rb +0 -1
- data/bundler/lib/bundler/match_remote_metadata.rb +29 -0
- data/bundler/lib/bundler/mirror.rb +5 -7
- data/bundler/lib/bundler/plugin/api/source.rb +3 -9
- data/bundler/lib/bundler/plugin/index.rb +4 -4
- data/bundler/lib/bundler/plugin/installer/git.rb +0 -4
- data/bundler/lib/bundler/plugin/installer/rubygems.rb +0 -8
- data/bundler/lib/bundler/plugin.rb +3 -1
- data/bundler/lib/bundler/process_lock.rb +1 -1
- data/bundler/lib/bundler/remote_specification.rb +8 -9
- data/bundler/lib/bundler/resolver/base.rb +77 -0
- data/bundler/lib/bundler/resolver/candidate.rb +94 -0
- data/bundler/lib/bundler/resolver/incompatibility.rb +15 -0
- data/bundler/lib/bundler/resolver/package.rb +72 -0
- data/bundler/lib/bundler/resolver/root.rb +25 -0
- data/bundler/lib/bundler/resolver/spec_group.rb +42 -70
- data/bundler/lib/bundler/resolver.rb +328 -299
- data/bundler/lib/bundler/ruby_dsl.rb +1 -1
- data/bundler/lib/bundler/ruby_version.rb +5 -18
- data/bundler/lib/bundler/rubygems_ext.rb +131 -17
- data/bundler/lib/bundler/rubygems_gem_installer.rb +32 -20
- data/bundler/lib/bundler/rubygems_integration.rb +13 -35
- data/bundler/lib/bundler/runtime.rb +1 -6
- data/bundler/lib/bundler/settings.rb +2 -8
- data/bundler/lib/bundler/setup.rb +4 -1
- data/bundler/lib/bundler/shared_helpers.rb +12 -12
- data/bundler/lib/bundler/source/git/git_proxy.rb +209 -69
- data/bundler/lib/bundler/source/git.rb +22 -25
- data/bundler/lib/bundler/source/metadata.rb +2 -3
- data/bundler/lib/bundler/source/path/installer.rb +1 -22
- data/bundler/lib/bundler/source/path.rb +7 -7
- data/bundler/lib/bundler/source/rubygems.rb +75 -117
- data/bundler/lib/bundler/source.rb +3 -4
- data/bundler/lib/bundler/source_list.rb +12 -2
- data/bundler/lib/bundler/source_map.rb +15 -2
- data/bundler/lib/bundler/spec_set.rb +58 -34
- data/bundler/lib/bundler/stub_specification.rb +5 -3
- data/bundler/lib/bundler/templates/Executable +3 -5
- data/bundler/lib/bundler/templates/Executable.bundler +6 -11
- data/bundler/lib/bundler/templates/Executable.standalone +4 -4
- data/bundler/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/README.md.tt +7 -11
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +2 -1
- data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +12 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
- data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +11 -1
- data/bundler/lib/bundler/templates/newgem/gitignore.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +13 -4
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +9 -3
- data/bundler/lib/bundler/ui/shell.rb +35 -12
- data/bundler/lib/bundler/ui/silent.rb +21 -5
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +3 -3
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +0 -1
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +3 -1
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1350 -408
- data/bundler/lib/bundler/vendor/net-http-persistent/README.rdoc +1 -1
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +1 -1
- data/bundler/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +155 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +60 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +129 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +411 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +243 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +1 -1
- data/bundler/lib/bundler/vendor/tsort/lib/tsort.rb +318 -319
- data/bundler/lib/bundler/vendor/uri/lib/uri/common.rb +64 -16
- data/bundler/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/generic.rb +27 -7
- data/bundler/lib/bundler/vendor/uri/lib/uri/http.rb +40 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/https.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +13 -7
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +10 -5
- data/bundler/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ws.rb +1 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/wss.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri.rb +3 -2
- data/bundler/lib/bundler/vendored_persistent.rb +1 -33
- data/bundler/lib/bundler/{vendored_tmpdir.rb → vendored_pub_grub.rb} +1 -1
- data/bundler/lib/bundler/version.rb +5 -1
- data/bundler/lib/bundler/worker.rb +5 -7
- data/bundler/lib/bundler.rb +39 -73
- data/lib/rubygems/available_set.rb +3 -3
- data/lib/rubygems/basic_specification.rb +4 -4
- data/lib/rubygems/bundler_version_finder.rb +1 -1
- data/lib/rubygems/command.rb +40 -32
- data/lib/rubygems/command_manager.rb +33 -14
- data/lib/rubygems/commands/build_command.rb +11 -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 +10 -7
- data/lib/rubygems/commands/exec_command.rb +248 -0
- data/lib/rubygems/commands/fetch_command.rb +9 -9
- data/lib/rubygems/commands/generate_index_command.rb +17 -17
- data/lib/rubygems/commands/help_command.rb +6 -6
- data/lib/rubygems/commands/info_command.rb +3 -3
- data/lib/rubygems/commands/install_command.rb +28 -24
- 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 +17 -12
- data/lib/rubygems/commands/pristine_command.rb +37 -37
- 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 +20 -19
- 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 +99 -108
- 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 +22 -22
- data/lib/rubygems/commands/specification_command.rb +14 -14
- 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 +13 -13
- data/lib/rubygems/commands/update_command.rb +49 -68
- data/lib/rubygems/commands/which_command.rb +7 -7
- data/lib/rubygems/commands/yank_command.rb +11 -11
- data/lib/rubygems/compatibility.rb +4 -2
- data/lib/rubygems/config_file.rb +54 -21
- data/lib/rubygems/core_ext/kernel_gem.rb +1 -6
- data/lib/rubygems/core_ext/kernel_require.rb +117 -114
- data/lib/rubygems/core_ext/kernel_warn.rb +33 -37
- data/lib/rubygems/core_ext/tcpsocket_init.rb +1 -1
- data/lib/rubygems/defaults.rb +32 -18
- data/lib/rubygems/dependency.rb +14 -11
- data/lib/rubygems/dependency_installer.rb +37 -37
- data/lib/rubygems/dependency_list.rb +6 -6
- data/lib/rubygems/deprecate.rb +2 -2
- data/lib/rubygems/doctor.rb +18 -18
- data/lib/rubygems/errors.rb +3 -3
- data/lib/rubygems/exceptions.rb +6 -8
- data/lib/rubygems/ext/build_error.rb +1 -1
- data/lib/rubygems/ext/builder.rb +27 -18
- data/lib/rubygems/ext/cargo_builder/link_flag_converter.rb +27 -0
- data/lib/rubygems/ext/cargo_builder.rb +360 -0
- 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 +36 -59
- data/lib/rubygems/ext/rake_builder.rb +3 -3
- data/lib/rubygems/ext.rb +7 -6
- data/lib/rubygems/gem_runner.rb +8 -12
- data/lib/rubygems/gemcutter_utilities.rb +60 -21
- data/lib/rubygems/indexer.rb +30 -28
- 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 +40 -50
- data/lib/rubygems/installer_uninstaller_utils.rb +2 -2
- data/lib/rubygems/local_remote_options.rb +19 -21
- data/lib/rubygems/mock_gem_ui.rb +2 -2
- data/lib/rubygems/name_tuple.rb +4 -4
- data/lib/rubygems/optparse/lib/optparse/ac.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse/date.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse/kwargs.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse/shellwords.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse/time.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse/uri.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse.rb +95 -17
- 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 +61 -61
- data/lib/rubygems/package/tar_reader/entry.rb +90 -9
- data/lib/rubygems/package/tar_reader.rb +1 -29
- data/lib/rubygems/package/tar_writer.rb +7 -7
- data/lib/rubygems/package.rb +66 -49
- data/lib/rubygems/package_task.rb +4 -4
- data/lib/rubygems/platform.rb +80 -51
- data/lib/rubygems/psych_tree.rb +1 -1
- data/lib/rubygems/query_utils.rb +36 -36
- 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 +24 -24
- data/lib/rubygems/request_set/gem_dependency_api.rb +122 -123
- 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 +14 -14
- 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/lib/molinillo/dependency_graph.rb +1 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +32 -26
- data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +1 -1
- data/lib/rubygems/resolver/molinillo.rb +1 -1
- data/lib/rubygems/resolver/specification.rb +1 -1
- data/lib/rubygems/resolver/stats.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 +40 -40
- data/lib/rubygems/s3_uri_signer.rb +6 -6
- data/lib/rubygems/safe_yaml.rb +2 -2
- data/lib/rubygems/security/policies.rb +47 -47
- data/lib/rubygems/security/policy.rb +18 -18
- data/lib/rubygems/security/signer.rb +5 -5
- data/lib/rubygems/security/trust_dir.rb +4 -4
- data/lib/rubygems/security.rb +29 -42
- data/lib/rubygems/security_option.rb +5 -5
- data/lib/rubygems/source/git.rb +25 -24
- 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 +18 -25
- data/lib/rubygems/source_list.rb +1 -5
- data/lib/rubygems/spec_fetcher.rb +11 -11
- data/lib/rubygems/specification.rb +175 -118
- data/lib/rubygems/specification_policy.rb +35 -16
- data/lib/rubygems/stub_specification.rb +8 -8
- data/lib/rubygems/text.rb +2 -2
- data/lib/rubygems/tsort/lib/tsort.rb +308 -310
- data/lib/rubygems/tsort.rb +1 -1
- data/lib/rubygems/uninstaller.rb +18 -18
- data/lib/rubygems/update_suggestion.rb +69 -0
- data/lib/rubygems/uri.rb +45 -30
- 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 +12 -16
- data/lib/rubygems/validator.rb +6 -6
- data/lib/rubygems/version.rb +17 -11
- data/lib/rubygems/version_option.rb +3 -3
- data/lib/rubygems.rb +96 -77
- data/rubygems-update.gemspec +3 -3
- data/setup.rb +10 -10
- data/test/rubygems/alternate_cert.pem +14 -14
- data/test/rubygems/alternate_cert_32.pem +15 -15
- data/test/rubygems/alternate_key.pem +25 -25
- data/test/rubygems/bundler_test_gem.rb +419 -0
- data/test/rubygems/child_cert.pem +15 -16
- data/test/rubygems/child_cert_32.pem +15 -16
- data/test/rubygems/child_key.pem +25 -25
- data/test/rubygems/data/excon-0.7.7.gemspec.rz +0 -0
- data/test/rubygems/data/pry-0.4.7.gemspec.rz +0 -0
- data/test/rubygems/encrypted_private_key.pem +26 -26
- data/test/rubygems/expired_cert.pem +15 -15
- data/test/rubygems/future_cert.pem +15 -15
- data/test/rubygems/future_cert_32.pem +15 -15
- data/test/rubygems/grandchild_cert.pem +15 -16
- data/test/rubygems/grandchild_cert_32.pem +15 -16
- data/test/rubygems/grandchild_key.pem +25 -25
- data/test/rubygems/helper.rb +183 -163
- data/test/rubygems/installer_test_case.rb +13 -13
- data/test/rubygems/invalid_issuer_cert.pem +16 -16
- data/test/rubygems/invalid_issuer_cert_32.pem +16 -16
- data/test/rubygems/invalid_key.pem +25 -25
- data/test/rubygems/invalid_signer_cert.pem +15 -15
- data/test/rubygems/invalid_signer_cert_32.pem +15 -15
- data/test/rubygems/invalidchild_cert.pem +15 -16
- data/test/rubygems/invalidchild_cert_32.pem +15 -16
- data/test/rubygems/invalidchild_key.pem +25 -25
- data/test/rubygems/package/tar_test_case.rb +52 -17
- data/test/rubygems/packages/Bluebie-legs-0.6.2.gem +0 -0
- data/test/rubygems/plugin/exception/rubygems_plugin.rb +1 -1
- data/test/rubygems/plugin/standarderror/rubygems_plugin.rb +1 -1
- data/test/rubygems/private_key.pem +25 -25
- data/test/rubygems/public_cert.pem +16 -16
- data/test/rubygems/public_cert_32.pem +15 -15
- data/test/rubygems/public_key.pem +7 -7
- data/test/rubygems/rubygems_plugin.rb +2 -2
- data/test/rubygems/simple_gem.rb +1 -1
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +4 -4
- data/test/rubygems/test_bundled_ca.rb +11 -11
- data/test/rubygems/test_config.rb +3 -3
- data/test/rubygems/test_deprecate.rb +3 -3
- data/test/rubygems/test_exit.rb +8 -2
- data/test/rubygems/test_gem.rb +327 -694
- data/test/rubygems/test_gem_available_set.rb +21 -21
- data/test/rubygems/test_gem_bundler_version_finder.rb +5 -4
- data/test/rubygems/test_gem_command.rb +44 -44
- data/test/rubygems/test_gem_command_manager.rb +102 -31
- data/test/rubygems/test_gem_commands_build_command.rb +73 -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 +28 -28
- data/test/rubygems/test_gem_commands_dependency_command.rb +36 -36
- data/test/rubygems/test_gem_commands_environment_command.rb +38 -14
- data/test/rubygems/test_gem_commands_exec_command.rb +851 -0
- 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 +153 -134
- 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 +126 -45
- data/test/rubygems/test_gem_commands_pristine_command.rb +93 -92
- data/test/rubygems/test_gem_commands_push_command.rb +85 -59
- 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 +123 -94
- data/test/rubygems/test_gem_commands_signin_command.rb +153 -25
- data/test/rubygems/test_gem_commands_signout_command.rb +3 -3
- data/test/rubygems/test_gem_commands_sources_command.rb +74 -25
- 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 +145 -93
- data/test/rubygems/test_gem_commands_which_command.rb +6 -6
- data/test/rubygems/test_gem_commands_yank_command.rb +42 -42
- data/test/rubygems/test_gem_config_file.rb +93 -81
- data/test/rubygems/test_gem_dependency.rb +75 -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 +60 -62
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/.gitignore +1 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec +8 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock +233 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml +10 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/src/lib.rs +27 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb +1 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/.gitignore +1 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +247 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +10 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/rust_ruby_example.gemspec +8 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs +51 -0
- data/test/rubygems/test_gem_ext_cargo_builder.rb +166 -0
- data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb +33 -0
- data/test/rubygems/test_gem_ext_cargo_builder_unit.rb +60 -0
- data/test/rubygems/test_gem_ext_cmake_builder.rb +17 -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 +9 -9
- data/test/rubygems/test_gem_gemcutter_utilities.rb +71 -65
- data/test/rubygems/test_gem_impossible_dependencies_error.rb +4 -4
- data/test/rubygems/test_gem_indexer.rb +90 -67
- data/test/rubygems/test_gem_install_update_options.rb +16 -16
- data/test/rubygems/test_gem_installer.rb +371 -304
- 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 +244 -234
- data/test/rubygems/test_gem_package_old.rb +13 -13
- data/test/rubygems/test_gem_package_tar_header.rb +47 -47
- data/test/rubygems/test_gem_package_tar_reader.rb +55 -8
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +161 -16
- 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 +335 -214
- data/test/rubygems/test_gem_rdoc.rb +14 -14
- data/test/rubygems/test_gem_remote_fetcher.rb +157 -157
- 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 +100 -100
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +209 -211
- data/test/rubygems/test_gem_request_set_lockfile.rb +86 -86
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +58 -58
- 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 +166 -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 +79 -35
- 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 +68 -68
- data/test/rubygems/test_gem_security_policy.rb +72 -72
- data/test/rubygems/test_gem_security_signer.rb +34 -34
- data/test/rubygems/test_gem_security_trust_dir.rb +6 -6
- 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 +69 -62
- 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 +539 -474
- 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 +113 -113
- data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +3 -3
- data/test/rubygems/test_gem_update_suggestion.rb +208 -0
- 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 +23 -16
- data/test/rubygems/test_gem_version_option.rb +15 -15
- data/test/rubygems/test_kernel.rb +41 -47
- 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 +129 -119
- data/test/rubygems/test_rubygems.rb +19 -16
- data/test/rubygems/utilities.rb +55 -33
- data/test/rubygems/wrong_key_cert.pem +15 -15
- data/test/rubygems/wrong_key_cert_32.pem +15 -15
- data/test/test_changelog_generator.rb +1 -0
- metadata +67 -35
- data/bundler/lib/bundler/dep_proxy.rb +0 -55
- data/bundler/lib/bundler/templates/gems.rb +0 -5
- data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -6
- data/bundler/lib/bundler/vendor/molinillo/LICENSE +0 -9
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -88
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -164
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -255
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -143
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -112
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -839
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -11
- data/bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +0 -154
- data/bundler/lib/bundler/vendored_molinillo.rb +0 -4
- data/bundler/lib/bundler/version_ranges.rb +0 -122
- data/lib/rubygems/psych_additions.rb +0 -10
- data/test/rubygems/data/null-type.gemspec.rz +0 -0
- /data/bundler/lib/bundler/templates/newgem/ext/newgem/{extconf.rb.tt → extconf-c.rb.tt} +0 -0
@@ -6,12 +6,11 @@
|
|
6
6
|
# See LICENSE.txt for permissions.
|
7
7
|
#++
|
8
8
|
|
9
|
-
require_relative
|
10
|
-
require_relative
|
11
|
-
require_relative
|
12
|
-
require_relative
|
13
|
-
require_relative
|
14
|
-
require_relative 'util/list'
|
9
|
+
require_relative "deprecate"
|
10
|
+
require_relative "basic_specification"
|
11
|
+
require_relative "stub_specification"
|
12
|
+
require_relative "platform"
|
13
|
+
require_relative "util/list"
|
15
14
|
|
16
15
|
##
|
17
16
|
# The Specification class contains the information for a gem. Typically
|
@@ -75,29 +74,29 @@ class Gem::Specification < Gem::BasicSpecification
|
|
75
74
|
# key should be equal to the CURRENT_SPECIFICATION_VERSION.
|
76
75
|
|
77
76
|
SPECIFICATION_VERSION_HISTORY = { # :nodoc:
|
78
|
-
-1 => [
|
79
|
-
1
|
77
|
+
-1 => ["(RubyGems versions up to and including 0.7 did not have versioned specifications)"],
|
78
|
+
1 => [
|
80
79
|
'Deprecated "test_suite_file" in favor of the new, but equivalent, "test_files"',
|
81
80
|
'"test_file=x" is a shortcut for "test_files=[x]"',
|
82
81
|
],
|
83
82
|
2 => [
|
84
83
|
'Added "required_rubygems_version"',
|
85
|
-
|
84
|
+
"Now forward-compatible with future versions",
|
86
85
|
],
|
87
86
|
3 => [
|
88
|
-
|
87
|
+
"Added Fixnum validation to the specification_version",
|
89
88
|
],
|
90
89
|
4 => [
|
91
|
-
|
90
|
+
"Added sandboxed freeform metadata to the specification version.",
|
92
91
|
],
|
93
92
|
}.freeze
|
94
93
|
|
95
94
|
MARSHAL_FIELDS = { # :nodoc:
|
96
95
|
-1 => 16,
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
96
|
+
1 => 16,
|
97
|
+
2 => 16,
|
98
|
+
3 => 17,
|
99
|
+
4 => 18,
|
101
100
|
}.freeze
|
102
101
|
|
103
102
|
today = Time.now.utc
|
@@ -125,39 +124,39 @@ class Gem::Specification < Gem::BasicSpecification
|
|
125
124
|
# Map of attribute names to default values.
|
126
125
|
|
127
126
|
@@default_value = {
|
128
|
-
:authors
|
129
|
-
:autorequire
|
130
|
-
:bindir
|
131
|
-
:cert_chain
|
132
|
-
:date
|
133
|
-
:dependencies
|
134
|
-
:description
|
135
|
-
:email
|
136
|
-
:executables
|
137
|
-
:extensions
|
138
|
-
:extra_rdoc_files
|
139
|
-
:files
|
140
|
-
:homepage
|
141
|
-
:licenses
|
142
|
-
:metadata
|
143
|
-
:name
|
144
|
-
:platform
|
145
|
-
:post_install_message
|
146
|
-
:rdoc_options
|
147
|
-
:require_paths
|
148
|
-
:required_ruby_version
|
127
|
+
:authors => [],
|
128
|
+
:autorequire => nil,
|
129
|
+
:bindir => "bin",
|
130
|
+
:cert_chain => [],
|
131
|
+
:date => nil,
|
132
|
+
:dependencies => [],
|
133
|
+
:description => nil,
|
134
|
+
:email => nil,
|
135
|
+
:executables => [],
|
136
|
+
:extensions => [],
|
137
|
+
:extra_rdoc_files => [],
|
138
|
+
:files => [],
|
139
|
+
:homepage => nil,
|
140
|
+
:licenses => [],
|
141
|
+
:metadata => {},
|
142
|
+
:name => nil,
|
143
|
+
:platform => Gem::Platform::RUBY,
|
144
|
+
:post_install_message => nil,
|
145
|
+
:rdoc_options => [],
|
146
|
+
:require_paths => ["lib"],
|
147
|
+
:required_ruby_version => Gem::Requirement.default,
|
149
148
|
:required_rubygems_version => Gem::Requirement.default,
|
150
|
-
:requirements
|
151
|
-
:rubygems_version
|
152
|
-
:signing_key
|
153
|
-
:specification_version
|
154
|
-
:summary
|
155
|
-
:test_files
|
156
|
-
:version
|
149
|
+
:requirements => [],
|
150
|
+
:rubygems_version => Gem::VERSION,
|
151
|
+
:signing_key => nil,
|
152
|
+
:specification_version => CURRENT_SPECIFICATION_VERSION,
|
153
|
+
:summary => nil,
|
154
|
+
:test_files => [],
|
155
|
+
:version => nil,
|
157
156
|
}.freeze
|
158
157
|
|
159
158
|
# rubocop:disable Style/MutableConstant
|
160
|
-
INITIALIZE_CODE_FOR_DEFAULTS = {
|
159
|
+
INITIALIZE_CODE_FOR_DEFAULTS = {} # :nodoc:
|
161
160
|
# rubocop:enable Style/MutableConstant
|
162
161
|
|
163
162
|
@@default_value.each do |k,v|
|
@@ -339,7 +338,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
339
338
|
# The simplest way is to specify the standard SPDX ID
|
340
339
|
# https://spdx.org/licenses/ for the license.
|
341
340
|
# Ideally, you should pick one that is OSI (Open Source Initiative)
|
342
|
-
#
|
341
|
+
# https://opensource.org/licenses/ approved.
|
343
342
|
#
|
344
343
|
# The most commonly used OSI-approved licenses are MIT and Apache-2.0.
|
345
344
|
# GitHub also provides a license picker at http://choosealicense.com/.
|
@@ -474,7 +473,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
474
473
|
# spec.platform = Gem::Platform.local
|
475
474
|
|
476
475
|
def platform=(platform)
|
477
|
-
if @original_platform.nil?
|
476
|
+
if @original_platform.nil? ||
|
478
477
|
@original_platform == Gem::Platform::RUBY
|
479
478
|
@original_platform = platform
|
480
479
|
end
|
@@ -490,12 +489,12 @@ class Gem::Specification < Gem::BasicSpecification
|
|
490
489
|
# legacy constants
|
491
490
|
when nil, Gem::Platform::RUBY then
|
492
491
|
@new_platform = Gem::Platform::RUBY
|
493
|
-
when
|
494
|
-
@new_platform = Gem::Platform.new
|
495
|
-
when
|
496
|
-
@new_platform = Gem::Platform.new
|
497
|
-
when
|
498
|
-
@new_platform = Gem::Platform.new
|
492
|
+
when "mswin32" then # was Gem::Platform::WIN32
|
493
|
+
@new_platform = Gem::Platform.new "x86-mswin32"
|
494
|
+
when "i586-linux" then # was Gem::Platform::LINUX_586
|
495
|
+
@new_platform = Gem::Platform.new "x86-linux"
|
496
|
+
when "powerpc-darwin" then # was Gem::Platform::DARWIN
|
497
|
+
@new_platform = Gem::Platform.new "ppc-darwin"
|
499
498
|
else
|
500
499
|
@new_platform = Gem::Platform.new platform
|
501
500
|
end
|
@@ -657,6 +656,8 @@ class Gem::Specification < Gem::BasicSpecification
|
|
657
656
|
@rdoc_options ||= []
|
658
657
|
end
|
659
658
|
|
659
|
+
LATEST_RUBY_WITHOUT_PATCH_VERSIONS = Gem::Version.new("2.1")
|
660
|
+
|
660
661
|
##
|
661
662
|
# The version of Ruby required by this gem. The ruby version can be
|
662
663
|
# specified to the patch-level:
|
@@ -683,6 +684,14 @@ class Gem::Specification < Gem::BasicSpecification
|
|
683
684
|
|
684
685
|
def required_ruby_version=(req)
|
685
686
|
@required_ruby_version = Gem::Requirement.create req
|
687
|
+
|
688
|
+
@required_ruby_version.requirements.map! do |op, v|
|
689
|
+
if v >= LATEST_RUBY_WITHOUT_PATCH_VERSIONS && v.release.segments.size == 4
|
690
|
+
[op == "~>" ? "=" : op, Gem::Version.new(v.segments.tap {|s| s.delete_at(3) }.join("."))]
|
691
|
+
else
|
692
|
+
[op, v]
|
693
|
+
end
|
694
|
+
end
|
686
695
|
end
|
687
696
|
|
688
697
|
##
|
@@ -873,6 +882,30 @@ class Gem::Specification < Gem::BasicSpecification
|
|
873
882
|
end
|
874
883
|
end
|
875
884
|
|
885
|
+
##
|
886
|
+
# Adds +spec+ to the known specifications, keeping the collection
|
887
|
+
# properly sorted.
|
888
|
+
|
889
|
+
def self.add_spec(spec)
|
890
|
+
return if _all.include? spec
|
891
|
+
|
892
|
+
_all << spec
|
893
|
+
stubs << spec
|
894
|
+
(@@stubs_by_name[spec.name] ||= []) << spec
|
895
|
+
|
896
|
+
_resort!(@@stubs_by_name[spec.name])
|
897
|
+
_resort!(stubs)
|
898
|
+
end
|
899
|
+
|
900
|
+
##
|
901
|
+
# Removes +spec+ from the known specs.
|
902
|
+
|
903
|
+
def self.remove_spec(spec)
|
904
|
+
_all.delete spec.to_spec
|
905
|
+
stubs.delete spec
|
906
|
+
(@@stubs_by_name[spec.name] || []).delete spec
|
907
|
+
end
|
908
|
+
|
876
909
|
##
|
877
910
|
# Returns all specifications. This method is discouraged from use.
|
878
911
|
# You probably want to use one of the Enumerable methods instead.
|
@@ -988,6 +1021,12 @@ class Gem::Specification < Gem::BasicSpecification
|
|
988
1021
|
Gem::Dependency.new(name, *requirements).to_spec
|
989
1022
|
end
|
990
1023
|
|
1024
|
+
##
|
1025
|
+
# Find the best specification matching a +full_name+.
|
1026
|
+
def self.find_by_full_name(full_name)
|
1027
|
+
stubs.find {|s| s.full_name == full_name }&.to_spec
|
1028
|
+
end
|
1029
|
+
|
991
1030
|
##
|
992
1031
|
# Return the best specification that contains the file matching +path+.
|
993
1032
|
|
@@ -1013,7 +1052,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1013
1052
|
|
1014
1053
|
def self.find_active_stub_by_path(path)
|
1015
1054
|
stub = @@active_stub_with_requirable_file[path] ||= (stubs.find do |s|
|
1016
|
-
s.activated?
|
1055
|
+
s.activated? && s.contains_requirable_file?(path)
|
1017
1056
|
end || NOT_FOUND)
|
1018
1057
|
stub.this
|
1019
1058
|
end
|
@@ -1072,6 +1111,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1072
1111
|
|
1073
1112
|
spec.specification_version ||= NONEXISTENT_SPECIFICATION_VERSION
|
1074
1113
|
spec.reset_nil_attributes_to_default
|
1114
|
+
spec.flatten_require_paths
|
1075
1115
|
|
1076
1116
|
spec
|
1077
1117
|
end
|
@@ -1100,7 +1140,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1100
1140
|
result[spec.name] = spec
|
1101
1141
|
end
|
1102
1142
|
|
1103
|
-
result.map(&:last).flatten.sort_by{|tup| tup.name }
|
1143
|
+
result.map(&:last).flatten.sort_by {|tup| tup.name }
|
1104
1144
|
end
|
1105
1145
|
|
1106
1146
|
##
|
@@ -1115,7 +1155,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1115
1155
|
file = file.dup.tap(&Gem::UNTAINT)
|
1116
1156
|
return unless File.file?(file)
|
1117
1157
|
|
1118
|
-
code = Gem.open_file(file,
|
1158
|
+
code = Gem.open_file(file, "r:UTF-8:-", &:read)
|
1119
1159
|
|
1120
1160
|
code.tap(&Gem::UNTAINT)
|
1121
1161
|
|
@@ -1200,7 +1240,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1200
1240
|
latest_remote = remotes.sort.last
|
1201
1241
|
|
1202
1242
|
yield [local_spec, latest_remote] if
|
1203
|
-
latest_remote
|
1243
|
+
latest_remote && local_spec.version < latest_remote
|
1204
1244
|
end
|
1205
1245
|
|
1206
1246
|
nil
|
@@ -1231,8 +1271,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1231
1271
|
clear_load_cache
|
1232
1272
|
unresolved = unresolved_deps
|
1233
1273
|
unless unresolved.empty?
|
1234
|
-
|
1235
|
-
warn "#{w}: Unresolved or ambiguous specs during Gem::Specification.reset:"
|
1274
|
+
warn "WARN: Unresolved or ambiguous specs during Gem::Specification.reset:"
|
1236
1275
|
unresolved.values.each do |dep|
|
1237
1276
|
warn " #{dep}"
|
1238
1277
|
|
@@ -1242,7 +1281,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1242
1281
|
versions.each {|s| warn " - #{s.version}" }
|
1243
1282
|
end
|
1244
1283
|
end
|
1245
|
-
warn "
|
1284
|
+
warn "WARN: Clearing out unresolved specs. Try 'gem cleanup <gem>'"
|
1246
1285
|
warn "Please report a bug if this causes problems."
|
1247
1286
|
unresolved.clear
|
1248
1287
|
end
|
@@ -1260,7 +1299,30 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1260
1299
|
def self._load(str)
|
1261
1300
|
Gem.load_yaml
|
1262
1301
|
|
1263
|
-
array =
|
1302
|
+
array = begin
|
1303
|
+
Marshal.load str
|
1304
|
+
rescue ArgumentError => e
|
1305
|
+
#
|
1306
|
+
# Some very old marshaled specs included references to `YAML::PrivateType`
|
1307
|
+
# and `YAML::Syck::DefaultKey` constants due to bugs in the old emitter
|
1308
|
+
# that generated them. Workaround the issue by defining the necessary
|
1309
|
+
# constants and retrying.
|
1310
|
+
#
|
1311
|
+
message = e.message
|
1312
|
+
raise unless message.include?("YAML::")
|
1313
|
+
|
1314
|
+
Object.const_set "YAML", Psych unless Object.const_defined?(:YAML)
|
1315
|
+
|
1316
|
+
if message.include?("YAML::Syck::")
|
1317
|
+
YAML.const_set "Syck", YAML unless YAML.const_defined?(:Syck)
|
1318
|
+
|
1319
|
+
YAML::Syck.const_set "DefaultKey", Class.new if message.include?("YAML::Syck::DefaultKey")
|
1320
|
+
elsif message.include?("YAML::PrivateType")
|
1321
|
+
YAML.const_set "PrivateType", Class.new
|
1322
|
+
end
|
1323
|
+
|
1324
|
+
retry
|
1325
|
+
end
|
1264
1326
|
|
1265
1327
|
spec = Gem::Specification.new
|
1266
1328
|
spec.instance_variable_set :@specification_version, array[1]
|
@@ -1279,11 +1341,6 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1279
1341
|
raise TypeError, "invalid Gem::Specification format #{array.inspect}"
|
1280
1342
|
end
|
1281
1343
|
|
1282
|
-
# Cleanup any Psych::PrivateType. They only show up for an old bug
|
1283
|
-
# where nil => null, so just convert them to nil based on the type.
|
1284
|
-
|
1285
|
-
array.map! {|e| e.kind_of?(Psych::PrivateType) ? nil : e }
|
1286
|
-
|
1287
1344
|
spec.instance_variable_set :@rubygems_version, array[0]
|
1288
1345
|
# spec version
|
1289
1346
|
spec.instance_variable_set :@name, array[2]
|
@@ -1339,7 +1396,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1339
1396
|
@required_rubygems_version,
|
1340
1397
|
@original_platform,
|
1341
1398
|
@dependencies,
|
1342
|
-
|
1399
|
+
"", # rubyforge_project
|
1343
1400
|
@email,
|
1344
1401
|
@authors,
|
1345
1402
|
@description,
|
@@ -1505,7 +1562,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1505
1562
|
# Singular reader for #authors. Returns the first author in the list
|
1506
1563
|
|
1507
1564
|
def author
|
1508
|
-
val = authors
|
1565
|
+
(val = authors) && val.first
|
1509
1566
|
end
|
1510
1567
|
|
1511
1568
|
##
|
@@ -1555,9 +1612,11 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1555
1612
|
def build_extensions # :nodoc:
|
1556
1613
|
return if extensions.empty?
|
1557
1614
|
return if default_gem?
|
1615
|
+
# we need to fresh build when same name and version of default gems
|
1616
|
+
return if self.class.find_by_full_name(full_name)&.default_gem?
|
1558
1617
|
return if File.exist? gem_build_complete_path
|
1559
1618
|
return if !File.writable?(base_dir)
|
1560
|
-
return if !File.exist?(File.join(base_dir,
|
1619
|
+
return if !File.exist?(File.join(base_dir, "extensions"))
|
1561
1620
|
|
1562
1621
|
begin
|
1563
1622
|
# We need to require things in $LOAD_PATH without looking for the
|
@@ -1565,9 +1624,9 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1565
1624
|
unresolved_deps = Gem::Specification.unresolved_deps.dup
|
1566
1625
|
Gem::Specification.unresolved_deps.clear
|
1567
1626
|
|
1568
|
-
require_relative
|
1569
|
-
require_relative
|
1570
|
-
require_relative
|
1627
|
+
require_relative "config_file"
|
1628
|
+
require_relative "ext"
|
1629
|
+
require_relative "user_interaction"
|
1571
1630
|
|
1572
1631
|
ui = Gem::SilentUI.new
|
1573
1632
|
Gem::DefaultUserInteraction.use_ui ui do
|
@@ -1617,7 +1676,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1617
1676
|
conflicts = {}
|
1618
1677
|
self.runtime_dependencies.each do |dep|
|
1619
1678
|
spec = Gem.loaded_specs[dep.name]
|
1620
|
-
if spec
|
1679
|
+
if spec && !spec.satisfies_requirement?(dep)
|
1621
1680
|
(conflicts[spec] ||= []) << dep
|
1622
1681
|
end
|
1623
1682
|
end
|
@@ -1644,7 +1703,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1644
1703
|
self.dependencies.any? do |dep|
|
1645
1704
|
if dep.runtime?
|
1646
1705
|
spec = Gem.loaded_specs[dep.name]
|
1647
|
-
spec
|
1706
|
+
spec && !spec.satisfies_requirement?(dep)
|
1648
1707
|
else
|
1649
1708
|
false
|
1650
1709
|
end
|
@@ -1665,7 +1724,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1665
1724
|
|
1666
1725
|
DateLike = Object.new # :nodoc:
|
1667
1726
|
def DateLike.===(obj) # :nodoc:
|
1668
|
-
defined?(::Date)
|
1727
|
+
defined?(::Date) && Date === obj
|
1669
1728
|
end
|
1670
1729
|
|
1671
1730
|
DateTimeFormat = # :nodoc:
|
@@ -1705,9 +1764,9 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1705
1764
|
# executable now. See Gem.bin_path.
|
1706
1765
|
|
1707
1766
|
def default_executable # :nodoc:
|
1708
|
-
if defined?(@default_executable)
|
1767
|
+
if defined?(@default_executable) && @default_executable
|
1709
1768
|
result = @default_executable
|
1710
|
-
elsif @executables
|
1769
|
+
elsif @executables && @executables.size == 1
|
1711
1770
|
result = Array(@executables).first
|
1712
1771
|
else
|
1713
1772
|
result = nil
|
@@ -1786,7 +1845,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1786
1845
|
# spec.doc_dir 'ri' # => "/path/to/gem_repo/doc/a-1/ri"
|
1787
1846
|
|
1788
1847
|
def doc_dir(type = nil)
|
1789
|
-
@doc_dir ||= File.join base_dir,
|
1848
|
+
@doc_dir ||= File.join base_dir, "doc", full_name
|
1790
1849
|
|
1791
1850
|
if type
|
1792
1851
|
File.join @doc_dir, type
|
@@ -1798,17 +1857,17 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1798
1857
|
def encode_with(coder) # :nodoc:
|
1799
1858
|
mark_version
|
1800
1859
|
|
1801
|
-
coder.add
|
1802
|
-
coder.add
|
1860
|
+
coder.add "name", @name
|
1861
|
+
coder.add "version", @version
|
1803
1862
|
platform = case @original_platform
|
1804
|
-
when nil,
|
1805
|
-
|
1863
|
+
when nil, "" then
|
1864
|
+
"ruby"
|
1806
1865
|
when String then
|
1807
1866
|
@original_platform
|
1808
1867
|
else
|
1809
1868
|
@original_platform.to_s
|
1810
1869
|
end
|
1811
|
-
coder.add
|
1870
|
+
coder.add "platform", platform
|
1812
1871
|
|
1813
1872
|
attributes = @@attributes.map(&:to_s) - %w[name version platform]
|
1814
1873
|
attributes.each do |name|
|
@@ -1824,7 +1883,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1824
1883
|
# Singular accessor for #executables
|
1825
1884
|
|
1826
1885
|
def executable
|
1827
|
-
val = executables
|
1886
|
+
(val = executables) && val.first
|
1828
1887
|
end
|
1829
1888
|
|
1830
1889
|
##
|
@@ -1936,7 +1995,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1936
1995
|
# True if this gem has files in test_files
|
1937
1996
|
|
1938
1997
|
def has_unit_tests? # :nodoc:
|
1939
|
-
|
1998
|
+
!test_files.empty?
|
1940
1999
|
end
|
1941
2000
|
|
1942
2001
|
# :stopdoc:
|
@@ -1989,7 +2048,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1989
2048
|
self.name = name if name
|
1990
2049
|
self.version = version if version
|
1991
2050
|
|
1992
|
-
if platform = Gem.platforms.last
|
2051
|
+
if (platform = Gem.platforms.last) && platform != Gem::Platform::RUBY && platform != Gem::Platform.local
|
1993
2052
|
self.platform = platform
|
1994
2053
|
end
|
1995
2054
|
|
@@ -2104,8 +2163,8 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2104
2163
|
return
|
2105
2164
|
end
|
2106
2165
|
|
2107
|
-
if @specification_version > CURRENT_SPECIFICATION_VERSION
|
2108
|
-
|
2166
|
+
if @specification_version > CURRENT_SPECIFICATION_VERSION &&
|
2167
|
+
sym.to_s.end_with?("=")
|
2109
2168
|
warn "ignoring #{sym} loading #{full_name}" if $DEBUG
|
2110
2169
|
else
|
2111
2170
|
super
|
@@ -2131,7 +2190,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2131
2190
|
# file list.
|
2132
2191
|
|
2133
2192
|
def normalize
|
2134
|
-
if defined?(@extra_rdoc_files)
|
2193
|
+
if defined?(@extra_rdoc_files) && @extra_rdoc_files
|
2135
2194
|
@extra_rdoc_files.uniq!
|
2136
2195
|
@files ||= []
|
2137
2196
|
@files.concat(@extra_rdoc_files)
|
@@ -2156,7 +2215,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2156
2215
|
# platform. For use with legacy gems.
|
2157
2216
|
|
2158
2217
|
def original_name # :nodoc:
|
2159
|
-
if platform == Gem::Platform::RUBY
|
2218
|
+
if platform == Gem::Platform::RUBY || platform.nil?
|
2160
2219
|
"#{@name}-#{@version}"
|
2161
2220
|
else
|
2162
2221
|
"#{@name}-#{@version}-#{@original_platform}"
|
@@ -2178,7 +2237,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2178
2237
|
end
|
2179
2238
|
|
2180
2239
|
def pretty_print(q) # :nodoc:
|
2181
|
-
q.group 2,
|
2240
|
+
q.group 2, "Gem::Specification.new do |s|", "end" do
|
2182
2241
|
q.breakable
|
2183
2242
|
|
2184
2243
|
attributes = @@attributes - [:name, :version]
|
@@ -2189,8 +2248,8 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2189
2248
|
attributes.each do |attr_name|
|
2190
2249
|
current_value = self.send attr_name
|
2191
2250
|
current_value = current_value.sort if %i[files test_files].include? attr_name
|
2192
|
-
if current_value != default_value(attr_name)
|
2193
|
-
self.class.required_attribute?
|
2251
|
+
if current_value != default_value(attr_name) ||
|
2252
|
+
self.class.required_attribute?(attr_name)
|
2194
2253
|
|
2195
2254
|
q.text "s.#{attr_name} = "
|
2196
2255
|
|
@@ -2248,7 +2307,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2248
2307
|
# Singular accessor for #require_paths
|
2249
2308
|
|
2250
2309
|
def require_path
|
2251
|
-
val = require_paths
|
2310
|
+
(val = require_paths) && val.first
|
2252
2311
|
end
|
2253
2312
|
|
2254
2313
|
##
|
@@ -2273,7 +2332,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2273
2332
|
# Returns the full path to this spec's ri directory.
|
2274
2333
|
|
2275
2334
|
def ri_dir
|
2276
|
-
@ri_dir ||= File.join base_dir,
|
2335
|
+
@ri_dir ||= File.join base_dir, "ri", full_name
|
2277
2336
|
end
|
2278
2337
|
|
2279
2338
|
##
|
@@ -2283,13 +2342,13 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2283
2342
|
def ruby_code(obj)
|
2284
2343
|
case obj
|
2285
2344
|
when String then obj.dump + ".freeze"
|
2286
|
-
when Array then
|
2345
|
+
when Array then "[" + obj.map {|x| ruby_code x }.join(", ") + "]"
|
2287
2346
|
when Hash then
|
2288
2347
|
seg = obj.keys.sort.map {|k| "#{k.to_s.dump} => #{obj[k].to_s.dump}" }
|
2289
2348
|
"{ #{seg.join(', ')} }"
|
2290
2349
|
when Gem::Version then obj.to_s.dump
|
2291
|
-
when DateLike then obj.strftime(
|
2292
|
-
when Time then obj.strftime(
|
2350
|
+
when DateLike then obj.strftime("%Y-%m-%d").dump
|
2351
|
+
when Time then obj.strftime("%Y-%m-%d").dump
|
2293
2352
|
when Numeric then obj.inspect
|
2294
2353
|
when true, false, nil then obj.inspect
|
2295
2354
|
when Gem::Platform then "Gem::Platform.new(#{obj.to_a.inspect})"
|
@@ -2323,7 +2382,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2323
2382
|
|
2324
2383
|
def satisfies_requirement?(dependency)
|
2325
2384
|
return @name == dependency.name &&
|
2326
|
-
|
2385
|
+
dependency.requirement.satisfied_by?(@version)
|
2327
2386
|
end
|
2328
2387
|
|
2329
2388
|
##
|
@@ -2377,7 +2436,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2377
2436
|
# Singular accessor for #test_files
|
2378
2437
|
|
2379
2438
|
def test_file # :nodoc:
|
2380
|
-
val = test_files
|
2439
|
+
(val = test_files) && val.first
|
2381
2440
|
end
|
2382
2441
|
|
2383
2442
|
##
|
@@ -2399,7 +2458,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2399
2458
|
@test_files = [@test_suite_file].flatten
|
2400
2459
|
@test_suite_file = nil
|
2401
2460
|
end
|
2402
|
-
if defined?(@test_files)
|
2461
|
+
if defined?(@test_files) && @test_files
|
2403
2462
|
@test_files
|
2404
2463
|
else
|
2405
2464
|
@test_files = []
|
@@ -2423,13 +2482,13 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2423
2482
|
|
2424
2483
|
result << " s.name = #{ruby_code name}"
|
2425
2484
|
result << " s.version = #{ruby_code version}"
|
2426
|
-
unless platform.nil?
|
2485
|
+
unless platform.nil? || platform == Gem::Platform::RUBY
|
2427
2486
|
result << " s.platform = #{ruby_code original_platform}"
|
2428
2487
|
end
|
2429
2488
|
result << ""
|
2430
2489
|
result << " s.required_rubygems_version = #{ruby_code required_rubygems_version} if s.respond_to? :required_rubygems_version="
|
2431
2490
|
|
2432
|
-
if metadata
|
2491
|
+
if metadata && !metadata.empty?
|
2433
2492
|
result << " s.metadata = #{ruby_code metadata} if s.respond_to? :metadata="
|
2434
2493
|
end
|
2435
2494
|
result << " s.require_paths = #{ruby_code raw_require_paths}"
|
@@ -2467,25 +2526,14 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2467
2526
|
|
2468
2527
|
unless dependencies.empty?
|
2469
2528
|
result << nil
|
2470
|
-
result << "
|
2471
|
-
result << " s.specification_version = #{specification_version}"
|
2472
|
-
result << " end"
|
2529
|
+
result << " s.specification_version = #{specification_version}"
|
2473
2530
|
result << nil
|
2474
2531
|
|
2475
|
-
result << " if s.respond_to? :add_runtime_dependency then"
|
2476
|
-
|
2477
2532
|
dependencies.each do |dep|
|
2478
2533
|
req = dep.requirements_list.inspect
|
2479
2534
|
dep.instance_variable_set :@type, :runtime if dep.type.nil? # HACK
|
2480
|
-
result << "
|
2481
|
-
end
|
2482
|
-
|
2483
|
-
result << " else"
|
2484
|
-
dependencies.each do |dep|
|
2485
|
-
version_reqs_param = dep.requirements_list.inspect
|
2486
|
-
result << " s.add_dependency(%q<#{dep.name}>.freeze, #{version_reqs_param})"
|
2535
|
+
result << " s.add_#{dep.type}_dependency(%q<#{dep.name}>.freeze, #{req})"
|
2487
2536
|
end
|
2488
|
-
result << " end"
|
2489
2537
|
end
|
2490
2538
|
|
2491
2539
|
result << "end"
|
@@ -2522,14 +2570,14 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2522
2570
|
# back, we have to check again here to make sure that our
|
2523
2571
|
# psych code was properly loaded, and load it if not.
|
2524
2572
|
unless Gem.const_defined?(:NoAliasYAMLTree)
|
2525
|
-
require_relative
|
2573
|
+
require_relative "psych_tree"
|
2526
2574
|
end
|
2527
2575
|
|
2528
2576
|
builder = Gem::NoAliasYAMLTree.create
|
2529
2577
|
builder << self
|
2530
2578
|
ast = builder.tree
|
2531
2579
|
|
2532
|
-
require
|
2580
|
+
require "stringio"
|
2533
2581
|
io = StringIO.new
|
2534
2582
|
io.set_encoding Encoding::UTF_8
|
2535
2583
|
|
@@ -2613,10 +2661,12 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2613
2661
|
|
2614
2662
|
def version=(version)
|
2615
2663
|
@version = Gem::Version.create(version)
|
2664
|
+
return if @version.nil?
|
2665
|
+
|
2616
2666
|
# skip to set required_ruby_version when pre-released rubygems.
|
2617
2667
|
# It caused to raise CircularDependencyError
|
2618
2668
|
if @version.prerelease? && (@name.nil? || @name.strip != "rubygems")
|
2619
|
-
self.required_rubygems_version =
|
2669
|
+
self.required_rubygems_version = "> 1.3.1"
|
2620
2670
|
end
|
2621
2671
|
invalidate_memoized_attributes
|
2622
2672
|
|
@@ -2664,6 +2714,13 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2664
2714
|
@installed_by_version ||= nil
|
2665
2715
|
end
|
2666
2716
|
|
2717
|
+
def flatten_require_paths # :nodoc:
|
2718
|
+
return unless raw_require_paths.first.is_a?(Array)
|
2719
|
+
|
2720
|
+
warn "#{name} #{version} includes a gemspec with `require_paths` set to an array of arrays. Newer versions of this gem might've already fixed this"
|
2721
|
+
raw_require_paths.flatten!
|
2722
|
+
end
|
2723
|
+
|
2667
2724
|
def raw_require_paths # :nodoc:
|
2668
2725
|
@require_paths
|
2669
2726
|
end
|