Refactor rename/migration handling in Formulary.
#16595
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MikeMcQuaid
approved these changes
Feb 6, 2024
There was a problem hiding this comment.
Makes sense to me but would like to see ✅ from @Bo98 and/or @apainintheneck as they've been working here recently.
7 tasks
apainintheneck
approved these changes
Feb 8, 2024
7 tasks
Comment on lines
-905
to
+927
| def self.tap_formula_name_path(tapped_name, warn:) | ||
| def self.tap_formula_name_type(tapped_name, warn:) | ||
| user, repo, name = tapped_name.split("/", 3).map(&:downcase) | ||
| tap = Tap.fetch user, repo | ||
| path = Formulary.find_formula_in_tap(name, tap) | ||
|
|
||
| unless path.file? | ||
| if (possible_alias = tap.alias_dir/name).file? | ||
| path = possible_alias.resolved_path | ||
| name = path.basename(".rb").to_s | ||
| elsif (new_name = tap.formula_renames[name].presence) && | ||
| (new_path = Formulary.find_formula_in_tap(new_name, tap)).file? | ||
| old_name = name | ||
| path = new_path | ||
| name = new_name | ||
| new_name = tap.core_tap? ? name : "#{tap}/#{name}" | ||
| elsif (new_tap_name = tap.tap_migrations[name].presence) | ||
| new_tap_user, new_tap_repo, = new_tap_name.split("/") | ||
| new_tap_name = "#{new_tap_user}/#{new_tap_repo}" | ||
| new_tap = Tap.fetch new_tap_name | ||
| new_tap.ensure_installed! | ||
| new_tapped_name = "#{new_tap_name}/#{name}" | ||
| name, path, tap = Formulary.tap_formula_name_path(new_tapped_name, warn: false) | ||
| old_name = tapped_name | ||
| new_name = new_tap.core_tap? ? name : new_tapped_name | ||
| end | ||
|
|
||
| opoo "Formula #{old_name} was renamed to #{new_name}." if warn && old_name && new_name | ||
| type = nil | ||
|
|
||
| if (possible_alias = tap.alias_table[name].presence) | ||
| name = possible_alias | ||
| type = :alias | ||
| elsif (new_name = tap.formula_renames[name].presence) | ||
| old_name = name | ||
| name = new_name | ||
| new_name = tap.core_tap? ? name : "#{tap}/#{name}" | ||
| type = :rename | ||
| elsif (new_tap_name = tap.tap_migrations[name].presence) | ||
| new_tap_user, new_tap_repo, = new_tap_name.split("/") | ||
| new_tap_name = "#{new_tap_user}/#{new_tap_repo}" | ||
| new_tap = Tap.fetch new_tap_name | ||
| new_tap.ensure_installed! | ||
| new_tapped_name = "#{new_tap_name}/#{name}" | ||
| name, tap, = Formulary.tap_formula_name_type(new_tapped_name, warn: false) | ||
| old_name = tapped_name | ||
| new_name = new_tap.core_tap? ? name : new_tapped_name | ||
| type = :migration |
There was a problem hiding this comment.
Yes, previously it would just skip all this if the formula path exists.
There was a problem hiding this comment.
Thanks for the attention and fix here, @apainintheneck @reitermarkus 🥰
There was a problem hiding this comment.
@reitermarkus @apainintheneck @dduugg Should we revert this PR given #16628 is still open?
3 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
brew stylewith your changes locally?brew typecheckwith your changes locally?brew testswith your changes locally?Merge most of the code paths for loading with/without API. Instead of checking if the renamed/alias file exists, we simply assume so, as the end result is an error anyways if it doesn't.