Merge pull request #21966 from Homebrew/share-full-name-utils

Share full-name parsing helpers

Author: MikeMcQuaid

Library/Homebrew/bundle/brew.rb

@@ -3,6 +3,7 @@
 
 require "json"
 require "tsort"
+require "utils"
 require "utils/output"
 require "bundle/package_type"
 
@@ -80,16 +81,16 @@ def no_upgrade_with_args?(no_upgrade, formula_name)
         sig { params(formula: String, array: T::Array[String]).returns(T::Boolean) }
         def formula_in_array?(formula, array)
           return true if array.include?(formula)
-          return true if array.include?(formula.split("/").fetch(-1))
+          return true if array.include?(Utils.name_from_full_name(formula))
 
           old_name = formula_oldnames[formula]
-          old_name ||= formula_oldnames[formula.split("/").fetch(-1)]
+          old_name ||= formula_oldnames[Utils.name_from_full_name(formula)]
           return true if old_name && array.include?(old_name)
 
           resolved_full_name = formula_aliases[formula]
           return false unless resolved_full_name
           return true if array.include?(resolved_full_name)
-          return true if array.include?(resolved_full_name.split("/").last)
+          return true if array.include?(Utils.name_from_full_name(resolved_full_name))
 
           false
         end
@@ -201,9 +202,8 @@ def dump_output(describe: false, no_restart: false)
         def fetchable_name(name, options = {}, no_upgrade: false)
           _ = options
 
-          user, repository, = name.split("/", 3)
-          return if user.present? && repository.present? &&
-                    Homebrew::Bundle::Tap.installed_taps.exclude?("#{user}/#{repository}")
+          return if (tap_name = Utils.tap_from_full_name(name)) &&
+                    Homebrew::Bundle::Tap.installed_taps.exclude?(tap_name)
           return if formula_installed_and_up_to_date?(name, no_upgrade:)
 
           name
@@ -220,8 +220,7 @@ def formula_aliases
 
             aliases.each do |a|
               @formula_aliases[a] = f[:full_name]
-              if f[:full_name].include? "/" # tap formula
-                tap_name = f[:full_name].rpartition("/").first
+              if (tap_name = Utils.tap_from_full_name(f[:full_name]))
                 @formula_aliases["#{tap_name}/#{a}"] = f[:full_name]
               end
             end
@@ -240,8 +239,7 @@ def formula_oldnames
 
             oldnames.each do |oldname|
               @formula_oldnames[oldname] = f[:full_name]
-              if f[:full_name].include? "/" # tap formula
-                tap_name = f[:full_name].rpartition("/").first
+              if (tap_name = Utils.tap_from_full_name(f[:full_name]))
                 @formula_oldnames["#{tap_name}/#{oldname}"] = f[:full_name]
               end
             end
@@ -380,7 +378,7 @@ def sort!(formulae)
       def initialize(name = "", options = {})
         super()
         @full_name = name
-        @name = T.let(name.split("/").last || name, String)
+        @name = T.let(Utils.name_from_full_name(name), String)
         @args = T.let(options.fetch(:args, []).map { |arg| "--#{arg}" }, T::Array[String])
         @conflicts_with_arg = T.let(options.fetch(:conflicts_with, []), T::Array[String])
         @restart_service = T.let(options[:restart_service], T.nilable(T.any(Symbol, T::Boolean)))

Library/Homebrew/bundle/brew_services.rb

@@ -124,7 +124,7 @@ def installed_and_up_to_date?(formula, no_upgrade: false)
 
           # `brew services list` returns base names, so fall back to the last
           # path component for tap-qualified entries (e.g., "user/tap/formula").
-          base_name = name.split("/").fetch(-1)
+          base_name = Utils.name_from_full_name(name)
           return true if base_name != name && self.class.started?(base_name)
 
           old_name = lookup_old_name(name)
