From 3dc6efbe9ca582d6930f25754a16043dedecfa6f Mon Sep 17 00:00:00 2001 From: hsbt Date: Tue, 22 Jan 2019 06:28:04 +0000 Subject: Merge rubygems master targeted RubyGems 3.1.0. https://github.com/rubygems/rubygems/commit/1172320540c8c33c59fc1db5191b021c3b2db487 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems.rb | 2 +- lib/rubygems/commands/build_command.rb | 41 +++++++++++------ lib/rubygems/commands/push_command.rb | 2 + lib/rubygems/gemcutter_utilities.rb | 4 +- lib/rubygems/rdoc.rb | 4 +- lib/rubygems/request.rb | 1 + lib/rubygems/resolver.rb | 2 - lib/rubygems/specification.rb | 3 +- lib/rubygems/test_case.rb | 2 + lib/rubygems/validator.rb | 27 ++---------- test/rubygems/test_gem.rb | 5 ++- test/rubygems/test_gem_commands_build_command.rb | 1 + test/rubygems/test_gem_commands_push_command.rb | 15 +++++++ test/rubygems/test_gem_commands_setup_command.rb | 2 +- test/rubygems/test_gem_ext_cmake_builder.rb | 2 +- test/rubygems/test_gem_request.rb | 11 +++++ .../test_gem_request_set_gem_dependency_api.rb | 51 ++++++++++------------ test/rubygems/test_gem_specification.rb | 4 +- 18 files changed, 103 insertions(+), 76 deletions(-) diff --git a/lib/rubygems.rb b/lib/rubygems.rb index e114c5abd4..d31c216142 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -9,7 +9,7 @@ require 'rbconfig' module Gem - VERSION = "3.0.2".freeze + VERSION = "3.1.0.pre1".freeze end # Must be first since it unloads the prelude from 1.9.2 diff --git a/lib/rubygems/commands/build_command.rb b/lib/rubygems/commands/build_command.rb index e59471e976..761b80ee94 100644 --- a/lib/rubygems/commands/build_command.rb +++ b/lib/rubygems/commands/build_command.rb @@ -18,6 +18,10 @@ class Gem::Commands::BuildCommand < Gem::Command add_option '-o', '--output FILE', 'output gem with the given filename' do |value, options| options[:output] = value end + + add_option '-C PATH', '', 'Run as if gem build was started in instead of the current working directory.' do |value, options| + options[:build_path] = value + end end def arguments # :nodoc: @@ -60,25 +64,36 @@ Gems can be saved to a specified filename with the output option: end if File.exist? gemspec - Dir.chdir(File.dirname(gemspec)) do - spec = Gem::Specification.load File.basename(gemspec) - - if spec - Gem::Package.build( - spec, - options[:force], - options[:strict], - options[:output] - ) - else - alert_error "Error loading gemspec. Aborting." - terminate_interaction 1 + spec = Gem::Specification.load(gemspec) + + if options[:build_path] + Dir.chdir(File.dirname(gemspec)) do + spec = Gem::Specification.load File.basename(gemspec) + build_package(spec) end + else + build_package(spec) end + else alert_error "Gemspec file not found: #{gemspec}" terminate_interaction 1 end end + private + + def build_package(spec) + if spec + Gem::Package.build( + spec, + options[:force], + options[:strict], + options[:output] + ) + else + alert_error "Error loading gemspec. Aborting." + terminate_interaction 1 + end + end end diff --git a/lib/rubygems/commands/push_command.rb b/lib/rubygems/commands/push_command.rb index 3ea4703a3e..55ee3ae73f 100644 --- a/lib/rubygems/commands/push_command.rb +++ b/lib/rubygems/commands/push_command.rb @@ -15,6 +15,8 @@ https://rubygems.org) and adds it to the index. The gem can be removed from the index and deleted from the server using the yank command. For further discussion see the help for the yank command. + +The push command will use ~/.gem/credentials to authenticate to a server, but you can use the RubyGems environment variable GEM_HOST_API_KEY to set the api key to authenticate. EOF end diff --git a/lib/rubygems/gemcutter_utilities.rb b/lib/rubygems/gemcutter_utilities.rb index 3607b61529..c6ccc209c8 100644 --- a/lib/rubygems/gemcutter_utilities.rb +++ b/lib/rubygems/gemcutter_utilities.rb @@ -38,7 +38,9 @@ module Gem::GemcutterUtilities # The API key from the command options or from the user's configuration. def api_key - if options[:key] + if ENV["GEM_HOST_API_KEY"] + ENV["GEM_HOST_API_KEY"] + elsif options[:key] verify_api_key options[:key] elsif Gem.configuration.api_keys.key?(host) Gem.configuration.api_keys[host] diff --git a/lib/rubygems/rdoc.rb b/lib/rubygems/rdoc.rb index dfaf7c55bf..4e16fbb86f 100644 --- a/lib/rubygems/rdoc.rb +++ b/lib/rubygems/rdoc.rb @@ -18,7 +18,7 @@ begin module Gem RDoc = ::RDoc::RubygemsHook end + + Gem.done_installing(&Gem::RDoc.method(:generation_hook)) rescue LoadError end - -Gem.done_installing(&Gem::RDoc.method(:generation_hook)) diff --git a/lib/rubygems/request.rb b/lib/rubygems/request.rb index fb164d79cf..d442f6534b 100644 --- a/lib/rubygems/request.rb +++ b/lib/rubygems/request.rb @@ -168,6 +168,7 @@ class Gem::Request no_env_proxy = env_proxy.nil? || env_proxy.empty? + return :no_proxy if scheme == 'https' && no_env_proxy return get_proxy_from_env 'http' if no_env_proxy and _scheme != 'http' return :no_proxy if no_env_proxy diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb index 46276f3260..8a72006ea8 100644 --- a/lib/rubygems/resolver.rb +++ b/lib/rubygems/resolver.rb @@ -231,8 +231,6 @@ class Gem::Resolver raise exc end - sources = [] - groups = Hash.new { |hash, key| hash[key] = [] } # create groups & sources in the same loop diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb index bba3ffeab5..0215f4aa66 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb @@ -1285,7 +1285,7 @@ class Gem::Specification < Gem::BasicSpecification unresolved = unresolved_deps unless unresolved.empty? w = "W" + "ARN" - warn "#{w}: Unresolved or ambigious specs during Gem::Specification.reset:" + warn "#{w}: Unresolved or ambiguous specs during Gem::Specification.reset:" unresolved.values.each do |dep| warn " #{dep}" @@ -2254,6 +2254,7 @@ class Gem::Specification < Gem::BasicSpecification attributes.each do |attr_name| current_value = self.send attr_name + current_value = current_value.sort if %i(files test_files).include? attr_name if current_value != default_value(attr_name) or self.class.required_attribute? attr_name diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index a93f749240..783e8956a1 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -1057,6 +1057,8 @@ Also, a list: Gem.instance_variable_set :@platforms, nil Gem::Platform.instance_variable_set :@local, nil + yield if block_given? + platform end diff --git a/lib/rubygems/validator.rb b/lib/rubygems/validator.rb index 828497f700..f00021daa9 100644 --- a/lib/rubygems/validator.rb +++ b/lib/rubygems/validator.rb @@ -19,29 +19,6 @@ class Gem::Validator require 'find' end - ## - # Given a gem file's contents, validates against its own MD5 checksum - # gem_data:: [String] Contents of the gem file - - def verify_gem(gem_data) - # TODO remove me? The code here only validate an MD5SUM that was - # in some old formatted gems, but hasn't been for a long time. - end - - ## - # Given the path to a gem file, validates against its own MD5 checksum - # - # gem_path:: [String] Path to gem file - - def verify_gem_file(gem_path) - File.open gem_path, Gem.binary_mode do |file| - gem_data = file.read - verify_gem gem_data - end - rescue Errno::ENOENT, Errno::EINVAL - raise Gem::VerificationError, "missing gem file #{gem_path}" - end - private def find_files_for_gem(gem_directory) @@ -105,7 +82,9 @@ class Gem::Validator end begin - verify_gem_file(gem_path) + unless File.readable?(gem_path) + raise Gem::VerificationError, "missing gem file #{gem_path}" + end good, gone, unreadable = nil, nil, nil, nil diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index e740a5ab94..c913f30e27 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -156,7 +156,7 @@ class TestGem < Gem::TestCase end def assert_self_install_permissions - mask = /mingw|mswin/ =~ RUBY_PLATFORM ? 0700 : 0777 + mask = win_platform? ? 0700 : 0777 options = { :dir_mode => 0500, :prog_mode => 0510, @@ -198,6 +198,9 @@ class TestGem < Gem::TestCase 'gems/foo-1/bin/foo.cmd' => prog_mode, 'gems/foo-1/data/foo.txt' => data_mode, } + # below is for intermittent errors on Appveyor & Travis 2019-01, + # see https://github.com/rubygems/rubygems/pull/2568 + sleep 0.2 result = {} Dir.chdir @gemhome do expected.each_key do |n| diff --git a/test/rubygems/test_gem_commands_build_command.rb b/test/rubygems/test_gem_commands_build_command.rb index ac82a408c7..02d1b98e8f 100644 --- a/test/rubygems/test_gem_commands_build_command.rb +++ b/test/rubygems/test_gem_commands_build_command.rb @@ -207,6 +207,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase gs.write @gem.to_ruby end + @cmd.options[:build_path] = gemspec_dir @cmd.options[:args] = [gemspec_file] use_ui @ui do diff --git a/test/rubygems/test_gem_commands_push_command.rb b/test/rubygems/test_gem_commands_push_command.rb index 9d2185dcd9..592295d684 100644 --- a/test/rubygems/test_gem_commands_push_command.rb +++ b/test/rubygems/test_gem_commands_push_command.rb @@ -199,6 +199,21 @@ class TestGemCommandsPushCommand < Gem::TestCase send_battery end + def test_sending_gem_with_env_var_api_key + @host = "http://privategemserver.example" + + @spec, @path = util_gem "freebird", "1.0.1" do |spec| + spec.metadata['allowed_push_host'] = @host + end + + @api_key = "PRIVKEY" + ENV["GEM_HOST_API_KEY"] = "PRIVKEY" + + @response = "Successfully registered gem: freebird (1.0.1)" + @fetcher.data["#{@host}/api/v1/gems"] = [@response, 200, 'OK'] + send_battery + end + def test_sending_gem_to_allowed_push_host_with_basic_credentials @sanitized_host = "http://privategemserver.example" @host = "http://user:password@privategemserver.example" diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb index f1598f3fc2..4f34112099 100644 --- a/test/rubygems/test_gem_commands_setup_command.rb +++ b/test/rubygems/test_gem_commands_setup_command.rb @@ -10,7 +10,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase if File.exist?(bundler_gemspec) BUNDLER_VERS = File.read(bundler_gemspec).match(/VERSION = "(#{Gem::Version::VERSION_PATTERN})"/)[1] else - BUNDLER_VERS = "1.16.2".freeze + BUNDLER_VERS = "2.0.1".freeze end def setup diff --git a/test/rubygems/test_gem_ext_cmake_builder.rb b/test/rubygems/test_gem_ext_cmake_builder.rb index 6e62908090..757266cae2 100644 --- a/test/rubygems/test_gem_ext_cmake_builder.rb +++ b/test/rubygems/test_gem_ext_cmake_builder.rb @@ -25,7 +25,7 @@ class TestGemExtCmakeBuilder < Gem::TestCase File.open File.join(@ext, 'CMakeLists.txt'), 'w' do |cmakelists| cmakelists.write <<-eo_cmake cmake_minimum_required(VERSION 2.6) -project(self_build LANGUAGES NONE) +project(self_build NONE) install (FILES test.txt DESTINATION bin) eo_cmake end diff --git a/test/rubygems/test_gem_request.rb b/test/rubygems/test_gem_request.rb index 8b475fae42..0577eb6f99 100644 --- a/test/rubygems/test_gem_request.rb +++ b/test/rubygems/test_gem_request.rb @@ -79,6 +79,17 @@ class TestGemRequest < Gem::TestCase assert_equal URI(@proxy_uri), proxy end + def test_proxy_ENV + ENV['http_proxy'] = "http://proxy" + ENV['https_proxy'] = "" + + request = make_request URI('https://example'), nil, nil, nil + + proxy = request.proxy_uri + + assert_nil proxy + end + def test_configure_connection_for_https connection = Net::HTTP.new 'localhost', 443 diff --git a/test/rubygems/test_gem_request_set_gem_dependency_api.rb b/test/rubygems/test_gem_request_set_gem_dependency_api.rb index 320fdcb604..0e597f2b11 100644 --- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb +++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb @@ -652,20 +652,23 @@ end end def test_platform_mswin - util_set_arch 'i686-darwin8.10.1' do - @gda.platform :mswin do - @gda.gem 'a' + if win_platform? + util_set_arch 'x86-mswin32-60' do + @gda.platform :mswin do + @gda.gem 'a' + end + + assert_equal [dep('a')], @set.dependencies + refute_empty @set.dependencies end + else + util_set_arch 'i686-darwin8.10.1' do + @gda.platform :mswin do + @gda.gem 'a' + end - assert_empty @set.dependencies - end - - util_set_arch 'x86-mswin32-60' do - @gda.platform :mswin do - @gda.gem 'a' + assert_empty @set.dependencies end - - refute_empty @set.dependencies end end @@ -708,26 +711,20 @@ end end def test_platforms - util_set_arch 'i686-darwin8.10.1' do - @gda.platforms :ruby do - @gda.gem 'a' - end + unless win_platform? + util_set_arch 'i686-darwin8.10.1' do + @gda.platforms :ruby do + @gda.gem 'a' + end - assert_equal [dep('a')], @set.dependencies + assert_equal [dep('a')], @set.dependencies - @gda.platforms :mswin do - @gda.gem 'b' - end + @gda.platforms :mswin do + @gda.gem 'b' + end - assert_equal [dep('a')], @set.dependencies - end - - util_set_arch 'x86-mswin32-60' do - @gda.platforms :mswin do - @gda.gem 'c' + assert_equal [dep('a')], @set.dependencies end - - assert_equal [dep('a'), dep('c')], @set.dependencies end end diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb index d2ecbf4434..797e34cd92 100644 --- a/test/rubygems/test_gem_specification.rb +++ b/test/rubygems/test_gem_specification.rb @@ -2936,7 +2936,7 @@ duplicate dependency on c (>= 1.2.3, development), (~> 1.2) use: end expected = <<-EXPECTED -WARN: Unresolved or ambigious specs during Gem::Specification.reset: +WARN: Unresolved or ambiguous specs during Gem::Specification.reset: x (= 1) WARN: Clearing out unresolved specs. Try 'gem cleanup ' Please report a bug if this causes problems. @@ -2964,7 +2964,7 @@ Please report a bug if this causes problems. end expected = <<-EXPECTED -WARN: Unresolved or ambigious specs during Gem::Specification.reset: +WARN: Unresolved or ambiguous specs during Gem::Specification.reset: x (= 1) Available/installed versions of this gem: - 1 -- cgit v1.2.3