locd 0.1.3 → 0.1.4

data/lib/locd/cli/command/job.rb

@@ -54,6 +54,28 @@ class Locd::CLI::Command::Job < Locd::CLI::Command::Agent
       end
     end
     
+    def get_start_interval
+      if options[:every] && options[:at]
+        raise Thor::ConflictingArgumentError,
+          "Don't supply both `every` and `at` options"
+      end
+      
+      start_interval = if options[:every]
+        self.class.parse_every_option options[:every]
+      elsif options[:at]
+        options[:at].map { |key, value|
+          [key.to_sym, value.to_i]
+        }.to_h
+      else
+        raise Thor::RequiredArgumentMissingError,
+          "Must provide `every` or `at` option"
+      end
+      
+      logger.debug "Parsed start interval", start_interval: start_interval
+      
+      start_interval
+    end
+    
   # end protected
   public
   
@@ -61,7 +83,7 @@ class Locd::CLI::Command::Job < Locd::CLI::Command::Agent
   # Write Commands
   # ----------------------------------------------------------------------------
   
-  desc              "add CMD_TEMPLATE...",
+  desc              "add [OPTIONS] -- CMD_TEMPLATE...",
                     "Add job that runs in the current directory"
   include_options   groups: [:write, :add, :respond_with_agents]
   option            :every,
@@ -70,41 +92,27 @@ class Locd::CLI::Command::Job < Locd::CLI::Command::Agent
   option            :at,
                     desc: "Day/time to start the job",
                     type: :hash
-  def add           *cmd_template
-    logger.debug "#{ self.class.name }##{ __method__ }",
+  def add           *cmd_template, **kwds
+    logger.trace "#{ self.class.name }##{ __method__ }",
       options: options,
       cmd_template: cmd_template,
+      kwds: kwds,
       shared: self.class.shared_method_options
     
-    if options[:every] && options[:at]
-      logger.error "Don't supply both `every` and `at` options",
-        options: options
-      exit 1
-    end
-    
-    start_interval = if options[:every]
-      self.class.parse_every_option options[:every]
-    elsif options[:at]
-      options[:at].map { |key, value|
-        [key.to_sym, value.to_i]
-      }.to_h
-    else
-      raise Thor::RequiredArgumentMissingError,
-        "Must provide `every` or `at` option"
-    end
-    
-    logger.debug "Parsed start interval", start_interval: start_interval
-    
-    job = agent_class.add \
-      cmd_template: cmd_template,
-      start_interval: start_interval,
-      **option_kwds( groups: :write )
-    
-    logger.info "`#{ job.label }` job added."
+    kwds[:start_interval] ||= get_start_interval
     
-    job.load if options[:load]
+    super *cmd_template, **kwds
     
-    respond job
+    # job = agent_class.add \
+    #   cmd_template: cmd_template,
+    #   start_interval: get_start_interval,
+    #   **option_kwds( groups: [:write, :add] )
+    # 
+    # logger.info "`#{ job.label }` job added."
+    # 
+    # job.reload if options[:load]
+    # 
+    # respond job
   end
   
 end # class Locd::CLI::Command::Job

data/lib/locd/cli/command/main.rb

@@ -40,22 +40,14 @@ class Locd::CLI::Command::Main < Locd::CLI::Command::Base
   LOG_LEVEL_STRINGS = SemanticLogger::LEVELS.map { |sym| sym.to_s.freeze }
   
   
-  # Mixins
-  # ============================================================================
-  
-  # Dynamically add {.logger} and {#logger} methods.
-  # 
-  # Needs to be in `no_commands` or Thor gets upset.
-  # 
-  # no_commands { include SemanticLogger::Loggable }
-  
-  
   # Global (Class-Level) Options
   # ============================================================================
   # 
   # Applicable to all commands.
   # 
   
+  common_class_options :backtrace
+  
   class_option :log_level,
     desc: "Set log level",
     type: :string,
@@ -137,6 +129,7 @@ class Locd::CLI::Command::Main < Locd::CLI::Command::Base
       end
       
       Locd::Logging.level = level unless level.nil?
+      Locd::Logging.set_config_levels
       
       if [:trace, :debug].include? Locd::Logging.level
         logger.send Locd::Logging.level, "Hello! We about to start the show..."

data/lib/locd/cli/command/proxy.rb

@@ -69,10 +69,10 @@ class Locd::CLI::Command::Proxy < Locd::CLI::Command::Agent
   # Commands
   # ============================================================================
   
-  desc              "setup",
+  desc              "add",
                     "Add agents that runs a command in the current directory"
   include_options   groups: [:write, :add, :respond_with_agents]
-  def setup
+  def add
     agent = agent_class.add **option_kwds( groups: :write )
     
     logger.info "`#{ agent.label }` agent created."

data/lib/locd/cli/command/rotate_logs.rb

@@ -27,7 +27,7 @@ using NRSER::Types
 
 # Manage log rotation.
 # 
