locd 0.1.12 → 0.1.13

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

@@ -0,0 +1,57 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+
+require 'nrser/refinements/types'
+using NRSER::Types
+
+
+# Namespace
+# =======================================================================
+
+module  Locd
+module  CLI
+module  Command
+
+
+# Definitions
+# =======================================================================
+
+class Job < Agent
+  
+  desc              "add [OPTIONS] -- CMD_TEMPLATE...",
+                    "Add job that runs in the current directory"
+  
+  include_shared    t[  groups:
+                          t.has_any(  :write,
+                                      :add,
+                                      :respond_with_agents  ) ]
+
+  option            :every,
+                    desc: "How often to start the job",
+                    type: :string
+  
+  option            :at,
+                    desc: "Day/time to start the job",
+                    type: :hash
+  
+  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
+    
+    kwds[:start_interval] ||= get_start_interval
+    
+    super *cmd_template, **kwds
+  end
+
+end # class Job
+
+
+# /Namespace
+# =======================================================================
+
+end # module  Command
+end # module  CLI
+end # module  Locd

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

@@ -59,6 +59,7 @@ class Main < Base
   # 
   
   common_class_options :backtrace
+  common_class_options :color
   
   class_option :log_level,
     desc: "Set log level",
@@ -220,9 +221,8 @@ class Main < Base
               Locd::CLI::Command::Proxy,
     desc:     'Deal with the HTTP proxy that routes requests to servers'
                     
-
-  # subcommand  'rotate-logs',
-  subcommand  'rotate_logs',
+  
+  subcommand  'rotate-logs',
               Locd::CLI::Command::RotateLogs,
     desc:     'Deal with the log rotation job'
   

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

@@ -1,18 +1,21 @@
+# encoding: UTF-8
 # frozen_string_literal: true
 
+
 # Requirements
 # =======================================================================
 
-# Stdlib
-# -----------------------------------------------------------------------
+### Stdlib ###
+
 require 'shellwords'
 
-# Deps
-# -----------------------------------------------------------------------
+### Deps ###
+
 require 'thor'
 
-# Project / Package
-# -----------------------------------------------------------------------
+### Project / Package ###
+
+require_relative './agent'
 
 
 # Refinements
@@ -22,6 +25,14 @@ require 'nrser/refinements/types'
 using NRSER::Types
 
 
+# Namespace
+# =======================================================================
+
+module  Locd
+module  CLI
+module  Command
+
+
 # Definitions
 # =======================================================================
 
@@ -29,7 +40,7 @@ using NRSER::Types
 # 
 # @see http://whatisthor.com/
 # 
-class Locd::CLI::Command::Proxy < Locd::CLI::Command::Agent
+class Proxy < Agent
   
   
   # Helpers
@@ -52,7 +63,7 @@ class Locd::CLI::Command::Proxy < Locd::CLI::Command::Agent
           logger.error "Proxy agent plist not found",
             expected_path: Locd::Agent::Proxy.plist_abs_path.to_s
             
-          logger.info "Run `locd setup` to create it."
+          logger.info "Run `locd proxy add` to create it."
           
           exit 1
         end
@@ -65,19 +76,23 @@ class Locd::CLI::Command::Proxy < Locd::CLI::Command::Agent
   public
   
   
-  
   # Commands
   # ============================================================================
   
   desc              "add",
                     "Add agents that runs a command in the current directory"
-  include_options   groups: [:write, :add, :respond_with_agents]
+  
+  include_shared    t[  groups: t.HasAny( :add,
+                                          :respond_with_agents  ) ]
+  
+  include_shared    t[ groups: :write, name: t.Not( :label ) ]
+  
   def add
     agent = agent_class.add **option_kwds( groups: :write )
     
     logger.info "`#{ agent.label }` agent created."
     
-    agent.load if options[:load]
+    agent.reload if options[:load]
     
     respond agent
   end
@@ -85,11 +100,13 @@ class Locd::CLI::Command::Proxy < Locd::CLI::Command::Agent
   
   desc              "run",
                     "Run the proxy server (in the foreground)"
+                    
   method_option     :bind,
                     desc: "Address to bind the proxy server to",
                     aliases: ['-b', '--host', '-h'],
                     type: :string,
                     default: Locd.config[:proxy, :bind]
+                    
   method_option     :port,
                     desc: "Port to run the proxy on",
                     aliases: '-p',
@@ -104,6 +121,7 @@ class Locd::CLI::Command::Proxy < Locd::CLI::Command::Agent
   
   desc              "port",
                     "Get port Loc'd proxy is running on or configured for"
+                    
   def port
     respond Locd::Proxy.port
   end
@@ -145,33 +163,39 @@ class Locd::CLI::Command::Proxy < Locd::CLI::Command::Agent
     
   desc              "start",
                     "Start the proxy"
