matir/skel
1
0
Fork 0
mirror of https://github.com/Matir/skel.git synced 2026-05-25 21:19:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix brew manager

Browse Source
This commit is contained in:
David Tomaschik
2026-04-06 18:34:06 -07:00
parent 74c2472dd2
commit 69e4b83652
1 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
bin/macos/update_brewfile
View File

@@ -48,6 +48,7 @@ def parse_brewfile(content):
""" """
Parses Brewfile content. Parses Brewfile content.
Returns: Returns:
- unconditional_lines: list of strings
- conditional_pkgs: set of (type, name) - conditional_pkgs: set of (type, name)
- preserved_footer: string (everything from first conditional onwards) - preserved_footer: string (everything from first conditional onwards)
""" """
@@ -60,7 +61,7 @@ def parse_brewfile(content):
for i, line in enumerate(lines): for i, line in enumerate(lines):
stripped = line.strip() stripped = line.strip()
if stripped.startswith(('if ', 'unless ', 'case ')) and not stripped.endswith('; end'): if stripped.startswith(('if ', 'unless ', 'case ', 'def ', 'begin ')) and not stripped.endswith('; end'):
if first_conditional_idx == -1: if first_conditional_idx == -1:
# Look back for comments that might belong to this block # Look back for comments that might belong to this block
j = i - 1 j = i - 1
@@ -78,10 +79,11 @@ def parse_brewfile(content):
in_conditional -= 1 in_conditional -= 1
if first_conditional_idx == -1: if first_conditional_idx == -1:
return set(), "" return lines, set(), ""
unconditional_lines = lines[:first_conditional_idx]
footer = "\n".join(lines[first_conditional_idx:]) footer = "\n".join(lines[first_conditional_idx:])
return conditional_pkgs, footer return unconditional_lines, conditional_pkgs, footer
def main(args): def main(args):
repo_root = get_repo_root() repo_root = get_repo_root()
@@ -94,25 +96,52 @@ def main(args):
with open(brewfile_path) as f: with open(brewfile_path) as f:
old_content = f.read() old_content = f.read()
conditional_pkgs, footer = parse_brewfile(old_content) unconditional_lines, conditional_pkgs, footer = parse_brewfile(old_content)
ignore_list = get_ignore_list(repo_root) ignore_list = get_ignore_list(repo_root)
dumped_lines = get_current_packages() dumped_lines = get_current_packages()
new_unconditional_lines = [] new_unconditional_lines = []
seen_pkgs = set()
for line in dumped_lines: if args.add_only:
match = PKG_RE.match(line) # First, keep existing unconditional packages
if match: for line in unconditional_lines:
pkg_type, pkg_name = match.group(1), match.group(2) match = PKG_RE.match(line)
if pkg_name in ignore_list: if match:
continue pkg_type, pkg_name = match.group(1), match.group(2)
if (pkg_type, pkg_name) in conditional_pkgs: if pkg_name in ignore_list or (pkg_type, pkg_name) in conditional_pkgs:
continue continue
new_unconditional_lines.append(line)
seen_pkgs.add((pkg_type, pkg_name))
elif line.strip() and not line.strip().startswith('#'):
# Keep other non-comment lines
new_unconditional_lines.append(line)
# If it's not a package line (e.g. comment from dump), we can skip or keep # Then, add new packages from dump
if line.strip(): for line in dumped_lines:
new_unconditional_lines.append(line) match = PKG_RE.match(line)
if match:
pkg_type, pkg_name = match.group(1), match.group(2)
if (pkg_type, pkg_name) not in seen_pkgs and pkg_name not in ignore_list and (pkg_type, pkg_name) not in conditional_pkgs:
new_unconditional_lines.append(line)
seen_pkgs.add((pkg_type, pkg_name))
else:
for line in dumped_lines:
match = PKG_RE.match(line)
if match:
pkg_type, pkg_name = match.group(1), match.group(2)
if pkg_name in ignore_list:
continue
if (pkg_type, pkg_name) in conditional_pkgs:
continue
if (pkg_type, pkg_name) in seen_pkgs:
continue
seen_pkgs.add((pkg_type, pkg_name))
# If it's not a package line (e.g. comment from dump), we can skip or keep
if line.strip():
new_unconditional_lines.append(line)
# Sort lines by type (tap, brew, cask, mas) then name # Sort lines by type (tap, brew, cask, mas) then name
def sort_key(line): def sort_key(line):
@@ -152,5 +181,6 @@ def main(args):
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser(description="Update Brewfile while preserving conditionals.") parser = argparse.ArgumentParser(description="Update Brewfile while preserving conditionals.")
parser.add_argument("--dry-run", action="store_true", help="Show changes without applying them.") parser.add_argument("--dry-run", action="store_true", help="Show changes without applying them.")
parser.add_argument("--add-only", action="store_true", help="Only add missing entries, do not remove existing ones.")
args = parser.parse_args() args = parser.parse_args()
main(args) main(args)