Skip to content

Commit 9c1be12

Browse files
deivid-rodriguezhsbt
authored andcommitted
[rubygems/rubygems] Add Specification#lock_name and use that when dealing with checksums
ruby/rubygems@8e2c5748d9
1 parent 5bff692 commit 9c1be12

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

lib/bundler/checksum.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ def inspect
190190
def replace(spec, checksum)
191191
return unless checksum
192192

193-
lock_name = spec.name_tuple.lock_name
193+
lock_name = spec.lock_name
194194
@store_mutex.synchronize do
195195
existing = fetch_checksum(lock_name, checksum.algo)
196196
if !existing || existing.same_source?(checksum)
@@ -204,7 +204,7 @@ def replace(spec, checksum)
204204
def register(spec, checksum)
205205
return unless checksum
206206

207-
register_checksum(spec.name_tuple.lock_name, checksum)
207+
register_checksum(spec.lock_name, checksum)
208208
end
209209

210210
def merge!(other)
@@ -216,7 +216,7 @@ def merge!(other)
216216
end
217217

218218
def to_lock(spec)
219-
lock_name = spec.name_tuple.lock_name
219+
lock_name = spec.lock_name
220220
checksums = @store[lock_name]
221221
if checksums
222222
"#{lock_name} #{checksums.values.map(&:to_lock).sort.join(",")}"

lib/bundler/rubygems_ext.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,10 @@ def installation_missing?
262262
!default_gem? && !File.directory?(full_gem_path)
263263
end
264264

265+
def lock_name
266+
@lock_name ||= name_tuple.lock_name
267+
end
268+
265269
unless VALIDATES_FOR_RESOLUTION
266270
def validate_for_resolution
267271
SpecificationPolicy.new(self).validate_for_resolution

spec/bundler/bundler/lockfile_parser_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
expect(subject.ruby_version).to eq ruby_version
139139
rake_spec = specs.last
140140
checksums = subject.sources.last.checksum_store.to_lock(specs.last)
141-
expect(checksums).to eq("#{rake_spec.name_tuple.lock_name} #{rake_checksums.map(&:to_lock).sort.join(",")}")
141+
expect(checksums).to eq("#{rake_spec.lock_name} #{rake_checksums.map(&:to_lock).sort.join(",")}")
142142
end
143143
end
144144

0 commit comments

Comments
 (0)