From e40932e26152d371b1117e141e8744a282ad0e34 Mon Sep 17 00:00:00 2001 From: Sam Ford <1584702+samford@users.noreply.github.com> Date: Wed, 11 Nov 2020 17:03:51 -0500 Subject: [PATCH] livecheck: skip disabled formulae --- Library/Homebrew/livecheck/livecheck.rb | 7 +++++++ Library/Homebrew/test/livecheck/livecheck_spec.rb | 15 +++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/Library/Homebrew/livecheck/livecheck.rb b/Library/Homebrew/livecheck/livecheck.rb index 7e90808ea8..fae6e91804 100644 --- a/Library/Homebrew/livecheck/livecheck.rb +++ b/Library/Homebrew/livecheck/livecheck.rb @@ -233,6 +233,13 @@ module Homebrew return end + if formula.disabled? && !formula.livecheckable? + return status_hash(formula, "disabled", args: args) if args.json? + + puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : disabled" unless args.quiet? + return + end + if formula.versioned_formula? && !formula.livecheckable? return status_hash(formula, "versioned", args: args) if args.json? diff --git a/Library/Homebrew/test/livecheck/livecheck_spec.rb b/Library/Homebrew/test/livecheck/livecheck_spec.rb index 5bbd943203..5571ad7fa1 100644 --- a/Library/Homebrew/test/livecheck/livecheck_spec.rb +++ b/Library/Homebrew/test/livecheck/livecheck_spec.rb @@ -29,6 +29,15 @@ describe Homebrew::Livecheck do end end + let(:f_disabled) do + formula("test_disabled") do + desc "Disabled test formula" + homepage "https://brew.sh" + url "https://brew.sh/test-0.0.1.tgz" + disable! because: :unmaintained + end + end + let(:f_gist) do formula("test_gist") do desc "Gist test formula" @@ -100,6 +109,12 @@ describe Homebrew::Livecheck do .and not_to_output.to_stderr end + it "skips a disabled formula without a livecheckable" do + expect { livecheck.skip_conditions(f_disabled, args: args) } + .to output("test_disabled : disabled\n").to_stdout + .and not_to_output.to_stderr + end + it "skips a versioned formula without a livecheckable" do expect { livecheck.skip_conditions(f_versioned, args: args) } .to output("test@0.0.1 : versioned\n").to_stdout