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
@@ -9,6 +9,7 @@ module Bundler
|
|
9
9
|
attr_accessor :ignores_bundler_dependencies
|
10
10
|
|
11
11
|
def initialize(all_specs)
|
12
|
+
@all_specs = all_specs
|
12
13
|
raise ArgumentError, "cannot initialize with an empty value" unless exemplary_spec = all_specs.first
|
13
14
|
@name = exemplary_spec.name
|
14
15
|
@version = exemplary_spec.version
|
@@ -28,7 +29,7 @@ module Bundler
|
|
28
29
|
lazy_spec = LazySpecification.new(name, version, s.platform, source)
|
29
30
|
lazy_spec.dependencies.replace s.dependencies
|
30
31
|
lazy_spec
|
31
|
-
end.compact
|
32
|
+
end.compact.uniq
|
32
33
|
end
|
33
34
|
|
34
35
|
def activate_platform!(platform)
|
@@ -37,13 +38,25 @@ module Bundler
|
|
37
38
|
@activated_platforms << platform
|
38
39
|
end
|
39
40
|
|
41
|
+
def copy_for(platform)
|
42
|
+
copied_sg = self.class.new(@all_specs)
|
43
|
+
copied_sg.ignores_bundler_dependencies = @ignores_bundler_dependencies
|
44
|
+
return nil unless copied_sg.for?(platform)
|
45
|
+
copied_sg.activate_platform!(platform)
|
46
|
+
copied_sg
|
47
|
+
end
|
48
|
+
|
49
|
+
def spec_for(platform)
|
50
|
+
@specs[platform]
|
51
|
+
end
|
52
|
+
|
40
53
|
def for?(platform)
|
41
|
-
|
42
|
-
!spec.nil?
|
54
|
+
!spec_for(platform).nil?
|
43
55
|
end
|
44
56
|
|
45
57
|
def to_s
|
46
|
-
|
58
|
+
activated_platforms_string = sorted_activated_platforms.join(", ")
|
59
|
+
"#{name} (#{version}) (#{activated_platforms_string})"
|
47
60
|
end
|
48
61
|
|
49
62
|
def dependencies_for_activated_platforms
|
@@ -58,6 +71,7 @@ module Bundler
|
|
58
71
|
return unless other.is_a?(SpecGroup)
|
59
72
|
name == other.name &&
|
60
73
|
version == other.version &&
|
74
|
+
sorted_activated_platforms == other.sorted_activated_platforms &&
|
61
75
|
source == other.source
|
62
76
|
end
|
63
77
|
|
@@ -65,11 +79,18 @@ module Bundler
|
|
65
79
|
return unless other.is_a?(SpecGroup)
|
66
80
|
name.eql?(other.name) &&
|
67
81
|
version.eql?(other.version) &&
|
82
|
+
sorted_activated_platforms.eql?(other.sorted_activated_platforms) &&
|
68
83
|
source.eql?(other.source)
|
69
84
|
end
|
70
85
|
|
71
86
|
def hash
|
72
|
-
|
87
|
+
name.hash ^ version.hash ^ sorted_activated_platforms.hash ^ source.hash
|
88
|
+
end
|
89
|
+
|
90
|
+
protected
|
91
|
+
|
92
|
+
def sorted_activated_platforms
|
93
|
+
@activated_platforms.sort_by(&:to_s)
|
73
94
|
end
|
74
95
|
|
75
96
|
private
|
@@ -47,14 +47,13 @@ module Gem
|
|
47
47
|
full_require_paths
|
48
48
|
end
|
49
49
|
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
end
|
50
|
+
alias_method :rg_extension_dir, :extension_dir
|
51
|
+
def extension_dir
|
52
|
+
@bundler_extension_dir ||= if source.respond_to?(:extension_dir_name)
|
53
|
+
unique_extension_dir = [source.extension_dir_name, File.basename(full_gem_path)].uniq.join("-")
|
54
|
+
File.expand_path(File.join(extensions_dir, unique_extension_dir))
|
55
|
+
else
|
56
|
+
rg_extension_dir
|
58
57
|
end
|
59
58
|
end
|
60
59
|
|
@@ -4,12 +4,6 @@ require "rubygems/installer"
|
|
4
4
|
|
5
5
|
module Bundler
|
6
6
|
class RubyGemsGemInstaller < Gem::Installer
|
7
|
-
unless respond_to?(:at)
|
8
|
-
def self.at(*args)
|
9
|
-
new(*args)
|
10
|
-
end
|
11
|
-
end
|
12
|
-
|
13
7
|
def check_executable_overwrite(filename)
|
14
8
|
# Bundler needs to install gems regardless of binstub overwriting
|
15
9
|
end
|
@@ -20,7 +14,7 @@ module Bundler
|
|
20
14
|
|
21
15
|
def build_extensions
|
22
16
|
extension_cache_path = options[:bundler_extension_cache_path]
|
23
|
-
return super unless extension_cache_path && extension_dir =
|
17
|
+
return super unless extension_cache_path && extension_dir = spec.extension_dir
|
24
18
|
|
25
19
|
extension_dir = Pathname.new(extension_dir)
|
26
20
|
build_complete = SharedHelpers.filesystem_access(extension_cache_path.join("gem.build_complete"), :read, &:file?)
|
@@ -1,5 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require "rubygems" unless defined?(Gem)
|
4
|
+
|
3
5
|
module Bundler
|
4
6
|
class RubygemsIntegration
|
5
7
|
if defined?(Gem::Ext::Builder::CHDIR_MONITOR)
|
@@ -100,11 +102,6 @@ module Bundler
|
|
100
102
|
end.flatten(1)
|
101
103
|
end
|
102
104
|
|
103
|
-
def spec_extension_dir(spec)
|
104
|
-
return unless spec.respond_to?(:extension_dir)
|
105
|
-
spec.extension_dir
|
106
|
-
end
|
107
|
-
|
108
105
|
def stub_set_spec(stub, spec)
|
109
106
|
stub.instance_variable_set(:@spec, spec)
|
110
107
|
end
|
@@ -139,14 +136,10 @@ module Bundler
|
|
139
136
|
end
|
140
137
|
|
141
138
|
def inflate(obj)
|
142
|
-
require "rubygems/util"
|
143
|
-
|
144
139
|
Gem::Util.inflate(obj)
|
145
140
|
end
|
146
141
|
|
147
142
|
def correct_for_windows_path(path)
|
148
|
-
require "rubygems/util"
|
149
|
-
|
150
143
|
if Gem::Util.respond_to?(:correct_for_windows_path)
|
151
144
|
Gem::Util.correct_for_windows_path(path)
|
152
145
|
elsif path[0].chr == "/" && path[1].chr =~ /[a-z]/i && path[2].chr == ":"
|
@@ -221,11 +214,6 @@ module Bundler
|
|
221
214
|
Gem.bin_path(gem, bin, ver)
|
222
215
|
end
|
223
216
|
|
224
|
-
def preserve_paths
|
225
|
-
# this is a no-op outside of RubyGems 1.8
|
226
|
-
yield
|
227
|
-
end
|
228
|
-
|
229
217
|
def loaded_gem_paths
|
230
218
|
loaded_gem_paths = Gem.loaded_specs.map {|_, s| s.full_require_paths }
|
231
219
|
loaded_gem_paths.flatten
|
@@ -263,8 +251,6 @@ module Bundler
|
|
263
251
|
require "rubygems/security"
|
264
252
|
require_relative "psyched_yaml"
|
265
253
|
gem_from_path(path, security_policies[policy]).spec
|
266
|
-
rescue Gem::Package::FormatError
|
267
|
-
raise GemspecError, "Could not read gem at #{path}. It may be corrupted."
|
268
254
|
rescue Exception, Gem::Exception, Gem::Security::Exception => e # rubocop:disable Lint/RescueException
|
269
255
|
if e.is_a?(Gem::Security::Exception) ||
|
270
256
|
e.message =~ /unknown trust policy|unsigned gem/i ||
|
@@ -344,7 +330,7 @@ module Bundler
|
|
344
330
|
raise e
|
345
331
|
end
|
346
332
|
|
347
|
-
# backwards compatibility shim, see https://github.com/
|
333
|
+
# backwards compatibility shim, see https://github.com/rubygems/bundler/issues/5102
|
348
334
|
kernel_class.send(:public, :gem) if Bundler.feature_flag.setup_makes_kernel_gem_public?
|
349
335
|
end
|
350
336
|
end
|
@@ -496,6 +482,14 @@ module Bundler
|
|
496
482
|
end
|
497
483
|
end
|
498
484
|
|
485
|
+
def plain_specs
|
486
|
+
Gem::Specification._all
|
487
|
+
end
|
488
|
+
|
489
|
+
def plain_specs=(specs)
|
490
|
+
Gem::Specification.all = specs
|
491
|
+
end
|
492
|
+
|
499
493
|
def fetch_specs(remote, name)
|
500
494
|
path = remote.uri.to_s + "#{name}.#{Gem.marshal_version}.gz"
|
501
495
|
fetcher = gem_remote_fetcher
|
@@ -563,10 +557,10 @@ module Bundler
|
|
563
557
|
|
564
558
|
def backport_ext_builder_monitor
|
565
559
|
# So we can avoid requiring "rubygems/ext" in its entirety
|
566
|
-
Gem.module_eval <<-
|
560
|
+
Gem.module_eval <<-RUBY, __FILE__, __LINE__ + 1
|
567
561
|
module Ext
|
568
562
|
end
|
569
|
-
|
563
|
+
RUBY
|
570
564
|
|
571
565
|
require "rubygems/ext/builder"
|
572
566
|
|
@@ -43,14 +43,6 @@ module Bundler
|
|
43
43
|
self
|
44
44
|
end
|
45
45
|
|
46
|
-
REQUIRE_ERRORS = [
|
47
|
-
/^no such file to load -- (.+)$/i,
|
48
|
-
/^Missing \w+ (?:file\s*)?([^\s]+.rb)$/i,
|
49
|
-
/^Missing API definition file in (.+)$/i,
|
50
|
-
/^cannot load such file -- (.+)$/i,
|
51
|
-
/^dlopen\([^)]*\): Library not loaded: (.+)$/i,
|
52
|
-
].freeze
|
53
|
-
|
54
46
|
def require(*groups)
|
55
47
|
groups.map!(&:to_sym)
|
56
48
|
groups = [:default] if groups.empty?
|
@@ -79,16 +71,14 @@ module Bundler
|
|
79
71
|
end
|
80
72
|
end
|
81
73
|
rescue LoadError => e
|
82
|
-
|
83
|
-
raise if dep.autorequire || $1 != required_file
|
74
|
+
raise if dep.autorequire || e.path != required_file
|
84
75
|
|
85
76
|
if dep.autorequire.nil? && dep.name.include?("-")
|
86
77
|
begin
|
87
78
|
namespaced_file = dep.name.tr("-", "/")
|
88
79
|
Kernel.require namespaced_file
|
89
80
|
rescue LoadError => e
|
90
|
-
|
91
|
-
raise if $1 != namespaced_file
|
81
|
+
raise if e.path != namespaced_file
|
92
82
|
end
|
93
83
|
end
|
94
84
|
end
|
@@ -12,7 +12,6 @@ module Bundler
|
|
12
12
|
allow_offline_install
|
13
13
|
auto_clean_without_path
|
14
14
|
auto_install
|
15
|
-
auto_config_jobs
|
16
15
|
cache_all
|
17
16
|
cache_all_platforms
|
18
17
|
default_install_uses_path
|
@@ -22,7 +21,6 @@ module Bundler
|
|
22
21
|
disable_exec_load
|
23
22
|
disable_local_branch_check
|
24
23
|
disable_multisource
|
25
|
-
disable_platform_warnings
|
26
24
|
disable_shared_gems
|
27
25
|
disable_version_check
|
28
26
|
force_ruby_platform
|
@@ -44,7 +42,6 @@ module Bundler
|
|
44
42
|
setup_makes_kernel_gem_public
|
45
43
|
silence_deprecations
|
46
44
|
silence_root_warning
|
47
|
-
skip_default_git_sources
|
48
45
|
specific_platform
|
49
46
|
suppress_install_using_messages
|
50
47
|
unlock_source_unlocks_spec
|
@@ -19,4 +19,9 @@ if Bundler::SharedHelpers.in_bundle?
|
|
19
19
|
else
|
20
20
|
Bundler.ui.silence { Bundler.setup }
|
21
21
|
end
|
22
|
+
|
23
|
+
# We might be in the middle of shelling out to rubygems
|
24
|
+
# (RUBYOPT=-rbundler/setup), so we need to give rubygems the opportunity of
|
25
|
+
# not being silent.
|
26
|
+
Gem::DefaultUserInteraction.ui = nil
|
22
27
|
end
|
@@ -18,7 +18,7 @@ module Bundler
|
|
18
18
|
def initialize(command)
|
19
19
|
msg = String.new
|
20
20
|
msg << "Bundler is trying to run a `git #{command}` at runtime. You probably need to run `bundle install`. However, "
|
21
|
-
msg << "this error message could probably be more useful. Please submit a ticket at https://github.com/
|
21
|
+
msg << "this error message could probably be more useful. Please submit a ticket at https://github.com/rubygems/rubygems/issues/new?labels=Bundler&template=bundler-related-issue.md "
|
22
22
|
msg << "with steps to reproduce as well as the following\n\nCALLER: #{caller.join("\n")}"
|
23
23
|
super msg
|
24
24
|
end
|
@@ -27,21 +27,21 @@ module Bundler
|
|
27
27
|
class GitCommandError < GitError
|
28
28
|
attr_reader :command
|
29
29
|
|
30
|
-
def initialize(command, path
|
30
|
+
def initialize(command, path, destination_path, extra_info = nil)
|
31
31
|
@command = command
|
32
32
|
|
33
33
|
msg = String.new
|
34
|
-
msg << "Git error: command `git #{command}` in directory #{
|
34
|
+
msg << "Git error: command `git #{command}` in directory #{destination_path} has failed."
|
35
35
|
msg << "\n#{extra_info}" if extra_info
|
36
|
-
msg << "\nIf this error persists you could try removing the cache directory '#{path}'" if path
|
36
|
+
msg << "\nIf this error persists you could try removing the cache directory '#{path}'" if path.exist?
|
37
37
|
super msg
|
38
38
|
end
|
39
39
|
end
|
40
40
|
|
41
41
|
class MissingGitRevisionError < GitCommandError
|
42
|
-
def initialize(command, path, ref, repo)
|
42
|
+
def initialize(command, path, destination_path, ref, repo)
|
43
43
|
msg = "Revision #{ref} does not exist in the repository #{repo}. Maybe you misspelled it?"
|
44
|
-
super command, path, msg
|
44
|
+
super command, path, destination_path, msg
|
45
45
|
end
|
46
46
|
end
|
47
47
|
|
@@ -62,26 +62,18 @@ module Bundler
|
|
62
62
|
end
|
63
63
|
|
64
64
|
def revision
|
65
|
-
|
66
|
-
|
67
|
-
begin
|
68
|
-
@revision ||= find_local_revision
|
69
|
-
rescue GitCommandError => e
|
70
|
-
raise MissingGitRevisionError.new(e.command, path, ref, URICredentialsFilter.credential_filtered_uri(uri))
|
71
|
-
end
|
72
|
-
|
73
|
-
@revision
|
65
|
+
@revision ||= find_local_revision
|
74
66
|
end
|
75
67
|
|
76
68
|
def branch
|
77
|
-
@branch ||=
|
78
|
-
git("rev-parse --abbrev-ref HEAD").strip
|
69
|
+
@branch ||= allowed_with_path do
|
70
|
+
git("rev-parse --abbrev-ref HEAD", :dir => path).strip
|
79
71
|
end
|
80
72
|
end
|
81
73
|
|
82
74
|
def contains?(commit)
|
83
|
-
|
84
|
-
result, status = git_null("branch --contains #{commit}")
|
75
|
+
allowed_with_path do
|
76
|
+
result, status = git_null("branch --contains #{commit}", :dir => path)
|
85
77
|
status.success? && result =~ /^\* (.*)$/
|
86
78
|
end
|
87
79
|
end
|
@@ -108,8 +100,8 @@ module Bundler
|
|
108
100
|
return unless extra_ref
|
109
101
|
end
|
110
102
|
|
111
|
-
|
112
|
-
git_retry %(fetch --force --quiet --tags #{uri_escaped_with_configured_credentials} "refs/heads/*:refs/heads/*" #{extra_ref})
|
103
|
+
with_path do
|
104
|
+
git_retry %(fetch --force --quiet --tags #{uri_escaped_with_configured_credentials} "refs/heads/*:refs/heads/*" #{extra_ref}), :dir => path
|
113
105
|
end
|
114
106
|
end
|
115
107
|
|
@@ -133,58 +125,54 @@ module Bundler
|
|
133
125
|
end
|
134
126
|
end
|
135
127
|
# method 2
|
136
|
-
|
137
|
-
git_retry %(fetch --force --quiet --tags "#{path}")
|
128
|
+
git_retry %(fetch --force --quiet --tags "#{path}"), :dir => destination
|
138
129
|
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
130
|
+
begin
|
131
|
+
git "reset --hard #{@revision}", :dir => destination
|
132
|
+
rescue GitCommandError => e
|
133
|
+
raise MissingGitRevisionError.new(e.command, path, destination, @revision, URICredentialsFilter.credential_filtered_uri(uri))
|
134
|
+
end
|
144
135
|
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
end
|
136
|
+
if submodules
|
137
|
+
git_retry "submodule update --init --recursive", :dir => destination
|
138
|
+
elsif Gem::Version.create(version) >= Gem::Version.create("2.9.0")
|
139
|
+
git_retry "submodule deinit --all --force", :dir => destination
|
150
140
|
end
|
151
141
|
end
|
152
142
|
|
153
143
|
private
|
154
144
|
|
155
|
-
def git_null(command)
|
156
|
-
|
157
|
-
raise GitNotAllowedError.new(command_with_no_credentials) unless allow?
|
145
|
+
def git_null(command, dir: SharedHelpers.pwd)
|
146
|
+
check_allowed(command)
|
158
147
|
|
159
148
|
out, status = SharedHelpers.with_clean_git_env do
|
160
|
-
capture_and_ignore_stderr("git #{command}")
|
149
|
+
capture_and_ignore_stderr("git #{command}", :chdir => dir.to_s)
|
161
150
|
end
|
162
151
|
|
163
152
|
[URICredentialsFilter.credential_filtered_string(out, uri), status]
|
164
153
|
end
|
165
154
|
|
166
|
-
def git_retry(command)
|
155
|
+
def git_retry(command, dir: SharedHelpers.pwd)
|
167
156
|
Bundler::Retry.new("`git #{URICredentialsFilter.credential_filtered_string(command, uri)}`", GitNotAllowedError).attempts do
|
168
|
-
git(command)
|
157
|
+
git(command, :dir => dir)
|
169
158
|
end
|
170
159
|
end
|
171
160
|
|
172
|
-
def git(command,
|
173
|
-
command_with_no_credentials =
|
174
|
-
raise GitNotAllowedError.new(command_with_no_credentials) unless allow?
|
161
|
+
def git(command, dir: SharedHelpers.pwd)
|
162
|
+
command_with_no_credentials = check_allowed(command)
|
175
163
|
|
176
164
|
out, status = SharedHelpers.with_clean_git_env do
|
177
|
-
capture_and_filter_stderr(uri, "git #{command}")
|
165
|
+
capture_and_filter_stderr(uri, "git #{command}", :chdir => dir.to_s)
|
178
166
|
end
|
179
167
|
|
180
|
-
|
181
|
-
|
182
|
-
|
168
|
+
raise GitCommandError.new(command_with_no_credentials, path, dir) unless status.success?
|
169
|
+
|
170
|
+
URICredentialsFilter.credential_filtered_string(out, uri)
|
183
171
|
end
|
184
172
|
|
185
173
|
def has_revision_cached?
|
186
174
|
return unless @revision
|
187
|
-
|
175
|
+
with_path { git("cat-file -e #{@revision}", :dir => path) }
|
188
176
|
true
|
189
177
|
rescue GitError
|
190
178
|
false
|
@@ -195,9 +183,11 @@ module Bundler
|
|
195
183
|
end
|
196
184
|
|
197
185
|
def find_local_revision
|
198
|
-
|
199
|
-
git("rev-parse --verify #{Shellwords.shellescape(ref)}",
|
186
|
+
allowed_with_path do
|
187
|
+
git("rev-parse --verify #{Shellwords.shellescape(ref)}", :dir => path).strip
|
200
188
|
end
|
189
|
+
rescue GitCommandError => e
|
190
|
+
raise MissingGitRevisionError.new(e.command, path, path, ref, URICredentialsFilter.credential_filtered_uri(uri))
|
201
191
|
end
|
202
192
|
|
203
193
|
# Escape the URI for git commands
|
@@ -230,27 +220,32 @@ module Bundler
|
|
230
220
|
@git ? @git.allow_git_ops? : true
|
231
221
|
end
|
232
222
|
|
233
|
-
def
|
223
|
+
def with_path(&blk)
|
234
224
|
checkout unless path.exist?
|
235
|
-
|
236
|
-
SharedHelpers.chdir(path, &blk)
|
225
|
+
blk.call
|
237
226
|
end
|
238
227
|
|
239
|
-
def
|
240
|
-
return
|
228
|
+
def allowed_with_path
|
229
|
+
return with_path { yield } if allow?
|
241
230
|
raise GitError, "The git source #{uri} is not yet checked out. Please run `bundle install` before trying to start your application"
|
242
231
|
end
|
243
232
|
|
244
|
-
def
|
233
|
+
def check_allowed(command)
|
234
|
+
command_with_no_credentials = URICredentialsFilter.credential_filtered_string(command, uri)
|
235
|
+
raise GitNotAllowedError.new(command_with_no_credentials) unless allow?
|
236
|
+
command_with_no_credentials
|
237
|
+
end
|
238
|
+
|
239
|
+
def capture_and_filter_stderr(uri, cmd, chdir: SharedHelpers.pwd)
|
245
240
|
require "open3"
|
246
|
-
return_value, captured_err, status = Open3.capture3(cmd)
|
241
|
+
return_value, captured_err, status = Open3.capture3(cmd, :chdir => chdir)
|
247
242
|
Bundler.ui.warn URICredentialsFilter.credential_filtered_string(captured_err, uri) if uri && !captured_err.empty?
|
248
243
|
[return_value, status]
|
249
244
|
end
|
250
245
|
|
251
|
-
def capture_and_ignore_stderr(cmd)
|
246
|
+
def capture_and_ignore_stderr(cmd, chdir: SharedHelpers.pwd)
|
252
247
|
require "open3"
|
253
|
-
return_value, _, status = Open3.capture3(cmd)
|
248
|
+
return_value, _, status = Open3.capture3(cmd, :chdir => chdir)
|
254
249
|
[return_value, status]
|
255
250
|
end
|
256
251
|
end
|