Merge pull request #625 from stefansundin/filter

Improve behavior of `--all`

cmd/services.rb

@@ -102,13 +102,22 @@ def services
     opoo "The --all argument overrides provided formula argument!" if formula.present? && args.all?
 
     targets = if args.all?
-      ::Service::Formulae.available_services
+      if subcommand == "start"
+        ::Service::Formulae.available_services(loaded: false, skip_root: !::Service::System.root?)
+      elsif subcommand == "stop"
+        ::Service::Formulae.available_services(loaded: true, skip_root: !::Service::System.root?)
+      else
+        ::Service::Formulae.available_services
+      end
     elsif formula
       [::Service::FormulaWrapper.new(Formulary.factory(formula))]
     else
       []
     end
 
+    # Exit successfully if --all was used but there is nothing to do
+    return if args.all? && targets.empty?
+
     if ::Service::System.systemctl?
       ENV["DBUS_SESSION_BUS_ADDRESS"] = ENV.fetch("HOMEBREW_DBUS_SESSION_BUS_ADDRESS", nil)
       ENV["XDG_RUNTIME_DIR"] = ENV.fetch("HOMEBREW_XDG_RUNTIME_DIR", nil)

lib/service/formulae.rb

@@ -4,15 +4,20 @@ module Service
   module Formulae
     module_function
 
-    # All available services
+    # All available services, with optional filters applied
     # @private
-    def available_services
+    def available_services(loaded: nil, skip_root: false)
       require "formula"
 
-      Formula.installed
-             .map { |formula| FormulaWrapper.new(formula) }
-             .select { |formula| formula.service? || formula.plist? }
-             .sort_by(&:name)
+      formulae = Formula.installed
+                        .map { |formula| FormulaWrapper.new(formula) }
+                        .select { |formula| formula.service? || formula.plist? }
+                        .sort_by(&:name)
+
+      formulae = formulae.select { |formula| formula.loaded? == loaded } unless loaded.nil?
+      formulae = formulae.reject { |formula| formula.owner == "root" } if skip_root
+
+      formulae
     end
 
     # List all available services with status, user, and path to the file.