@@ -147,7 +147,7 @@ def formula_needs_to_start?(formula)
         def lookup_old_name(service_name)
           @old_names ||= T.let(Homebrew::Bundle::Brew.formula_oldnames, T.nilable(T::Hash[String, String]))
           old_name = @old_names[service_name]
-          old_name ||= @old_names[service_name.split("/").fetch(-1)]
+          old_name ||= @old_names[Utils.name_from_full_name(service_name)]
           old_name
         end
 

Library/Homebrew/bundle/cask.rb

@@ -1,6 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
+require "utils"
 require "utils/output"
 require "bundle/package_type"
 
@@ -143,9 +144,8 @@ def installable_or_upgradable?(name, no_upgrade: false, **options)
         sig { params(name: String, options: Homebrew::Bundle::EntryOptions, no_upgrade: T::Boolean).returns(T.nilable(String)) }
         def fetchable_name(name, options = {}, no_upgrade: false)
           full_name = T.cast(options.fetch(:full_name, name), String)
-          user, repository, = full_name.split("/", 3)
-          return if user.present? && repository.present? &&
-                    Homebrew::Bundle::Tap.installed_taps.exclude?("#{user}/#{repository}")
+          return if (tap_name = Utils.tap_from_full_name(full_name)) &&
+                    Homebrew::Bundle::Tap.installed_taps.exclude?(tap_name)
           return unless installable_or_upgradable?(name, no_upgrade:, **options)
 
           full_name
@@ -163,15 +163,15 @@ def cask_installed_and_up_to_date?(cask, no_upgrade: false)
         def cask_in_array?(cask, array)
           return true if array.include?(cask)
 
-          array.include?(cask.split("/").last)
+          array.include?(Utils.name_from_full_name(cask))
         end
 
         sig { params(cask: String).returns(T::Boolean) }
         def cask_installed?(cask)
           return true if cask_in_array?(cask, installed_casks)
 
           old_name = cask_oldnames[cask]
-          old_name ||= cask_oldnames[cask.split("/").fetch(-1)]
+          old_name ||= cask_oldnames[Utils.name_from_full_name(cask)]
           return false unless old_name
           return false unless cask_in_array?(old_name, installed_casks)
 
@@ -242,8 +242,7 @@ def cask_oldnames
 
             oldnames.each do |oldname|
               hash[oldname] = c.full_name
-              if c.full_name.include? "/" # tap cask
-                tap_name = c.full_name.rpartition("/").first
+              if (tap_name = Utils.tap_from_full_name(c.full_name))
                 hash["#{tap_name}/#{oldname}"] = c.full_name
               end
             end

Library/Homebrew/bundle/dsl.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "bundle/package_type"
+require "utils"
 
 module Homebrew
   module Bundle
@@ -125,8 +126,7 @@ def self.sanitize_tap_name(name)
 
       sig { params(name: String).returns(String) }
       def self.sanitize_cask_name(name)
