rubygems-update 3.2.30 → 3.4.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1666 -994
- data/CONTRIBUTING.md +71 -15
- data/Manifest.txt +93 -37
- data/POLICIES.md +65 -16
- data/README.md +28 -13
- data/UPGRADING.md +5 -81
- data/bin/gem +2 -10
- data/bin/update_rubygems +5 -5
- data/bundler/CHANGELOG.md +647 -1
- data/bundler/README.md +3 -6
- data/bundler/UPGRADING.md +11 -4
- data/bundler/bundler.gemspec +8 -10
- data/bundler/exe/bundle +7 -11
- data/bundler/exe/bundler +1 -1
- data/bundler/lib/bundler/.document +1 -0
- 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/config.rb +10 -1
- data/bundler/lib/bundler/cli/console.rb +2 -2
- data/bundler/lib/bundler/cli/doctor.rb +10 -3
- data/bundler/lib/bundler/cli/gem.rb +136 -42
- data/bundler/lib/bundler/cli/info.rb +17 -3
- data/bundler/lib/bundler/cli/init.rb +6 -2
- data/bundler/lib/bundler/cli/install.rb +15 -33
- 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 +2 -2
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/update.rb +8 -4
- data/bundler/lib/bundler/cli/viz.rb +1 -1
- data/bundler/lib/bundler/cli.rb +67 -21
- data/bundler/lib/bundler/compact_index_client/cache.rb +1 -10
- data/bundler/lib/bundler/compact_index_client/updater.rb +53 -44
- data/bundler/lib/bundler/compact_index_client.rb +0 -6
- data/bundler/lib/bundler/constants.rb +1 -1
- data/bundler/lib/bundler/current_ruby.rb +18 -6
- data/bundler/lib/bundler/definition.rb +259 -242
- data/bundler/lib/bundler/dependency.rb +24 -71
- data/bundler/lib/bundler/digest.rb +1 -1
- data/bundler/lib/bundler/dsl.rb +29 -46
- data/bundler/lib/bundler/endpoint_specification.rb +15 -13
- data/bundler/lib/bundler/env.rb +2 -2
- data/bundler/lib/bundler/environment_preserver.rb +7 -3
- 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 +18 -25
- data/bundler/lib/bundler/fetcher/dependency.rb +2 -6
- data/bundler/lib/bundler/fetcher/downloader.rb +2 -5
- data/bundler/lib/bundler/fetcher/index.rb +0 -26
- data/bundler/lib/bundler/fetcher.rb +22 -29
- data/bundler/lib/bundler/force_platform.rb +18 -0
- data/bundler/lib/bundler/friendly_errors.rb +21 -7
- data/bundler/lib/bundler/gem_helper.rb +4 -4
- 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 +18 -4
- data/bundler/lib/bundler/inline.rb +9 -21
- data/bundler/lib/bundler/installer/gem_installer.rb +13 -5
- 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 -44
- data/bundler/lib/bundler/lazy_specification.rb +72 -55
- data/bundler/lib/bundler/lockfile_generator.rb +3 -3
- data/bundler/lib/bundler/lockfile_parser.rb +28 -26
- data/bundler/lib/bundler/man/bundle-add.1 +21 -5
- data/bundler/lib/bundler/man/bundle-add.1.ronn +16 -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 +34 -15
- data/bundler/lib/bundler/man/bundle-config.1.ronn +31 -19
- 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 +37 -34
- data/bundler/lib/bundler/man/bundle-gem.1.ronn +21 -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 +6 -31
- data/bundler/lib/bundler/man/bundle-install.1.ronn +8 -31
- 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 +2 -2
- data/bundler/lib/bundler/man/bundle-update.1.ronn +2 -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 +117 -80
- data/bundler/lib/bundler/man/gemfile.5.ronn +105 -84
- 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 +4 -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/installer.rb +6 -3
- data/bundler/lib/bundler/plugin.rb +3 -1
- data/bundler/lib/bundler/process_lock.rb +1 -1
- data/bundler/lib/bundler/remote_specification.rb +7 -5
- data/bundler/lib/bundler/resolver/base.rb +109 -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 +43 -71
- data/bundler/lib/bundler/resolver.rb +332 -308
- 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 +144 -25
- data/bundler/lib/bundler/rubygems_gem_installer.rb +32 -20
- data/bundler/lib/bundler/rubygems_integration.rb +24 -95
- data/bundler/lib/bundler/runtime.rb +2 -7
- data/bundler/lib/bundler/self_manager.rb +168 -0
- data/bundler/lib/bundler/settings.rb +5 -10
- data/bundler/lib/bundler/setup.rb +4 -1
- data/bundler/lib/bundler/shared_helpers.rb +17 -25
- data/bundler/lib/bundler/source/git/git_proxy.rb +219 -71
- data/bundler/lib/bundler/source/git.rb +23 -26
- data/bundler/lib/bundler/source/metadata.rb +3 -4
- 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 +91 -130
- data/bundler/lib/bundler/source/rubygems_aggregate.rb +1 -1
- data/bundler/lib/bundler/source.rb +4 -5
- data/bundler/lib/bundler/source_list.rb +19 -31
- data/bundler/lib/bundler/source_map.rb +15 -2
- data/bundler/lib/bundler/spec_set.rb +63 -35
- 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/Gemfile +0 -2
- data/bundler/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +8 -2
- data/bundler/lib/bundler/templates/newgem/README.md.tt +7 -11
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +27 -3
- 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 +13 -3
- 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 +22 -16
- data/bundler/lib/bundler/templates/newgem/sig/newgem.rbs.tt +8 -0
- data/bundler/lib/bundler/templates/newgem/standard.yml.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/test/minitest/{newgem_test.rb.tt → test_newgem.rb.tt} +1 -1
- data/bundler/lib/bundler/ui/shell.rb +36 -13
- data/bundler/lib/bundler/ui/silent.rb +21 -5
- data/bundler/lib/bundler/uri_normalizer.rb +23 -0
- data/bundler/lib/bundler/vendor/.document +1 -0
- 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 +150 -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/actions/file_manipulation.rb +6 -6
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +1 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +6 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +6 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +9 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +19 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +23 -5
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/util.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
- data/bundler/lib/bundler/vendor/tsort/lib/tsort.rb +452 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/common.rb +76 -91
- data/bundler/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/generic.rb +32 -13
- data/bundler/lib/bundler/vendor/uri/lib/uri/http.rb +40 -3
- data/bundler/lib/bundler/vendor/uri/lib/uri/https.rb +2 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb +2 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -3
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +14 -21
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +11 -17
- data/bundler/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ws.rb +83 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/wss.rb +23 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri.rb +3 -3
- data/bundler/lib/bundler/vendored_persistent.rb +1 -33
- data/bundler/lib/bundler/{vendored_molinillo.rb → vendored_pub_grub.rb} +1 -1
- data/bundler/lib/bundler/{vendored_tmpdir.rb → vendored_tsort.rb} +1 -1
- data/bundler/lib/bundler/version.rb +5 -1
- data/bundler/lib/bundler/worker.rb +5 -7
- data/bundler/lib/bundler.rb +50 -77
- data/hide_lib_for_update/note.txt +0 -4
- data/lib/rubygems/available_set.rb +3 -3
- data/lib/rubygems/basic_specification.rb +12 -12
- data/lib/rubygems/bundler_version_finder.rb +14 -46
- data/lib/rubygems/command.rb +47 -39
- data/lib/rubygems/command_manager.rb +34 -13
- data/lib/rubygems/commands/build_command.rb +11 -8
- data/lib/rubygems/commands/cert_command.rb +39 -39
- data/lib/rubygems/commands/check_command.rb +20 -20
- data/lib/rubygems/commands/cleanup_command.rb +23 -23
- data/lib/rubygems/commands/contents_command.rb +13 -13
- data/lib/rubygems/commands/dependency_command.rb +35 -45
- 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 +32 -13
- 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 +31 -24
- data/lib/rubygems/commands/list_command.rb +4 -4
- 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 +64 -49
- data/lib/rubygems/commands/push_command.rb +16 -16
- data/lib/rubygems/commands/query_command.rb +9 -9
- data/lib/rubygems/commands/rdoc_command.rb +26 -25
- data/lib/rubygems/commands/search_command.rb +4 -4
- data/lib/rubygems/commands/server_command.rb +16 -79
- data/lib/rubygems/commands/setup_command.rb +172 -173
- 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 +18 -18
- data/lib/rubygems/commands/stale_command.rb +2 -2
- data/lib/rubygems/commands/uninstall_command.rb +43 -40
- data/lib/rubygems/commands/unpack_command.rb +13 -13
- data/lib/rubygems/commands/update_command.rb +61 -72
- 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 +58 -25
- data/lib/rubygems/core_ext/kernel_gem.rb +1 -6
- data/lib/rubygems/core_ext/kernel_require.rb +108 -115
- 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 -36
- data/lib/rubygems/dependency.rb +20 -17
- data/lib/rubygems/dependency_installer.rb +37 -37
- data/lib/rubygems/dependency_list.rb +7 -7
- data/lib/rubygems/deprecate.rb +55 -8
- data/lib/rubygems/doctor.rb +21 -21
- data/lib/rubygems/errors.rb +3 -6
- data/lib/rubygems/exceptions.rb +35 -7
- data/lib/rubygems/ext/build_error.rb +1 -1
- data/lib/rubygems/ext/builder.rb +51 -22
- 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 +35 -59
- data/lib/rubygems/ext/rake_builder.rb +3 -3
- data/lib/rubygems/ext.rb +7 -6
- data/lib/rubygems/gem_runner.rb +12 -16
- 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 +70 -61
- data/lib/rubygems/installer.rb +135 -87
- data/lib/rubygems/installer_uninstaller_utils.rb +2 -2
- data/lib/rubygems/local_remote_options.rb +22 -24
- data/lib/rubygems/mock_gem_ui.rb +2 -2
- data/lib/rubygems/name_tuple.rb +6 -7
- data/lib/rubygems/optparse/.document +1 -0
- data/lib/rubygems/optparse/COPYING +56 -0
- data/lib/rubygems/optparse/lib/optionparser.rb +2 -0
- data/lib/rubygems/optparse/lib/optparse/ac.rb +54 -0
- data/lib/rubygems/optparse/lib/optparse/date.rb +18 -0
- data/lib/rubygems/optparse/lib/optparse/kwargs.rb +22 -0
- data/lib/rubygems/optparse/lib/optparse/shellwords.rb +7 -0
- data/lib/rubygems/optparse/lib/optparse/time.rb +11 -0
- data/lib/rubygems/optparse/lib/optparse/uri.rb +7 -0
- data/lib/rubygems/optparse/lib/optparse/version.rb +71 -0
- data/lib/rubygems/optparse/lib/optparse.rb +2308 -0
- data/lib/rubygems/optparse.rb +3 -0
- data/lib/rubygems/package/file_source.rb +2 -2
- data/lib/rubygems/package/old.rb +9 -9
- data/lib/rubygems/package/tar_header.rb +62 -62
- 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 +77 -60
- data/lib/rubygems/package_task.rb +4 -4
- data/lib/rubygems/path_support.rb +1 -6
- data/lib/rubygems/platform.rb +94 -61
- data/lib/rubygems/psych_tree.rb +1 -1
- data/lib/rubygems/query_utils.rb +49 -51
- data/lib/rubygems/rdoc.rb +2 -2
- data/lib/rubygems/remote_fetcher.rb +27 -27
- 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 +9 -9
- data/lib/rubygems/request_set.rb +18 -18
- data/lib/rubygems/requirement.rb +15 -15
- 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 +21 -26
- 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 +3 -3
- 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 +10 -10
- data/lib/rubygems/security/policies.rb +47 -47
- data/lib/rubygems/security/policy.rb +19 -21
- data/lib/rubygems/security/signer.rb +5 -5
- data/lib/rubygems/security/trust_dir.rb +4 -4
- data/lib/rubygems/security.rb +37 -43
- data/lib/rubygems/security_option.rb +7 -7
- 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 +27 -32
- data/lib/rubygems/source_list.rb +5 -9
- data/lib/rubygems/spec_fetcher.rb +37 -37
- data/lib/rubygems/specification.rb +265 -211
- data/lib/rubygems/specification_policy.rb +49 -30
- data/lib/rubygems/stub_specification.rb +24 -27
- data/lib/rubygems/text.rb +22 -21
- data/lib/rubygems/tsort/.document +1 -0
- data/lib/rubygems/tsort/LICENSE.txt +22 -0
- data/lib/rubygems/tsort/lib/tsort.rb +452 -0
- data/lib/rubygems/tsort.rb +3 -0
- data/lib/rubygems/uninstaller.rb +29 -26
- data/lib/rubygems/unknown_command_spell_checker.rb +21 -0
- 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 +42 -28
- data/lib/rubygems/util/licenses.rb +4 -2
- data/lib/rubygems/util.rb +12 -16
- data/lib/rubygems/validator.rb +6 -6
- data/lib/rubygems/version.rb +28 -17
- data/lib/rubygems/version_option.rb +5 -5
- data/lib/rubygems.rb +129 -117
- data/rubygems-update.gemspec +3 -3
- data/setup.rb +11 -16
- 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 +237 -207
- 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 +5 -5
- data/test/rubygems/test_deprecate.rb +3 -3
- data/test/rubygems/test_exit.rb +17 -0
- data/test/rubygems/test_gem.rb +367 -757
- data/test/rubygems/test_gem_available_set.rb +21 -21
- data/test/rubygems/test_gem_bundler_version_finder.rb +27 -47
- data/test/rubygems/test_gem_command.rb +45 -45
- data/test/rubygems/test_gem_command_manager.rb +124 -27
- data/test/rubygems/test_gem_commands_build_command.rb +73 -63
- data/test/rubygems/test_gem_commands_cert_command.rb +105 -107
- 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 +159 -26
- 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 +200 -132
- 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 +5 -5
- 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 +141 -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 +6 -48
- data/test/rubygems/test_gem_commands_setup_command.rb +169 -92
- data/test/rubygems/test_gem_commands_signin_command.rb +154 -26
- 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 +99 -82
- data/test/rubygems/test_gem_commands_unpack_command.rb +31 -31
- data/test/rubygems/test_gem_commands_update_command.rb +202 -91
- data/test/rubygems/test_gem_commands_which_command.rb +6 -6
- data/test/rubygems/test_gem_commands_yank_command.rb +43 -43
- data/test/rubygems/test_gem_config_file.rb +93 -81
- data/test/rubygems/test_gem_dependency.rb +78 -80
- 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 +53 -50
- data/test/rubygems/test_gem_ext_rake_builder.rb +15 -15
- data/test/rubygems/test_gem_gem_runner.rb +13 -8
- 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 +18 -18
- data/test/rubygems/test_gem_installer.rb +511 -327
- 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 +246 -236
- 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 +15 -19
- 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 +169 -154
- data/test/rubygems/test_gem_request.rb +65 -59
- 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 -42
- data/test/rubygems/test_gem_resolver.rb +173 -106
- 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 +69 -69
- 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 +560 -493
- data/test/rubygems/test_gem_stream_ui.rb +20 -20
- data/test/rubygems/test_gem_stub_specification.rb +32 -48
- data/test/rubygems/test_gem_text.rb +7 -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 +27 -16
- data/test/rubygems/test_gem_version_option.rb +15 -15
- data/test/rubygems/test_kernel.rb +42 -60
- data/test/rubygems/test_project_sanity.rb +2 -2
- data/test/rubygems/test_remote_fetch_error.rb +6 -6
- data/test/rubygems/test_require.rb +132 -174
- data/test/rubygems/test_rubygems.rb +42 -12
- data/test/rubygems/utilities.rb +59 -37
- 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 +97 -41
- data/bundler/lib/bundler/dep_proxy.rb +0 -55
- data/bundler/lib/bundler/gemdeps.rb +0 -29
- data/bundler/lib/bundler/psyched_yaml.rb +0 -22
- data/bundler/lib/bundler/templates/gems.rb +0 -8
- 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/version_ranges.rb +0 -122
- data/lib/rubygems/psych_additions.rb +0 -10
- data/lib/rubygems/server.rb +0 -882
- data/test/rubygems/bogussources.rb +0 -9
- data/test/rubygems/data/null-type.gemspec.rz +0 -0
- data/test/rubygems/test_gem_server.rb +0 -608
- /data/bundler/lib/bundler/templates/newgem/ext/newgem/{extconf.rb.tt → extconf-c.rb.tt} +0 -0
@@ -1,5 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require_relative
|
2
|
+
require_relative "../command"
|
3
3
|
|
4
4
|
##
|
5
5
|
# Installs RubyGems itself. This command is ordinarily only available from a
|
@@ -12,96 +12,94 @@ class Gem::Commands::SetupCommand < Gem::Command
|
|
12
12
|
ENV_PATHS = %w[/usr/bin/env /bin/env].freeze
|
13
13
|
|
14
14
|
def initialize
|
15
|
-
|
16
|
-
|
17
|
-
super 'setup', 'Install RubyGems',
|
15
|
+
super "setup", "Install RubyGems",
|
18
16
|
:format_executable => false, :document => %w[ri],
|
19
17
|
:force => true,
|
20
|
-
:site_or_vendor =>
|
21
|
-
:destdir =>
|
18
|
+
:site_or_vendor => "sitelibdir",
|
19
|
+
:destdir => "", :prefix => "", :previous_version => "",
|
22
20
|
:regenerate_binstubs => true,
|
23
21
|
:regenerate_plugins => true
|
24
22
|
|
25
|
-
add_option
|
26
|
-
|
27
|
-
|
23
|
+
add_option "--previous-version=VERSION",
|
24
|
+
"Previous version of RubyGems",
|
25
|
+
"Used for changelog processing" do |version, options|
|
28
26
|
options[:previous_version] = version
|
29
27
|
end
|
30
28
|
|
31
|
-
add_option
|
32
|
-
|
33
|
-
|
29
|
+
add_option "--prefix=PREFIX",
|
30
|
+
"Prefix path for installing RubyGems",
|
31
|
+
"Will not affect gem repository location" do |prefix, options|
|
34
32
|
options[:prefix] = File.expand_path prefix
|
35
33
|
end
|
36
34
|
|
37
|
-
add_option
|
38
|
-
|
39
|
-
|
35
|
+
add_option "--destdir=DESTDIR",
|
36
|
+
"Root directory to install RubyGems into",
|
37
|
+
"Mainly used for packaging RubyGems" do |destdir, options|
|
40
38
|
options[:destdir] = File.expand_path destdir
|
41
39
|
end
|
42
40
|
|
43
|
-
add_option
|
44
|
-
|
45
|
-
options[:site_or_vendor] = vendor ?
|
41
|
+
add_option "--[no-]vendor",
|
42
|
+
"Install into vendorlibdir not sitelibdir" do |vendor, options|
|
43
|
+
options[:site_or_vendor] = vendor ? "vendorlibdir" : "sitelibdir"
|
46
44
|
end
|
47
45
|
|
48
|
-
add_option
|
49
|
-
|
50
|
-
|
46
|
+
add_option "--[no-]format-executable",
|
47
|
+
"Makes `gem` match ruby",
|
48
|
+
"If Ruby is ruby18, gem will be gem18" do |value, options|
|
51
49
|
options[:format_executable] = value
|
52
50
|
end
|
53
51
|
|
54
|
-
add_option
|
55
|
-
|
56
|
-
|
57
|
-
|
52
|
+
add_option "--[no-]document [TYPES]", Array,
|
53
|
+
"Generate documentation for RubyGems",
|
54
|
+
"List the documentation types you wish to",
|
55
|
+
"generate. For example: rdoc,ri" do |value, options|
|
58
56
|
options[:document] = case value
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
57
|
+
when nil then %w[rdoc ri]
|
58
|
+
when false then []
|
59
|
+
else value
|
60
|
+
end
|
63
61
|
end
|
64
62
|
|
65
|
-
add_option
|
66
|
-
|
63
|
+
add_option "--[no-]rdoc",
|
64
|
+
"Generate RDoc documentation for RubyGems" do |value, options|
|
67
65
|
if value
|
68
|
-
options[:document] <<
|
66
|
+
options[:document] << "rdoc"
|
69
67
|
else
|
70
|
-
options[:document].delete
|
68
|
+
options[:document].delete "rdoc"
|
71
69
|
end
|
72
70
|
|
73
71
|
options[:document].uniq!
|
74
72
|
end
|
75
73
|
|
76
|
-
add_option
|
77
|
-
|
74
|
+
add_option "--[no-]ri",
|
75
|
+
"Generate RI documentation for RubyGems" do |value, options|
|
78
76
|
if value
|
79
|
-
options[:document] <<
|
77
|
+
options[:document] << "ri"
|
80
78
|
else
|
81
|
-
options[:document].delete
|
79
|
+
options[:document].delete "ri"
|
82
80
|
end
|
83
81
|
|
84
82
|
options[:document].uniq!
|
85
83
|
end
|
86
84
|
|
87
|
-
add_option
|
88
|
-
|
85
|
+
add_option "--[no-]regenerate-binstubs",
|
86
|
+
"Regenerate gem binstubs" do |value, options|
|
89
87
|
options[:regenerate_binstubs] = value
|
90
88
|
end
|
91
89
|
|
92
|
-
add_option
|
93
|
-
|
90
|
+
add_option "--[no-]regenerate-plugins",
|
91
|
+
"Regenerate gem plugins" do |value, options|
|
94
92
|
options[:regenerate_plugins] = value
|
95
93
|
end
|
96
94
|
|
97
|
-
add_option
|
98
|
-
|
95
|
+
add_option "-f", "--[no-]force",
|
96
|
+
"Forcefully overwrite binstubs" do |value, options|
|
99
97
|
options[:force] = value
|
100
98
|
end
|
101
99
|
|
102
|
-
add_option(
|
103
|
-
|
104
|
-
|
100
|
+
add_option("-E", "--[no-]env-shebang",
|
101
|
+
"Rewrite executables with a shebang",
|
102
|
+
"of /usr/bin/env") do |value, options|
|
105
103
|
options[:env_shebang] = value
|
106
104
|
end
|
107
105
|
|
@@ -109,7 +107,7 @@ class Gem::Commands::SetupCommand < Gem::Command
|
|
109
107
|
end
|
110
108
|
|
111
109
|
def check_ruby_version
|
112
|
-
required_version = Gem::Requirement.new
|
110
|
+
required_version = Gem::Requirement.new ">= 2.6.0"
|
113
111
|
|
114
112
|
unless required_version.satisfied_by? Gem.ruby_version
|
115
113
|
alert_error "Expected Ruby version #{required_version}, is #{Gem.ruby_version}"
|
@@ -149,16 +147,9 @@ By default, this RubyGems will install gem as:
|
|
149
147
|
def execute
|
150
148
|
@verbose = Gem.configuration.really_verbose
|
151
149
|
|
152
|
-
install_destdir = options[:destdir]
|
153
|
-
|
154
|
-
unless install_destdir.empty?
|
155
|
-
ENV['GEM_HOME'] ||= File.join(install_destdir,
|
156
|
-
Gem.default_dir.gsub(/^[a-zA-Z]:/, ''))
|
157
|
-
end
|
158
|
-
|
159
150
|
check_ruby_version
|
160
151
|
|
161
|
-
require
|
152
|
+
require "fileutils"
|
162
153
|
if Gem.configuration.really_verbose
|
163
154
|
extend FileUtils::Verbose
|
164
155
|
else
|
@@ -166,8 +157,8 @@ By default, this RubyGems will install gem as:
|
|
166
157
|
end
|
167
158
|
extend MakeDirs
|
168
159
|
|
169
|
-
lib_dir, bin_dir = make_destination_dirs
|
170
|
-
man_dir = generate_default_man_dir
|
160
|
+
lib_dir, bin_dir = make_destination_dirs
|
161
|
+
man_dir = generate_default_man_dir
|
171
162
|
|
172
163
|
install_lib lib_dir
|
173
164
|
|
@@ -189,8 +180,8 @@ By default, this RubyGems will install gem as:
|
|
189
180
|
|
190
181
|
say "RubyGems #{Gem::VERSION} installed"
|
191
182
|
|
192
|
-
regenerate_binstubs if options[:regenerate_binstubs]
|
193
|
-
regenerate_plugins if options[:regenerate_plugins]
|
183
|
+
regenerate_binstubs(bin_dir) if options[:regenerate_binstubs]
|
184
|
+
regenerate_plugins(bin_dir) if options[:regenerate_plugins]
|
194
185
|
|
195
186
|
uninstall_old_gemcutter
|
196
187
|
|
@@ -203,7 +194,7 @@ By default, this RubyGems will install gem as:
|
|
203
194
|
end
|
204
195
|
|
205
196
|
if options[:previous_version].empty?
|
206
|
-
options[:previous_version] = Gem::VERSION.sub(/[0-9]+$/,
|
197
|
+
options[:previous_version] = Gem::VERSION.sub(/[0-9]+$/, "0")
|
207
198
|
end
|
208
199
|
|
209
200
|
options[:previous_version] = Gem::Version.new(options[:previous_version])
|
@@ -225,7 +216,7 @@ By default, this RubyGems will install gem as:
|
|
225
216
|
end
|
226
217
|
|
227
218
|
if documentation_success
|
228
|
-
if options[:document].include?
|
219
|
+
if options[:document].include? "rdoc"
|
229
220
|
say "Rdoc documentation was installed. You may now invoke:"
|
230
221
|
say " gem server"
|
231
222
|
say "and then peruse beautifully formatted documentation for your gems"
|
@@ -236,7 +227,7 @@ By default, this RubyGems will install gem as:
|
|
236
227
|
say
|
237
228
|
end
|
238
229
|
|
239
|
-
if options[:document].include?
|
230
|
+
if options[:document].include? "ri"
|
240
231
|
say "Ruby Interactive (ri) documentation was installed. ri is kind of like man "
|
241
232
|
say "pages for Ruby libraries. You may access it like this:"
|
242
233
|
say " ri Classname"
|
@@ -253,40 +244,39 @@ By default, this RubyGems will install gem as:
|
|
253
244
|
def install_executables(bin_dir)
|
254
245
|
prog_mode = options[:prog_mode] || 0755
|
255
246
|
|
256
|
-
executables = {
|
247
|
+
executables = { "gem" => "bin" }
|
257
248
|
executables.each do |tool, path|
|
258
249
|
say "Installing #{tool} executable" if @verbose
|
259
250
|
|
260
251
|
Dir.chdir path do
|
261
|
-
|
252
|
+
bin_file = "gem"
|
262
253
|
|
263
|
-
|
254
|
+
require "tmpdir"
|
264
255
|
|
265
|
-
|
266
|
-
|
267
|
-
bin_tmp_file = File.join Dir.tmpdir, "#{bin_file}.#{$$}"
|
256
|
+
dest_file = target_bin_path(bin_dir, bin_file)
|
257
|
+
bin_tmp_file = File.join Dir.tmpdir, "#{bin_file}.#{$$}"
|
268
258
|
|
269
|
-
|
270
|
-
|
271
|
-
|
259
|
+
begin
|
260
|
+
bin = File.readlines bin_file
|
261
|
+
bin[0] = shebang
|
272
262
|
|
273
|
-
|
274
|
-
|
275
|
-
end
|
276
|
-
|
277
|
-
install bin_tmp_file, dest_file, :mode => prog_mode
|
278
|
-
bin_file_names << dest_file
|
279
|
-
ensure
|
280
|
-
rm bin_tmp_file
|
263
|
+
File.open bin_tmp_file, "w" do |fp|
|
264
|
+
fp.puts bin.join
|
281
265
|
end
|
282
266
|
|
283
|
-
|
267
|
+
install bin_tmp_file, dest_file, :mode => prog_mode
|
268
|
+
bin_file_names << dest_file
|
269
|
+
ensure
|
270
|
+
rm bin_tmp_file
|
271
|
+
end
|
272
|
+
|
273
|
+
next unless Gem.win_platform?
|
284
274
|
|
285
|
-
|
286
|
-
|
275
|
+
begin
|
276
|
+
bin_cmd_file = File.join Dir.tmpdir, "#{bin_file}.bat"
|
287
277
|
|
288
|
-
|
289
|
-
|
278
|
+
File.open bin_cmd_file, "w" do |file|
|
279
|
+
file.puts <<-TEXT
|
290
280
|
@ECHO OFF
|
291
281
|
IF NOT "%~f0" == "~f0" GOTO :WinNT
|
292
282
|
@"#{File.basename(Gem.ruby).chomp('"')}" "#{dest_file}" %1 %2 %3 %4 %5 %6 %7 %8 %9
|
@@ -294,12 +284,11 @@ By default, this RubyGems will install gem as:
|
|
294
284
|
:WinNT
|
295
285
|
@"#{File.basename(Gem.ruby).chomp('"')}" "%~dpn0" %*
|
296
286
|
TEXT
|
297
|
-
end
|
298
|
-
|
299
|
-
install bin_cmd_file, "#{dest_file}.bat", :mode => prog_mode
|
300
|
-
ensure
|
301
|
-
rm bin_cmd_file
|
302
287
|
end
|
288
|
+
|
289
|
+
install bin_cmd_file, "#{dest_file}.bat", :mode => prog_mode
|
290
|
+
ensure
|
291
|
+
rm bin_cmd_file
|
303
292
|
end
|
304
293
|
end
|
305
294
|
end
|
@@ -307,7 +296,7 @@ By default, this RubyGems will install gem as:
|
|
307
296
|
|
308
297
|
def shebang
|
309
298
|
if options[:env_shebang]
|
310
|
-
ruby_name = RbConfig::CONFIG[
|
299
|
+
ruby_name = RbConfig::CONFIG["ruby_install_name"]
|
311
300
|
@env_path ||= ENV_PATHS.find {|env_path| File.executable? env_path }
|
312
301
|
"#!#{@env_path} #{ruby_name}\n"
|
313
302
|
else
|
@@ -316,8 +305,8 @@ By default, this RubyGems will install gem as:
|
|
316
305
|
end
|
317
306
|
|
318
307
|
def install_lib(lib_dir)
|
319
|
-
libs = {
|
320
|
-
libs[
|
308
|
+
libs = { "RubyGems" => "lib" }
|
309
|
+
libs["Bundler"] = "bundler/lib"
|
321
310
|
libs.each do |tool, path|
|
322
311
|
say "Installing #{tool}" if @verbose
|
323
312
|
|
@@ -330,7 +319,7 @@ By default, this RubyGems will install gem as:
|
|
330
319
|
end
|
331
320
|
|
332
321
|
def install_rdoc
|
333
|
-
gem_doc_dir = File.join Gem.dir,
|
322
|
+
gem_doc_dir = File.join Gem.dir, "doc"
|
334
323
|
rubygems_name = "rubygems-#{Gem::VERSION}"
|
335
324
|
rubygems_doc_dir = File.join gem_doc_dir, rubygems_name
|
336
325
|
|
@@ -340,23 +329,23 @@ By default, this RubyGems will install gem as:
|
|
340
329
|
# ignore
|
341
330
|
end
|
342
331
|
|
343
|
-
if File.writable?
|
344
|
-
(
|
345
|
-
File.writable?
|
332
|
+
if File.writable?(gem_doc_dir) &&
|
333
|
+
(!File.exist?(rubygems_doc_dir) ||
|
334
|
+
File.writable?(rubygems_doc_dir))
|
346
335
|
say "Removing old RubyGems RDoc and ri" if @verbose
|
347
|
-
Dir[File.join(Gem.dir,
|
336
|
+
Dir[File.join(Gem.dir, "doc", "rubygems-[0-9]*")].each do |dir|
|
348
337
|
rm_rf dir
|
349
338
|
end
|
350
339
|
|
351
|
-
require_relative
|
340
|
+
require_relative "../rdoc"
|
352
341
|
|
353
|
-
fake_spec = Gem::Specification.new
|
342
|
+
fake_spec = Gem::Specification.new "rubygems", Gem::VERSION
|
354
343
|
def fake_spec.full_gem_path
|
355
|
-
File.expand_path
|
344
|
+
File.expand_path "../../..", __dir__
|
356
345
|
end
|
357
346
|
|
358
|
-
generate_ri = options[:document].include?
|
359
|
-
generate_rdoc = options[:document].include?
|
347
|
+
generate_ri = options[:document].include? "ri"
|
348
|
+
generate_rdoc = options[:document].include? "rdoc"
|
360
349
|
|
361
350
|
rdoc = Gem::RDoc.new fake_spec, generate_rdoc, generate_ri
|
362
351
|
rdoc.generate
|
@@ -371,24 +360,26 @@ By default, this RubyGems will install gem as:
|
|
371
360
|
end
|
372
361
|
|
373
362
|
def install_default_bundler_gem(bin_dir)
|
374
|
-
|
375
|
-
specs_dir =
|
376
|
-
|
363
|
+
current_default_spec = Gem::Specification.default_stubs.find {|s| s.name == "bundler" }
|
364
|
+
specs_dir = if current_default_spec && default_dir == Gem.default_dir
|
365
|
+
Gem::Specification.remove_spec current_default_spec
|
366
|
+
loaded_from = current_default_spec.loaded_from
|
367
|
+
File.delete(loaded_from)
|
368
|
+
File.dirname(loaded_from)
|
369
|
+
else
|
370
|
+
target_specs_dir = File.join(default_dir, "specifications", "default")
|
371
|
+
mkdir_p target_specs_dir, :mode => 0755
|
372
|
+
target_specs_dir
|
373
|
+
end
|
377
374
|
|
378
375
|
bundler_spec = Dir.chdir("bundler") { Gem::Specification.load("bundler.gemspec") }
|
379
|
-
|
380
|
-
# Remove bundler-*.gemspec in default specification directory.
|
381
|
-
Dir.entries(specs_dir).
|
382
|
-
select {|gs| gs.start_with?("bundler-") }.
|
383
|
-
each {|gs| File.delete(File.join(specs_dir, gs)) }
|
384
|
-
|
385
376
|
default_spec_path = File.join(specs_dir, "#{bundler_spec.full_name}.gemspec")
|
386
377
|
Gem.write_binary(default_spec_path, bundler_spec.to_ruby)
|
387
378
|
|
388
379
|
bundler_spec = Gem::Specification.load(default_spec_path)
|
389
380
|
|
390
381
|
# Remove gemspec that was same version of vendored bundler.
|
391
|
-
normal_gemspec = File.join(
|
382
|
+
normal_gemspec = File.join(default_dir, "specifications", "bundler-#{bundler_spec.version}.gemspec")
|
392
383
|
if File.file? normal_gemspec
|
393
384
|
File.delete normal_gemspec
|
394
385
|
end
|
@@ -401,19 +392,26 @@ By default, this RubyGems will install gem as:
|
|
401
392
|
end
|
402
393
|
|
403
394
|
bundler_bin_dir = bundler_spec.bin_dir
|
404
|
-
bundler_bin_dir = File.join(options[:destdir], bundler_bin_dir) unless Gem.win_platform?
|
405
395
|
mkdir_p bundler_bin_dir, :mode => 0755
|
406
396
|
bundler_spec.executables.each do |e|
|
407
397
|
cp File.join("bundler", bundler_spec.bindir, e), File.join(bundler_bin_dir, e)
|
408
398
|
end
|
409
399
|
|
410
|
-
require_relative
|
400
|
+
require_relative "../installer"
|
411
401
|
|
412
402
|
Dir.chdir("bundler") do
|
413
403
|
built_gem = Gem::Package.build(bundler_spec)
|
414
404
|
begin
|
415
|
-
|
416
|
-
|
405
|
+
Gem::Installer.at(
|
406
|
+
built_gem,
|
407
|
+
env_shebang: options[:env_shebang],
|
408
|
+
format_executable: options[:format_executable],
|
409
|
+
force: options[:force],
|
410
|
+
install_as_default: true,
|
411
|
+
bin_dir: bin_dir,
|
412
|
+
install_dir: default_dir,
|
413
|
+
wrappers: true
|
414
|
+
).install
|
417
415
|
ensure
|
418
416
|
FileUtils.rm_f built_gem
|
419
417
|
end
|
@@ -424,11 +422,11 @@ By default, this RubyGems will install gem as:
|
|
424
422
|
say "Bundler #{bundler_spec.version} installed"
|
425
423
|
end
|
426
424
|
|
427
|
-
def make_destination_dirs
|
425
|
+
def make_destination_dirs
|
428
426
|
lib_dir, bin_dir = Gem.default_rubygems_dirs
|
429
427
|
|
430
428
|
unless lib_dir
|
431
|
-
lib_dir, bin_dir = generate_default_dirs
|
429
|
+
lib_dir, bin_dir = generate_default_dirs
|
432
430
|
end
|
433
431
|
|
434
432
|
mkdir_p lib_dir, :mode => 0755
|
@@ -437,70 +435,49 @@ By default, this RubyGems will install gem as:
|
|
437
435
|
return lib_dir, bin_dir
|
438
436
|
end
|
439
437
|
|
440
|
-
def generate_default_man_dir
|
438
|
+
def generate_default_man_dir
|
441
439
|
prefix = options[:prefix]
|
442
440
|
|
443
441
|
if prefix.empty?
|
444
|
-
man_dir = RbConfig::CONFIG[
|
442
|
+
man_dir = RbConfig::CONFIG["mandir"]
|
445
443
|
return unless man_dir
|
446
444
|
else
|
447
|
-
man_dir = File.join prefix,
|
448
|
-
end
|
449
|
-
|
450
|
-
unless install_destdir.empty?
|
451
|
-
man_dir = File.join install_destdir, man_dir.gsub(/^[a-zA-Z]:/, '')
|
445
|
+
man_dir = File.join prefix, "man"
|
452
446
|
end
|
453
447
|
|
454
|
-
man_dir
|
448
|
+
prepend_destdir_if_present(man_dir)
|
455
449
|
end
|
456
450
|
|
457
|
-
def generate_default_dirs
|
451
|
+
def generate_default_dirs
|
458
452
|
prefix = options[:prefix]
|
459
453
|
site_or_vendor = options[:site_or_vendor]
|
460
454
|
|
461
455
|
if prefix.empty?
|
462
456
|
lib_dir = RbConfig::CONFIG[site_or_vendor]
|
463
|
-
bin_dir = RbConfig::CONFIG[
|
457
|
+
bin_dir = RbConfig::CONFIG["bindir"]
|
464
458
|
else
|
465
|
-
|
466
|
-
|
467
|
-
# sitelibdir/vendorlibdir.
|
468
|
-
if defined?(APPLE_GEM_HOME) and
|
469
|
-
# just in case Apple and RubyGems don't get this patched up proper.
|
470
|
-
(prefix == RbConfig::CONFIG['libdir'] or
|
471
|
-
# this one is important
|
472
|
-
prefix == File.join(RbConfig::CONFIG['libdir'], 'ruby'))
|
473
|
-
lib_dir = RbConfig::CONFIG[site_or_vendor]
|
474
|
-
bin_dir = RbConfig::CONFIG['bindir']
|
475
|
-
else
|
476
|
-
lib_dir = File.join prefix, 'lib'
|
477
|
-
bin_dir = File.join prefix, 'bin'
|
478
|
-
end
|
479
|
-
end
|
480
|
-
|
481
|
-
unless install_destdir.empty?
|
482
|
-
lib_dir = File.join install_destdir, lib_dir.gsub(/^[a-zA-Z]:/, '')
|
483
|
-
bin_dir = File.join install_destdir, bin_dir.gsub(/^[a-zA-Z]:/, '')
|
459
|
+
lib_dir = File.join prefix, "lib"
|
460
|
+
bin_dir = File.join prefix, "bin"
|
484
461
|
end
|
485
462
|
|
486
|
-
[lib_dir, bin_dir]
|
463
|
+
[prepend_destdir_if_present(lib_dir), prepend_destdir_if_present(bin_dir)]
|
487
464
|
end
|
488
465
|
|
489
466
|
def files_in(dir)
|
490
467
|
Dir.chdir dir do
|
491
|
-
Dir.glob(File.join(
|
492
|
-
select{|f| !File.directory?(f) }
|
468
|
+
Dir.glob(File.join("**", "*"), File::FNM_DOTMATCH).
|
469
|
+
select {|f| !File.directory?(f) }
|
493
470
|
end
|
494
471
|
end
|
495
472
|
|
496
473
|
def remove_old_bin_files(bin_dir)
|
497
474
|
old_bin_files = {
|
498
|
-
|
499
|
-
|
500
|
-
|
501
|
-
|
502
|
-
|
503
|
-
|
475
|
+
"gem_mirror" => "gem mirror",
|
476
|
+
"gem_server" => "gem server",
|
477
|
+
"gemlock" => "gem lock",
|
478
|
+
"gemri" => "ri",
|
479
|
+
"gemwhich" => "gem which",
|
480
|
+
"index_gem_repository.rb" => "gem generate_index",
|
504
481
|
}
|
505
482
|
|
506
483
|
old_bin_files.each do |old_bin_file, new_name|
|
@@ -509,7 +486,7 @@ By default, this RubyGems will install gem as:
|
|
509
486
|
|
510
487
|
deprecation_message = "`#{old_bin_file}` has been deprecated. Use `#{new_name}` instead."
|
511
488
|
|
512
|
-
File.open old_bin_path,
|
489
|
+
File.open old_bin_path, "w" do |fp|
|
513
490
|
fp.write <<-EOF
|
514
491
|
#!#{Gem.ruby}
|
515
492
|
|
@@ -519,15 +496,15 @@ abort "#{deprecation_message}"
|
|
519
496
|
|
520
497
|
next unless Gem.win_platform?
|
521
498
|
|
522
|
-
File.open "#{old_bin_path}.bat",
|
499
|
+
File.open "#{old_bin_path}.bat", "w" do |fp|
|
523
500
|
fp.puts %(@ECHO.#{deprecation_message})
|
524
501
|
end
|
525
502
|
end
|
526
503
|
end
|
527
504
|
|
528
505
|
def remove_old_lib_files(lib_dir)
|
529
|
-
lib_dirs = { File.join(lib_dir,
|
530
|
-
lib_dirs[File.join(lib_dir,
|
506
|
+
lib_dirs = { File.join(lib_dir, "rubygems") => "lib/rubygems" }
|
507
|
+
lib_dirs[File.join(lib_dir, "bundler")] = "bundler/lib/bundler"
|
531
508
|
lib_dirs.each do |old_lib_dir, new_lib_dir|
|
532
509
|
lib_files = files_in(new_lib_dir)
|
533
510
|
|
@@ -535,11 +512,11 @@ abort "#{deprecation_message}"
|
|
535
512
|
|
536
513
|
to_remove = old_lib_files - lib_files
|
537
514
|
|
538
|
-
gauntlet_rubygems = File.join(lib_dir,
|
515
|
+
gauntlet_rubygems = File.join(lib_dir, "gauntlet_rubygems.rb")
|
539
516
|
to_remove << gauntlet_rubygems if File.exist? gauntlet_rubygems
|
540
517
|
|
541
518
|
to_remove.delete_if do |file|
|
542
|
-
file.start_with?
|
519
|
+
file.start_with? "defaults"
|
543
520
|
end
|
544
521
|
|
545
522
|
remove_file_list(to_remove, old_lib_dir)
|
@@ -565,7 +542,7 @@ abort "#{deprecation_message}"
|
|
565
542
|
end
|
566
543
|
|
567
544
|
def show_release_notes
|
568
|
-
release_notes = File.join Dir.pwd,
|
545
|
+
release_notes = File.join Dir.pwd, "CHANGELOG.md"
|
569
546
|
|
570
547
|
release_notes =
|
571
548
|
if File.exist? release_notes
|
@@ -582,7 +559,7 @@ abort "#{deprecation_message}"
|
|
582
559
|
|
583
560
|
history_string = ""
|
584
561
|
|
585
|
-
until versions.length == 0
|
562
|
+
until versions.length == 0 ||
|
586
563
|
versions.shift <= options[:previous_version] do
|
587
564
|
history_string += version_lines.shift + text.shift
|
588
565
|
end
|
@@ -596,19 +573,20 @@ abort "#{deprecation_message}"
|
|
596
573
|
end
|
597
574
|
|
598
575
|
def uninstall_old_gemcutter
|
599
|
-
require_relative
|
576
|
+
require_relative "../uninstaller"
|
600
577
|
|
601
|
-
ui = Gem::Uninstaller.new(
|
602
|
-
|
578
|
+
ui = Gem::Uninstaller.new("gemcutter", :all => true, :ignore => true,
|
579
|
+
:version => "< 0.4")
|
603
580
|
ui.uninstall
|
604
581
|
rescue Gem::InstallError
|
605
582
|
end
|
606
583
|
|
607
|
-
def regenerate_binstubs
|
584
|
+
def regenerate_binstubs(bindir)
|
608
585
|
require_relative "pristine_command"
|
609
586
|
say "Regenerating binstubs"
|
610
587
|
|
611
588
|
args = %w[--all --only-executables --silent]
|
589
|
+
args << "--bindir=#{bindir}"
|
612
590
|
if options[:env_shebang]
|
613
591
|
args << "--env-shebang"
|
614
592
|
end
|
@@ -617,11 +595,13 @@ abort "#{deprecation_message}"
|
|
617
595
|
command.invoke(*args)
|
618
596
|
end
|
619
597
|
|
620
|
-
def regenerate_plugins
|
598
|
+
def regenerate_plugins(bindir)
|
621
599
|
require_relative "pristine_command"
|
622
600
|
say "Regenerating plugins"
|
623
601
|
|
624
602
|
args = %w[--all --only-plugins --silent]
|
603
|
+
args << "--bindir=#{bindir}"
|
604
|
+
args << "--install-dir=#{default_dir}"
|
625
605
|
|
626
606
|
command = Gem::Commands::PristineCommand.new
|
627
607
|
command.invoke(*args)
|
@@ -629,6 +609,25 @@ abort "#{deprecation_message}"
|
|
629
609
|
|
630
610
|
private
|
631
611
|
|
612
|
+
def default_dir
|
613
|
+
prefix = options[:prefix]
|
614
|
+
|
615
|
+
if prefix.empty?
|
616
|
+
dir = Gem.default_dir
|
617
|
+
else
|
618
|
+
dir = prefix
|
619
|
+
end
|
620
|
+
|
621
|
+
prepend_destdir_if_present(dir)
|
622
|
+
end
|
623
|
+
|
624
|
+
def prepend_destdir_if_present(path)
|
625
|
+
destdir = options[:destdir]
|
626
|
+
return path if destdir.empty?
|
627
|
+
|
628
|
+
File.join(options[:destdir], path.gsub(/^[a-zA-Z]:/, ""))
|
629
|
+
end
|
630
|
+
|
632
631
|
def install_file_list(files, dest_dir)
|
633
632
|
files.each do |file|
|
634
633
|
install_file file, dest_dir
|
@@ -658,10 +657,10 @@ abort "#{deprecation_message}"
|
|
658
657
|
|
659
658
|
def target_bin_path(bin_dir, bin_file)
|
660
659
|
bin_file_formatted = if options[:format_executable]
|
661
|
-
|
662
|
-
|
663
|
-
|
664
|
-
|
660
|
+
Gem.default_exec_format % bin_file
|
661
|
+
else
|
662
|
+
bin_file
|
663
|
+
end
|
665
664
|
File.join bin_dir, bin_file_formatted
|
666
665
|
end
|
667
666
|
|