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

7
lib/rubygems/commands/lock_command.rb
View file

@ -59,7 +59,7 @@ lock it down to the exact version.
end
def complain(message)
if options[:strict] then
if options[:strict]
raise Gem::Exception, message
else
say "# #{message}"
@ -78,7 +78,7 @@ lock it down to the exact version.
spec = Gem::Specification.load spec_path(full_name)
if spec.nil? then
if spec.nil?
complain "Could not find gem #{full_name}, try using the full name"
next
end
@ -90,7 +90,7 @@ lock it down to the exact version.
next if locked[dep.name]
candidates = dep.matching_specs
if candidates.empty? then
if candidates.empty?
complain "Unable to satisfy '#{dep}' from currently installed gems"
else
pending << candidates.last.full_name
@ -108,4 +108,3 @@ lock it down to the exact version.
end
end