-        name = name.split("/").fetch(-1) if name.include?("/")
-        name.downcase
+        Utils.name_from_full_name(name).downcase
       end
 
       sig {

Library/Homebrew/cli/named_args.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "cli/args"
+require "utils"
 require "utils/output"
 
 module Homebrew
@@ -447,10 +448,10 @@ def load_formula_or_cask(name, only: nil, method: nil, warn: false)
 
           raise unreadable_error if unreadable_error
 
-          user, repo, short_name = name.downcase.split("/", 3)
-          if repo.present? && short_name.present?
-            tap = Tap.fetch(T.must(user), repo)
-            raise TapFormulaOrCaskUnavailableError.new(tap, short_name)
+          downcased_name = name.downcase
+          if (tap_name = Utils.tap_from_full_name(downcased_name))
+            raise TapFormulaOrCaskUnavailableError.new(Tap.fetch(tap_name),
+                                                       Utils.name_from_full_name(downcased_name))
           end
 
           raise NoSuchKegError, name if resolve_formula(name)

Library/Homebrew/cmd/leaves.rb

@@ -34,7 +34,7 @@ def run
               full_name = dep["full_name"]
               next unless full_name
 
-              base_name(full_name)
+              Utils.name_from_full_name(full_name)
             end
           else
             # Fallback for installations without tab runtime_dependencies.
@@ -43,7 +43,9 @@ def run
         end
 
         # Add direct cask formula dependency names; their transitive deps are already in dep_names.
-        cask_dep_names = Cask::Caskroom.casks.flat_map { |cask| CaskDependent.new(cask).deps.map { |dep| base_name(dep.name) } }
+        cask_dep_names = Cask::Caskroom.casks.flat_map do |cask|
+          CaskDependent.new(cask).deps.map { |dep| Utils.name_from_full_name(dep.name) }
+        end
 
         dep_names = T.let((formula_dep_names + cask_dep_names).to_set, T::Set[String])
 
@@ -58,11 +60,6 @@ def run
 
       private
 
-      sig { params(full_name: String).returns(String) }
-      def base_name(full_name)
-        full_name.include?("/") ? full_name.rpartition("/").last : full_name
-      end
-
       sig { params(formula: Formula).returns(T::Boolean) }
       def installed_on_request?(formula)
         formula.any_installed_keg&.tab&.installed_on_request == true

Library/Homebrew/cmd/untap.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "abstract_command"
+require "utils"
 
 module Homebrew
   module Cmd
@@ -49,7 +50,7 @@ def run
       sig { params(tap: Tap).returns(T::Array[Formula]) }
       def installed_formulae_for(tap:)
         tap.formula_names.filter_map do |formula_name|
-          next unless installed_formulae_names.include?(formula_name.split("/").fetch(-1))
+          next unless installed_formulae_names.include?(Utils.name_from_full_name(formula_name))
 
           formula = begin
             Formulary.factory(formula_name)
@@ -68,7 +69,7 @@ def installed_formulae_for(tap:)
       sig { params(tap: Tap).returns(T::Array[Cask::Cask]) }
       def installed_casks_for(tap:)
         tap.cask_tokens.filter_map do |cask_token|
-          next unless installed_cask_tokens.include?(cask_token.split("/").fetch(-1))
+          next unless installed_cask_tokens.include?(Utils.name_from_full_name(cask_token))
 
           cask = begin
             Cask::CaskLoader.load(cask_token)

Library/Homebrew/cmd/update-report.rb

@@ -467,7 +467,7 @@ def report(auto_update: false)
       case status
       when "A", "D"
         full_name = tap.formula_file_to_name(src)
-        name = full_name.split("/").fetch(-1)
+        name = Utils.name_from_full_name(full_name)
         new_tap = tap.tap_migrations[name]
         if new_tap.blank?
           @report[T.must(status).to_sym] << full_name
@@ -492,7 +492,7 @@ def report(auto_update: false)
 
     renamed_casks = Set.new
     @report[:DC].each do |old_full_name|
-      old_name = old_full_name.split("/").last
+      old_name = Utils.name_from_full_name(old_full_name)
       new_name = tap.cask_renames[old_name]
       next unless new_name
 
@@ -506,7 +506,7 @@ def report(auto_update: false)
     end
 
     @report[:AC].each do |new_full_name|
-      new_name = new_full_name.split("/").last
+      new_name = Utils.name_from_full_name(new_full_name)
       old_name = tap.cask_renames.key(new_name)
       next unless old_name
 
@@ -527,7 +527,7 @@ def report(auto_update: false)
 
     renamed_formulae = Set.new
     @report[:D].each do |old_full_name|
-      old_name = old_full_name.split("/").last
+      old_name = Utils.name_from_full_name(old_full_name)
       new_name = tap.formula_renames[old_name]
       next unless new_name
 
@@ -541,7 +541,7 @@ def report(auto_update: false)
     end
 
     @report[:A].each do |new_full_name|
-      new_name = new_full_name.split("/").last
+      new_name = Utils.name_from_full_name(new_full_name)
       old_name = tap.formula_renames.key(new_name)
       next unless old_name
 
@@ -586,22 +586,23 @@ def updated?
   sig { void }
   def migrate_tap_migration
     [report[:D], report[:DC], report[:T]].flatten.each do |full_name|
-      name = full_name.split("/").fetch(-1)
-      new_tap_name = tap.tap_migrations[name]
-      next if new_tap_name.nil? # skip if not in tap_migrations list.
-
-      new_tap_user, new_tap_repo, new_tap_new_name = new_tap_name.split("/")
-      new_name = if new_tap_new_name
-        new_full_name = new_tap_new_name
-        new_tap_name = "#{new_tap_user}/#{new_tap_repo}"
-        new_tap_new_name
-      elsif new_tap_repo
+      name = Utils.name_from_full_name(full_name)
+      migration_target = tap.tap_migrations[name]
+      next if migration_target.nil? # skip if not in tap_migrations list.
+
+      migrated_tap_name = Utils.tap_from_full_name(migration_target)
+      new_name = if migrated_tap_name
+        new_full_name = Utils.name_from_full_name(migration_target)
+        new_tap_name = migrated_tap_name
+        new_full_name
+      elsif migration_target.include?("/")
+        new_tap_name = migration_target
         new_full_name = "#{new_tap_name}/#{name}"
         name
       else
         new_tap_name = tap.name
-        new_full_name = "#{new_tap_name}/#{new_tap_user}"
-        new_tap_user
+        new_full_name = "#{new_tap_name}/#{migration_target}"
+        migration_target
       end
 
       # This means it is a cask
@@ -614,7 +615,7 @@ def migrate_tap_migration
           To uninstall the cask, run:
             brew uninstall --cask --force #{name}
         EOS
-        next if (HOMEBREW_CELLAR/new_name.split("/").last).directory?
+        next if (HOMEBREW_CELLAR/Utils.name_from_full_name(new_name)).directory?
 
         ohai "Installing #{new_name}..."
         begin
@@ -894,7 +895,7 @@ def dump_new_cask_report
       true
     end
     casks.each do |cask|
-      cask_token = cask.split("/").fetch(-1)
+      cask_token = Utils.name_from_full_name(cask)
       if should_display_descriptions && (desc = cask_description(cask))
         puts "#{cask_token}: #{desc}"
       else
@@ -917,7 +918,7 @@ def dump_deleted_cask_report
     return if Homebrew::SimulateSystem.simulating_or_running_on_linux?
 
     casks = select_formula_or_cask(:DC).sort.filter_map do |name|
-      name = name.split("/").fetch(-1)
+      name = Utils.name_from_full_name(name)
       pretty_uninstalled(name) if cask_installed?(name)
     end
 
@@ -933,7 +934,7 @@ def output_dump_formula_or_cask_report(title, formulae_or_casks)
 
   sig { params(formula: String).returns(T::Boolean) }
   def installed?(formula)
-    (HOMEBREW_CELLAR/formula.split("/").last).directory?
+    (HOMEBREW_CELLAR/Utils.name_from_full_name(formula)).directory?
   end
 
   sig { params(cask: String).returns(T::Boolean) }

Library/Homebrew/dependency.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "dependable"
+require "utils"
 
 # A dependency on another Homebrew formula.
 #
@@ -119,7 +120,7 @@ def missing_options
   end
 
   def option_names
-    [name.split("/").last].freeze
+    [Utils.name_from_full_name(name)].freeze
   end
 
   sig { overridable.returns(T::Boolean) }

Library/Homebrew/descriptions.rb

@@ -158,7 +158,7 @@ def installed_casks
   sig { returns(T::Hash[String, String]) }
   def short_names
     @short_names ||= T.let(
-      @descriptions.keys.to_h { |k| [k, k.split("/").fetch(-1)] },
+      @descriptions.keys.to_h { |k| [k, Utils.name_from_full_name(k)] },
       T.nilable(T::Hash[String, String]),
     )
   end