-  option            :write,
-                    desc: "Set `launchd` *Disabled* key to `false`",
-                    type: :boolean
+  include_shared    t[ groups: :start ]
   def start
-    proxy.start **option_kwds( :write )
+    proxy.start **option_kwds( groups: :start )
   end
   
   
   desc              "stop",
                     "Stop the proxy"
-  include_options   groups: [:stop]
+  include_shared    t[ groups: :stop ]
   option            :write,
                     desc: "Set `launchd` *Disabled* key to `true`",
                     type: :boolean
   def stop
-    proxy.stop **option_kwds( :unload, groups: :stop )
+    proxy.stop **option_kwds( groups: :stop )
   end
   
   
   desc              "restart",
                     "Restart the proxy"
-  include_options   groups: [:stop]
+  include_shared    t[ groups: t.HasAny( :start, :stop ) ]
   option            :write,
                     desc: "Set `launchd` *Disabled* key to `false`",
                     type: :boolean
   def restart
-    proxy.restart **option_kwds( :write, groups: :stop )
+    proxy.restart **option_kwds( groups: [ :start, :stop ] )
   end
   
-end # module Locd::CLI::Proxy
+end # class Proxy
+
+
+# /Namespace
+# ============================================================================
+
+end # module  Command
+end # module  CLI
+end # module  Locd

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

@@ -22,12 +22,20 @@ require 'nrser/refinements/types'
 using NRSER::Types
 
 
+# Namespace
+# =======================================================================
+
+module  Locd
+module  CLI
+module  Command
+
+
 # Definitions
 # =======================================================================
 
 # Manage log rotation.
 # 
-class Locd::CLI::Command::RotateLogs < Locd::CLI::Command::Job
+class RotateLogs < Job
   
   
   # Helpers
@@ -58,7 +66,13 @@ class Locd::CLI::Command::RotateLogs < Locd::CLI::Command::Job
         agent
       end
     end
-    
+
+
+    def find_only! pattern; agent; end
+
+    def find_multi! pattern; [ agent ]; end
+
+
   # end protected
   public
   
@@ -66,35 +80,7 @@ class Locd::CLI::Command::RotateLogs < Locd::CLI::Command::Job
   # Commands
   # ============================================================================
   
-  desc              "add [OPTIONS] [-- CMD_TEMPLATE...]",
-                    "Add agents that runs a command in the current directory"
-  include_options   groups: [:write, :add, :respond_with_agents]
-  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
-    
-    kwds[:start_interval] ||= if options[:every] || options[:at]
-      get_start_interval
-    else
-      agent_class.default_start_interval
-    end
-    
-    super *cmd_template, **kwds
-    
-    # agent = agent_class.add **add_kwds
-    # 
-    # logger.info "`#{ agent.label }` agent created."
-    # 
-    # agent.reload if options[:load]
-    # 
-    # respond agent
-  end
+  require_relative './rotate_logs/add'
   
   
   desc              "run",
@@ -107,22 +93,6 @@ class Locd::CLI::Command::RotateLogs < Locd::CLI::Command::Job
   # Agent Interface
   # ----------------------------------------------------------------------------
   
-  desc              'status',
-                    'Print agent status'
-  def status
-    respond \
-      label:  agent.label,
-      status: agent.status
-  end
-  
-  
-  desc              "rm",
-                    "Remove (uninstall, delete) the agent"
-  map               remove: :rm
-  def rm
-    agent.remove
-  end
-  
   
   desc              "plist",
                     "Show the agent's launchd property list"
@@ -147,7 +117,7 @@ class Locd::CLI::Command::RotateLogs < Locd::CLI::Command::Job
   
   desc              "stop",
                     "Stop the agent"
-  include_options   groups: [:stop]
+  include_shared    t[ groups: :stop ]
   option            :write,
                     desc: "Set `launchd` *Disabled* key to `true`",
                     type: :boolean
@@ -158,12 +128,21 @@ class Locd::CLI::Command::RotateLogs < Locd::CLI::Command::Job
   
   desc              "restart",
                     "Restart the agent"
-  include_options   groups: [:stop]
+  include_shared    t[ groups: :stop ]
   option            :write,
                     desc: "Set `launchd` *Disabled* key to `false`",
                     type: :boolean
   def restart
     agent.restart **option_kwds( :write, groups: :stop )
   end
+
   
 end # module Locd::CLI::RotateLogs
+
+
+# /Namespace
+# ========================================================================
+
+end # module  Command
+end # module  CLI
+end # module  Locd

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

