Add group selection for dump command

Homebrew · Jun 12, 2023 · e967a86 · e967a86
1 parent 4a99ca5
commit e967a86
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 11 deletions.
diff --git a/cmd/bundle.rb b/cmd/bundle.rb
@@ -116,6 +116,13 @@ def bundle
           describe:   args.describe?,
           force:      args.force?,
           no_restart: args.no_restart?,
+          all:        args.all?,
+          taps:       args.taps?,
+          brews:      args.brews?,
+          casks:      args.casks?,
+          mas:        args.mas?,
+          whalebrew:  args.whalebrew?,
+          vscode:     args.vscode?,
         )
       when "cleanup"
         Bundle::Commands::Cleanup.run(

diff --git a/completions/zsh/brew-bundle b/completions/zsh/brew-bundle
@@ -60,7 +60,17 @@ _brew_bundle_dump() {
     '-f[overwrite an existing Brewfile]' \
     '--force[overwrite an existing Brewfile]' \
     '--describe[add a description comment above each line, unless the dependency does not have a description]' \
-    "--no-restart[don't add restart_service to formula lines]"
+    "--no-restart[don't add restart_service to formula lines]" \
+    '--all[dump all dependencies]' \
+    '--formula[dump Homebrew dependencies]' \
+    '--brews[dump Homebrew dependencies]' \
+    '--cask[dump Homebrew Cask dependencies]' \
+    '--casks[dump Homebrew Cask dependencies]' \
+    '--tap[dump tap dependencies]' \
+    '--taps[dump tap dependencies]' \
+    '--mas[dump Mac App Store dependencies]' \
+    '--whalebrew[dump Whalebrew dependencies]' \
+    '--vscode[dump VSCode extensions]'
 }
 
 _brew_bundle_cleanup() {

diff --git a/lib/bundle/commands/dump.rb b/lib/bundle/commands/dump.rb
@@ -5,9 +5,13 @@ module Commands
     module Dump
       module_function
 
-      def run(global: false, file: nil, describe: false, force: false, no_restart: false)
+      def run(global: false, file: nil, describe: false, force: false, no_restart: false,
+              all: false, taps: false, brews: false, casks: false,
+              mas: false, whalebrew: false, vscode: false)
         Bundle::Dumper.dump_brewfile(
           global: global, file: file, describe: describe, force: force, no_restart: no_restart,
+          all: all, taps: taps, brews: brews, casks: casks,
+          mas: mas, whalebrew: whalebrew, vscode: vscode
         )
       end
     end

diff --git a/lib/bundle/dumper.rb b/lib/bundle/dumper.rb
@@ -13,21 +13,28 @@ def can_write_to_brewfile?(brewfile_path, force: false)
       true
     end
 
-    def build_brewfile(describe: false, no_restart: false)
+    def build_brewfile(describe: false, no_restart: false,
+                       all: false, taps: false, brews: false, casks: false,
+                       mas: false, whalebrew: false, vscode: false)
+      all     = all || !(taps || brews || casks || mas || whalebrew || vscode)
       content = []
-      content << TapDumper.dump
-      content << BrewDumper.dump(describe: describe, no_restart: no_restart)
-      content << CaskDumper.dump(describe: describe)
-      content << MacAppStoreDumper.dump
-      content << WhalebrewDumper.dump
-      content << VscodeExtensionDumper.dump
+      content << TapDumper.dump if taps || all
+      content << BrewDumper.dump(describe: describe, no_restart: no_restart) if brews || all
+      content << CaskDumper.dump(describe: describe) if casks || all
+      content << MacAppStoreDumper.dump if mas || all
+      content << WhalebrewDumper.dump if whalebrew || all
+      content << VscodeExtensionDumper.dump if vscode || all
       "#{content.reject(&:empty?).join("\n")}\n"
     end
 
-    def dump_brewfile(global: false, file: nil, describe: false, force: false, no_restart: false)
+    def dump_brewfile(global: false, file: nil, describe: false, force: false, no_restart: false,
+                      all: false, taps: false, brews: false, casks: false,
+                      mas: false, whalebrew: false, vscode: false)
       path = brewfile_path(global: global, file: file)
       can_write_to_brewfile?(path, force: force)
-      content = build_brewfile(describe: describe, no_restart: no_restart)
+      content = build_brewfile(describe: describe, no_restart: no_restart,
+                               all: all, taps: taps, brews: brews, casks: casks,
+                               mas: mas, whalebrew: whalebrew, vscode: vscode)
       write_file path, content
     end