-class Locd::CLI::Command::RotateLogs < Locd::CLI::Command::Agent
+class Locd::CLI::Command::RotateLogs < Locd::CLI::Command::Job
   
   
   # Helpers
@@ -66,17 +66,34 @@ class Locd::CLI::Command::RotateLogs < Locd::CLI::Command::Agent
   # Commands
   # ============================================================================
   
-  desc              "setup",
+  desc              "add [OPTIONS] [-- CMD_TEMPLATE...]",
                     "Add agents that runs a command in the current directory"
   include_options   groups: [:write, :add, :respond_with_agents]
-  def setup
-    agent = agent_class.add **option_kwds( groups: :write )
+  def add *cmd_template, **kwds
+    if cmd_template.empty? || cmd_template.all?( &:empty? )
+      cmd_template = agent_class.default_cmd_template
+    end
+    
+    if options.key? :label
+      raise Thor::ProhibitedArgumentError,
+        "Label can not be customized on system agents"
+    end
     
-    logger.info "`#{ agent.label }` agent created."
+    kwds[:start_interval] ||= if options[:every] || options[:at]
+      get_start_interval
+    else
+      agent_class.default_start_interval
+    end
     
-    agent.load if options[:load]
+    super *cmd_template, **kwds
     
-    respond agent
+    # agent = agent_class.add **add_kwds
+    # 
+    # logger.info "`#{ agent.label }` agent created."
+    # 
+    # agent.reload if options[:load]
+    # 
+    # respond agent
   end
   
   

data/lib/locd/label.rb

@@ -25,7 +25,7 @@ module Locd::Label
   # @param [String] string
   #   Glob-style pattern to search for in {Locd::Agent#label} strings.
   # 
-  # @param [Boolean] exact:
+  # @param [Boolean] full:
   #   When `false`, the returned Regexp will match any part of label
   #   strings.
   #   
@@ -36,7 +36,7 @@ module Locd::Label
   #   Makes the Regexp case-insensitive.
   # 
   # 
-  def self.regexp_for_glob string, exact: false, ignore_case: false
+  def self.regexp_for_glob string, full: false, ignore_case: false
     string.
       # Uncommon option: `-1` causes empty segments to be included, which
       # fixes the issue of `*` at start or end
@@ -45,7 +45,7 @@ module Locd::Label
       join( '.*' ).
       thru { |regexp_string|
         # Add `\A` and `\z` caps if `exact` is set
-        regexp_string = "\\A#{ regexp_string }\\z" if exact
+        regexp_string = "\\A#{ regexp_string }\\z" if full
         
         Regexp.new regexp_string, ignore_case
       }

data/lib/locd/launchctl.rb

@@ -31,6 +31,9 @@ using NRSER::Types
 # 
 module Locd::Launchctl
   
+  # Constants
+  # ============================================================================
+  
   # Mappings between any option keyword names we use to the ones `launchctl`
   # expects.
   # 
@@ -53,10 +56,24 @@ module Locd::Launchctl
   STATUS_CACHE_TIMEOUT_SEC = 5
   
   
+  # Mixins
+  # ============================================================================
+  
   # Add {.logger} method
   include SemanticLogger::Loggable
   
   
+  # Classes
+  # ============================================================================
+  
+  class Error < StandardError; end
+  
+  
+  # Raised when we failed to parse some output from `launchctl`.
+  # 
+  class ParseError < Error; end
+  
+  
   # `launchctl` executable to use. You shouldn't need to touch this, but might
   # be useful for testing or if you have path weirdness.
   # 
@@ -141,7 +158,27 @@ module Locd::Launchctl
   
   
   def self.disabled
-    execute :'print-disabled', Cmds.expr( "user/$(id -u)" )
+    uid = Cmds.chomp! 'id -u'
+    result = execute :'print-disabled', "user/#{ uid }"
+    
+    lines = if match = /disabled\ services\ =\ \{([^\}]+)\}/.match( result.out )
+      match[1].lines
+    else
+      raise ParseError.new binding.erb <<~END
+        Unable to find 'disabled services' section output
+        
+        Command:
+        
+            <%= result.cmd %>
+        
+        Output:
+        
+            <%= result.out %>
+        
+      END
+    end
+    
+    lines
   end
   
   

data/lib/locd/logging.rb

@@ -272,26 +272,65 @@ module Locd::Logging
   end
   
   
-  def self.get_env_level
-    if ENV['LOCD_TRACE'].truthy?
+  def self.get_config_level
+    if Locd.config[:trace].truthy?
       return :trace
-    elsif ENV['LOCD_DEBUG'].truthy?
+    elsif Locd.config[:debug].truthy?
       return :debug
-    elsif ENV['LOCD_LOG_LEVEL']
-      return ENV['LOCD_LOG_LEVEL'].to_sym
+    elsif level = Locd.config[:log, :level]
+      return level.to_sym
     end
     
     nil
   end
   
   
