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
|
@ -60,7 +60,7 @@ Use --overwrite to force rebuilding of documentation.
|
|||
end
|
||||
|
||||
def execute
|
||||
specs = if options[:all] then
|
||||
specs = if options[:all]
|
||||
Gem::Specification.to_a
|
||||
else
|
||||
get_all_gem_names.map do |name|
|
||||
|
@ -68,7 +68,7 @@ Use --overwrite to force rebuilding of documentation.
|
|||
end.flatten.uniq
|
||||
end
|
||||
|
||||
if specs.empty? then
|
||||
if specs.empty?
|
||||
alert_error 'No matching gems found'
|
||||
terminate_interaction 1
|
||||
end
|
||||
|
@ -78,7 +78,7 @@ Use --overwrite to force rebuilding of documentation.
|
|||
|
||||
doc.force = options[:overwrite]
|
||||
|
||||
if options[:overwrite] then
|
||||
if options[:overwrite]
|
||||
FileUtils.rm_rf File.join(spec.doc_dir, 'ri')
|
||||
FileUtils.rm_rf File.join(spec.doc_dir, 'rdoc')
|
||||
end
|
||||
|
@ -94,4 +94,3 @@ Use --overwrite to force rebuilding of documentation.
|
|||
end
|
||||
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue