diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-02-14 12:59:03 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-02-14 12:59:03 +0000 |
| commit | 4ae3df42f723d25b0fe4ba6b2689d607b01c6f48 (patch) | |
| tree | 26c5f5cf033f79373e63b10f684df07898b7cd8f /lib/rubygems/server.rb | |
| parent | d1e6304a891fc5e9cc63e50520bdc798fb95b829 (diff) | |
Merge RubyGems master@9be7858f7f17eae3058204f3c03e4b798ba18b9c
This version contains the some style changes by RuboCop.
* https://github.com/rubygems/rubygems/commit/9d810be0ede925fb2e3af535848582c3f8e0e72f
* https://github.com/rubygems/rubygems/commit/61ea98a727fb1b76b6fac52d74107ee4b02aaef2
* https://github.com/rubygems/rubygems/commit/795893dce3c5f8540804fc08144cc6a90f086b13
* https://github.com/rubygems/rubygems/commit/9be7858f7f17eae3058204f3c03e4b798ba18b9c
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/server.rb')
| -rw-r--r-- | lib/rubygems/server.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/rubygems/server.rb b/lib/rubygems/server.rb index 1453bf2323..97923ef698 100644 --- a/lib/rubygems/server.rb +++ b/lib/rubygems/server.rb @@ -607,13 +607,13 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; } Gem::Specification.each do |spec| total_file_count += spec.files.size - deps = spec.dependencies.map { |dep| + deps = spec.dependencies.map do |dep| { "name" => dep.name, "type" => dep.type, "version" => dep.requirement.to_s, } - } + end deps = deps.sort_by { |dep| [dep["name"].downcase, dep["version"]] } deps.last["is_last"] = true unless deps.empty? @@ -754,9 +754,9 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; } # documentation - just put it underneath the main doc folder. def show_rdoc_for_pattern(pattern, res) - found_gems = Dir.glob("{#{@gem_dirs.join ','}}/doc/#{pattern}").select {|path| + found_gems = Dir.glob("{#{@gem_dirs.join ','}}/doc/#{pattern}").select do |path| File.exist? File.join(path, 'rdoc/index.html') - } + end case found_gems.length when 0 return false @@ -875,4 +875,5 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; } system("#{@launch} http://#{host}:#{@port}") end + end |