potluck 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92a30f07b5c14817cd0f61c62cf3ea56dce665498b022321348d9d9fe99605b7
-  data.tar.gz: f7166d54bb8c382714c6503569a4d4416c9db432575de49ee763402f42520310
+  metadata.gz: 8be6daeb322e6bd8b0a99cc25d8fb5a2a805b6354c620439c7a22ecdd289e189
+  data.tar.gz: 852bafb9263287a210c98c26b99e4a3e9358fd490c8b71910ecce2be16b980d7
 SHA512:
-  metadata.gz: 76407292ddfa7135cfe05728a1b860237ee6914fed9ebc5477960cf607174515d81058d2b0f23e1d7bab525a977593430d8830394083f2326f2b30d41b04bb02
-  data.tar.gz: ad0a00525b1146bf8587defa8fd96e2a1bd7066dd92961bd37d74a53283da22aaaab9bf434a848bf92d375756d2c204e96229e52c3c2d5fa4725c8eaf67b1b37
+  metadata.gz: 84d60ae064035c6657aa601a622e1f65e38fc915162cbb6287a40b2309d6736c17881f552abbf7daef2c159961a010aed4a61d5cc8111c7d7c4865925c058a81
+  data.tar.gz: 2659df968b31e9851addaa50369c92c1e143ea118e3837ae493c728ea6050f1f9efb34a350f238cb788d847a3a77632f5777b9f607e3cf00b391effec9c34c3f

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/potluck/dish.rb

@@ -10,14 +10,54 @@ module Potluck
 
     LAUNCHCTL_ERROR_REGEX = /^-|\t[^0]\t/.freeze
 
-    def initialize(logger: nil, is_local: nil)
+    def initialize(logger: nil, manage: launchctl?, is_local: (is_local_omitted = true; nil))
       @logger = logger
+      @manage = !!manage
+
+      if manage.kind_of?(Hash)
+        @status_command = manage[:status]
+        @status_error_regex = manage[:status_error_regex]
+        @start_command = manage[:start]
+        @stop_command = manage[:stop]
+      elsif manage
+        ensure_launchctl!
+      end
+
+      # DEPRECATED. Use `manage` instead.
       @is_local = is_local.nil? ? (IS_MACOS && ensure_launchctl! rescue false) : is_local
+
+      unless is_local_omitted
+        warn("#{self.class}#initialize `is_local` parameter is deprecated and will be removed soon (use "\
+          '`manage` instead)')
+      end
+    end
+
+    def manage?
+      @manage
+    end
+
+    def launchctl?
+      defined?(@@launchctl) ? @@launchctl : (@@launchctl = `which launchctl 2>&1` && $? == 0)
     end
 
     def ensure_launchctl!
-      @@launchctl = `which launchctl` && $? == 0 unless defined?(@@launchctl)
-      @@launchctl || raise("Cannot manage #{self.class.to_s.split('::').last}: launchctl not found")
+      launchctl? || raise("Cannot manage #{self.class.to_s.split('::').last}: launchctl not found")
+    end
+
+    def status_command
+      @status_command || "launchctl list 2>&1 | grep #{SERVICE_PREFIX}#{self.class.service_name}"
+    end
+
+    def status_error_regex
+      @status_error_regex || LAUNCHCTL_ERROR_REGEX
+    end
+
+    def start_command
+      @start_command || "launchctl bootstrap gui/#{Process.uid} #{self.class.plist_path}"
+    end
+
+    def stop_command
+      @stop_command || "launchctl bootout gui/#{Process.uid}/#{self.class.launchctl_name}"
     end
 
     def ensure_plist
@@ -25,13 +65,13 @@ module Potluck
     end
 
     def status
-      return :inactive unless @is_local && ensure_launchctl!
+      return :inactive unless manage?
 
-      output = `launchctl list 2>&1 | grep #{SERVICE_PREFIX}#{self.class.service_name}`
+      output = `#{status_command}`
 
       if $? != 0
         :inactive
-      elsif output[LAUNCHCTL_ERROR_REGEX]
+      elsif status_error_regex && output[status_error_regex]
         :error
       else
         :active
@@ -39,16 +79,16 @@ module Potluck
     end
 
     def start
-      return unless @is_local && ensure_launchctl!
+      return unless manage?
 
-      ensure_plist
+      ensure_plist unless @start_command
 
       case status
       when :error then stop
       when :active then return
       end
 
-      run("launchctl bootstrap gui/#{Process.uid} #{self.class.plist_path}")
+      run(start_command)
       wait { status == :inactive }
 
       raise("Could not start #{self.class.pretty_name}") if status != :active
@@ -57,9 +97,9 @@ module Potluck
     end
 
     def stop
-      return unless @is_local && ensure_launchctl! && status != :inactive
+      return unless manage? && status != :inactive
 
-      run("launchctl bootout gui/#{Process.uid}/#{self.class.launchctl_name}")
+      run(stop_command)
       wait { status != :inactive }
 
       raise("Could not stop #{self.class.pretty_name}") if status != :inactive
@@ -68,7 +108,7 @@ module Potluck
     end
 
     def restart
-      return unless @is_local && ensure_launchctl!
+      return unless manage?
 
       stop
       start

data/lib/potluck/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Potluck
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: potluck
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nate Pickens
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler