admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Add resource signature.

Browse Source
This commit is contained in:
Markus Reiter 2024-05-03 21:47:49 +02:00
parent dfbf26910d
commit e39a421bb0
No known key found for this signature in database
GPG Key ID: 245293B51702655B
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/formula.rb
View File

@ -553,7 +553,17 @@ class Formula
# ```ruby
# resource("additional_files").stage { bin.install "my/extra/tool" }
# ```
delegate resource: :active_spec
#
# FIXME: This should not actually take a block. All resources should be defined
# at the top-level using {Formula.resource} instead
# (see https://github.com/Homebrew/brew/issues/17203#issuecomment-2093654431).
#
# @api public
sig {
params(name: String, klass: T.class_of(Resource), block: T.nilable(T.proc.bind(Resource).void))
.returns(T.nilable(Resource))
}
def resource(name, klass = Resource, &block) = active_spec.resource(name, klass, &block)
# An old name for the formula.
sig { returns(T.nilable(String)) }
@ -3710,6 +3720,7 @@ class Formula
# ```
#
# @api public
sig { params(name: String, klass: T.class_of(Resource), block: T.nilable(T.proc.bind(Resource).void)).void }
def resource(name, klass = Resource, &block)
specs.each do |spec|
spec.resource(name, klass, &block) unless spec.resource_defined?(name)

5
Library/Homebrew/software_spec.rb
View File

@ -123,6 +123,10 @@ class SoftwareSpec
resources.key?(name)
end
sig {
params(name: String, klass: T.class_of(Resource), block: T.nilable(T.proc.bind(Resource).void))
.returns(T.nilable(Resource))
}
def resource(name, klass = Resource, &block)
if block
raise DuplicateResourceError, name if resource_defined?(name)
@ -132,6 +136,7 @@ class SoftwareSpec
resources[name] = res
dependency_collector.add(res)
res
else
resources.fetch(name) { raise ResourceMissingError.new(owner, name) }
end

3
Library/Homebrew/sorbet/rbi/parlour.rbi
View File

@ -80,9 +80,6 @@ class Formula
sig { params(args: T.untyped, options: T.untyped, block: T.untyped).returns(T::Boolean) }
def loaded_from_api?(*args, **options, &block); end
sig { params(args: T.untyped, options: T.untyped, block: T.untyped).returns(T.untyped) }
def resource(*args, **options, &block); end
sig { params(args: T.untyped, options: T.untyped, block: T.untyped).returns(T.untyped) }
def deps(*args, **options, &block); end