diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-22 06:28:04 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-22 06:28:04 +0000 |
| commit | 3dc6efbe9ca582d6930f25754a16043dedecfa6f () | |
| tree | 35980c7383e9e12d092e0eff78f5f16eca2fa1fc /lib/rubygems | |
| parent | 59a6215af65b3bfade13836681cbacc3294e6e78 (diff) | |
Merge rubygems master targeted RubyGems 3.1.0.
https://.com/rubygems/rubygems/commit/1172320540c8c33c59fc1db5191b021c3b2db487 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/rubygems/commands/build_command.rb | 41 | ||||
| -rw-r--r-- | lib/rubygems/commands/push_command.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/gemcutter_utilities.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/rdoc.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/request.rb | 1 | ||||
| -rw-r--r-- | lib/rubygems/resolver.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/specification.rb | 3 | ||||
| -rw-r--r-- | lib/rubygems/test_case.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/validator.rb | 27 |
9 files changed, 43 insertions, 43 deletions
@@ -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 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 end end else alert_error "Gemspec file not found: #{gemspec}" terminate_interaction 1 end end end @@ -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. EOF end @@ -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] verify_api_key options[:key] elsif Gem.configuration.api_keys.key?(host) Gem.configuration.api_keys[host] @@ -18,7 +18,7 @@ begin module Gem RDoc = ::RDoc::RubygemsHook end rescue LoadError end - -Gem.done_installing(&Gem::RDoc.method(:generation_hook)) @@ -168,6 +168,7 @@ class Gem::Request no_env_proxy = env_proxy.nil? || env_proxy.empty? return get_proxy_from_env 'http' if no_env_proxy and _scheme != 'http' return :no_proxy if no_env_proxy @@ -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 @@ -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:" 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 if current_value != default_value(attr_name) or self.class.required_attribute? attr_name @@ -1057,6 +1057,8 @@ Also, a list: Gem.instance_variable_set :@platforms, nil Gem::Platform.instance_variable_set :@local, nil platform end @@ -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) good, gone, unreadable = nil, nil, nil, nil |