From 40b0070bebf6ef34435ebd521c14c5a3770fca34 Mon Sep 17 00:00:00 2001 From: Sam Ford <1584702+samford@users.noreply.github.com> Date: Tue, 27 Sep 2022 00:18:20 -0400 Subject: [PATCH] Modify comments and other text The `check_for_resources` code arguably speaks for itself, so it doesn't feel like a necessary addition. Besides that, this cleans up some other comments and text to better align with existing examples. --- Library/Homebrew/livecheck/livecheck.rb | 4 +--- Library/Homebrew/livecheck/skip_conditions.rb | 2 +- Library/Homebrew/test/livecheck/livecheck_spec.rb | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/livecheck/livecheck.rb b/Library/Homebrew/livecheck/livecheck.rb index 9c7c4131d3..bacc7a638d 100644 --- a/Library/Homebrew/livecheck/livecheck.rb +++ b/Library/Homebrew/livecheck/livecheck.rb @@ -286,8 +286,6 @@ module Homebrew version_info[:latest] if version_info.present? end - # Check current and latest resources (if "--resources" flag is given) - # Only check current and latest versions if we have resources to check against check_for_resources = check_resources && formula_or_cask.is_a?(Formula) && formula_or_cask.resources.present? if check_for_resources resource_version_info = formula_or_cask.resources.map do |resource| @@ -531,7 +529,7 @@ module Homebrew end end - # Returns an Array containing the formula/resource/cask URLs that can be used by livecheck. + # Returns an Array containing the formula/cask/resource URLs that can be used by livecheck. sig { params(package_or_resource: T.any(Formula, Cask::Cask, Resource)).returns(T::Array[String]) } def checkable_urls(package_or_resource) urls = [] diff --git a/Library/Homebrew/livecheck/skip_conditions.rb b/Library/Homebrew/livecheck/skip_conditions.rb index 3e1fefe3f6..be5159cb97 100644 --- a/Library/Homebrew/livecheck/skip_conditions.rb +++ b/Library/Homebrew/livecheck/skip_conditions.rb @@ -172,7 +172,7 @@ module Homebrew :cask_url_unversioned, ].freeze - # Skip conditions for resource. + # Skip conditions for resources. RESOURCE_CHECKS = [ :package_or_resource_skip, ].freeze diff --git a/Library/Homebrew/test/livecheck/livecheck_spec.rb b/Library/Homebrew/test/livecheck/livecheck_spec.rb index fdc076dc47..c23f2391b9 100644 --- a/Library/Homebrew/test/livecheck/livecheck_spec.rb +++ b/Library/Homebrew/test/livecheck/livecheck_spec.rb @@ -152,11 +152,11 @@ describe Homebrew::Livecheck do RUBY end - it "returns a URL string when given a livecheck_url string for formula" do + it "returns a URL string when given a livecheck_url string for a formula" do expect(livecheck.livecheck_url_to_string(livecheck_url, f_livecheck_url)).to eq(livecheck_url) end - it "returns a URL string when given a livecheck_url string for resource" do + it "returns a URL string when given a livecheck_url string for a resource" do expect(livecheck.livecheck_url_to_string(livecheck_url, r_livecheck_url)).to eq(livecheck_url) end