@@ -0,0 +1,44 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+
+require 'nrser/refinements/types'
+using NRSER::Types
+
+
+# Namespace
+# =======================================================================
+
+module  Locd
+module  CLI
+module  Command
+
+
+# Definitions
+# =======================================================================
+
+class RotateLogs < Job
+  
+  desc              "add [OPTIONS] [-- CMD_TEMPLATE...]",
+                    "Add the rotate-logs agent"
+
+  include_shared  t[  groups: t.has_any( :add, :respond_with_agents ) ]
+
+  def add
+    agent = agent_class.add **option_kwds( groups: [ :write, :add ] )
+
+    logger.info "#{ agent_class.name } `#{ agent.label }` created."
+    
+    agent.reload if options[:load]
+    
+    respond agent
+  end
+
+end # class RotateLogs
+
+
+# /Namespace
+# =======================================================================
+
+end # module  Command
+end # module  CLI
+end # module  Locd

data/lib/locd/config.rb

@@ -12,6 +12,8 @@ require 'pathname'
 # -----------------------------------------------------------------------
 require 'nrser'
 require 'nrser/core_ext/object'
+require 'nrser/labs/i8'
+require 'nrser/labs/i8/struct'
 
 
 # Project / Package
@@ -64,7 +66,21 @@ class Locd::Config
   # @return [String]
   # 
   KEY_SEPARATOR = '.'
+
   
+  # Classes
+  # ============================================================================
+  
+  class FileLoad < I8::Struct.new(
+    name: t.label?,
+    path: t.Path,
+    prev: t.Hash,
+    parse: t.Hash,
+    post: t.Hash,
+  )
+
+  end # class FileLoad
+
   
   # Attributes
   # ============================================================================
@@ -74,6 +90,13 @@ class Locd::Config
   # @return [Pathname]
   #     
   attr_reader :default_config_path
+
+
+  # TODO document `file_loads` attribute.
+  # 
+  # @return [Array<FileLoad>]
+  #     
+  attr_reader :file_loads
   
   
   # Constructor
@@ -85,16 +108,29 @@ class Locd::Config
     @default_config_path = default_config_path.to_pn
     @dev_config_path = dev_config_path.to_pn
     
+    @file_loads = []
     @from_files = {}
     
-    load_file! default_config_path
+    begin
+      load_file! default_config_path, name: :default
+    rescue StandardError => error
+      logger.error "Failed to load default config!", error
+    end
     
-    if user_config_path.exist?
-      load_file! user_config_path
+    begin
+      if user_config_path.exist?
+        load_file! user_config_path, name: :user
+      end
+    rescue Exception => error
+      logger.error "Failed to load user config!", error
     end
     
-    if dev_config_path && dev_config_path.exist?
-      load_file! dev_config_path
+    begin
+      if dev_config_path && dev_config_path.exist?
+        load_file! dev_config_path, name: :dev
+      end
+    rescue Exception => error
+      logger.error "Failed to load dev config!", error
     end
   end # #initialize
   
@@ -113,11 +149,19 @@ class Locd::Config
     # 
     # @return [nil]
     # 
-    def load_file! path
-      path.
-        to_pn.
-        read.
-        thru { |contents| @from_files.deep_merge! YAML.load( contents ) }
+    def load_file! path, name: nil
+      parse = path.to_pn.read.thru { |str| YAML.safe_load str }
+      post = @from_files.deep_merge parse
+
+      @file_loads << FileLoad.new(
+        name: name,
+        path: path,
+        prev: @from_files,
+        parse: parse,
+        post: post,
+      )
+      
+      @from_files = post
       
       nil
     end # #load_file!
@@ -164,10 +208,20 @@ class Locd::Config
     
     return value if type.nil?
     
-    if value.is_a?( String ) && type.has_from_s?
-      type.from_s value
-    else
-      type.check! value
+    begin
+      if value.is_a?( String ) && type.has_from_s?
+        type.from_s value
+      else
+        type.check! value
+      end
+    rescue NRSER::TypeError => error
+      error.context.merge! \
+        key: key,
+        value: value,
+        type: type,
+        current_config_from_files: @from_files
+
+      raise error
     end
   end
   
@@ -247,22 +301,36 @@ class Locd::Config
   end
   
   
+  # Absolute path to Loc'd home directory (it's workspace). Doesn't check that
+  # the directory exists or anything.
+  # 
   # @return [Pathname]
-  #   Absolute path to Loc'd home directory (it's workspace).
-  #   Directory may not exist, or may be something else like a file.
   #   
   def home_dir
-    self[:home, type: t.abs_path].to_pn
+    self[:home].to_pn
   end
   
-  
+
+  # Directory to save system logs in (proxy, newsyslog, etc...)
+  # 
+  # @return [Pathname]
+  # 
   def log_dir
     self[
-      :log_dir,
-      type: t.abs_path,
+      :log,
+      :dir,
       default: (home_dir / 'log')
     ]
   end
+
+
+  def tmp_dir
+    self[
+      :tmp,
+      :dir,
+      default: ( home_dir / 'tmp' )
+    ]
+  end
   
   
   # @return [Pathname]