rubygems-update 3.1.0 → 3.2.0.rc.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CODE_OF_CONDUCT.md +55 -19
- data/CONTRIBUTING.md +2 -3
- data/History.txt +195 -7
- data/Manifest.txt +11 -23
- data/POLICIES.md +2 -9
- data/README.md +5 -5
- data/Rakefile +38 -35
- data/bin/update_rubygems +2 -2
- data/bundler/CHANGELOG.md +846 -728
- data/bundler/README.md +6 -8
- data/bundler/UPGRADING.md +16 -30
- data/bundler/bundler.gemspec +3 -3
- data/bundler/exe/bundle +3 -0
- data/bundler/lib/bundler.rb +15 -4
- data/bundler/lib/bundler/build_metadata.rb +2 -2
- data/bundler/lib/bundler/cli.rb +29 -9
- data/bundler/lib/bundler/cli/console.rb +1 -1
- data/bundler/lib/bundler/cli/exec.rb +3 -12
- data/bundler/lib/bundler/cli/gem.rb +74 -10
- data/bundler/lib/bundler/cli/info.rb +6 -3
- data/bundler/lib/bundler/cli/init.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +8 -16
- data/bundler/lib/bundler/cli/issue.rb +2 -2
- data/bundler/lib/bundler/cli/outdated.rb +5 -5
- data/bundler/lib/bundler/cli/plugin.rb +10 -0
- data/bundler/lib/bundler/definition.rb +32 -32
- data/bundler/lib/bundler/dependency.rb +0 -9
- data/bundler/lib/bundler/dsl.rb +1 -5
- data/bundler/lib/bundler/environment_preserver.rb +26 -2
- data/bundler/lib/bundler/errors.rb +1 -0
- data/bundler/lib/bundler/feature_flag.rb +0 -2
- data/bundler/lib/bundler/fetcher.rb +1 -0
- data/bundler/lib/bundler/friendly_errors.rb +4 -10
- data/bundler/lib/bundler/gem_helper.rb +18 -12
- data/bundler/lib/bundler/gem_version_promoter.rb +1 -1
- data/bundler/lib/bundler/injector.rb +14 -3
- data/bundler/lib/bundler/inline.rb +2 -2
- data/bundler/lib/bundler/installer.rb +29 -28
- data/bundler/lib/bundler/installer/gem_installer.rb +2 -2
- data/bundler/lib/bundler/installer/parallel_installer.rb +9 -9
- data/bundler/lib/bundler/lazy_specification.rb +16 -3
- data/bundler/lib/bundler/plugin.rb +26 -0
- data/bundler/lib/bundler/plugin/index.rb +9 -0
- data/bundler/lib/bundler/psyched_yaml.rb +0 -15
- data/bundler/lib/bundler/remote_specification.rb +4 -1
- data/bundler/lib/bundler/resolver.rb +31 -8
- data/bundler/lib/bundler/resolver/spec_group.rb +26 -5
- data/bundler/lib/bundler/rubygems_ext.rb +7 -8
- data/bundler/lib/bundler/rubygems_gem_installer.rb +1 -7
- data/bundler/lib/bundler/rubygems_integration.rb +13 -19
- data/bundler/lib/bundler/runtime.rb +2 -12
- data/bundler/lib/bundler/settings.rb +0 -3
- data/bundler/lib/bundler/setup.rb +5 -0
- data/bundler/lib/bundler/shared_helpers.rb +1 -1
- data/bundler/lib/bundler/source/git/git_proxy.rb +53 -58
- data/bundler/lib/bundler/source/path.rb +5 -1
- data/bundler/lib/bundler/source/path/installer.rb +7 -9
- data/bundler/lib/bundler/source/rubygems.rb +11 -14
- data/bundler/lib/bundler/stub_specification.rb +16 -4
- data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +57 -47
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +7 -2
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +12 -5
- data/bundler/lib/bundler/templates/newgem/bin/console.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +13 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +18 -0
- data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +9 -0
- data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +5 -3
- data/bundler/lib/bundler/templates/newgem/rubocop.yml.tt +10 -0
- data/bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/test/{newgem_test.rb.tt → minitest/newgem_test.rb.tt} +2 -0
- data/bundler/lib/bundler/templates/newgem/test/{test_helper.rb.tt → minitest/test_helper.rb.tt} +2 -0
- data/bundler/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt +15 -0
- data/bundler/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt +6 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +72 -208
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +0 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +2 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +9 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/version.rb +1 -1
- data/bundler/man/bundle-add.1 +1 -1
- data/bundler/man/bundle-add.1.txt +15 -15
- data/bundler/man/bundle-binstubs.1 +1 -1
- data/bundler/man/bundle-binstubs.1.txt +10 -10
- data/bundler/man/bundle-cache.1 +1 -1
- data/bundler/man/bundle-cache.1.txt +15 -15
- data/bundler/man/bundle-check.1 +1 -1
- data/bundler/man/bundle-check.1.txt +8 -8
- data/bundler/man/bundle-clean.1 +1 -1
- data/bundler/man/bundle-clean.1.txt +6 -6
- data/bundler/man/bundle-config.1 +3 -9
- data/bundler/man/bundle-config.1.txt +271 -272
- data/bundler/man/bundle-config.ronn +5 -9
- data/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/man/bundle-doctor.1.txt +9 -9
- data/bundler/man/bundle-exec.1 +1 -1
- data/bundler/man/bundle-exec.1.txt +84 -81
- data/bundler/man/bundle-gem.1 +25 -3
- data/bundler/man/bundle-gem.1.txt +65 -39
- data/bundler/man/bundle-gem.ronn +30 -7
- data/bundler/man/bundle-info.1 +1 -1
- data/bundler/man/bundle-info.1.txt +2 -2
- data/bundler/man/bundle-init.1 +1 -1
- data/bundler/man/bundle-init.1.txt +9 -9
- data/bundler/man/bundle-inject.1 +1 -1
- data/bundler/man/bundle-inject.1.txt +4 -4
- data/bundler/man/bundle-install.1 +1 -1
- data/bundler/man/bundle-install.1.txt +169 -169
- data/bundler/man/bundle-list.1 +1 -1
- data/bundler/man/bundle-list.1.txt +7 -7
- data/bundler/man/bundle-lock.1 +1 -1
- data/bundler/man/bundle-lock.1.txt +28 -28
- data/bundler/man/bundle-open.1 +1 -1
- data/bundler/man/bundle-open.1.txt +3 -3
- data/bundler/man/bundle-outdated.1 +1 -1
- data/bundler/man/bundle-outdated.1.txt +34 -34
- data/bundler/man/bundle-platform.1 +1 -1
- data/bundler/man/bundle-platform.1.txt +16 -16
- data/bundler/man/bundle-pristine.1 +1 -1
- data/bundler/man/bundle-pristine.1.txt +8 -8
- data/bundler/man/bundle-remove.1 +1 -1
- data/bundler/man/bundle-remove.1.txt +9 -9
- data/bundler/man/bundle-show.1 +1 -1
- data/bundler/man/bundle-show.1.txt +8 -8
- data/bundler/man/bundle-update.1 +1 -1
- data/bundler/man/bundle-update.1.txt +149 -148
- data/bundler/man/bundle-viz.1 +1 -1
- data/bundler/man/bundle-viz.1.txt +11 -11
- data/bundler/man/bundle.1 +1 -1
- data/bundler/man/bundle.1.txt +31 -31
- data/bundler/man/gemfile.5 +1 -1
- data/bundler/man/gemfile.5.txt +218 -216
- data/lib/rubygems.rb +135 -185
- data/lib/rubygems/available_set.rb +4 -4
- data/lib/rubygems/basic_specification.rb +12 -6
- data/lib/rubygems/bundler_version_finder.rb +14 -9
- data/lib/rubygems/command.rb +17 -15
- data/lib/rubygems/command_manager.rb +4 -3
- data/lib/rubygems/commands/cert_command.rb +1 -1
- data/lib/rubygems/commands/cleanup_command.rb +3 -3
- data/lib/rubygems/commands/contents_command.rb +4 -4
- data/lib/rubygems/commands/dependency_command.rb +6 -6
- data/lib/rubygems/commands/fetch_command.rb +2 -2
- data/lib/rubygems/commands/help_command.rb +2 -2
- data/lib/rubygems/commands/info_command.rb +9 -4
- data/lib/rubygems/commands/install_command.rb +3 -3
- data/lib/rubygems/commands/list_command.rb +9 -6
- data/lib/rubygems/commands/lock_command.rb +1 -1
- data/lib/rubygems/commands/open_command.rb +0 -2
- data/lib/rubygems/commands/pristine_command.rb +10 -2
- data/lib/rubygems/commands/push_command.rb +4 -42
- data/lib/rubygems/commands/query_command.rb +7 -352
- data/lib/rubygems/commands/search_command.rb +8 -6
- data/lib/rubygems/commands/setup_command.rb +156 -45
- data/lib/rubygems/commands/sources_command.rb +3 -3
- data/lib/rubygems/commands/specification_command.rb +2 -2
- data/lib/rubygems/commands/stale_command.rb +1 -1
- data/lib/rubygems/commands/uninstall_command.rb +2 -2
- data/lib/rubygems/commands/unpack_command.rb +1 -1
- data/lib/rubygems/commands/update_command.rb +40 -10
- data/lib/rubygems/config_file.rb +11 -2
- data/lib/rubygems/core_ext/kernel_require.rb +26 -36
- data/lib/rubygems/defaults.rb +99 -5
- data/lib/rubygems/dependency.rb +2 -5
- data/lib/rubygems/dependency_installer.rb +1 -73
- data/lib/rubygems/dependency_list.rb +7 -7
- data/lib/rubygems/deprecate.rb +46 -1
- data/lib/rubygems/doctor.rb +4 -2
- data/lib/rubygems/errors.rb +3 -2
- data/lib/rubygems/exceptions.rb +2 -13
- data/lib/rubygems/ext.rb +6 -6
- data/lib/rubygems/ext/build_error.rb +2 -0
- data/lib/rubygems/ext/builder.rb +4 -2
- data/lib/rubygems/ext/cmake_builder.rb +1 -1
- data/lib/rubygems/ext/ext_conf_builder.rb +6 -7
- data/lib/rubygems/gem_runner.rb +3 -8
- data/lib/rubygems/gemcutter_utilities.rb +1 -1
- data/lib/rubygems/indexer.rb +1 -19
- data/lib/rubygems/install_update_options.rb +5 -5
- data/lib/rubygems/installer.rb +45 -42
- data/lib/rubygems/installer_test_case.rb +19 -2
- data/lib/rubygems/installer_uninstaller_utils.rb +24 -0
- data/lib/rubygems/local_remote_options.rb +1 -1
- data/lib/rubygems/name_tuple.rb +2 -4
- data/lib/rubygems/package.rb +8 -13
- data/lib/rubygems/package/old.rb +1 -1
- data/lib/rubygems/package/tar_header.rb +3 -3
- data/lib/rubygems/package/tar_reader.rb +0 -1
- data/lib/rubygems/package/tar_reader/entry.rb +0 -1
- data/lib/rubygems/package/tar_test_case.rb +1 -1
- data/lib/rubygems/package/tar_writer.rb +2 -6
- data/lib/rubygems/package_task.rb +1 -5
- data/lib/rubygems/path_support.rb +1 -1
- data/lib/rubygems/platform.rb +3 -3
- data/lib/rubygems/query_utils.rb +362 -0
- data/lib/rubygems/rdoc.rb +0 -12
- data/lib/rubygems/remote_fetcher.rb +5 -19
- data/lib/rubygems/request/connection_pools.rb +1 -1
- data/lib/rubygems/request_set.rb +5 -5
- data/lib/rubygems/request_set/gem_dependency_api.rb +2 -2
- data/lib/rubygems/request_set/lockfile.rb +8 -8
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +1 -1
- data/lib/rubygems/requirement.rb +14 -15
- data/lib/rubygems/resolver.rb +7 -8
- data/lib/rubygems/resolver/api_set.rb +4 -4
- data/lib/rubygems/resolver/api_specification.rb +1 -1
- data/lib/rubygems/resolver/composed_set.rb +3 -3
- data/lib/rubygems/resolver/conflict.rb +1 -1
- data/lib/rubygems/resolver/index_set.rb +1 -1
- data/lib/rubygems/resolver/installer_set.rb +3 -3
- data/lib/rubygems/resolver/lock_set.rb +1 -1
- data/lib/rubygems/safe_yaml.rb +4 -4
- data/lib/rubygems/security.rb +25 -25
- data/lib/rubygems/security/policy.rb +3 -3
- data/lib/rubygems/security/signer.rb +4 -4
- data/lib/rubygems/security/trust_dir.rb +1 -1
- data/lib/rubygems/server.rb +9 -9
- data/lib/rubygems/source/git.rb +7 -6
- data/lib/rubygems/source/local.rb +2 -2
- data/lib/rubygems/source_list.rb +6 -5
- data/lib/rubygems/spec_fetcher.rb +18 -15
- data/lib/rubygems/specification.rb +91 -112
- data/lib/rubygems/specification_policy.rb +88 -28
- data/lib/rubygems/test_case.rb +122 -81
- data/lib/rubygems/test_utilities.rb +6 -6
- data/lib/rubygems/uninstaller.rb +35 -14
- data/lib/rubygems/user_interaction.rb +1 -10
- data/lib/rubygems/util.rb +17 -3
- data/lib/rubygems/util/licenses.rb +4 -4
- data/lib/rubygems/validator.rb +1 -1
- data/lib/rubygems/version.rb +5 -5
- data/rubygems-update.gemspec +2 -2
- data/setup.rb +2 -7
- data/test/rubygems/specifications/bar-0.0.2.gemspec +0 -2
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +12 -0
- data/test/rubygems/test_bundled_ca.rb +1 -5
- data/test/rubygems/test_deprecate.rb +43 -4
- data/test/rubygems/test_gem.rb +150 -101
- data/test/rubygems/test_gem_available_set.rb +3 -3
- data/test/rubygems/test_gem_bundler_version_finder.rb +19 -1
- data/test/rubygems/test_gem_command.rb +24 -3
- data/test/rubygems/test_gem_command_manager.rb +37 -4
- data/test/rubygems/test_gem_commands_build_command.rb +25 -3
- data/test/rubygems/test_gem_commands_cert_command.rb +2 -2
- data/test/rubygems/test_gem_commands_cleanup_command.rb +1 -1
- data/test/rubygems/test_gem_commands_contents_command.rb +48 -15
- data/test/rubygems/test_gem_commands_environment_command.rb +21 -21
- data/test/rubygems/test_gem_commands_generate_index_command.rb +1 -5
- data/test/rubygems/test_gem_commands_info_command.rb +6 -6
- data/test/rubygems/test_gem_commands_install_command.rb +31 -31
- data/test/rubygems/test_gem_commands_mirror.rb +1 -1
- data/test/rubygems/test_gem_commands_open_command.rb +4 -4
- data/test/rubygems/test_gem_commands_owner_command.rb +11 -3
- data/test/rubygems/test_gem_commands_pristine_command.rb +41 -8
- data/test/rubygems/test_gem_commands_push_command.rb +7 -2
- data/test/rubygems/test_gem_commands_query_command.rb +9 -5
- data/test/rubygems/test_gem_commands_setup_command.rb +212 -114
- data/test/rubygems/test_gem_commands_signin_command.rb +6 -4
- data/test/rubygems/test_gem_commands_signout_command.rb +0 -5
- data/test/rubygems/test_gem_commands_sources_command.rb +39 -1
- data/test/rubygems/test_gem_commands_specification_command.rb +18 -18
- data/test/rubygems/test_gem_commands_uninstall_command.rb +2 -1
- data/test/rubygems/test_gem_commands_update_command.rb +68 -5
- data/test/rubygems/test_gem_commands_which_command.rb +3 -3
- data/test/rubygems/test_gem_commands_yank_command.rb +14 -6
- data/test/rubygems/test_gem_config_file.rb +7 -10
- data/test/rubygems/test_gem_dependency_installer.rb +52 -189
- data/test/rubygems/test_gem_dependency_list.rb +8 -8
- data/test/rubygems/test_gem_dependency_resolution_error.rb +1 -1
- data/test/rubygems/test_gem_doctor.rb +28 -0
- data/test/rubygems/test_gem_ext_builder.rb +14 -25
- data/test/rubygems/test_gem_ext_cmake_builder.rb +13 -12
- data/test/rubygems/test_gem_ext_configure_builder.rb +1 -9
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +0 -1
- data/test/rubygems/test_gem_ext_rake_builder.rb +9 -9
- data/test/rubygems/test_gem_gem_runner.rb +42 -0
- data/test/rubygems/test_gem_gemcutter_utilities.rb +5 -0
- data/test/rubygems/test_gem_indexer.rb +9 -13
- data/test/rubygems/test_gem_installer.rb +158 -67
- data/test/rubygems/test_gem_package.rb +16 -20
- data/test/rubygems/test_gem_package_tar_header.rb +19 -0
- data/test/rubygems/test_gem_package_tar_writer.rb +8 -3
- data/test/rubygems/test_gem_package_task.rb +46 -11
- data/test/rubygems/test_gem_remote_fetcher.rb +152 -190
- data/test/rubygems/test_gem_request.rb +11 -11
- data/test/rubygems/test_gem_request_set.rb +72 -20
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +3 -3
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +9 -9
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +118 -118
- data/test/rubygems/test_gem_requirement.rb +2 -2
- data/test/rubygems/test_gem_resolver.rb +6 -6
- data/test/rubygems/test_gem_resolver_api_set.rb +3 -3
- data/test/rubygems/test_gem_resolver_best_set.rb +2 -2
- data/test/rubygems/test_gem_resolver_index_set.rb +2 -2
- data/test/rubygems/test_gem_resolver_installer_set.rb +7 -7
- data/test/rubygems/test_gem_resolver_lock_set.rb +3 -3
- data/test/rubygems/test_gem_security.rb +20 -20
- data/test/rubygems/test_gem_security_policy.rb +5 -8
- data/test/rubygems/test_gem_security_signer.rb +8 -8
- data/test/rubygems/test_gem_security_trust_dir.rb +2 -2
- data/test/rubygems/test_gem_server.rb +10 -10
- data/test/rubygems/test_gem_source.rb +12 -14
- data/test/rubygems/test_gem_source_git.rb +12 -11
- data/test/rubygems/test_gem_source_installed.rb +7 -7
- data/test/rubygems/test_gem_source_local.rb +8 -8
- data/test/rubygems/test_gem_source_lock.rb +10 -10
- data/test/rubygems/test_gem_source_specific_file.rb +7 -7
- data/test/rubygems/test_gem_source_vendor.rb +7 -7
- data/test/rubygems/test_gem_spec_fetcher.rb +11 -2
- data/test/rubygems/test_gem_specification.rb +169 -119
- data/test/rubygems/test_gem_stream_ui.rb +3 -1
- data/test/rubygems/test_gem_stub_specification.rb +0 -1
- data/test/rubygems/test_gem_text.rb +1 -1
- data/test/rubygems/test_gem_uninstaller.rb +134 -10
- data/test/rubygems/test_gem_util.rb +7 -5
- data/test/rubygems/test_gem_version.rb +1 -1
- data/test/rubygems/test_kernel.rb +25 -8
- data/test/rubygems/test_project_sanity.rb +8 -1
- data/test/rubygems/test_require.rb +242 -40
- metadata +33 -46
- data/.bundle/config +0 -2
- data/.rubocop.yml +0 -91
- data/Gemfile +0 -8
- data/Gemfile.lock +0 -43
- data/bundler/CODE_OF_CONDUCT.md +0 -136
- data/lib/rubygems/source_local.rb +0 -7
- data/lib/rubygems/source_specific_file.rb +0 -6
- data/lib/ubygems.rb +0 -14
- data/tmp/.keep +0 -0
- data/util/CL2notes +0 -55
- data/util/bisect +0 -10
- data/util/ci.sh +0 -62
- data/util/cops/deprecations.rb +0 -52
- data/util/create_certs.rb +0 -171
- data/util/create_certs.sh +0 -27
- data/util/create_encrypted_key.rb +0 -16
- data/util/generate_spdx_license_list.rb +0 -63
- data/util/patch_with_prs.rb +0 -77
- data/util/rubocop +0 -8
- data/util/update_bundled_ca_certificates.rb +0 -139
- data/util/update_changelog.rb +0 -67
@@ -15,6 +15,10 @@ module Bundler
|
|
15
15
|
new(opts[:dir], opts[:name]).install
|
16
16
|
end
|
17
17
|
|
18
|
+
def tag_prefix=(prefix)
|
19
|
+
instance.tag_prefix = prefix
|
20
|
+
end
|
21
|
+
|
18
22
|
def gemspec(&block)
|
19
23
|
gemspec = instance.gemspec
|
20
24
|
block.call(gemspec) if block
|
@@ -24,12 +28,15 @@ module Bundler
|
|
24
28
|
|
25
29
|
attr_reader :spec_path, :base, :gemspec
|
26
30
|
|
31
|
+
attr_writer :tag_prefix
|
32
|
+
|
27
33
|
def initialize(base = nil, name = nil)
|
28
|
-
@base = (base
|
29
|
-
gemspecs = name ? [File.join(base, "#{name}.gemspec")] : Dir[File.join(base, "{,*}.gemspec")]
|
34
|
+
@base = File.expand_path(base || SharedHelpers.pwd)
|
35
|
+
gemspecs = name ? [File.join(@base, "#{name}.gemspec")] : Dir[File.join(@base, "{,*}.gemspec")]
|
30
36
|
raise "Unable to determine name from existing gemspec. Use :name => 'gemname' in #install_tasks to manually set it." unless gemspecs.size == 1
|
31
37
|
@spec_path = gemspecs.first
|
32
38
|
@gemspec = Bundler.load_gemspec(@spec_path)
|
39
|
+
@tag_prefix = ""
|
33
40
|
end
|
34
41
|
|
35
42
|
def install
|
@@ -73,7 +80,7 @@ module Bundler
|
|
73
80
|
|
74
81
|
def build_gem
|
75
82
|
file_name = nil
|
76
|
-
sh(
|
83
|
+
sh([*gem_command, "build", "-V", spec_path]) do
|
77
84
|
file_name = File.basename(built_gem_path)
|
78
85
|
SharedHelpers.filesystem_access(File.join(base, "pkg")) {|p| FileUtils.mkdir_p(p) }
|
79
86
|
FileUtils.mv(built_gem_path, "pkg")
|
@@ -84,9 +91,9 @@ module Bundler
|
|
84
91
|
|
85
92
|
def install_gem(built_gem_path = nil, local = false)
|
86
93
|
built_gem_path ||= build_gem
|
87
|
-
cmd =
|
88
|
-
cmd
|
89
|
-
_, status = sh_with_status(cmd
|
94
|
+
cmd = [*gem_command, "install", built_gem_path.to_s]
|
95
|
+
cmd << "--local" if local
|
96
|
+
_, status = sh_with_status(cmd)
|
90
97
|
unless status.success?
|
91
98
|
raise "Couldn't install gem, run `gem install #{built_gem_path}' for more detailed output"
|
92
99
|
end
|
@@ -96,11 +103,11 @@ module Bundler
|
|
96
103
|
protected
|
97
104
|
|
98
105
|
def rubygem_push(path)
|
99
|
-
cmd =
|
106
|
+
cmd = [*gem_command, "push", path]
|
100
107
|
cmd << "--key" << gem_key if gem_key
|
101
108
|
cmd << "--host" << allowed_push_host if allowed_push_host
|
102
109
|
unless allowed_push_host || Bundler.user_home.join(".gem/credentials").file?
|
103
|
-
raise "Your rubygems.org credentials aren't set. Run `gem
|
110
|
+
raise "Your rubygems.org credentials aren't set. Run `gem signin` to set them."
|
104
111
|
end
|
105
112
|
sh_with_input(cmd)
|
106
113
|
Bundler.ui.confirm "Pushed #{name} #{version} to #{gem_push_host}"
|
@@ -130,9 +137,8 @@ module Bundler
|
|
130
137
|
|
131
138
|
def perform_git_push(options = "")
|
132
139
|
cmd = "git push #{options}"
|
133
|
-
out, status = sh_with_status(cmd)
|
140
|
+
out, status = sh_with_status(cmd.shellsplit)
|
134
141
|
return if status.success?
|
135
|
-
cmd = cmd.shelljoin if cmd.respond_to?(:shelljoin)
|
136
142
|
raise "Couldn't git push. `#{cmd}' failed with the following output:\n\n#{out}\n"
|
137
143
|
end
|
138
144
|
|
@@ -169,7 +175,7 @@ module Bundler
|
|
169
175
|
end
|
170
176
|
|
171
177
|
def version_tag
|
172
|
-
"v#{version}"
|
178
|
+
"#{@tag_prefix}v#{version}"
|
173
179
|
end
|
174
180
|
|
175
181
|
def name
|
@@ -211,7 +217,7 @@ module Bundler
|
|
211
217
|
end
|
212
218
|
|
213
219
|
def gem_command
|
214
|
-
ENV["GEM_COMMAND"]
|
220
|
+
ENV["GEM_COMMAND"]&.shellsplit || ["gem"]
|
215
221
|
end
|
216
222
|
end
|
217
223
|
end
|
@@ -7,7 +7,7 @@ module Bundler
|
|
7
7
|
# available dependency versions as found in its index, before returning it to
|
8
8
|
# to the resolution engine to select the best version.
|
9
9
|
class GemVersionPromoter
|
10
|
-
DEBUG = ENV["DEBUG_RESOLVER"]
|
10
|
+
DEBUG = ENV["BUNDLER_DEBUG_RESOLVER"] || ENV["DEBUG_RESOLVER"]
|
11
11
|
|
12
12
|
attr_reader :level, :locked_specs, :unlock_gems
|
13
13
|
|
@@ -180,10 +180,21 @@ module Bundler
|
|
180
180
|
def remove_gems_from_gemfile(gems, gemfile_path)
|
181
181
|
patterns = /gem\s+(['"])#{Regexp.union(gems)}\1|gem\s*\((['"])#{Regexp.union(gems)}\2\)/
|
182
182
|
|
183
|
-
|
184
|
-
|
183
|
+
new_gemfile = []
|
184
|
+
multiline_removal = false
|
185
|
+
IO.readlines(gemfile_path).each do |line|
|
186
|
+
if line.match(patterns)
|
187
|
+
multiline_removal = line.rstrip.end_with?(",")
|
188
|
+
# skip lines which match the regex
|
189
|
+
next
|
190
|
+
end
|
191
|
+
|
192
|
+
# skip followup lines until line does not end with ','
|
193
|
+
new_gemfile << line unless multiline_removal
|
194
|
+
multiline_removal = line.rstrip.end_with?(",") if multiline_removal
|
195
|
+
end
|
185
196
|
|
186
|
-
# remove
|
197
|
+
# remove line \n and append them with other strings
|
187
198
|
new_gemfile.each_with_index do |_line, index|
|
188
199
|
if new_gemfile[index + 1] == "\n"
|
189
200
|
new_gemfile[index] += new_gemfile[index + 1]
|
@@ -58,7 +58,7 @@ def gemfile(install = false, options = {}, &gemfile)
|
|
58
58
|
|
59
59
|
Bundler.ui = install ? ui : Bundler::UI::Silent.new
|
60
60
|
if install || definition.missing_specs?
|
61
|
-
Bundler.settings.temporary(:inline => true
|
61
|
+
Bundler.settings.temporary(:inline => true) do
|
62
62
|
installer = Bundler::Installer.install(Bundler.root, definition, :system => true)
|
63
63
|
installer.post_install_messages.each do |name, message|
|
64
64
|
Bundler.ui.info "Post-install message from #{name}:\n#{message}"
|
@@ -78,7 +78,7 @@ def gemfile(install = false, options = {}, &gemfile)
|
|
78
78
|
if old_gemfile
|
79
79
|
ENV["BUNDLE_GEMFILE"] = old_gemfile
|
80
80
|
else
|
81
|
-
ENV
|
81
|
+
ENV["BUNDLE_GEMFILE"] = ""
|
82
82
|
end
|
83
83
|
end
|
84
84
|
end
|
@@ -135,12 +135,17 @@ module Bundler
|
|
135
135
|
next
|
136
136
|
end
|
137
137
|
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
138
|
+
mode = Bundler::WINDOWS ? "wb:UTF-8" : "w"
|
139
|
+
content = if RUBY_VERSION >= "2.6"
|
140
|
+
ERB.new(template, :trim_mode => "-").result(binding)
|
141
|
+
else
|
142
|
+
ERB.new(template, nil, "-").result(binding)
|
143
|
+
end
|
144
|
+
|
145
|
+
File.write(binstub_path, content, :mode => mode, :perm => 0o777 & ~File.umask)
|
146
|
+
if Bundler::WINDOWS
|
147
|
+
prefix = "@ruby -x \"%~f0\" %*\n@exit /b %ERRORLEVEL%\n\n"
|
148
|
+
File.write("#{binstub_path}.cmd", prefix + content, :mode => mode)
|
144
149
|
end
|
145
150
|
end
|
146
151
|
|
@@ -175,12 +180,18 @@ module Bundler
|
|
175
180
|
next if executable == "bundle"
|
176
181
|
executable_path = Pathname(spec.full_gem_path).join(spec.bindir, executable).relative_path_from(bin_path)
|
177
182
|
executable_path = executable_path
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
183
|
+
|
184
|
+
mode = Bundler::WINDOWS ? "wb:UTF-8" : "w"
|
185
|
+
content = if RUBY_VERSION >= "2.6"
|
186
|
+
ERB.new(template, :trim_mode => "-").result(binding)
|
187
|
+
else
|
188
|
+
ERB.new(template, nil, "-").result(binding)
|
189
|
+
end
|
190
|
+
|
191
|
+
File.write("#{bin_path}/#{executable}", content, :mode => mode, :perm => 0o755)
|
192
|
+
if Bundler::WINDOWS
|
193
|
+
prefix = "@ruby -x \"%~f0\" %*\n@exit /b %ERRORLEVEL%\n\n"
|
194
|
+
File.write("#{bin_path}/#{executable}.cmd", prefix + content, :mode => mode)
|
184
195
|
end
|
185
196
|
end
|
186
197
|
end
|
@@ -202,20 +213,14 @@ module Bundler
|
|
202
213
|
return jobs
|
203
214
|
end
|
204
215
|
|
205
|
-
return 1 unless can_install_in_parallel?
|
206
|
-
|
207
|
-
auto_config_jobs = Bundler.feature_flag.auto_config_jobs?
|
208
216
|
if jobs = Bundler.settings[:jobs]
|
209
|
-
|
210
|
-
jobs
|
211
|
-
else
|
212
|
-
[jobs.pred, 1].max
|
213
|
-
end
|
214
|
-
elsif auto_config_jobs
|
215
|
-
processor_count
|
216
|
-
else
|
217
|
-
1
|
217
|
+
return jobs
|
218
218
|
end
|
219
|
+
|
220
|
+
# Parallelization has some issues on Windows, so it's not yet the default
|
221
|
+
return 1 if Gem.win_platform?
|
222
|
+
|
223
|
+
processor_count
|
219
224
|
end
|
220
225
|
|
221
226
|
def processor_count
|
@@ -274,10 +279,6 @@ module Bundler
|
|
274
279
|
end
|
275
280
|
end
|
276
281
|
|
277
|
-
def can_install_in_parallel?
|
278
|
-
true
|
279
|
-
end
|
280
|
-
|
281
282
|
def install_in_parallel(size, standalone, force = false)
|
282
283
|
spec_installations = ParallelInstaller.call(self, @definition.specs, size, standalone, force)
|
283
284
|
spec_installations.each do |installation|
|
@@ -19,11 +19,11 @@ module Bundler
|
|
19
19
|
Bundler.ui.debug "#{worker}: #{spec.name} (#{spec.version}) from #{spec.loaded_from}"
|
20
20
|
generate_executable_stubs
|
21
21
|
return true, post_install_message
|
22
|
-
rescue Bundler::InstallHookError, Bundler::SecurityError, APIResponseMismatchError
|
22
|
+
rescue Bundler::InstallHookError, Bundler::SecurityError, Bundler::APIResponseMismatchError
|
23
23
|
raise
|
24
24
|
rescue Errno::ENOSPC
|
25
25
|
return false, out_of_space_message
|
26
|
-
rescue
|
26
|
+
rescue Bundler::BundlerError, Gem::InstallError, Bundler::APIResponseInvalidDependenciesError => e
|
27
27
|
return false, specific_failure_message(e)
|
28
28
|
end
|
29
29
|
|
@@ -99,7 +99,7 @@ module Bundler
|
|
99
99
|
install_serially
|
100
100
|
end
|
101
101
|
|
102
|
-
handle_error if
|
102
|
+
handle_error if failed_specs.any?
|
103
103
|
@specs
|
104
104
|
ensure
|
105
105
|
worker_pool && worker_pool.stop
|
@@ -132,6 +132,10 @@ module Bundler
|
|
132
132
|
|
133
133
|
private
|
134
134
|
|
135
|
+
def failed_specs
|
136
|
+
@specs.select(&:failed?)
|
137
|
+
end
|
138
|
+
|
135
139
|
def install_with_worker
|
136
140
|
enqueue_specs
|
137
141
|
process_specs until finished_installing?
|
@@ -156,17 +160,13 @@ module Bundler
|
|
156
160
|
gem_installer = Bundler::GemInstaller.new(
|
157
161
|
spec_install.spec, @installer, @standalone, worker_num, @force
|
158
162
|
)
|
159
|
-
success, message =
|
160
|
-
gem_installer.install_from_spec
|
161
|
-
rescue RuntimeError => e
|
162
|
-
raise e, "#{e}\n\n#{require_tree_for_spec(spec_install.spec)}"
|
163
|
-
end
|
163
|
+
success, message = gem_installer.install_from_spec
|
164
164
|
if success
|
165
165
|
spec_install.state = :installed
|
166
166
|
spec_install.post_install_message = message unless message.nil?
|
167
167
|
else
|
168
|
-
spec_install.state = :failed
|
169
168
|
spec_install.error = "#{message}\n\n#{require_tree_for_spec(spec_install.spec)}"
|
169
|
+
spec_install.state = :failed
|
170
170
|
end
|
171
171
|
Plugin.hook(Plugin::Events::GEM_AFTER_INSTALL, spec_install)
|
172
172
|
spec_install
|
@@ -190,11 +190,11 @@ module Bundler
|
|
190
190
|
end
|
191
191
|
|
192
192
|
def handle_error
|
193
|
-
errors =
|
193
|
+
errors = failed_specs.map(&:error)
|
194
194
|
if exception = errors.find {|e| e.is_a?(Bundler::BundlerError) }
|
195
195
|
raise exception
|
196
196
|
end
|
197
|
-
raise Bundler::InstallError, errors.
|
197
|
+
raise Bundler::InstallError, errors.join("\n\n")
|
198
198
|
end
|
199
199
|
|
200
200
|
def require_tree_for_spec(spec)
|
@@ -46,6 +46,14 @@ module Bundler
|
|
46
46
|
identifier == other.identifier
|
47
47
|
end
|
48
48
|
|
49
|
+
def eql?(other)
|
50
|
+
identifier.eql?(other.identifier)
|
51
|
+
end
|
52
|
+
|
53
|
+
def hash
|
54
|
+
identifier.hash
|
55
|
+
end
|
56
|
+
|
49
57
|
def satisfies?(dependency)
|
50
58
|
@name == dependency.name && dependency.requirement.satisfied_by?(Gem::Version.new(@version))
|
51
59
|
end
|
@@ -68,12 +76,17 @@ module Bundler
|
|
68
76
|
end
|
69
77
|
|
70
78
|
def __materialize__
|
71
|
-
search_object = Bundler.feature_flag.specific_platform? || Bundler.settings[:force_ruby_platform] ? self : Dependency.new(name, version)
|
72
79
|
@specification = if source.is_a?(Source::Gemspec) && source.gemspec.name == name
|
73
80
|
source.gemspec.tap {|s| s.source = source }
|
74
81
|
else
|
75
|
-
|
76
|
-
|
82
|
+
search_object = Bundler.feature_flag.specific_platform? || Bundler.settings[:force_ruby_platform] ? self : Dependency.new(name, version)
|
83
|
+
platform_object = Gem::Platform.new(platform)
|
84
|
+
candidates = source.specs.search(search_object)
|
85
|
+
same_platform_candidates = candidates.select do |spec|
|
86
|
+
MatchPlatform.platforms_match?(spec.platform, platform_object)
|
87
|
+
end
|
88
|
+
search = same_platform_candidates.last || candidates.last
|
89
|
+
if search && Gem::Platform.new(search.platform) != platform_object && !search.runtime_dependencies.-(dependencies.reject {|d| d.type == :development }).empty?
|
77
90
|
Bundler.ui.warn "Unable to use the platform-specific (#{search.platform}) version of #{name} (#{version}) " \
|
78
91
|
"because it has different dependencies from the #{platform} version. " \
|
79
92
|
"To use the platform-specific version of the gem, run `bundle config set specific_platform true` and install again."
|
@@ -47,6 +47,32 @@ module Bundler
|
|
47
47
|
Bundler.ui.error "Failed to install plugin #{name}: #{e.message}\n #{e.backtrace.join("\n ")}"
|
48
48
|
end
|
49
49
|
|
50
|
+
# Uninstalls plugins by the given names
|
51
|
+
#
|
52
|
+
# @param [Array<String>] names the names of plugins to be uninstalled
|
53
|
+
def uninstall(names, options)
|
54
|
+
if names.empty? && !options[:all]
|
55
|
+
Bundler.ui.error "No plugins to uninstall. Specify at least 1 plugin to uninstall.\n"\
|
56
|
+
"Use --all option to uninstall all the installed plugins."
|
57
|
+
return
|
58
|
+
end
|
59
|
+
|
60
|
+
names = index.installed_plugins if options[:all]
|
61
|
+
if names.any?
|
62
|
+
names.each do |name|
|
63
|
+
if index.installed?(name)
|
64
|
+
Bundler.rm_rf(index.plugin_path(name))
|
65
|
+
index.unregister_plugin(name)
|
66
|
+
Bundler.ui.info "Uninstalled plugin #{name}"
|
67
|
+
else
|
68
|
+
Bundler.ui.error "Plugin #{name} is not installed \n"
|
69
|
+
end
|
70
|
+
end
|
71
|
+
else
|
72
|
+
Bundler.ui.info "No plugins installed"
|
73
|
+
end
|
74
|
+
end
|
75
|
+
|
50
76
|
# List installed plugins and commands
|
51
77
|
#
|
52
78
|
def list
|
@@ -71,6 +71,15 @@ module Bundler
|
|
71
71
|
raise
|
72
72
|
end
|
73
73
|
|
74
|
+
def unregister_plugin(name)
|
75
|
+
@commands.delete_if {|_, v| v == name }
|
76
|
+
@sources.delete_if {|_, v| v == name }
|
77
|
+
@hooks.each {|_, plugin_names| plugin_names.delete(name) }
|
78
|
+
@plugin_paths.delete(name)
|
79
|
+
@load_paths.delete(name)
|
80
|
+
save_index
|
81
|
+
end
|
82
|
+
|
74
83
|
# Path of default index file
|
75
84
|
def index_file
|
76
85
|
Plugin.root.join("index")
|
@@ -1,11 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
# Psych could be a gem, so try to ask for it
|
4
|
-
begin
|
5
|
-
gem "psych"
|
6
|
-
rescue LoadError
|
7
|
-
end if defined?(gem)
|
8
|
-
|
9
3
|
# Psych could be in the stdlib
|
10
4
|
# but it's too late if Syck is already loaded
|
11
5
|
begin
|
@@ -26,12 +20,3 @@ module Bundler
|
|
26
20
|
YamlLibrarySyntaxError = ::ArgumentError
|
27
21
|
end
|
28
22
|
end
|
29
|
-
|
30
|
-
require_relative "deprecate"
|
31
|
-
begin
|
32
|
-
Bundler::Deprecate.skip_during do
|
33
|
-
require "rubygems/safe_yaml"
|
34
|
-
end
|
35
|
-
rescue LoadError
|
36
|
-
# it's OK if the file isn't there
|
37
|
-
end
|
@@ -50,6 +50,8 @@ module Bundler
|
|
50
50
|
# once the remote gem is downloaded, the backend specification will
|
51
51
|
# be swapped out.
|
52
52
|
def __swap__(spec)
|
53
|
+
raise APIResponseInvalidDependenciesError unless spec.dependencies.all? {|d| d.is_a?(Gem::Dependency) }
|
54
|
+
|
53
55
|
SharedHelpers.ensure_same_dependencies(self, dependencies, spec.dependencies)
|
54
56
|
@_remote_specification = spec
|
55
57
|
end
|
@@ -76,7 +78,8 @@ module Bundler
|
|
76
78
|
deps = method_missing(:dependencies)
|
77
79
|
|
78
80
|
# allow us to handle when the specs dependencies are an array of array of string
|
79
|
-
#
|
81
|
+
# in order to delay the crash to `#__swap__` where it results in a friendlier error
|
82
|
+
# see https://github.com/rubygems/bundler/issues/5797
|
80
83
|
deps = deps.map {|d| d.is_a?(Gem::Dependency) ? d : Gem::Dependency.new(*d) }
|
81
84
|
|
82
85
|
deps
|
@@ -75,12 +75,17 @@ module Bundler
|
|
75
75
|
return unless debug?
|
76
76
|
debug_info = yield
|
77
77
|
debug_info = debug_info.inspect unless debug_info.is_a?(String)
|
78
|
-
warn debug_info.split("\n").map {|s| " " * depth + s }
|
78
|
+
warn debug_info.split("\n").map {|s| "BUNDLER: " + " " * depth + s }
|
79
79
|
end
|
80
80
|
|
81
81
|
def debug?
|
82
82
|
return @debug_mode if defined?(@debug_mode)
|
83
|
-
@debug_mode =
|
83
|
+
@debug_mode =
|
84
|
+
ENV["BUNDLER_DEBUG_RESOLVER"] ||
|
85
|
+
ENV["BUNDLER_DEBUG_RESOLVER_TREE"] ||
|
86
|
+
ENV["DEBUG_RESOLVER"] ||
|
87
|
+
ENV["DEBUG_RESOLVER_TREE"] ||
|
88
|
+
false
|
84
89
|
end
|
85
90
|
|
86
91
|
def before_resolution
|
@@ -146,7 +151,26 @@ module Bundler
|
|
146
151
|
@gem_version_promoter.sort_versions(dependency, spec_groups)
|
147
152
|
end
|
148
153
|
end
|
149
|
-
|
154
|
+
selected_sgs = []
|
155
|
+
search.each do |sg|
|
156
|
+
next unless sg.for?(platform)
|
157
|
+
# Add a spec group for "non platform specific spec" as the fallback
|
158
|
+
# spec group.
|
159
|
+
sg_ruby = sg.copy_for(Gem::Platform::RUBY)
|
160
|
+
selected_sgs << sg_ruby if sg_ruby
|
161
|
+
sg_all_platforms = nil
|
162
|
+
all_platforms = @platforms + [platform]
|
163
|
+
sorted_all_platforms = self.class.sort_platforms(all_platforms)
|
164
|
+
sorted_all_platforms.reverse_each do |other_platform|
|
165
|
+
if sg_all_platforms.nil?
|
166
|
+
sg_all_platforms = sg.copy_for(other_platform)
|
167
|
+
else
|
168
|
+
sg_all_platforms.activate_platform!(other_platform)
|
169
|
+
end
|
170
|
+
end
|
171
|
+
selected_sgs << sg_all_platforms
|
172
|
+
end
|
173
|
+
selected_sgs
|
150
174
|
end
|
151
175
|
|
152
176
|
def index_for(dependency)
|
@@ -183,9 +207,7 @@ module Bundler
|
|
183
207
|
end
|
184
208
|
|
185
209
|
def requirement_satisfied_by?(requirement, activated, spec)
|
186
|
-
|
187
|
-
spec.activate_platform!(requirement.__platform) if !@platforms || @platforms.include?(requirement.__platform)
|
188
|
-
true
|
210
|
+
requirement.matches_spec?(spec) || spec.source.is_a?(Source::Gemspec)
|
189
211
|
end
|
190
212
|
|
191
213
|
def relevant_sources_for_vertex(vertex)
|
@@ -223,8 +245,9 @@ module Bundler
|
|
223
245
|
end
|
224
246
|
|
225
247
|
def self.platform_sort_key(platform)
|
226
|
-
|
227
|
-
|
248
|
+
# Prefer specific platform to not specific platform
|
249
|
+
return ["99-LAST", "", "", ""] if Gem::Platform::RUBY == platform
|
250
|
+
["00", *platform.to_a.map {|part| part || "" }]
|
228
251
|
end
|
229
252
|
|
230
253
|
private
|