diff --git a/Library/Homebrew/livecheck/livecheck.rb b/Library/Homebrew/livecheck/livecheck.rb index c3eeae87d6..bf986c6324 100644 --- a/Library/Homebrew/livecheck/livecheck.rb +++ b/Library/Homebrew/livecheck/livecheck.rb @@ -398,15 +398,13 @@ resource: false) puts JSON.pretty_generate(formulae_checked.compact) end - sig { params(formula_or_cask: T.any(Formula, Cask::Cask, Resource), full_name: T::Boolean).returns(String) } + sig { params(formula_or_cask: T.any(Formula, Cask::Cask), full_name: T::Boolean).returns(String) } def formula_or_cask_name(formula_or_cask, full_name: false) case formula_or_cask when Formula formula_name(formula_or_cask, full_name: full_name) when Cask::Cask cask_name(formula_or_cask, full_name: full_name) - when Resource - resource_name(formula_or_cask, full_name: full_name) else T.absurd(formula_or_cask) end @@ -426,13 +424,6 @@ resource: false) full_name ? formula.full_name : formula.name end - # Returns the fully-qualified name of a resource if the `full_name` argument is - # provided; returns the name otherwise. - sig { params(resource: Resource, full_name: T::Boolean).returns(String) } - def resource_name(resource, full_name: false) - resource.name - end - sig { params( package_or_resource: T.any(Formula, Cask::Cask, Resource), @@ -453,7 +444,7 @@ resource: false) elsif cask status_hash[:cask] = cask_name(cask, full_name: full_name) elsif resource - status_hash[:resource] = resource_name(resource, full_name: full_name) + status_hash[:resource] = resource.name end status_hash[:status] = status_str status_hash[:messages] = messages if messages.is_a?(Array) @@ -632,7 +623,7 @@ resource: false) if debug puts "\n\n" - puts "Resource: #{resource_name(resource, full_name: full_name)}" + puts "Resource: #{resource.name}" puts "Livecheckable?: #{has_livecheckable ? "Yes" : "No"}" end @@ -758,7 +749,7 @@ resource: false) is_outdated = (res_current != res_latest) && !is_newer_than_upstream resource_version_info = { - resource: resource_name(resource, full_name: full_name), + resource: resource.name, version: { current: res_current.to_s, latest: res_latest.to_s, diff --git a/Library/Homebrew/test/livecheck/livecheck_spec.rb b/Library/Homebrew/test/livecheck/livecheck_spec.rb index 069f03fa0d..a9f31774fa 100644 --- a/Library/Homebrew/test/livecheck/livecheck_spec.rb +++ b/Library/Homebrew/test/livecheck/livecheck_spec.rb @@ -75,16 +75,6 @@ describe Homebrew::Livecheck do end end - describe "::resource_name" do - it "returns the name of the resource" do - expect(livecheck.resource_name(r)).to eq("foo") - end - - it "returns the full name of the resource" do - expect(livecheck.resource_name(r, full_name: true)).to eq("foo") - end - end - describe "::cask_name" do it "returns the token of the cask" do expect(livecheck.cask_name(c)).to eq("test")