From 22cc750c666a38f9bc22983f1edda7de218cde92 Mon Sep 17 00:00:00 2001
From: nandahkrishna <nanda.harishankar@gmail.com>
Date: Thu, 18 Feb 2021 15:05:01 +0530
Subject: [PATCH] livecheck and bump: formula/cask disambiguation

---
 Library/Homebrew/dev-cmd/bump.rb        | 11 +++++++++--
 Library/Homebrew/dev-cmd/livecheck.rb   | 13 +++++++------
 Library/Homebrew/livecheck/livecheck.rb | 16 +++++++++++++---
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/Library/Homebrew/dev-cmd/bump.rb b/Library/Homebrew/dev-cmd/bump.rb
index d52400fc85..6ce526e62c 100644
--- a/Library/Homebrew/dev-cmd/bump.rb
+++ b/Library/Homebrew/dev-cmd/bump.rb
@@ -161,11 +161,18 @@ module Homebrew
     livecheck_latest = livecheck_result(formula_or_cask)
     pull_requests = retrieve_pull_requests(formula_or_cask, name) unless args.no_pull_requests?
 
+    print_name = begin
+      "#{name} (cask)" if formula_or_cask.is_a?(Cask::Cask) && Formula[name] && !args.cask?
+    rescue FormulaUnavailableError
+      nil
+    end
+    print_name ||= name
+
     title = if current_version == repology_latest &&
                current_version == livecheck_latest
-      "#{name} is up to date!"
+      "#{print_name} is up to date!"
     else
-      name
+      print_name
     end
 
     ohai title
diff --git a/Library/Homebrew/dev-cmd/livecheck.rb b/Library/Homebrew/dev-cmd/livecheck.rb
index 13f05f09f4..30bbf7d5a4 100644
--- a/Library/Homebrew/dev-cmd/livecheck.rb
+++ b/Library/Homebrew/dev-cmd/livecheck.rb
@@ -103,12 +103,13 @@ module Homebrew
     raise UsageError, "No formulae or casks to check." if formulae_and_casks_to_check.blank?
 
     options = {
-      json:       args.json?,
-      full_name:  args.full_name?,
-      newer_only: args.newer_only?,
-      quiet:      args.quiet?,
-      debug:      args.debug?,
-      verbose:    args.verbose?,
+      json:                 args.json?,
+      full_name:            args.full_name?,
+      handle_name_conflict: !args.cask?,
+      newer_only:           args.newer_only?,
+      quiet:                args.quiet?,
+      debug:                args.debug?,
+      verbose:              args.verbose?,
     }.compact
 
     Livecheck.run_checks(formulae_and_casks_to_check, **options)
diff --git a/Library/Homebrew/livecheck/livecheck.rb b/Library/Homebrew/livecheck/livecheck.rb
index 4ff07d864b..33bbcd7bee 100644
--- a/Library/Homebrew/livecheck/livecheck.rb
+++ b/Library/Homebrew/livecheck/livecheck.rb
@@ -88,6 +88,7 @@ module Homebrew
       params(
         formulae_and_casks_to_check: T::Enumerable[T.any(Formula, Cask::Cask)],
         full_name:                   T::Boolean,
+        handle_name_conflict:        T::Boolean,
         json:                        T::Boolean,
         newer_only:                  T::Boolean,
         debug:                       T::Boolean,
@@ -97,7 +98,8 @@ module Homebrew
     }
     def run_checks(
       formulae_and_casks_to_check,
-      full_name: false, json: false, newer_only: false, debug: false, quiet: false, verbose: false
+      full_name: false, handle_name_conflict: false, json: false, newer_only: false,
+      debug: false, quiet: false, verbose: false
     )
       load_other_tap_strategies(formulae_and_casks_to_check)
 
@@ -123,6 +125,12 @@ module Homebrew
         formula = formula_or_cask if formula_or_cask.is_a?(Formula)
         cask = formula_or_cask if formula_or_cask.is_a?(Cask::Cask)
         name = formula_or_cask_name(formula_or_cask, full_name: full_name)
+        print_name = begin
+          "#{name} (cask)" if cask && Formula[name] && handle_name_conflict
+        rescue FormulaUnavailableError
+          nil
+        end
+        print_name ||= name
 
         if debug && i.positive?
           puts <<~EOS
@@ -130,6 +138,8 @@ module Homebrew
             ----------
 
           EOS
+        elsif debug
+          puts
         end
 
         skip_info = SkipConditions.skip_information(formula_or_cask, full_name: full_name, verbose: verbose)
@@ -220,6 +230,7 @@ module Homebrew
           next info
         end
 
+        info[:cask] = print_name
         print_latest_version(info, verbose: verbose)
         nil
       rescue => e
@@ -229,7 +240,7 @@ module Homebrew
           progress&.increment
           status_hash(formula_or_cask, "error", [e.to_s], full_name: full_name, verbose: verbose)
         elsif !quiet
-          onoe "#{Tty.blue}#{name}#{Tty.reset}: #{e}"
+          onoe "#{Tty.blue}#{print_name}#{Tty.reset}: #{e}"
           $stderr.puts e.backtrace if debug && !e.is_a?(Livecheck::Error)
           nil
         end
@@ -438,7 +449,6 @@ module Homebrew
       urls ||= checkable_urls(formula_or_cask)
 
       if debug
-        puts
         if formula
           puts "Formula:          #{formula_name(formula, full_name: full_name)}"
           puts "Head only?:       true" if formula.head_only?