rubygems-update 3.1.4 → 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 +1 -2
- data/History.txt +130 -5
- data/Manifest.txt +10 -23
- data/POLICIES.md +2 -9
- data/README.md +1 -1
- data/Rakefile +30 -32
- data/bin/update_rubygems +1 -1
- data/bundler/CHANGELOG.md +806 -741
- 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 +32 -11
- data/bundler/lib/bundler/cli/console.rb +1 -1
- data/bundler/lib/bundler/cli/gem.rb +83 -10
- data/bundler/lib/bundler/cli/info.rb +13 -3
- data/bundler/lib/bundler/cli/init.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +5 -14
- data/bundler/lib/bundler/cli/issue.rb +2 -2
- data/bundler/lib/bundler/cli/list.rb +11 -9
- data/bundler/lib/bundler/cli/outdated.rb +88 -65
- data/bundler/lib/bundler/cli/plugin.rb +10 -0
- data/bundler/lib/bundler/cli/pristine.rb +5 -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 +17 -10
- data/bundler/lib/bundler/gem_version_promoter.rb +1 -1
- data/bundler/lib/bundler/injector.rb +14 -3
- data/bundler/lib/bundler/inline.rb +1 -1
- 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 +3 -48
- data/bundler/lib/bundler/runtime.rb +2 -12
- data/bundler/lib/bundler/settings.rb +0 -3
- data/bundler/lib/bundler/shared_helpers.rb +1 -1
- data/bundler/lib/bundler/source/git.rb +4 -4
- 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 +9 -1
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +19 -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 +6 -4
- 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 +75 -189
- 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 +7 -7
- data/bundler/man/bundle-list.1.txt +12 -11
- data/bundler/man/bundle-list.ronn +6 -6
- 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 +80 -157
- data/lib/rubygems/available_set.rb +4 -4
- data/lib/rubygems/basic_specification.rb +11 -5
- data/lib/rubygems/bundler_version_finder.rb +14 -9
- data/lib/rubygems/command.rb +16 -14
- 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 +1 -1
- 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 +128 -32
- 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 +1 -1
- 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 +1 -1
- 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 +1 -1
- 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 +3 -3
- 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 +8 -8
- data/lib/rubygems/source/git.rb +7 -6
- data/lib/rubygems/source/local.rb +2 -2
- data/lib/rubygems/source_list.rb +4 -5
- data/lib/rubygems/spec_fetcher.rb +18 -15
- data/lib/rubygems/specification.rb +79 -104
- data/lib/rubygems/specification_policy.rb +79 -27
- data/lib/rubygems/test_case.rb +64 -83
- 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 +10 -2
- data/lib/rubygems/util/licenses.rb +4 -4
- data/lib/rubygems/validator.rb +1 -1
- data/lib/rubygems/version.rb +4 -4
- 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 +0 -2
- data/test/rubygems/test_bundled_ca.rb +1 -5
- data/test/rubygems/test_deprecate.rb +43 -4
- data/test/rubygems/test_gem.rb +79 -74
- 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 +7 -2
- 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 +160 -108
- 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_specification_command.rb +18 -18
- data/test/rubygems/test_gem_commands_uninstall_command.rb +1 -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 +149 -45
- data/test/rubygems/test_gem_package.rb +13 -12
- data/test/rubygems/test_gem_package_tar_header.rb +19 -0
- data/test/rubygems/test_gem_package_tar_writer.rb +3 -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 +20 -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 +143 -113
- data/test/rubygems/test_gem_stream_ui.rb +3 -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 +29 -43
- 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 -64
data/util/patch_with_prs.rb
DELETED
@@ -1,77 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
|
3
|
-
$:.unshift File.expand_path("../../lib", __FILE__)
|
4
|
-
require "rubygems"
|
5
|
-
require "optparse"
|
6
|
-
|
7
|
-
def confirm(prompt = "")
|
8
|
-
loop do
|
9
|
-
print(prompt)
|
10
|
-
print(": ") unless prompt.empty?
|
11
|
-
break if $stdin.gets.strip == "y"
|
12
|
-
end
|
13
|
-
rescue Interrupt
|
14
|
-
abort
|
15
|
-
end
|
16
|
-
|
17
|
-
def sh(*cmd)
|
18
|
-
return if system(*cmd)
|
19
|
-
raise "#{cmd} failed"
|
20
|
-
end
|
21
|
-
|
22
|
-
version = nil
|
23
|
-
prs = []
|
24
|
-
|
25
|
-
OptionParser.new do |opts|
|
26
|
-
opts.banner = "Usage: #{__FILE__} [options]"
|
27
|
-
|
28
|
-
opts.on("--version=VERSION", "The version to release") do |v|
|
29
|
-
version = v
|
30
|
-
end
|
31
|
-
end.parse!
|
32
|
-
|
33
|
-
prs = ARGV.dup
|
34
|
-
|
35
|
-
version ||= begin
|
36
|
-
version = Gem::Version.new(Gem::VERSION)
|
37
|
-
segments = version.segments
|
38
|
-
if segments.last.is_a?(String)
|
39
|
-
segments << "1"
|
40
|
-
else
|
41
|
-
segments[-1] += 1
|
42
|
-
end
|
43
|
-
segments.join(".")
|
44
|
-
end
|
45
|
-
|
46
|
-
confirm "You are about to release #{version}, currently #{Gem::VERSION}"
|
47
|
-
|
48
|
-
branch = version.split(".", 3)[0, 2].join(".")
|
49
|
-
sh("git", "checkout", branch)
|
50
|
-
sh("git", "submodule", "update", "--init", "--recursive")
|
51
|
-
|
52
|
-
commits = `git log --oneline origin/master --`.split("\n").map {|l| l.split(/\s/, 2) }.reverse
|
53
|
-
commits.select! {|_sha, message| message =~ /(Auto merge of|Merge pull request|Merge) ##{Regexp.union(*prs)}/ }
|
54
|
-
|
55
|
-
unless system("git", "cherry-pick", "-x", "-m", "1", *commits.map(&:first))
|
56
|
-
abort unless system("zsh")
|
57
|
-
end
|
58
|
-
|
59
|
-
sh(Gem.ruby, File.expand_path("../update_changelog.rb", __FILE__))
|
60
|
-
|
61
|
-
version_file = "lib/rubygems.rb"
|
62
|
-
version_contents = File.read(version_file)
|
63
|
-
unless version_contents.sub!(/^(\s*VERSION = )(["'])#{Gem::Version::VERSION_PATTERN}\2/, "\\1#{version.to_s.dump}")
|
64
|
-
abort "failed to update #{version_file}, is it in the expected format?"
|
65
|
-
end
|
66
|
-
File.open(version_file, "w") {|f| f.write(version_contents) }
|
67
|
-
|
68
|
-
confirm "Update changelog"
|
69
|
-
sh("git", "commit", "-am", "Version #{version} with changelog")
|
70
|
-
sh("rake", "release", "VERSION=#{version}")
|
71
|
-
sh("git", "push")
|
72
|
-
sh("git", "checkout", "master")
|
73
|
-
sh("git", "pull")
|
74
|
-
unless system("git", "merge", "v#{version}", "--no-edit")
|
75
|
-
abort unless system("zsh")
|
76
|
-
end
|
77
|
-
sh("git", "push")
|
data/util/rubocop
DELETED
@@ -1,139 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
require 'net/http'
|
3
|
-
require 'openssl'
|
4
|
-
require 'fileutils'
|
5
|
-
|
6
|
-
URIS = [
|
7
|
-
URI('https://rubygems.org'),
|
8
|
-
URI('https://index.rubygems.org'),
|
9
|
-
URI('https://staging.rubygems.org'),
|
10
|
-
URI('https://fastly.rubygems.org'),
|
11
|
-
URI('https://rubygems.global.ssl.fastly.net'),
|
12
|
-
].freeze
|
13
|
-
|
14
|
-
HOSTNAMES_TO_MAP = [
|
15
|
-
'rubygems.global.ssl.fastly.net',
|
16
|
-
'rubygems.org',
|
17
|
-
'index.rubygems.org'
|
18
|
-
].freeze
|
19
|
-
|
20
|
-
def connect_to(uri, store)
|
21
|
-
# None of the URIs are IPv6, so URI::Generic#hostname(ruby 1.9.3+) isn't needed
|
22
|
-
http = Net::HTTP.new uri.host, uri.port
|
23
|
-
|
24
|
-
http.use_ssl = uri.scheme.downcase == 'https'
|
25
|
-
http.ssl_version = :TLSv1_2
|
26
|
-
http.verify_mode = OpenSSL::SSL::VERIFY_PEER
|
27
|
-
http.cert_store = store
|
28
|
-
|
29
|
-
http.get '/'
|
30
|
-
|
31
|
-
true
|
32
|
-
rescue OpenSSL::SSL::SSLError
|
33
|
-
false
|
34
|
-
end
|
35
|
-
|
36
|
-
def load_certificates(io)
|
37
|
-
cert_texts =
|
38
|
-
io.read.scan(/^-{5}BEGIN CERTIFICATE-{5}.*?^-{5}END CERTIFICATE-{5}/m)
|
39
|
-
|
40
|
-
cert_texts.map do |cert_text|
|
41
|
-
OpenSSL::X509::Certificate.new cert_text
|
42
|
-
end
|
43
|
-
end
|
44
|
-
|
45
|
-
def show_certificates(certificates)
|
46
|
-
certificates.each do |certificate|
|
47
|
-
p certificate.subject.to_a
|
48
|
-
end
|
49
|
-
end
|
50
|
-
|
51
|
-
def store_for(certificates)
|
52
|
-
store = OpenSSL::X509::Store.new
|
53
|
-
certificates.each do |certificate|
|
54
|
-
store.add_cert certificate
|
55
|
-
end
|
56
|
-
|
57
|
-
store
|
58
|
-
end
|
59
|
-
|
60
|
-
def test_certificates(certificates, uri)
|
61
|
-
1.upto certificates.length do |n|
|
62
|
-
puts "combinations of #{n} certificates"
|
63
|
-
certificates.combination(n).each do |combination|
|
64
|
-
match = test_uri uri, combination
|
65
|
-
|
66
|
-
if match
|
67
|
-
$needed_combinations << match
|
68
|
-
puts
|
69
|
-
puts match.map { |certificate| certificate.subject }
|
70
|
-
return
|
71
|
-
else
|
72
|
-
print '.'
|
73
|
-
end
|
74
|
-
end
|
75
|
-
puts
|
76
|
-
end
|
77
|
-
end
|
78
|
-
|
79
|
-
def test_uri(uri, certificates)
|
80
|
-
store = store_for certificates
|
81
|
-
|
82
|
-
verified = connect_to uri, store
|
83
|
-
|
84
|
-
return certificates if verified
|
85
|
-
|
86
|
-
nil
|
87
|
-
end
|
88
|
-
|
89
|
-
def hostname_certificate_mapping(certificates)
|
90
|
-
mapping = {}
|
91
|
-
HOSTNAMES_TO_MAP.each do |hostname|
|
92
|
-
uri = URI("https://#{hostname}")
|
93
|
-
certificates.each do |cert|
|
94
|
-
match = test_uri uri, [cert]
|
95
|
-
mapping[hostname] = cert if match && !mapping.values.include?(cert)
|
96
|
-
end
|
97
|
-
end
|
98
|
-
mapping
|
99
|
-
end
|
100
|
-
|
101
|
-
def write_certificates(certificates)
|
102
|
-
mapping = hostname_certificate_mapping(certificates)
|
103
|
-
mapping.each do |hostname, certificate|
|
104
|
-
subject = certificate.subject.to_a
|
105
|
-
name = (subject.assoc('CN') || subject.assoc('OU'))[1]
|
106
|
-
name = name.delete ' .-'
|
107
|
-
|
108
|
-
FileUtils.mkdir_p("lib/rubygems/ssl_certs/#{hostname}")
|
109
|
-
destination = "lib/rubygems/ssl_certs/#{hostname}/#{name}.pem"
|
110
|
-
|
111
|
-
warn "overwriting certificate #{name}" if File.exist? destination
|
112
|
-
|
113
|
-
open destination, 'w' do |io|
|
114
|
-
io.write certificate.to_pem
|
115
|
-
end
|
116
|
-
end
|
117
|
-
end
|
118
|
-
|
119
|
-
io =
|
120
|
-
if ARGV.empty?
|
121
|
-
open OpenSSL::X509::DEFAULT_CERT_FILE
|
122
|
-
else
|
123
|
-
ARGF
|
124
|
-
end
|
125
|
-
|
126
|
-
certificates = load_certificates io
|
127
|
-
puts "loaded #{certificates.length} certificates"
|
128
|
-
|
129
|
-
$needed_combinations = []
|
130
|
-
|
131
|
-
URIS.each do |uri|
|
132
|
-
puts uri
|
133
|
-
|
134
|
-
test_certificates certificates, uri
|
135
|
-
end
|
136
|
-
|
137
|
-
needed = $needed_combinations.flatten.uniq
|
138
|
-
|
139
|
-
write_certificates needed
|
data/util/update_changelog.rb
DELETED
@@ -1,64 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
|
3
|
-
require 'json'
|
4
|
-
require 'net/http'
|
5
|
-
|
6
|
-
def github_api(path)
|
7
|
-
base = 'https://api.github.com'
|
8
|
-
url = path.start_with?(base) ? path : base + path
|
9
|
-
uri = URI.parse(url)
|
10
|
-
http = Net::HTTP.new(uri.host, uri.port)
|
11
|
-
http.use_ssl = true
|
12
|
-
req = Net::HTTP::Get.new(uri.request_uri)
|
13
|
-
req["authorization"] = "token #{ENV['GITHUB_API_TOKEN']}" if ENV['GITHUB_API_TOKEN']
|
14
|
-
response = http.request(req)
|
15
|
-
JSON.load(response.body)
|
16
|
-
end
|
17
|
-
|
18
|
-
def wrap(text, length, indent)
|
19
|
-
result = []
|
20
|
-
work = text.dup
|
21
|
-
|
22
|
-
while work.length > length
|
23
|
-
if work =~ /^(.{0,#{length}})[ \n]/o
|
24
|
-
result << $1
|
25
|
-
work.slice!(0, $&.length)
|
26
|
-
else
|
27
|
-
result << work.slice!(0, length)
|
28
|
-
end
|
29
|
-
end
|
30
|
-
|
31
|
-
result << work unless work.empty?
|
32
|
-
result = result.reduce(String.new) do |acc, elem|
|
33
|
-
acc << "\n" << ' ' * indent unless acc.empty?
|
34
|
-
acc << elem
|
35
|
-
end
|
36
|
-
result += "\n" unless result.end_with?("\n")
|
37
|
-
result
|
38
|
-
end
|
39
|
-
|
40
|
-
def sentence(text)
|
41
|
-
text = text[0].upcase + text[1..-1]
|
42
|
-
text.end_with?('.') ? text : text << '.'
|
43
|
-
end
|
44
|
-
|
45
|
-
from = ARGV.shift || Gem::VERSION
|
46
|
-
branch = ARGV.shift || "HEAD"
|
47
|
-
|
48
|
-
history = File.read(File.expand_path('../../History.txt', __FILE__))
|
49
|
-
|
50
|
-
File.open(File.expand_path('../../ChangeLog', __FILE__), 'w') do |changelog|
|
51
|
-
commits = `git log --oneline v#{from}..#{branch}`.split("\n")
|
52
|
-
prs = commits.reverse_each.map { |c| c =~ /(Auto merge of|Merge pull request|Merge) #(\d+)/ && $2 }.compact.uniq.sort!
|
53
|
-
prs.each do |pr|
|
54
|
-
next if history =~ /Pull\srequest\s##{pr}/m
|
55
|
-
details = github_api "/repos/rubygems/rubygems/pulls/#{pr}"
|
56
|
-
title, user = details.values_at('title', 'user')
|
57
|
-
user = github_api(user['url'])
|
58
|
-
name = user['name'] || user['login']
|
59
|
-
changelog << wrap(
|
60
|
-
['*', sentence(title), sentence("Pull request ##{pr} by #{name}")].join(' '),
|
61
|
-
74, 2
|
62
|
-
)
|
63
|
-
end
|
64
|
-
end
|