summaryrefslogtreecommitdiff
path: root/lib/bundler/source/rubygems/remote.rb
diff options
context:
space:
mode:
authorBundlerbot <bot@bundler.io>2019-06-24 10:33:28 +0000
committerBundlerbot <bot@bundler.io>2019-06-24 10:33:28 +0000
commitc5dcdfbc3617d1ecf551f047456d4ea03a18f930 (patch)
tree0d2220557c369a371964385daf3442000ffc4f95 /lib/bundler/source/rubygems/remote.rb
parent67bd477a2831e476c682ad41878ee99248420c07 (diff)
parentb35d7fc74ace61e86ebdc4f82a8beb0d8baabf07 (diff)
downloadbundler-c5dcdfbc3617d1ecf551f047456d4ea03a18f930.tar.gz
Merge #7161
7161: Fix file URIs on Windows r=hsbt a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that file:// URIs were not properly handled on Windows, and those are heavily used by our specs. ### What was your diagnosis of the problem? My diagnosis was that Windows paths do not start with a slash, so we need to add an extra slash to separate the host from the path in file:// urls. Otherwise "D:" is parsed as the host segment in the URI. As a consequence of that change, we also need to strip that leading character when using the path segment for those URIs, so that it's a valid file path on Windows. This change reduces Windows CI spec failures from 429 to 355. In order to apply this fix for all file URI's in tests, I extracted a helper method and searched and replaced all file:// ocurrences with the method. The diff is big because of that, but I think it works fine. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
Diffstat (limited to 'lib/bundler/source/rubygems/remote.rb')
-rw-r--r--lib/bundler/source/rubygems/remote.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/bundler/source/rubygems/remote.rb b/lib/bundler/source/rubygems/remote.rb
index b45f33770a..7558b2cc3f 100644
--- a/lib/bundler/source/rubygems/remote.rb
+++ b/lib/bundler/source/rubygems/remote.rb
@@ -25,8 +25,7 @@ module Bundler
cache_uri = original_uri || uri
- # URI::File of Ruby 2.6 returns empty string when given "file://".
- host = defined?(URI::File) && cache_uri.is_a?(URI::File) ? nil : cache_uri.host
+ host = cache_uri.to_s.start_with?("file://") ? nil : cache_uri.host
uri_parts = [host, cache_uri.user, cache_uri.port, cache_uri.path]
uri_digest = SharedHelpers.digest(:MD5).hexdigest(uri_parts.compact.join("."))