Skip to content

Commit ba4495d

Browse files
hsbtmatzbot
authored andcommitted
[rubygems/rubygems] Align code styles with rubocop and others.
rubygems/rubygems@c31a1592ee
1 parent 7e69d74 commit ba4495d

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

test/rubygems/test_gem_remote_fetcher_local_server.rb

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def setup
8686
end
8787

8888
def teardown
89-
@fetcher.close_all if @fetcher
89+
@fetcher&.close_all
9090

9191
if @normal_server
9292
@normal_server.kill.join
@@ -186,7 +186,7 @@ def assert_data_from_proxy(data)
186186
end
187187

188188
def start_server(data)
189-
server = TCPServer.new('localhost', 0)
189+
server = TCPServer.new("localhost", 0)
190190
thread = Thread.new do
191191
loop do
192192
client = server.accept
@@ -201,16 +201,12 @@ def handle_request(client, data)
201201
request_line = client.gets
202202
headers = {}
203203
while (line = client.gets) && line != "\r\n"
204-
key, value = line.split(': ', 2)
204+
key, value = line.split(": ", 2)
205205
headers[key] = value.strip
206206
end
207207

208208
if request_line.start_with?("GET /yaml")
209-
response = if headers["X-Captain"]
210-
headers["X-Captain"]
211-
else
212-
data
213-
end
209+
response = headers["X-Captain"] ? headers["X-Captain"] : data
214210
client.print "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: #{response.size}\r\n\r\n#{response}"
215211
elsif request_line.start_with?("HEAD /yaml") || request_line.start_with?("GET http://") && request_line.include?("/yaml")
216212
client.print "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: #{data.size}\r\n\r\n#{data}"

test/rubygems/test_gem_remote_fetcher_local_ssl_server.rb

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def setup
3636

3737
def teardown
3838
if @ssl_server
39-
# TODO lookup ssl_server status and close it properly
39+
# TODO: lookup ssl_server status and close it properly
4040
# @ssl_server.shutdown
4141
@ssl_server = nil
4242
end
@@ -162,13 +162,11 @@ def start_ssl_server(config = {})
162162
loop do
163163
ssl_client = ssl_server.accept
164164
Thread.new(ssl_client) do |client|
165-
begin
166-
handle_request(client)
167-
rescue OpenSSL::SSL::SSLError => e
168-
warn "SSL error: #{e.message}"
169-
ensure
170-
client.close
171-
end
165+
handle_request(client)
166+
rescue OpenSSL::SSL::SSLError => e
167+
warn "SSL error: #{e.message}"
168+
ensure
169+
client.close
172170
end
173171
end
174172
end

0 commit comments

Comments
 (0)