chore: split large blocks into functions to help readability

Author: SMillerDev

README.md

@@ -15,6 +15,7 @@ This does not (and cannot) work with Homebrew on Linux (so don't file Linux issu
 ## Usage
 
 See [the `brew services` section of the `brew man` output](https://docs.brew.sh/Manpage#services-subcommand) or `brew services --help`.
+To specify a plist file use `brew services <command> <formula> --file=<file>`.
 
 
 ## Tests

cmd/services.rb

@@ -33,6 +33,7 @@ def services_args
         [`sudo`] `brew services cleanup`:
         Remove all unused services.
       EOS
+      flag "--file=", description: "Use the plist file from this location to start or run the service."
       switch "--all", description: "Run <subcommand> on all services."
     end
   end
@@ -42,9 +43,52 @@ def services
 
     raise UsageError, "`brew services` is supported only on macOS!" unless OS.mac?
 
+    # pbpaste's exit status is a proxy for detecting the use of reattach-to-user-namespace
+    raise UsageError, "`brew services` cannot run under tmux!" if ENV["TMUX"] && !quiet_system("/usr/bin/pbpaste")
+
     # Keep this after the .parse to keep --help fast.
     require_relative "../lib/services_cli"
 
-    Homebrew::ServicesCli.run!(args)
+    # Parse arguments.
+    subcommand, formula, custom_plist, = args.named
+
+    if custom_plist.present?
+      odeprecated "with file as last argument", "`--file=` to specify a plist file"
+    else
+      custom_plist = args.file
+    end
+
+    if ["list", "cleanup"].include?(subcommand)
+      raise UsageError, "The `#{subcommand}` subcommand does not accept a formula argument!" if formula
+      raise UsageError, "The `#{subcommand}` subcommand does not accept the --all argument!" if args.all?
+    end
+
+    target = if args.all?
+      available_services
+    elsif formula
+      Service.new(Formulary.factory(formula))
+    end
+
+    # Dispatch commands and aliases.
+    case subcommand.presence
+    when nil, "list", "ls"
+      Homebrew::ServicesCli.list
+    when "cleanup", "clean", "cl", "rm"
+      Homebrew::ServicesCli.cleanup
+    when "restart", "relaunch", "reload", "r"
+      Homebrew::ServicesCli.check(target) &&
+        Homebrew::ServicesCli.restart(target, custom_plist, verbose: args.verbose?)
+    when "run"
+      Homebrew::ServicesCli.check(target) &&
+        Homebrew::ServicesCli.run(target)
+    when "start", "launch", "load", "s", "l"
+      Homebrew::ServicesCli.check(target) &&
+        Homebrew::ServicesCli.start(target, custom_plist, verbose: args.verbose?)
+    when "stop", "unload", "terminate", "term", "t", "u"
+      Homebrew::ServicesCli.check(target) &&
+        Homebrew::ServicesCli.stop(target)
+    else
+      raise UsageError, "unknown subcommand: `#{subcommand}`"
+    end
   end
 end

lib/service.rb

@@ -118,14 +118,11 @@ def exit_code
     end
 
     # Generate that plist file, dude.
-    def generate_plist(data = nil, args:)
+    def generate_plist(data = nil)
       data ||= plist.file? ? plist : formula.plist
 
       if data.respond_to?(:file?) && data.file?
         data = data.read
-      elsif data.respond_to?(:keys) && data.key?(:url)
-        require "open-uri"
-        data = URI.parse(data).read
       elsif !data
         odie "Could not read the plist for `#{name}`!"
       end
@@ -140,12 +137,6 @@ def generate_plist(data = nil, args:)
         data = data.gsub(%r{(<key>UserName</key>\s*<string>)[^<]*(</string>)}, "")
       end
 
-      if args.verbose?
-        ohai "Generated plist for #{formula.name}:"
-        puts "   #{data.gsub("\n", "\n   ")}"
-        puts
-      end
-
       data
     end