kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Merge master branch from rubygems/rubygems upstream.

Browse source 
* Enable Style/MethodDefParentheses in Rubocop
    https://github.com/rubygems/rubygems/pull/2478
  * Enable Style/MultilineIfThen in Rubocop
    https://github.com/rubygems/rubygems/pull/2479
  * Fix required_ruby_version with prereleases and improve error message
    https://github.com/rubygems/rubygems/pull/2344
  * Fix bundler rubygems binstub not properly looking for bundler
    https://github.com/rubygems/rubygems/pull/2426

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2018-11-21 10:20:47 +00:00
parent 2f023c5dba
commit 5335ce0e06
247 changed files with 1290 additions and 1363 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/rubygems/resolver/activation_request.rb
View file

@ -22,13 +22,13 @@ class Gem::Resolver::ActivationRequest
# +others_possible+ indicates that other specifications may also match this
# activation request.
def initialize spec, request, others_possible = true
def initialize(spec, request, others_possible = true)
@spec = spec
@request = request
@others_possible = others_possible
end
def == other # :nodoc:
def ==(other) # :nodoc:
case other
when Gem::Specification
@spec == other
@ -49,7 +49,7 @@ class Gem::Resolver::ActivationRequest
##
# Downloads a gem at +path+ and returns the file path.
def download path
def download(path)
Gem.ensure_gem_subdirectories path
if @spec.respond_to? :sources
@ -97,7 +97,7 @@ class Gem::Resolver::ActivationRequest
when false then # TODO remove at RubyGems 3
nil
else
unless @others_possible.empty? then
unless @others_possible.empty?
others = @others_possible.map { |s| s.full_name }
" (others possible: #{others.join ', '})"
end
@ -152,7 +152,7 @@ class Gem::Resolver::ActivationRequest
@request.requester
end
def pretty_print q # :nodoc:
def pretty_print(q) # :nodoc:
q.group 2, '[Activation request', ']' do
q.breakable
q.pp @spec
@ -167,7 +167,7 @@ class Gem::Resolver::ActivationRequest
q.breakable
q.text 'others possible'
else
unless @others_possible.empty? then
unless @others_possible.empty?
q.breakable
q.text 'others '
q.pp @others_possible.map { |s| s.full_name }