+  def self.set_config_levels
+    if levels = Locd.config[:log, :levels]
+      levels.each do |name, level|
+        const = begin
+          NRSER.to_const name
+        rescue
+          next
+        end
+        
+        level = level.to_sym
+        
+        self.logger.debug "Setting logger level",
+          logger: const.logger,
+          level: level
+        
+        const.logger.level = level
+        
+        self.logger.debug "Logger level set",
+          logger: const.logger
+      end
+    end
+  end
+  
+  
   # Setup logging.
   # 
-  # @param [type] arg_name
-  #   @todo Add name param description.
+  # @param [Symbol?] level:
+  #   Optional log level. If provided, it takes precedence. Otherwise, we will
+  #   look for log levels in the ENV vars. If nothing is found, no default
+  #   log level will be set - it will remain whatever default it already is
+  #   (usually `:info` unless something else has changed it).
+  # 
+  # @param [Boolean] sync:
+  #   When `true`, we will hack out Semantic Logger's async (threaded)
+  #   processor and install a synchronous one, which is what you want when
+  #   running from the CLI so that output is in order with execution (we don't
+  #   care about the performance implications there).
+  # 
+  # @param [IO | Hash | String] dest:
+  #   Set the appender, see {.appender=}.
+  # 
+  # @return [true]
+  #   If logging was setup.
   # 
-  # @return [return_type]
-  #   @todo Document return value.
+  # @return [false]
+  #   If logging has already been setup (warning will be logged as well).
   # 
   def self.setup level: nil, sync: false, dest: nil
     if setup?
@@ -301,7 +340,7 @@ module Locd::Logging
     
     SemanticLogger.application = 'locd'
     
-    level = get_env_level if level.nil?
+    level = get_config_level if level.nil?
     self.level = level if level
     self.appender = dest if dest
     

data/lib/locd/newsyslog.rb

@@ -221,10 +221,7 @@ module Locd::Newsyslog
     workdir = workdir.to_pn
     
     # Collect the unique log paths
-    log_paths = [
-      agent.out_path,
-      agent.err_path,
-    ].compact.uniq
+    log_paths = agent.log_paths
     
     if log_paths.empty?
       logger.info "Agent #{ agent.label } has no log files."

data/lib/locd/pattern.rb

@@ -19,6 +19,28 @@ class Locd::Pattern
   #   1.  {String}        - a new pattern will be constructed.
   #   2.  {Locd::Pattern} - will just be returned.
   # 
+  # @param [Hash<Symbol, Object>] options
+  #   Options that will be passed to the concrete class constructor when
+  #   `object` is a string.
+  # 
+  # @option options [Boolean] full:
+  #   When `true`, pattern must match entire labels.
+  #   
+  #   When `false`, pattern may match any portion of label.
+  #   
+  #   Label patterns only.
+  # 
+  # @option options [Boolean] ignore_case:
+  #   Case-insensitive match (label patterns only).
+  # 
+  # @option options [Boolean] recursive:
+  #   Additionally match agents with `workdir` in subdirectories (workdir
+  #   patterns only).
+  # 
+  # @option options [String | Pathname] cwd:
+  #   Current working directory to base relative paths from (workdir patterns
+  #   only).
+  # 
   # @return [Locd::Pattern::Label | Locd::Pattern::Workdir]
   #   Pattern instance.
   # 
@@ -80,7 +102,12 @@ class Locd::Pattern
 end # class Locd::Pattern
 
 
-# A {Locd::Pattern} that matches against {Locd::Agent} labels.
+# A {Locd::Pattern} that matches against {Locd::Agent} labels with "glob-style"
+# matching (like the [lunchy](https://rubygems.org/gems/lunchy) gem).
+# 
+# **_Right now only handles the `*` wildcard!_**
+# 
+# @see Locd::Label.regexp_for_glob
 # 
 class Locd::Pattern::Label < Locd::Pattern
   
@@ -101,12 +128,21 @@ class Locd::Pattern::Label < Locd::Pattern
   
   # Instantiate a new `Locd::Pattern::Label`.
   # 
-  # @param (see Locd::Label.regexp_for_glob)
+  # @param [String] source
+  #   "Glob-style" pattern to search for in {Locd::Agent#label} strings.
+  #   
+  # @param [Boolean] full:
+  #   When `true`, pattern must match entire label.
+  #   
+  #   When `false` (default), may match any portion.
+  # 
+  # @param [Boolean] ignore_case:
+  #   Perform case-insensitive matching.
   # 
-  def initialize source, exact: false, ignore_case: false
+  def initialize source, full: false, ignore_case: false
     super source
     @regexp = Locd::Label.regexp_for_glob source,
-                                          exact: exact,
+                                          full: full,
                                           ignore_case: ignore_case
   end # #initialize
   
@@ -163,7 +199,7 @@ class Locd::Pattern::Workdir < Locd::Pattern
   #   
   #   See {#recursive}.
   # 
-  # @param [Pathname] cwd:
+  # @param [String | Pathname] cwd:
   #   Directory to expand relative paths against.
   # 
   def initialize source, recursive: false, cwd: Pathname.getwd