Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ jobs:
ruby:
- 3.1
- 3.2
- 3.3
- 3.4
- "4.0"
- head

steps:
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ gemspec

gem "rake"
gem "test-unit"
gem "rdoc"
20 changes: 2 additions & 18 deletions lib/rubygems/server.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# frozen_string_literal: true
require 'zlib'
require 'erb'
require 'uri'

Expand Down Expand Up @@ -450,8 +449,6 @@ def initialize(gem_dirs, port, daemon, launch = nil, addresses = nil)
@spec_dirs.reject! {|spec_dir| !File.directory? spec_dir }

reset_gems

@have_rdoc_4_plus = nil
end

def add_date(res)
Expand All @@ -467,16 +464,7 @@ def uri_encode(str)
end

def doc_root(gem_name)
if have_rdoc_4_plus?
"/doc_root/#{u gem_name}/"
else
"/doc_root/#{u gem_name}/rdoc/index.html"
end
end

def have_rdoc_4_plus?
@have_rdoc_4_plus ||=
Gem::Requirement.new('>= 4.0.0.preview2').satisfied_by? Gem::RDoc.rdoc_version
"/doc_root/#{u gem_name}/"
end

def latest_specs(req, res)
Expand Down Expand Up @@ -821,11 +809,7 @@ def run
'/gems' => '/cache/',
}

if have_rdoc_4_plus?
@server.mount '/doc_root', RDoc::Servlet, '/doc_root'
else
file_handlers['/doc_root'] = '/doc/'
end
@server.mount '/doc_root', RDoc::Servlet, '/doc_root'

@gem_dirs.each do |gem_dir|
file_handlers.each do |mount_point, mount_dir|
Expand Down
Loading
Loading