mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Merge master branch from rubygems/rubygems upstream.
* 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:
parent
2f023c5dba
commit
5335ce0e06
247 changed files with 1290 additions and 1363 deletions
|
@ -19,12 +19,12 @@ class Gem::Resolver::DependencyRequest
|
|||
# Creates a new DependencyRequest for +dependency+ from +requester+.
|
||||
# +requester may be nil if the request came from a user.
|
||||
|
||||
def initialize dependency, requester
|
||||
def initialize(dependency, requester)
|
||||
@dependency = dependency
|
||||
@requester = requester
|
||||
end
|
||||
|
||||
def == other # :nodoc:
|
||||
def ==(other) # :nodoc:
|
||||
case other
|
||||
when Gem::Dependency
|
||||
@dependency == other
|
||||
|
@ -48,7 +48,7 @@ class Gem::Resolver::DependencyRequest
|
|||
# NOTE: #match? only matches prerelease versions when #dependency is a
|
||||
# prerelease dependency.
|
||||
|
||||
def match? spec, allow_prerelease = false
|
||||
def match?(spec, allow_prerelease = false)
|
||||
@dependency.match? spec, nil, allow_prerelease
|
||||
end
|
||||
|
||||
|
@ -95,7 +95,7 @@ class Gem::Resolver::DependencyRequest
|
|||
@requester ? @requester.request : "(unknown)"
|
||||
end
|
||||
|
||||
def pretty_print q # :nodoc:
|
||||
def pretty_print(q) # :nodoc:
|
||||
q.group 2, '[Dependency request ', ']' do
|
||||
q.breakable
|
||||
q.text @dependency.to_s
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue