mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Merge RubyGems master@9be7858f7f17eae3058204f3c03e4b798ba18b9c
This version contains the some style changes by RuboCop. *9d810be0ed
*61ea98a727
*795893dce3
*9be7858f7f
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d1e6304a89
commit
4ae3df42f7
160 changed files with 1159 additions and 578 deletions
|
@ -5,6 +5,7 @@
|
|||
# constructed.
|
||||
|
||||
class Gem::RequestSet::Lockfile
|
||||
|
||||
##
|
||||
# Raised when a lockfile cannot be parsed
|
||||
|
||||
|
@ -35,6 +36,7 @@ class Gem::RequestSet::Lockfile
|
|||
@path = path
|
||||
super "#{message} (at line #{line} column #{column})"
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
##
|
||||
|
@ -79,7 +81,7 @@ class Gem::RequestSet::Lockfile
|
|||
|
||||
@gem_deps_file.untaint unless gem_deps_file.tainted?
|
||||
|
||||
@platforms = []
|
||||
@platforms = []
|
||||
end
|
||||
|
||||
def add_DEPENDENCIES(out) # :nodoc:
|
||||
|
@ -153,7 +155,7 @@ class Gem::RequestSet::Lockfile
|
|||
base = File.expand_path(base)
|
||||
|
||||
if dest.index(base) == 0
|
||||
offset = dest[base.size+1..-1]
|
||||
offset = dest[base.size + 1..-1]
|
||||
|
||||
return '.' unless offset
|
||||
|
||||
|
@ -233,6 +235,7 @@ class Gem::RequestSet::Lockfile
|
|||
def requests
|
||||
@set.sorted_requests
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
require 'rubygems/request_set/lockfile/tokenizer'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue