Skip to content

Commit 95f856e

Browse files
simideivid-rodriguez
authored andcommitted
Merge pull request #8337 from rubygems/deivid-rodriguez/fix-missing-gem-redact-on-ruby31
Fix missing `Gem::Uri.redact` on some Ruby 3.1 versions (cherry picked from commit 424a7a6)
1 parent 728e3fe commit 95f856e

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

.github/workflows/system-rubygems-bundler.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
include:
32-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 } }
33-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.6 } }
34-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.6 } }
32+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.0 } }
33+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.0 } }
34+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.0 } }
3535
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.0-rc1 } }
36-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.6 } }
37-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.6 } }
38-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.6 } }
36+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.0 } }
37+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.0 } }
38+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.0 } }
3939
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.4, value: 3.4.0-rc1 } }
4040
steps:
4141
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

bundler/lib/bundler/rubygems_ext.rb

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,4 +455,15 @@ def full_name
455455

456456
Package::TarReader::Entry.prepend(FixFullNameEncoding)
457457
end
458+
459+
require "rubygems/uri"
460+
461+
# Can be removed once RubyGems 3.3.15 support is dropped
462+
unless Gem::Uri.respond_to?(:redact)
463+
class Uri
464+
def self.redact(uri)
465+
new(uri).redacted
466+
end
467+
end
468+
end
458469
end

0 commit comments

Comments
 (0)