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
|
@ -75,7 +75,7 @@ Specific fields in the specification can be extracted in YAML format:
|
|||
specs = []
|
||||
gem = options[:args].shift
|
||||
|
||||
unless gem then
|
||||
unless gem
|
||||
raise Gem::CommandLineError,
|
||||
"Please specify a gem name or file on the command line"
|
||||
end
|
||||
|
@ -105,29 +105,29 @@ Specific fields in the specification can be extracted in YAML format:
|
|||
raise Gem::CommandLineError, "--ruby and FIELD are mutually exclusive" if
|
||||
field and options[:format] == :ruby
|
||||
|
||||
if local? then
|
||||
if File.exist? gem then
|
||||
if local?
|
||||
if File.exist? gem
|
||||
specs << Gem::Package.new(gem).spec rescue nil
|
||||
end
|
||||
|
||||
if specs.empty? then
|
||||
if specs.empty?
|
||||
specs.push(*dep.matching_specs)
|
||||
end
|
||||
end
|
||||
|
||||
if remote? then
|
||||
if remote?
|
||||
dep.prerelease = options[:prerelease]
|
||||
found, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dep
|
||||
|
||||
specs.push(*found.map { |spec,| spec })
|
||||
end
|
||||
|
||||
if specs.empty? then
|
||||
if specs.empty?
|
||||
alert_error "No gem matching '#{dep}' found"
|
||||
terminate_interaction 1
|
||||
end
|
||||
|
||||
unless options[:all] then
|
||||
unless options[:all]
|
||||
specs = [specs.max_by { |s| s.version }]
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue