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

15
lib/rubygems/resolver/lock_specification.rb
View file

@ -9,7 +9,7 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
attr_reader :sources
def initialize set, name, version, sources, platform
def initialize(set, name, version, sources, platform)
super()
@name = name
@ -27,10 +27,10 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
# This is a null install as a locked specification is considered installed.
# +options+ are ignored.
def install options = {}
def install(options = {})
destination = options[:install_dir] || Gem.dir
if File.exist? File.join(destination, 'specifications', spec.spec_name) then
if File.exist? File.join(destination, 'specifications', spec.spec_name)
yield nil
return
end
@ -41,11 +41,11 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
##
# Adds +dependency+ from the lockfile to this specification
def add_dependency dependency # :nodoc:
def add_dependency(dependency) # :nodoc:
@dependencies << dependency
end
def pretty_print q # :nodoc:
def pretty_print(q) # :nodoc:
q.group 2, '[LockSpecification', ']' do
q.breakable
q.text "name: #{@name}"
@ -53,12 +53,12 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
q.breakable
q.text "version: #{@version}"
unless @platform == Gem::Platform::RUBY then
unless @platform == Gem::Platform::RUBY
q.breakable
q.text "platform: #{@platform}"
end
unless @dependencies.empty? then
unless @dependencies.empty?
q.breakable
q.text 'dependencies:'
q.breakable
@ -85,4 +85,3 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
end
end